Updated Twitter networks

2 files changed, 76 insertions, 28 deletions

diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index b7e3982c3..c15c7a57f 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -21,20 +21,69 @@
 /* ****************************************************** */
 
 static ndpi_network host_protocol_list[] = {
-
- /*
-   Twitter
-   199.59.148.0/22
-   192.133.76.0/22
-   199.16.156.0/22
-   199.96.58.0/23
-   199.96.62.0/23
- */
- { 0xC73B9400 /* 199.59.148.0/22 */, 22, NDPI_SERVICE_TWITTER },
- { 0xC0854C00 /* 199.133.76.0/22 */, 22, NDPI_SERVICE_TWITTER },
- { 0xC7109C00 /* 199.16.156.0/22 */, 22, NDPI_SERVICE_TWITTER },
- { 0xC7603A00 /* 199.96.58.0/23 */,  23, NDPI_SERVICE_TWITTER },
- { 0xC7603E00 /* 199.96.62.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  /*
+    Twitter
+    199.59.148.0/22
+    192.133.76.0/22
+    199.16.156.0/22
+    199.96.58.0/23
+    199.96.62.0/23
+    104.244.40.0/24	
+    104.244.41.0/24	
+    104.244.42.0/24	
+    104.244.43.0/24	
+    104.244.44.0/24
+    104.244.45.0/24
+    104.244.46.0/24
+    104.244.47.0/24
+    185.45.5.0/24
+    185.45.6.0/23
+    192.133.76.0/22
+    199.16.156.0/22
+    199.59.148.0/22
+    199.96.56.0/23
+    199.96.56.0/24
+    199.96.57.0/24
+    199.96.58.0/23
+    199.96.60.0/23
+    199.96.60.0/24
+    199.96.61.0/24
+    199.96.62.0/23
+    202.160.128.0/24
+    202.160.129.0/24
+    202.160.130.0/24
+    202.160.131.0/24
+  */
+  { 0xC73B9400 /* 199.59.148.0/22 */, 22, NDPI_SERVICE_TWITTER },
+  { 0xC0854C00 /* 199.133.76.0/22 */, 22, NDPI_SERVICE_TWITTER },
+  { 0xC7109C00 /* 199.16.156.0/22 */, 22, NDPI_SERVICE_TWITTER },
+  { 0xC7603A00 /* 199.96.58.0/23 */,  23, NDPI_SERVICE_TWITTER },
+  { 0xC7603E00 /* 199.96.62.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  { 0x68F42800 /* 104.244.40.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42900 /* 104.244.41.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42A00 /* 104.244.42.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42B00 /* 104.244.43.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42C00 /* 104.244.44.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42D00 /* 104.244.45.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42E00 /* 104.244.46.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F42F00 /* 104.244.47.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0xB92D0500 /* 185.45.5.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0xB92D0600 /* 185.45.6.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  { 0xC0854C00 /* 192.133.76.0/22 */, 22, NDPI_SERVICE_TWITTER },
+  { 0xC7109C00 /* 199.16.156.0/22 */, 22, NDPI_SERVICE_TWITTER },
+  { 0xC73B9400 /* 199.59.148.0/22 */, 22, NDPI_SERVICE_TWITTER },
+  { 0xC7603800 /* 199.96.56.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  { 0xC7603900 /* 199.96.56.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0xC7603A00 /* 199.96.57.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0xC7603B00 /* 199.96.58.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  { 0xC7603C00 /* 199.96.60.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  { 0xC7603D00 /* 199.96.60.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0xC7603E00 /* 199.96.61.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0xC7603F00 /* 199.96.62.0/23 */, 23, NDPI_SERVICE_TWITTER },
+  { 0x68F28000 /* 202.160.128.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F28100 /* 202.160.129.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F28200 /* 202.160.130.0/24 */, 24, NDPI_SERVICE_TWITTER },
+  { 0x68F28300 /* 202.160.131.0/24 */, 24, NDPI_SERVICE_TWITTER },
 
  /*
    OpenDNS
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 2ebb5d59a..d80359b51 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -42,7 +42,7 @@
 int check_punycode_string(char * buffer , int len)
 {
   int i = 0;
-  
+
   while(i++ < len)
   {
     if( buffer[i] == 'x' &&
@@ -385,7 +385,7 @@ u_int16_t ndpi_get_proto_by_name(struct ndpi_detection_module_struct *ndpi_mod,
   for(i = 0; i < num; i++)
     if(strcasecmp(ndpi_get_proto_by_id(ndpi_mod, i), name) == 0)
       return(i);
-  
+
   return(NDPI_PROTOCOL_UNKNOWN);
 }
 
@@ -1563,7 +1563,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			    no_master, "GoogleHangout", NDPI_PROTOCOL_CATEGORY_CHAT,
 			    ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
 			    ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
-    
+
 
     /* calling function for host and content matched protocols */
     init_string_based_protocols(ndpi_mod);
@@ -1718,12 +1718,12 @@ void ndpi_debug_printf(unsigned int proto, struct ndpi_detection_module_struct *
 {
 #ifdef NDPI_ENABLE_DEBUG_MESSAGES
   va_list args;
-  #define MAX_STR_LEN 120 
+  #define MAX_STR_LEN 120
   char str[MAX_STR_LEN];
   va_start(args, format);
   vsprintf(str, format, args);
   va_end(args);
-  
+
   if (ndpi_str != NULL) {
     char proto_name[64];
 	snprintf(proto_name, sizeof(proto_name), "%s", ndpi_get_proto_name(ndpi_str, proto));
@@ -1805,7 +1805,7 @@ void* ndpi_init_automa(void) {
   return(ac_automata_init(ac_match_handler));
 }
 
-int ndpi_add_string_to_automa(void *_automa, char *str) { 
+int ndpi_add_string_to_automa(void *_automa, char *str) {
   AC_PATTERN_t ac_pattern;
   AC_AUTOMATA_t *automa = (AC_AUTOMATA_t*)_automa;
 
@@ -1826,8 +1826,8 @@ int ndpi_match_string(void *_automa, char *string_to_match) {
   int matching_protocol_id = NDPI_PROTOCOL_UNKNOWN;
   AC_TEXT_t ac_input_text;
   AC_AUTOMATA_t *automa = (AC_AUTOMATA_t*)_automa;
-  
-  if((automa == NULL) 
+
+  if((automa == NULL)
      || (string_to_match == NULL)
      || (string_to_match[0] == '\0'))
     return(-2);
@@ -1899,7 +1899,7 @@ static ndpi_default_ports_tree_node_t* ndpi_get_guessed_protocol_id(struct ndpi_
 								    u_int8_t proto, u_int16_t sport, u_int16_t dport) {
   const void *ret;
   ndpi_default_ports_tree_node_t node;
-  
+
   if(sport && dport) {
     int low  = ndpi_min(sport, dport);
     int high = ndpi_max(sport, dport);
@@ -1934,7 +1934,7 @@ u_int16_t ndpi_guess_protocol_id(struct ndpi_detection_module_struct *ndpi_struc
 
     if(found != NULL) {
       *user_defined_proto = found->customUserProto;
-      return(found->proto->protoId);    
+      return(found->proto->protoId);
     }
   } else {
     /* No TCP/UDP */
@@ -2612,7 +2612,7 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
 
   /* DRDA */
   init_drda_dissector(ndpi_struct, &a, detection_bitmask);
-  
+
   /*** Put false-positive sensitive protocols at the end ***/
 
   /* SKYPE */
@@ -3340,7 +3340,7 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
 #endif
 	 flow->packet.iph)) {
     u_int8_t user_defined_proto;
-    
+
     flow->protocol_id_already_guessed = 1,
       flow->guessed_protocol_id = (int16_t)ndpi_guess_protocol_id(ndpi_struct, l4_proto, sport, dport, &user_defined_proto);
 
@@ -3348,7 +3348,7 @@ ndpi_protocol ndpi_l4_detection_process_packet(struct ndpi_detection_module_stru
       ret.master_protocol = NDPI_PROTOCOL_UNKNOWN, ret.protocol = flow->guessed_protocol_id;
       return(ret);
     }
-      
+
     if(flow->packet.iph) {
       if((flow->guessed_host_protocol_id = ndpi_network_ptree_match(ndpi_struct, (struct in_addr *)&flow->packet.iph->saddr)) == NDPI_PROTOCOL_UNKNOWN)
         flow->guessed_host_protocol_id = ndpi_network_ptree_match(ndpi_struct, (struct in_addr *)&flow->packet.iph->daddr);
@@ -4768,4 +4768,3 @@ void NDPI_DUMP_BITMASK(NDPI_PROTOCOL_BITMASK a) {
 
   printf("\n");
 }
-