Split former protocol into upper and lower protocol

1 files changed, 25 insertions, 32 deletions

diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c
index 27827afa5..cadc43f6d 100644
--- a/src/lib/protocols/ssh.c
+++ b/src/lib/protocols/ssh.c
@@ -27,42 +27,35 @@
 #ifdef NDPI_PROTOCOL_SSH
 
 static void ndpi_int_ssh_add_connection(struct ndpi_detection_module_struct
-										  *ndpi_struct, struct ndpi_flow_struct *flow)
-{
-	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSH);
+					*ndpi_struct, struct ndpi_flow_struct *flow){
+  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SSH, NDPI_PROTOCOL_UNKNOWN);
 }
 
 void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
-	struct ndpi_packet_struct *packet = &flow->packet;
-	
-//      struct ndpi_id_struct         *src=ndpi_struct->src;
-//      struct ndpi_id_struct         *dst=ndpi_struct->dst;
-
-
-
-	if (flow->l4.tcp.ssh_stage == 0) {
-		if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
-			&& memcmp(packet->payload, "SSH-", 4) == 0) {
-			NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "ssh stage 0 passed\n");
-			flow->l4.tcp.ssh_stage = 1 + packet->packet_direction;
-			return;
-		}
-	} else if (flow->l4.tcp.ssh_stage == (2 - packet->packet_direction)) {
-		if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
-			&& memcmp(packet->payload, "SSH-", 4) == 0) {
-			NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "found ssh\n");
-			ndpi_int_ssh_add_connection(ndpi_struct, flow);
-			return;
-
-		}
-
-
-	}
-
-	NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "excluding ssh at stage %d\n", flow->l4.tcp.ssh_stage);
-
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSH);
+  struct ndpi_packet_struct *packet = &flow->packet;	
+  //      struct ndpi_id_struct         *src=ndpi_struct->src;
+  //      struct ndpi_id_struct         *dst=ndpi_struct->dst;
+
+  if (flow->l4.tcp.ssh_stage == 0) {
+    if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
+	&& memcmp(packet->payload, "SSH-", 4) == 0) {
+      NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "ssh stage 0 passed\n");
+      flow->l4.tcp.ssh_stage = 1 + packet->packet_direction;
+      return;
+    }
+  } else if (flow->l4.tcp.ssh_stage == (2 - packet->packet_direction)) {
+    if (packet->payload_packet_len > 7 && packet->payload_packet_len < 100
+	&& memcmp(packet->payload, "SSH-", 4) == 0) {
+      NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "found ssh\n");
+      ndpi_int_ssh_add_connection(ndpi_struct, flow);
+      return;
+
+    }
+  }
+
+  NDPI_LOG(NDPI_PROTOCOL_SSH, ndpi_struct, NDPI_LOG_DEBUG, "excluding ssh at stage %d\n", flow->l4.tcp.ssh_stage);
+  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSH);
 }
 
 #endif