Split former protocol into upper and lower protocol

1 files changed, 58 insertions, 58 deletions

diff --git a/src/lib/protocols/telnet.c b/src/lib/protocols/telnet.c
index b54b09865..4ed6c79ae 100644
--- a/src/lib/protocols/telnet.c
+++ b/src/lib/protocols/telnet.c
@@ -29,79 +29,79 @@
 
 
 static void ndpi_int_telnet_add_connection(struct ndpi_detection_module_struct
-											 *ndpi_struct, struct ndpi_flow_struct *flow)
+					   *ndpi_struct, struct ndpi_flow_struct *flow)
 {
-	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TELNET);
+  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TELNET, NDPI_PROTOCOL_UNKNOWN);
 }
 
 	
 #if !defined(WIN32)
- static inline
+static inline
 #else
 __forceinline static
 #endif
-	 u_int8_t search_iac(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
+u_int8_t search_iac(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
-	struct ndpi_packet_struct *packet = &flow->packet;
-
-	u_int16_t a;
-
-	if (packet->payload_packet_len < 3) {
-		return 0;
-	}
-
-	if (!(packet->payload[0] == 0xff
-		  && packet->payload[1] > 0xf9 && packet->payload[1] != 0xff && packet->payload[2] < 0x28)) {
-		return 0;
-	}
-
-	a = 3;
-
-	while (a < packet->payload_packet_len - 2) {
-		// commands start with a 0xff byte followed by a command byte >= 0xf0 and < 0xff
-		// command bytes 0xfb to 0xfe are followed by an option byte <= 0x28
-		if (!(packet->payload[a] != 0xff ||
-			  (packet->payload[a] == 0xff && (packet->payload[a + 1] >= 0xf0) && (packet->payload[a + 1] <= 0xfa)) ||
-			  (packet->payload[a] == 0xff && (packet->payload[a + 1] >= 0xfb) && (packet->payload[a + 1] != 0xff)
-			   && (packet->payload[a + 2] <= 0x28)))) {
-			return 0;
-		}
-		a++;
-	}
-
-	return 1;
+  struct ndpi_packet_struct *packet = &flow->packet;
+
+  u_int16_t a;
+
+  if (packet->payload_packet_len < 3) {
+    return 0;
+  }
+
+  if (!(packet->payload[0] == 0xff
+	&& packet->payload[1] > 0xf9 && packet->payload[1] != 0xff && packet->payload[2] < 0x28)) {
+    return 0;
+  }
+
+  a = 3;
+
+  while (a < packet->payload_packet_len - 2) {
+    // commands start with a 0xff byte followed by a command byte >= 0xf0 and < 0xff
+    // command bytes 0xfb to 0xfe are followed by an option byte <= 0x28
+    if (!(packet->payload[a] != 0xff ||
+	  (packet->payload[a] == 0xff && (packet->payload[a + 1] >= 0xf0) && (packet->payload[a + 1] <= 0xfa)) ||
+	  (packet->payload[a] == 0xff && (packet->payload[a + 1] >= 0xfb) && (packet->payload[a + 1] != 0xff)
+	   && (packet->payload[a + 2] <= 0x28)))) {
+      return 0;
+    }
+    a++;
+  }
+
+  return 1;
 }
 
 /* this detection also works asymmetrically */
 void ndpi_search_telnet_tcp(struct ndpi_detection_module_struct
-							  *ndpi_struct, struct ndpi_flow_struct *flow)
+			    *ndpi_struct, struct ndpi_flow_struct *flow)
 {
-//  struct ndpi_packet_struct *packet = &flow->packet;
+  //  struct ndpi_packet_struct *packet = &flow->packet;
 	
-//      struct ndpi_id_struct         *src=ndpi_struct->src;
-//      struct ndpi_id_struct         *dst=ndpi_struct->dst;
-
-	NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "search telnet.\n");
-
-	if (search_iac(ndpi_struct, flow) == 1) {
-
-		if (flow->l4.tcp.telnet_stage == 2) {
-			NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "telnet identified.\n");
-			ndpi_int_telnet_add_connection(ndpi_struct, flow);
-			return;
-		}
-		flow->l4.tcp.telnet_stage++;
-		NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "telnet stage %u.\n", flow->l4.tcp.telnet_stage);
-		return;
-	}
-
-	if ((flow->packet_counter < 12 && flow->l4.tcp.telnet_stage > 0) || flow->packet_counter < 6) {
-		return;
-	} else {
-		NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "telnet excluded.\n");
-		NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TELNET);
-	}
-	return;
+  //      struct ndpi_id_struct         *src=ndpi_struct->src;
+  //      struct ndpi_id_struct         *dst=ndpi_struct->dst;
+
+  NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "search telnet.\n");
+
+  if (search_iac(ndpi_struct, flow) == 1) {
+
+    if (flow->l4.tcp.telnet_stage == 2) {
+      NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "telnet identified.\n");
+      ndpi_int_telnet_add_connection(ndpi_struct, flow);
+      return;
+    }
+    flow->l4.tcp.telnet_stage++;
+    NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "telnet stage %u.\n", flow->l4.tcp.telnet_stage);
+    return;
+  }
+
+  if ((flow->packet_counter < 12 && flow->l4.tcp.telnet_stage > 0) || flow->packet_counter < 6) {
+    return;
+  } else {
+    NDPI_LOG(NDPI_PROTOCOL_TELNET, ndpi_struct, NDPI_LOG_DEBUG, "telnet excluded.\n");
+    NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TELNET);
+  }
+  return;
 }
 
 #endif