Win and indentation fixes

1 files changed, 114 insertions, 142 deletions

diff --git a/src/lib/protocols/softether.c b/src/lib/protocols/softether.c
index 6afdebb4a..59ba80b03 100644
--- a/src/lib/protocols/softether.c
+++ b/src/lib/protocols/softether.c
@@ -53,9 +53,10 @@ struct softether_value {
 static int ndpi_search_softether_again(struct ndpi_detection_module_struct *ndpi_struct,
                                        struct ndpi_flow_struct *flow);
 
+/* ***************************************************** */
+
 static void ndpi_int_softether_add_connection(struct ndpi_detection_module_struct * const ndpi_struct,
-                                             struct ndpi_flow_struct * const flow)
-{
+					      struct ndpi_flow_struct * const flow) {
   NDPI_LOG_INFO(ndpi_struct, "found softether\n");
 
   flow->check_extra_packets = 1;
@@ -68,22 +69,22 @@ static void ndpi_int_softether_add_connection(struct ndpi_detection_module_struc
                              NDPI_CONFIDENCE_DPI);
 }
 
+/* ***************************************************** */
+
 static size_t dissect_softether_type(enum softether_value_type t,
                                      struct softether_value *v,
                                      u_int8_t const *payload,
-                                     u_int16_t payload_len)
-{
+                                     u_int16_t payload_len) {
   size_t ret = 0;
   v->type = t;
   v->value_size = 0;
 
   switch (t)
-  {
+    {
     case VALUE_INT:
-      if (payload_len < 4)
-      {
-        return 0;
-      }
+      if(payload_len < 4)
+	return 0;
+
       v->value.value_int = ntohl(get_u_int32_t(payload, 0));
       v->value_size = sizeof(v->value.value_int);
       ret = v->value_size;
@@ -92,47 +93,42 @@ static size_t dissect_softether_type(enum softether_value_type t,
     case VALUE_DATA:
     case VALUE_STR:
     case VALUE_UNISTR:
-      if (payload_len < 4)
-      {
-        return 0;
-      }
+      if(payload_len < 4)
+	return 0;
+
       v->value.ptr.raw = payload + 4;
       u_int32_t siz = ntohl(get_u_int32_t(payload, 0));
-      if (payload_len < siz + 3)
-      {
-        return 0;
-      }
-      if (t == VALUE_DATA)
-      {
-        siz--;
-      }
+      if(payload_len < siz + 3)
+	return 0;
+
+      if(t == VALUE_DATA)
+	siz--;
+
       v->value_size = siz;
       ret = siz + sizeof(siz);
       break;
 
     case VALUE_INT64:
-      if (payload_len < 8)
-      {
-        return 0;
-      }
-      v->value.value_int64 = be64toh(get_u_int64_t(payload, 0));
+      if(payload_len < 8)
+	return 0;
+
+      v->value.value_int64 = ndpi_ntohll(get_u_int64_t(payload, 0));
       v->value_size = sizeof(v->value.value_int64);
       ret = v->value_size;
       break;
-  }
+    }
 
-  if (ret > payload_len)
-  {
+  if(ret > payload_len)
     return 0;
-  }
 
   return ret;
 }
 
-static int softether_type_to_enum(u_int32_t type, enum softether_value_type *result)
-{
+/* ***************************************************** */
+
+static int softether_type_to_enum(u_int32_t type, enum softether_value_type *result) {
   switch (type)
-  {
+    {
     case VALUE_INT:
     case VALUE_DATA:
     case VALUE_STR:
@@ -140,30 +136,27 @@ static int softether_type_to_enum(u_int32_t type, enum softether_value_type *res
     case VALUE_INT64:
       *result = (enum softether_value_type)type;
       return 0;
-  }
+    }
 
   return 1;
 }
 
+/* ***************************************************** */
+
 static size_t dissect_softether_tuples(u_int8_t const *payload, u_int16_t payload_len,
                                        struct softether_value *first_value,
-                                       struct softether_value *second_value)
-{
+                                       struct softether_value *second_value) {
   enum softether_value_type first_tuple_type;
   enum softether_value_type second_tuple_type;
   size_t value_siz;
   size_t const tuple_type_len = 8;
 
-  if (payload_len < tuple_type_len)
-  {
+  if(payload_len < tuple_type_len)
     return 0;
-  }
 
-  if (softether_type_to_enum(ntohl(get_u_int32_t(payload, 0)), &first_tuple_type) != 0 ||
-      softether_type_to_enum(ntohl(get_u_int32_t(payload, 4)), &second_tuple_type) != 0)
-  {
+  if(softether_type_to_enum(ntohl(get_u_int32_t(payload, 0)), &first_tuple_type) != 0 ||
+     softether_type_to_enum(ntohl(get_u_int32_t(payload, 4)), &second_tuple_type) != 0)
     return 0;
-  }
 
   payload += tuple_type_len;
   payload_len -= tuple_type_len;
@@ -178,9 +171,10 @@ static size_t dissect_softether_tuples(u_int8_t const *payload, u_int16_t payloa
   return value_siz + tuple_type_len;
 }
 
+/* ***************************************************** */
+
 static int dissect_softether_host_fqdn(struct ndpi_flow_struct *flow,
-                                       struct ndpi_packet_struct const *packet)
-{
+                                       struct ndpi_packet_struct const *packet) {
   u_int8_t const *payload = packet->payload;
   u_int16_t payload_len = packet->payload_packet_len;
   u_int32_t tuple_count;
@@ -188,66 +182,54 @@ static int dissect_softether_host_fqdn(struct ndpi_flow_struct *flow,
   struct softether_value val1, val2;
   uint8_t got_hostname = 0, got_fqdn = 0;
 
-  if (payload_len < 4)
-  {
+  if(payload_len < 4)
     return 1;
-  }
 
   tuple_count = ntohl(get_u_int32_t(payload, 0));
-  if (tuple_count == 0 || tuple_count * 8 > payload_len)
-  {
+  if(tuple_count == 0 || tuple_count * 8 > payload_len)
     return 1;
-  }
 
   payload += 4;
   payload_len -= 4;
 
   value_siz = dissect_softether_type(VALUE_DATA, &val1, payload, payload_len);
-  if (value_siz == 0)
-  {
+  if(value_siz == 0)
     return 1;
-  }
 
   payload += value_siz;
   payload_len -= value_siz;
 
-  if (strncmp(val1.value.ptr.value_str, "host_name", value_siz) == 0)
-  {
+  if(strncmp(val1.value.ptr.value_str, "host_name", value_siz) == 0)
     got_hostname = 1;
-  }
 
-  for (; tuple_count > 0; --tuple_count)
-  {
+  for (; tuple_count > 0; --tuple_count) {
     value_siz = dissect_softether_tuples(payload, payload_len, &val1, &val2);
-    if (value_siz == 0)
-    {
+    if(value_siz == 0)
       break;
-    }
 
-    if (got_hostname == 1)
-    {
-      if (val1.type == VALUE_STR && val1.value_size > 0)
-      {
-        size_t len = ndpi_min(val1.value_size, sizeof(flow->protos.softether.hostname) - 1);
-        strncpy(flow->protos.softether.hostname, val1.value.ptr.value_str, len);
-        flow->protos.softether.hostname[len] = '\0';
+    if(got_hostname == 1) {
+      if(val1.type == VALUE_STR && val1.value_size > 0) {
+	size_t len = ndpi_min(val1.value_size, sizeof(flow->protos.softether.hostname) - 1);
+	      
+	strncpy(flow->protos.softether.hostname, val1.value.ptr.value_str, len);
+	flow->protos.softether.hostname[len] = '\0';
       }
+	  
       got_hostname = 0;
     }
-    if (got_fqdn == 1)
-    {
-      if (val1.type == VALUE_STR && val1.value_size > 0)
-      {
-        size_t len = ndpi_min(val1.value_size, sizeof(flow->protos.softether.fqdn) - 1);
-        strncpy(flow->protos.softether.fqdn, val1.value.ptr.value_str, len);
-        flow->protos.softether.fqdn[len] = '\0';
+    if(got_fqdn == 1) {
+      if(val1.type == VALUE_STR && val1.value_size > 0)  {
+	size_t len = ndpi_min(val1.value_size, sizeof(flow->protos.softether.fqdn) - 1);
+	      
+	strncpy(flow->protos.softether.fqdn, val1.value.ptr.value_str, len);
+	flow->protos.softether.fqdn[len] = '\0';
       }
+	  
       got_fqdn = 0;
     }
 
-    if (val2.type == VALUE_DATA && val2.value_size > 0 &&
-        strncmp(val2.value.ptr.value_str, "ddns_fqdn", val2.value_size) == 0)
-    {
+    if(val2.type == VALUE_DATA && val2.value_size > 0 &&
+       strncmp(val2.value.ptr.value_str, "ddns_fqdn", val2.value_size) == 0)	{
       got_fqdn = 1;
     }
 
@@ -255,98 +237,86 @@ static int dissect_softether_host_fqdn(struct ndpi_flow_struct *flow,
     payload_len -= value_siz;
   }
 
-  if (payload_len != 0 || tuple_count != 0)
-  {
+  if(payload_len != 0 || tuple_count != 0)
     return 1;
-  }
 
   return 0;
 }
 
+/* ***************************************************** */
+
 static int dissect_softether_ip_port(struct ndpi_flow_struct *flow,
-                                     struct ndpi_packet_struct const *packet)
-{
+                                     struct ndpi_packet_struct const *packet) {
   char * ip_port_separator;
   size_t ip_len, port_len;
 
-  if (packet->payload_packet_len < NDPI_STATICSTRING_LEN("IP=") +
-                                   NDPI_STATICSTRING_LEN(",PORT="))
-  {
-    return 1;
-  }
+  if(packet->payload_packet_len < NDPI_STATICSTRING_LEN("IP=") +
+     NDPI_STATICSTRING_LEN(",PORT="))
+    return 1;    
 
-  if (strncmp((char *)&packet->payload[0], "IP=", NDPI_STATICSTRING_LEN("IP=")) != 0)
-  {
-    return 1;
-  }
+  if(strncmp((char *)&packet->payload[0], "IP=", NDPI_STATICSTRING_LEN("IP=")) != 0)    
+    return 1;    
 
   ip_port_separator = ndpi_strnstr((char const *)packet->payload + NDPI_STATICSTRING_LEN("IP="),
                                    ",PORT=",
                                    packet->payload_packet_len - NDPI_STATICSTRING_LEN("IP="));
-  if (ip_port_separator == NULL)
-  {
-    return 1;
-  }
+  if(ip_port_separator == NULL)    
+    return 1;    
 
-  if (ip_port_separator < (char const *)packet->payload + NDPI_STATICSTRING_LEN("IP="))
-  {
-    return 1;
-  }
+  if(ip_port_separator < (char const *)packet->payload + NDPI_STATICSTRING_LEN("IP="))    
+    return 1;    
 
   ip_len = ndpi_min(sizeof(flow->protos.softether.ip) - 1,
                     ip_port_separator - (char const *)packet->payload -
                     NDPI_STATICSTRING_LEN("IP="));
-  strncpy(flow->protos.softether.ip, (char const *)packet->payload + NDPI_STATICSTRING_LEN("IP="),
+
+  strncpy(flow->protos.softether.ip,
+	  (char const *)packet->payload + NDPI_STATICSTRING_LEN("IP="),
           ip_len);
   flow->protos.softether.ip[ip_len] = '\0';
 
-  if (ip_port_separator < (char const *)packet->payload +
-                          NDPI_STATICSTRING_LEN("IP=") + NDPI_STATICSTRING_LEN(",PORT="))
-  {
-    return 1;
-  }
+  if(ip_port_separator < (char const *)packet->payload +
+     NDPI_STATICSTRING_LEN("IP=") + NDPI_STATICSTRING_LEN(",PORT="))
+    return 1;    
 
   port_len = ndpi_min(sizeof(flow->protos.softether.port) - 1,
                       ip_port_separator - (char const *)packet->payload -
                       NDPI_STATICSTRING_LEN("IP=") - NDPI_STATICSTRING_LEN(",PORT="));
-  strncpy(flow->protos.softether.port, ip_port_separator + NDPI_STATICSTRING_LEN(",PORT="),
+
+  strncpy(flow->protos.softether.port,
+	  ip_port_separator + NDPI_STATICSTRING_LEN(",PORT="),
           port_len);
+  
   flow->protos.softether.port[port_len] = '\0';
 
   return 0;
 }
 
+/* ***************************************************** */
+
 void ndpi_search_softether(struct ndpi_detection_module_struct *ndpi_struct,
-                           struct ndpi_flow_struct *flow)
-{
+                           struct ndpi_flow_struct *flow) {
   struct ndpi_packet_struct const * const packet = &ndpi_struct->packet;
 
   NDPI_LOG_DBG(ndpi_struct, "search softether\n");
 
-  if (packet->payload_packet_len == 1)
-  {
-    if (packet->payload[0] != 0x41 ||
-        flow->packet_counter > 2)
-    {
-      NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-    }
+  if(packet->payload_packet_len == 1) {
+
+    if((packet->payload[0] != 0x41) || (flow->packet_counter > 2))	
+      NDPI_EXCLUDE_PROTO(ndpi_struct, flow);	
 
     return;
   }
 
-  if (packet->payload_packet_len > 9 && packet->payload_packet_len < 30)
-  {
-    if (dissect_softether_ip_port(flow, packet) == 0)
-    {
+  if(packet->payload_packet_len > 9 && packet->payload_packet_len < 30) {
+    if(dissect_softether_ip_port(flow, packet) == 0) {
       ndpi_int_softether_add_connection(ndpi_struct, flow);
       return;
     }
   }
-
-  if (packet->payload_packet_len >= 99)
-  {
-    if (dissect_softether_host_fqdn(flow, packet) == 0)
-    {
+    
+  if(packet->payload_packet_len >= 99) {
+    if(dissect_softether_host_fqdn(flow, packet) == 0) {
       ndpi_int_softether_add_connection(ndpi_struct, flow);
       return;
     }
@@ -355,15 +325,16 @@ void ndpi_search_softether(struct ndpi_detection_module_struct *ndpi_struct,
   NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }
 
+/* ***************************************************** */
+  
 static int ndpi_search_softether_again(struct ndpi_detection_module_struct *ndpi_struct,
-                                       struct ndpi_flow_struct *flow)
-{
-  if (dissect_softether_ip_port(flow, &ndpi_struct->packet) == 0 ||
-      dissect_softether_host_fqdn(flow, &ndpi_struct->packet) == 0)
-  {
-    if (flow->protos.softether.ip[0] != '\0' && flow->protos.softether.port[0] != '\0' &&
-        flow->protos.softether.hostname[0] != '\0' && flow->protos.softether.fqdn[0] != '\0')
-    {
+				       struct ndpi_flow_struct *flow) {
+  if((dissect_softether_ip_port(flow, &ndpi_struct->packet) == 0)
+     || (dissect_softether_host_fqdn(flow, &ndpi_struct->packet) == 0)) {
+    if((flow->protos.softether.ip[0] != '\0')
+       && (flow->protos.softether.port[0] != '\0')
+       && (flow->protos.softether.hostname[0] != '\0')
+       && (flow->protos.softether.fqdn[0] != '\0')) {
       flow->check_extra_packets = 0;
       flow->max_extra_packets_to_check = 0;
       flow->extra_packets_func = NULL;
@@ -375,16 +346,17 @@ static int ndpi_search_softether_again(struct ndpi_detection_module_struct *ndpi
   return 1;
 }
 
+/* ***************************************************** */
+  
 void init_softether_dissector(struct ndpi_detection_module_struct *ndpi_struct,
-                              u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
-{
+			      u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) {
   ndpi_set_bitmask_protocol_detection("Softether", ndpi_struct, detection_bitmask, *id,
-    NDPI_PROTOCOL_SOFTETHER,
-    ndpi_search_softether,
-    NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
-    SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-    ADD_TO_DETECTION_BITMASK
-  );
+				      NDPI_PROTOCOL_SOFTETHER,
+				      ndpi_search_softether,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
+				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK
+				      );
 
   *id += 1;
 }