Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	src/include/ndpi_protocols.h
	src/lib/ndpi_main.c
	src/lib/protocols/afp.c
	src/lib/protocols/aimini.c
	src/lib/protocols/applejuice.c
	src/lib/protocols/armagetron.c
	src/lib/protocols/ayiya.c
	src/lib/protocols/battlefield.c
	src/lib/protocols/bgp.c
	src/lib/protocols/bittorrent.c
	src/lib/protocols/ciscovpn.c
	src/lib/protocols/citrix.c
	src/lib/protocols/corba.c
	src/lib/protocols/crossfire.c
	src/lib/protocols/dcerpc.c
	src/lib/protocols/dhcp.c
	src/lib/protocols/dhcpv6.c
	src/lib/protocols/directconnect.c
	src/lib/protocols/directdownloadlink.c
	src/lib/protocols/dns.c
	src/lib/protocols/dofus.c
	src/lib/protocols/dropbox.c
	src/lib/protocols/eaq.c
	src/lib/protocols/edonkey.c
	src/lib/protocols/fasttrack.c
	src/lib/protocols/fiesta.c
	src/lib/protocols/filetopia.c
	src/lib/protocols/florensia.c
	src/lib/protocols/ftp_control.c
	src/lib/protocols/ftp_data.c
	src/lib/protocols/gnutella.c
	src/lib/protocols/gtp.c
	src/lib/protocols/guildwars.c
	src/lib/protocols/h323.c
	src/lib/protocols/halflife2_and_mods.c
	src/lib/protocols/http.c
	src/lib/protocols/http_activesync.c
	src/lib/protocols/iax.c
	src/lib/protocols/icecast.c
	src/lib/protocols/imesh.c
	src/lib/protocols/ipp.c
	src/lib/protocols/irc.c
	src/lib/protocols/jabber.c
	src/lib/protocols/kakaotalk_voice.c
	src/lib/protocols/kerberos.c
	src/lib/protocols/kontiki.c
	src/lib/protocols/ldap.c
	src/lib/protocols/lotus_notes.c
	src/lib/protocols/mail_imap.c
	src/lib/protocols/mail_pop.c
	src/lib/protocols/mail_smtp.c
	src/lib/protocols/maplestory.c
	src/lib/protocols/mdns.c
	src/lib/protocols/meebo.c
	src/lib/protocols/megaco.c
	src/lib/protocols/mgcp.c
	src/lib/protocols/mms.c
	src/lib/protocols/mpegts.c
	src/lib/protocols/msn.c
	src/lib/protocols/mssql.c
	src/lib/protocols/mysql.c
	src/lib/protocols/netbios.c
	src/lib/protocols/netflow.c
	src/lib/protocols/nfs.c
	src/lib/protocols/noe.c
	src/lib/protocols/ntp.c
	src/lib/protocols/openft.c
	src/lib/protocols/openvpn.c
	src/lib/protocols/oracle.c
	src/lib/protocols/oscar.c
	src/lib/protocols/pando.c
	src/lib/protocols/pcanywhere.c
	src/lib/protocols/postgres.c
	src/lib/protocols/pplive.c
	src/lib/protocols/ppstream.c
	src/lib/protocols/pptp.c
	src/lib/protocols/qq.c
	src/lib/protocols/quake.c
	src/lib/protocols/quic.c
	src/lib/protocols/radius.c
	src/lib/protocols/rdp.c
	src/lib/protocols/redis_net.c
	src/lib/protocols/rsync.c
	src/lib/protocols/rtcp.c
	src/lib/protocols/rtmp.c
	src/lib/protocols/rtp.c
	src/lib/protocols/rtsp.c
	src/lib/protocols/sflow.c
	src/lib/protocols/shoutcast.c
	src/lib/protocols/sip.c
	src/lib/protocols/skinny.c
	src/lib/protocols/skype.c
	src/lib/protocols/smb.c
	src/lib/protocols/snmp.c
	src/lib/protocols/socrates.c
	src/lib/protocols/sopcast.c
	src/lib/protocols/soulseek.c
	src/lib/protocols/spotify.c
	src/lib/protocols/ssdp.c
	src/lib/protocols/ssh.c
	src/lib/protocols/ssl.c
	src/lib/protocols/stealthnet.c
	src/lib/protocols/steam.c
	src/lib/protocols/stun.c
	src/lib/protocols/syslog.c
	src/lib/protocols/tds.c
	src/lib/protocols/teamspeak.c
	src/lib/protocols/teamviewer.c
	src/lib/protocols/telegram.c
	src/lib/protocols/telnet.c
	src/lib/protocols/tftp.c
	src/lib/protocols/thunder.c
	src/lib/protocols/tor.c
	src/lib/protocols/tvants.c
	src/lib/protocols/tvuplayer.c
	src/lib/protocols/twitter.c
	src/lib/protocols/usenet.c
	src/lib/protocols/veohtv.c
	src/lib/protocols/vhua.c
	src/lib/protocols/viber.c
	src/lib/protocols/vmware.c
	src/lib/protocols/vnc.c
	src/lib/protocols/warcraft3.c
	src/lib/protocols/whoisdas.c
	src/lib/protocols/winmx.c
	src/lib/protocols/world_of_kung_fu.c
	src/lib/protocols/world_of_warcraft.c
	src/lib/protocols/xbox.c
	src/lib/protocols/xdmcp.c
	src/lib/protocols/yahoo.c
	src/lib/protocols/zattoo.c
	src/lib/protocols/zeromq.c

133 files changed, 544 insertions, 436 deletions

diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h
index a56ef59fd..26f42e886 100644
--- a/src/include/ndpi_protocols.h
+++ b/src/include/ndpi_protocols.h
@@ -231,6 +231,7 @@ void init_guildwars_dissector(struct ndpi_detection_module_struct *ndpi_struct,
 void init_h323_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_halflife2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 /* void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); */
+void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_http_activesync_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_iax_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
@@ -300,6 +301,7 @@ void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct,
 void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
+void init_ssdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_teamspeak_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 13467a52d..b4fb14e22 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -2147,17 +2147,25 @@ void ndpi_set_bitmask_protocol_detection( char * label,
     Compare specify protocol bitmask with main detection bitmask
   */
   if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(*detection_bitmask, ndpi_protocol_id) != 0) {
-    // #ifdef DEBUG
+#ifdef DEBUG
     NDPI_LOG(0, ndpi_struct, NDPI_LOG_DEBUG,"[NDPI] ndpi_set_bitmask_protocol_detection: %s : [callback_buffer] idx= %u, [proto_defaults] protocol_id=%u\n", label, idx, ndpi_protocol_id);
-    // #endif
+#endif
+    
+    if(ndpi_struct->proto_defaults[ndpi_protocol_id].protoIdx != 0)
+      printf("[NDPI] Internal error: protocol %s/%u has been already registered\n", label, ndpi_protocol_id);
+    else {
+#ifdef DEBUG
+      printf("[NDPI] Adding %s with protocol id %d\n", label, ndpi_protocol_id);
+#endif
+    }
+
     /*
       Set funcition and index protocol within proto_default strcuture for port protocol detection
       and callback_buffer function for DPI protocol detection
     */
     ndpi_struct->proto_defaults[ndpi_protocol_id].protoIdx = idx;
+    ndpi_struct->proto_defaults[ndpi_protocol_id].func = ndpi_struct->callback_buffer[idx].func = func;
 
-    ndpi_struct->proto_defaults[ndpi_protocol_id].func =
-      ndpi_struct->callback_buffer[idx].func = func;
     /*
       Set ndpi_selection_bitmask for protocol
     */
@@ -2190,158 +2198,11 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
   ndpi_struct->callback_buffer_size = 0;
 
   /* HTTP */
-  /* init_http_dissector(ndpi_struct, &a, detection_bitmask); */
-#ifdef NDPI_PROTOCOL_HTTP
-  ndpi_set_bitmask_protocol_detection("HTTP",ndpi_struct, detection_bitmask, a++,
-				      NDPI_PROTOCOL_HTTP,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-
-  ndpi_set_bitmask_protocol_detection("HTTP_PROXY", ndpi_struct, detection_bitmask, a++,
-				      NDPI_PROTOCOL_HTTP_PROXY,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-
-#ifdef NDPI_CONTENT_MPEG
-  ndpi_set_bitmask_protocol_detection("MPEG", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_MPEG,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_FLASH
-  ndpi_set_bitmask_protocol_detection("FLASH", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_FLASH,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_QUICKTIME
-  ndpi_set_bitmask_protocol_detection("QUICKTIME", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_QUICKTIME,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_REALMEDIA
-  ndpi_set_bitmask_protocol_detection("REALMEDIA", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_REALMEDIA,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_WINDOWSMEDIA
-  ndpi_set_bitmask_protocol_detection("WINDOWSMEDIA", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_WINDOWSMEDIA,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_MMS
-  ndpi_set_bitmask_protocol_detection("MMS", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_MMS,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_PROTOCOL_XBOX
-  ndpi_set_bitmask_protocol_detection("XBOX", ndpi_struct, detection_bitmask, a++,
-				      NDPI_PROTOCOL_XBOX,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_PROTOCOL_WINDOWS_UPDATE
-  ndpi_set_bitmask_protocol_detection("WINDOWS_UPDATE", ndpi_struct, detection_bitmask, a++,
-				      NDPI_PROTOCOL_WINDOWS_UPDATE,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_PROTOCOL_QQ
-  ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, detection_bitmask, a++,
-				      NDPI_PROTOCOL_QQ,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_AVI
-  ndpi_set_bitmask_protocol_detection("AVI", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_AVI,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_CONTENT_OGG
-  ndpi_set_bitmask_protocol_detection("OGG", ndpi_struct, detection_bitmask, a++,
-				      NDPI_CONTENT_OGG,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-#ifdef NDPI_PROTOCOL_MOVE
-  ndpi_set_bitmask_protocol_detection("MOVE", ndpi_struct, detection_bitmask, a++,
-				      NDPI_PROTOCOL_MOVE,
-				      ndpi_search_http_tcp,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
-				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-#endif
-
+  init_http_dissector(ndpi_struct, &a, detection_bitmask);
 
   /* SKYPE */
   init_skype_dissector(ndpi_struct, &a, detection_bitmask);
 
-  /* Update excluded protocol bitmask */
-  NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
-  		   ndpi_struct->callback_buffer[a].detection_bitmask);
-
-  /*Delete protocol from exluded protocol bitmask*/
-  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
-  				 NDPI_PROTOCOL_UNKNOWN);
-
-  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
-  				 NDPI_PROTOCOL_QQ);
-
-#ifdef NDPI_CONTENT_FLASH
-  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
-				 NDPI_CONTENT_FLASH);
-#endif
-
-  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
-  				 NDPI_CONTENT_MMS);
-  /* #ifdef NDPI_PROTOCOL_RTSP */
-  /*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, */
-  /* 				 NDPI_PROTOCOL_RTSP); */
-  /* #endif */
-  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
-  				 NDPI_PROTOCOL_XBOX);
-
-  NDPI_BITMASK_SET(ndpi_struct->generic_http_packet_bitmask,
-  		   ndpi_struct->callback_buffer[a].detection_bitmask);
-
-  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->generic_http_packet_bitmask, NDPI_PROTOCOL_UNKNOWN);
-
-  /* Update callback_buffer index */
-  a++;
-
-#endif
-
   /* SSL */
   init_ssl_dissector(ndpi_struct, &a, detection_bitmask);
 
diff --git a/src/lib/protocols/afp.c b/src/lib/protocols/afp.c
index e13529f24..1b5232494 100644
--- a/src/lib/protocols/afp.c
+++ b/src/lib/protocols/afp.c
@@ -74,12 +74,13 @@ void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("AFP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("AFP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_AFP,
 				      ndpi_search_afp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 
diff --git a/src/lib/protocols/aimini.c b/src/lib/protocols/aimini.c
index eab32d6f1..e75b02f44 100644
--- a/src/lib/protocols/aimini.c
+++ b/src/lib/protocols/aimini.c
@@ -284,12 +284,14 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("AIMINI", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("AIMINI", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_AIMINI,
 				      ndpi_search_aimini,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/applejuice.c b/src/lib/protocols/applejuice.c
index 9f0376345..0ea65af36 100644
--- a/src/lib/protocols/applejuice.c
+++ b/src/lib/protocols/applejuice.c
@@ -57,12 +57,14 @@ void ndpi_search_applejuice_tcp(struct ndpi_detection_module_struct *ndpi_struct
 
 void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("APPLEJUICE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("APPLEJUICE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_APPLEJUICE,
 				      ndpi_search_applejuice_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/armagetron.c b/src/lib/protocols/armagetron.c
index 1e70e1334..ae80d4df9 100644
--- a/src/lib/protocols/armagetron.c
+++ b/src/lib/protocols/armagetron.c
@@ -101,12 +101,14 @@ void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct
 
 void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("ARMAGETRON", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("ARMAGETRON", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_ARMAGETRON,
 				      ndpi_search_armagetron_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 
diff --git a/src/lib/protocols/ayiya.c b/src/lib/protocols/ayiya.c
index 2d910e813..54331bd05 100644
--- a/src/lib/protocols/ayiya.c
+++ b/src/lib/protocols/ayiya.c
@@ -68,12 +68,14 @@ void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("AYIYA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("AYIYA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_AYIYA,
 				      ndpi_search_ayiya,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/battlefield.c b/src/lib/protocols/battlefield.c
index 5f8a0c0e2..6087e67a4 100644
--- a/src/lib/protocols/battlefield.c
+++ b/src/lib/protocols/battlefield.c
@@ -118,12 +118,13 @@ void ndpi_search_battlefield(struct ndpi_detection_module_struct *ndpi_struct, s
 
 void init_battlefield_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("BATTLEFIELD", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("BattleField", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_BATTLEFIELD,
 				      ndpi_search_battlefield,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/bgp.c b/src/lib/protocols/bgp.c
index 9d1e5e5ad..8f293b611 100644
--- a/src/lib/protocols/bgp.c
+++ b/src/lib/protocols/bgp.c
@@ -57,12 +57,13 @@ void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("BGP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("BGP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_BGP,
 				      ndpi_search_bgp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 
diff --git a/src/lib/protocols/bittorrent.c b/src/lib/protocols/bittorrent.c
index cc7842756..5fa7c11b2 100644
--- a/src/lib/protocols/bittorrent.c
+++ b/src/lib/protocols/bittorrent.c
@@ -479,12 +479,13 @@ void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("BITTORRENT", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("BitTorrent", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_BITTORRENT,
 				      ndpi_search_bittorrent,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ciscovpn.c b/src/lib/protocols/ciscovpn.c
index 8bfbf80a4..6c2fc1829 100644
--- a/src/lib/protocols/ciscovpn.c
+++ b/src/lib/protocols/ciscovpn.c
@@ -71,12 +71,13 @@ void ndpi_search_ciscovpn(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_ciscovpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("CISCOVPN", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("CiscoVPN", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_CISCOVPN,
 				      ndpi_search_ciscovpn,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/citrix.c b/src/lib/protocols/citrix.c
index d5602903b..d03c0cbe6 100644
--- a/src/lib/protocols/citrix.c
+++ b/src/lib/protocols/citrix.c
@@ -93,12 +93,13 @@ void ndpi_search_citrix(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_citrix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("CITRIX", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("Citrix", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_CITRIX,
 				      ndpi_search_citrix,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/corba.c b/src/lib/protocols/corba.c
index a99f16fa3..c16accc59 100644
--- a/src/lib/protocols/corba.c
+++ b/src/lib/protocols/corba.c
@@ -49,11 +49,12 @@ void ndpi_search_corba(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_corba_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("CORBA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("Corba", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_CORBA,
 				      ndpi_search_corba,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/crossfire.c b/src/lib/protocols/crossfire.c
index 2bdcd79c3..5dfddf5c3 100644
--- a/src/lib/protocols/crossfire.c
+++ b/src/lib/protocols/crossfire.c
@@ -82,12 +82,13 @@ void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_str
 
 void init_crossfire_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("CROSSFIRE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("Crossfire", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_CROSSFIRE,
 				      ndpi_search_crossfire_tcp_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/dcerpc.c b/src/lib/protocols/dcerpc.c
index f57c0e54e..2537afd56 100644
--- a/src/lib/protocols/dcerpc.c
+++ b/src/lib/protocols/dcerpc.c
@@ -54,12 +54,13 @@ void ndpi_search_dcerpc(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_dcerpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DCERPC", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DCE_RPC", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DCERPC,
 				      ndpi_search_dcerpc,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/dhcp.c b/src/lib/protocols/dhcp.c
index a64f52199..cb78c9429 100644
--- a/src/lib/protocols/dhcp.c
+++ b/src/lib/protocols/dhcp.c
@@ -61,12 +61,13 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_dhcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DHCP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DHCP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DHCP,
 				      ndpi_search_dhcp_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/dhcpv6.c b/src/lib/protocols/dhcpv6.c
index e2cd9d99a..31d912b39 100644
--- a/src/lib/protocols/dhcpv6.c
+++ b/src/lib/protocols/dhcpv6.c
@@ -60,12 +60,13 @@ void ndpi_search_dhcpv6_udp(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_dhcpv6_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DHCPV6", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DHCPV6", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DHCPV6,
 				      ndpi_search_dhcpv6_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/directconnect.c b/src/lib/protocols/directconnect.c
index 7e4e1b1d8..8c1649c6c 100644
--- a/src/lib/protocols/directconnect.c
+++ b/src/lib/protocols/directconnect.c
@@ -474,12 +474,14 @@ void ndpi_search_directconnect(struct ndpi_detection_module_struct
 
 void init_directconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DIRECTCONNECT", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DIRECTCONNECT", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DIRECTCONNECT,
 				      ndpi_search_directconnect,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/directdownloadlink.c b/src/lib/protocols/directdownloadlink.c
index e5b30da0f..d8f91d750 100644
--- a/src/lib/protocols/directdownloadlink.c
+++ b/src/lib/protocols/directdownloadlink.c
@@ -737,11 +737,13 @@ void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *n
 
 void init_directdownloadlink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DIRECT_DOWNLOAD_LINK", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DIRECT_DOWNLOAD_LINK", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK,
 				      ndpi_search_direct_download_link_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);  
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/dns.c b/src/lib/protocols/dns.c
index 9d62b6477..089ea913d 100644
--- a/src/lib/protocols/dns.c
+++ b/src/lib/protocols/dns.c
@@ -301,12 +301,14 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_dns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DNS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DNS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DNS,
 				      ndpi_search_dns,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/dofus.c b/src/lib/protocols/dofus.c
index 14ab3a478..b8d61fb37 100644
--- a/src/lib/protocols/dofus.c
+++ b/src/lib/protocols/dofus.c
@@ -148,11 +148,13 @@ void ndpi_search_dofus(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_dofus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("DOFUS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DOFUS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DOFUS,
 				      ndpi_search_dofus,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/dropbox.c b/src/lib/protocols/dropbox.c
index d5b3bed34..ec546d356 100644
--- a/src/lib/protocols/dropbox.c
+++ b/src/lib/protocols/dropbox.c
@@ -75,13 +75,13 @@ void ndpi_search_dropbox(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_dropbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) 
 {
-  ndpi_set_bitmask_protocol_detection("DROPBOX", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("DROPBOX", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_DROPBOX,
 				      ndpi_search_dropbox,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
-
+  *id += 1;
 }
 
 
diff --git a/src/lib/protocols/eaq.c b/src/lib/protocols/eaq.c
index 7d0702cb9..7dfc5f778 100644
--- a/src/lib/protocols/eaq.c
+++ b/src/lib/protocols/eaq.c
@@ -74,12 +74,14 @@ void ndpi_search_eaq(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("EAQ", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("EAQ", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_EAQ,
 				      ndpi_search_eaq,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/edonkey.c b/src/lib/protocols/edonkey.c
index 9fe50d12a..1ba681d4f 100644
--- a/src/lib/protocols/edonkey.c
+++ b/src/lib/protocols/edonkey.c
@@ -211,12 +211,14 @@ void ndpi_search_edonkey(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("EDONKEY", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("EDONKEY", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_EDONKEY,
 				      ndpi_search_edonkey,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/fasttrack.c b/src/lib/protocols/fasttrack.c
index a8c37342d..1a082aeae 100644
--- a/src/lib/protocols/fasttrack.c
+++ b/src/lib/protocols/fasttrack.c
@@ -83,12 +83,14 @@ void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct,
 
 void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("FASTTRACK", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("FASTTRACK", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_FASTTRACK,
 				      ndpi_search_fasttrack_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/fiesta.c b/src/lib/protocols/fiesta.c
index c4b02d3ac..226b466de 100644
--- a/src/lib/protocols/fiesta.c
+++ b/src/lib/protocols/fiesta.c
@@ -96,11 +96,13 @@ void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("FIESTA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("FIESTA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_FIESTA,
 				      ndpi_search_fiesta,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/filetopia.c b/src/lib/protocols/filetopia.c
index 399336a0f..09f102cfa 100644
--- a/src/lib/protocols/filetopia.c
+++ b/src/lib/protocols/filetopia.c
@@ -83,12 +83,13 @@ void ndpi_search_filetopia_tcp(struct ndpi_detection_module_struct *ndpi_struct,
 
 void init_filetopia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("FILETOPIA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("FILETOPIA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_FILETOPIA,
 				      ndpi_search_filetopia_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/florensia.c b/src/lib/protocols/florensia.c
index feeb49e7a..80c64dcda 100644
--- a/src/lib/protocols/florensia.c
+++ b/src/lib/protocols/florensia.c
@@ -122,12 +122,14 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
 
 void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("FLORENSIA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("FLORENSIA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_FLORENSIA,
 				      ndpi_search_florensia,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ftp_control.c b/src/lib/protocols/ftp_control.c
index 67900ea77..8710096be 100644
--- a/src/lib/protocols/ftp_control.c
+++ b/src/lib/protocols/ftp_control.c
@@ -999,12 +999,14 @@ void ndpi_search_ftp_control(struct ndpi_detection_module_struct *ndpi_struct, s
 
 void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("FTP_CONTROL", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("FTP_CONTROL", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_FTP_CONTROL,
 				      ndpi_search_ftp_control,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ftp_data.c b/src/lib/protocols/ftp_data.c
index 4afa50bb6..acde443fc 100644
--- a/src/lib/protocols/ftp_data.c
+++ b/src/lib/protocols/ftp_data.c
@@ -275,12 +275,14 @@ void ndpi_search_ftp_data(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("FTP_DATA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("FTP_DATA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_FTP_DATA,
 				      ndpi_search_ftp_data,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/gnutella.c b/src/lib/protocols/gnutella.c
index 311192b2c..3b2916f08 100644
--- a/src/lib/protocols/gnutella.c
+++ b/src/lib/protocols/gnutella.c
@@ -375,12 +375,14 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_gnutella_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("GNUTELLA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("GNUTELLA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_GNUTELLA,
 				      ndpi_search_gnutella,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 
diff --git a/src/lib/protocols/gtp.c b/src/lib/protocols/gtp.c
index d3ab13bfe..ec2c1099e 100644
--- a/src/lib/protocols/gtp.c
+++ b/src/lib/protocols/gtp.c
@@ -85,12 +85,14 @@ void ndpi_search_gtp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_gtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("GTP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("GTP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_GTP,
 				      ndpi_search_gtp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/guildwars.c b/src/lib/protocols/guildwars.c
index d3373f5f6..d585dbd76 100644
--- a/src/lib/protocols/guildwars.c
+++ b/src/lib/protocols/guildwars.c
@@ -69,12 +69,14 @@ void ndpi_search_guildwars_tcp(struct ndpi_detection_module_struct *ndpi_struct,
 
 void init_guildwars_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-    ndpi_set_bitmask_protocol_detection("GUILDWARS", ndpi_struct, detection_bitmask, *id++,
+    ndpi_set_bitmask_protocol_detection("GUILDWARS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_GUILDWARS,
 				      ndpi_search_guildwars_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+    *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/h323.c b/src/lib/protocols/h323.c
index 8f12c7648..1d503a747 100644
--- a/src/lib/protocols/h323.c
+++ b/src/lib/protocols/h323.c
@@ -97,12 +97,14 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_h323_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("H323", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("H323", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_H323,
 				      ndpi_search_h323,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/halflife2_and_mods.c b/src/lib/protocols/halflife2_and_mods.c
index da2435b70..d98cae08f 100644
--- a/src/lib/protocols/halflife2_and_mods.c
+++ b/src/lib/protocols/halflife2_and_mods.c
@@ -65,12 +65,14 @@ void ndpi_search_halflife2(struct ndpi_detection_module_struct *ndpi_struct, str
 
 void init_halflife2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("HALFLIFE2", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("HALFLIFE2", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_HALFLIFE2,
 				      ndpi_search_halflife2,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index 584853ef3..726a41bb5 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -986,158 +986,164 @@ char* ndpi_get_http_content_type(struct ndpi_detection_module_struct *ndpi_mod,
 }
 
 
-void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
+void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
+			 NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
+  ndpi_set_bitmask_protocol_detection("HTTP",ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_HTTP,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+
+#if 0
+  ndpi_set_bitmask_protocol_detection("HTTP_PROXY", ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_HTTP_PROXY,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 
-/* #ifdef NDPI_PROTOCOL_HTTP */
-/*   ndpi_set_bitmask_protocol_detection("HTTP",ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_PROTOCOL_HTTP, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-
-/*   ndpi_set_bitmask_protocol_detection("HTTP_PROXY", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_PROTOCOL_HTTP_PROXY, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-
-/* #ifdef NDPI_CONTENT_MPEG */
-/*   ndpi_set_bitmask_protocol_detection("MPEG", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_MPEG, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_CONTENT_FLASH */
-/*   ndpi_set_bitmask_protocol_detection("FLASH", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_FLASH, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_CONTENT_QUICKTIME */
-/*   ndpi_set_bitmask_protocol_detection("QUICKTIME", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_QUICKTIME, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_CONTENT_REALMEDIA */
-/*   ndpi_set_bitmask_protocol_detection("REALMEDIA", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_REALMEDIA, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_CONTENT_WINDOWSMEDIA */
-/*   ndpi_set_bitmask_protocol_detection("WINDOWSMEDIA", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_WINDOWSMEDIA, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-  
-/*   /\* MMS *\/ */
-/* #ifdef NDPI_CONTENT_MMS */
-/*   ndpi_set_bitmask_protocol_detection("MMS", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_MMS, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-
-/*   /\* XBOX *\/ */
-/* #ifdef NDPI_PROTOCOL_XBOX */
-/*   ndpi_set_bitmask_protocol_detection("XBOX", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_PROTOCOL_XBOX, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_PROTOCOL_WINDOWS_UPDATE */
-/*   ndpi_set_bitmask_protocol_detection("WINDOWS_UPDATE", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_PROTOCOL_WINDOWS_UPDATE, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/*   /\* QQ *\/ */
-/* #ifdef NDPI_PROTOCOL_QQ */
-/*   ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_PROTOCOL_QQ, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_CONTENT_AVI */
-/*   ndpi_set_bitmask_protocol_detection("AVI", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_AVI, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_CONTENT_OGG */
-/*   ndpi_set_bitmask_protocol_detection("OGG", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_CONTENT_OGG, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-/* #ifdef NDPI_PROTOCOL_MOVE */
-/*   ndpi_set_bitmask_protocol_detection("MOVE", ndpi_struct, detection_bitmask, *id++, */
-/* 				      NDPI_PROTOCOL_MOVE, */
-/* 				      ndpi_search_http_tcp, */
-/* 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD, */
-/* 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, */
-/* 				      ADD_TO_DETECTION_BITMASK); */
-/* #endif */
-
-
-/*   /\* Update excluded protocol bitmask *\/ */
-/*   NDPI_BITMASK_SET(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask, */
-/*   		   ndpi_struct->callback_buffer[*id].detection_bitmask); */
-
-/*   /\*Delete protocol from exluded protocol bitmask*\/ */
-/*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask, */
-/*   				 NDPI_PROTOCOL_UNKNOWN); */
-
-/*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask, */
-/*   				 NDPI_PROTOCOL_QQ); */
-
-/* #ifdef NDPI_CONTENT_FLASH */
-/*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask, */
-/* 				 NDPI_CONTENT_FLASH); */
-/* #endif */
-
-/*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask, */
-/*   				 NDPI_CONTENT_MMS); */
-
-/*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask, */
-/*   				 NDPI_PROTOCOL_XBOX); */
-
-/*   NDPI_BITMASK_SET(ndpi_struct->generic_http_packet_bitmask, */
-/*   		   ndpi_struct->callback_buffer[*id].detection_bitmask); */
-
-/*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->generic_http_packet_bitmask, NDPI_PROTOCOL_UNKNOWN); */
-
-/*   /\* Update callback_buffer index *\/ */
-/*   *id++; */
-
-/* #endif */
+#ifdef NDPI_CONTENT_MPEG
+  ndpi_set_bitmask_protocol_detection("MPEG", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_MPEG,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_FLASH
+  ndpi_set_bitmask_protocol_detection("FLASH", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_FLASH,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_QUICKTIME
+  ndpi_set_bitmask_protocol_detection("QUICKTIME", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_QUICKTIME,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_REALMEDIA
+  ndpi_set_bitmask_protocol_detection("REALMEDIA", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_REALMEDIA,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_WINDOWSMEDIA
+  ndpi_set_bitmask_protocol_detection("WINDOWSMEDIA", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_WINDOWSMEDIA,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_MMS
+  ndpi_set_bitmask_protocol_detection("MMS", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_MMS,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_PROTOCOL_XBOX
+  ndpi_set_bitmask_protocol_detection("XBOX", ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_XBOX,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_PROTOCOL_WINDOWS_UPDATE
+  ndpi_set_bitmask_protocol_detection("WINDOWS_UPDATE", ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_WINDOWS_UPDATE,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_PROTOCOL_QQ
+  ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_QQ,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_AVI
+  ndpi_set_bitmask_protocol_detection("AVI", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_AVI,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_CONTENT_OGG
+  ndpi_set_bitmask_protocol_detection("OGG", ndpi_struct, detection_bitmask, *id,
+				      NDPI_CONTENT_OGG,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+#ifdef NDPI_PROTOCOL_MOVE
+  ndpi_set_bitmask_protocol_detection("MOVE", ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_MOVE,
+				      ndpi_search_http_tcp,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
+				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
+#endif
+
+  /* Update excluded protocol bitmask */
+  NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
+  		   ndpi_struct->callback_buffer[a].detection_bitmask);
+
+  /*Delete protocol from exluded protocol bitmask*/
+  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_UNKNOWN);
+
+  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_QQ);
+
+#ifdef NDPI_CONTENT_FLASH
+  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_CONTENT_FLASH);
+#endif
+
+  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,  NDPI_CONTENT_MMS);
+  /* #ifdef NDPI_PROTOCOL_RTSP */
+  /*   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, */
+  /* 				 NDPI_PROTOCOL_RTSP); */
+  /* #endif */
+  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_XBOX);
+
+  NDPI_BITMASK_SET(ndpi_struct->generic_http_packet_bitmask, ndpi_struct->callback_buffer[a].detection_bitmask);
+
+  NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->generic_http_packet_bitmask, NDPI_PROTOCOL_UNKNOWN);
+
+  /* Update callback_buffer index */
+  a++;
+
+#endif
 
 }
 
diff --git a/src/lib/protocols/http_activesync.c b/src/lib/protocols/http_activesync.c
index 4eeeba835..c1b446ec6 100644
--- a/src/lib/protocols/http_activesync.c
+++ b/src/lib/protocols/http_activesync.c
@@ -55,12 +55,14 @@ void ndpi_search_activesync(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_http_activesync_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("HTTP_APPLICATION_ACTIVESYNC", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("HTTP_APPLICATION_ACTIVESYNC", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC,
 				      ndpi_search_activesync,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/iax.c b/src/lib/protocols/iax.c
index 14874ba11..84e039c2b 100644
--- a/src/lib/protocols/iax.c
+++ b/src/lib/protocols/iax.c
@@ -96,12 +96,14 @@ void ndpi_search_iax(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_iax_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("IAX", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("IAX", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_IAX,
 				      ndpi_search_iax,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/icecast.c b/src/lib/protocols/icecast.c
index dcd22f417..0c525a956 100644
--- a/src/lib/protocols/icecast.c
+++ b/src/lib/protocols/icecast.c
@@ -92,12 +92,14 @@ void ndpi_search_icecast_tcp(struct ndpi_detection_module_struct *ndpi_struct, s
 
 void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("ICECAST", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("ICECAST", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_ICECAST,
 				      ndpi_search_icecast_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/imesh.c b/src/lib/protocols/imesh.c
index fea5635c8..8b6648a3c 100644
--- a/src/lib/protocols/imesh.c
+++ b/src/lib/protocols/imesh.c
@@ -295,12 +295,14 @@ void ndpi_search_imesh_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct,
 
 void init_imesh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("IMESH", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("IMESH", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_IMESH,
 				      ndpi_search_imesh_tcp_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ipp.c b/src/lib/protocols/ipp.c
index 659bccd90..2135f297f 100644
--- a/src/lib/protocols/ipp.c
+++ b/src/lib/protocols/ipp.c
@@ -113,12 +113,14 @@ void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_ipp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("IPP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("IPP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_IPP,
 				      ndpi_search_ipp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/irc.c b/src/lib/protocols/irc.c
index 8a1cc156f..57c9f52bc 100644
--- a/src/lib/protocols/irc.c
+++ b/src/lib/protocols/irc.c
@@ -804,12 +804,14 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_irc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("IRC", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("IRC", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_IRC,
 				      ndpi_search_irc_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/jabber.c b/src/lib/protocols/jabber.c
index 030beee71..052a45700 100644
--- a/src/lib/protocols/jabber.c
+++ b/src/lib/protocols/jabber.c
@@ -307,11 +307,13 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("UNENCRYPED_JABBER", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("UNENCRYPED_JABBER", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_UNENCRYPED_JABBER,
 				      ndpi_search_jabber_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/kakaotalk_voice.c b/src/lib/protocols/kakaotalk_voice.c
index 60f6bb68b..38596e41d 100644
--- a/src/lib/protocols/kakaotalk_voice.c
+++ b/src/lib/protocols/kakaotalk_voice.c
@@ -63,12 +63,13 @@ void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struc
 
 void init_kakaotalk_voice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("KakaoTalk_Voice", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("KakaoTalk_Voice", ndpi_struct, detection_bitmask, *id,
 				      NDPI_SERVICE_KAKAOTALK_VOICE,
 				      ndpi_search_kakaotalk_voice,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
index 039890eac..6e4f9e5f3 100644
--- a/src/lib/protocols/kerberos.c
+++ b/src/lib/protocols/kerberos.c
@@ -73,12 +73,14 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_kerberos_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("KERBEROS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("KERBEROS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_KERBEROS,
 				      ndpi_search_kerberos,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/kontiki.c b/src/lib/protocols/kontiki.c
index 1789a6558..a1e22b756 100644
--- a/src/lib/protocols/kontiki.c
+++ b/src/lib/protocols/kontiki.c
@@ -66,12 +66,14 @@ void ndpi_search_kontiki(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_kontiki_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("KONTIKI", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("KONTIKI", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_KONTIKI,
 				      ndpi_search_kontiki,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ldap.c b/src/lib/protocols/ldap.c
index 6114995de..fee99a92d 100644
--- a/src/lib/protocols/ldap.c
+++ b/src/lib/protocols/ldap.c
@@ -99,12 +99,14 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_ldap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("LDAP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("LDAP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_LDAP,
 				      ndpi_search_ldap,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/lotus_notes.c b/src/lib/protocols/lotus_notes.c
index ba6dd1bd2..0a2d67cd2 100644
--- a/src/lib/protocols/lotus_notes.c
+++ b/src/lib/protocols/lotus_notes.c
@@ -87,12 +87,14 @@ void ndpi_search_lotus_notes(struct ndpi_detection_module_struct *ndpi_struct, s
 
 void init_lotus_notes_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("LOTUS_NOTES", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("LOTUS_NOTES", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_LOTUS_NOTES,
 				      ndpi_search_lotus_notes,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mail_imap.c b/src/lib/protocols/mail_imap.c
index 20a06d807..c62c1d366 100644
--- a/src/lib/protocols/mail_imap.c
+++ b/src/lib/protocols/mail_imap.c
@@ -295,12 +295,14 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct,
 
 void init_mail_imap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MAIL_IMAP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MAIL_IMAP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MAIL_IMAP,
 				      ndpi_search_mail_imap_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mail_pop.c b/src/lib/protocols/mail_pop.c
index 65c8814a2..0e487c4a5 100644
--- a/src/lib/protocols/mail_pop.c
+++ b/src/lib/protocols/mail_pop.c
@@ -205,12 +205,14 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct
 
 void init_mail_pop_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MAIL_POP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MAIL_POP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MAIL_POP,
 				      ndpi_search_mail_pop_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mail_smtp.c b/src/lib/protocols/mail_smtp.c
index f3074086e..37846930e 100644
--- a/src/lib/protocols/mail_smtp.c
+++ b/src/lib/protocols/mail_smtp.c
@@ -180,12 +180,14 @@ void ndpi_search_mail_smtp_tcp(struct ndpi_detection_module_struct
 
 void init_mail_smtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MAIL_SMTP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MAIL_SMTP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MAIL_SMTP,
 				      ndpi_search_mail_smtp_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);  
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/maplestory.c b/src/lib/protocols/maplestory.c
index 7771249a2..063c3299d 100644
--- a/src/lib/protocols/maplestory.c
+++ b/src/lib/protocols/maplestory.c
@@ -85,12 +85,14 @@ void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_maplestory_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MAPLESTORY", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MAPLESTORY", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MAPLESTORY,
 				      ndpi_search_maplestory,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mdns.c b/src/lib/protocols/mdns.c
index f23333b69..8226ab93c 100644
--- a/src/lib/protocols/mdns.c
+++ b/src/lib/protocols/mdns.c
@@ -144,12 +144,14 @@ void ndpi_search_mdns(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_mdns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MDNS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MDNS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MDNS,
 				      ndpi_search_mdns,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/meebo.c b/src/lib/protocols/meebo.c
index 421d5a071..a31f45a34 100644
--- a/src/lib/protocols/meebo.c
+++ b/src/lib/protocols/meebo.c
@@ -175,7 +175,7 @@ void init_meebo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_in
   NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[*id].detection_bitmask, NDPI_CONTENT_FLASH);
 #endif
 
-  *id++;
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/megaco.c b/src/lib/protocols/megaco.c
index 64b18b6b4..596ea86b6 100644
--- a/src/lib/protocols/megaco.c
+++ b/src/lib/protocols/megaco.c
@@ -49,11 +49,13 @@ void ndpi_search_megaco(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MEGACO", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MEGACO", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MEGACO,
 				      ndpi_search_megaco,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/mgcp.c b/src/lib/protocols/mgcp.c
index ca65f6c2a..f33ffd8ad 100644
--- a/src/lib/protocols/mgcp.c
+++ b/src/lib/protocols/mgcp.c
@@ -101,12 +101,14 @@ void ndpi_search_mgcp(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_mgpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MGCP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MGCP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MGCP,
 				      ndpi_search_mgcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);  
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mms.c b/src/lib/protocols/mms.c
index cec6b7ce9..d6b4edbca 100644
--- a/src/lib/protocols/mms.c
+++ b/src/lib/protocols/mms.c
@@ -81,12 +81,14 @@ void ndpi_search_mms_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MMS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MMS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_CONTENT_MMS,
 				      ndpi_search_mms_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mpegts.c b/src/lib/protocols/mpegts.c
index 9b0c1370f..e351eade4 100644
--- a/src/lib/protocols/mpegts.c
+++ b/src/lib/protocols/mpegts.c
@@ -54,12 +54,14 @@ void ndpi_search_mpegts(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MPEG_TS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MPEG_TS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MPEGTS,
 				      ndpi_search_mpegts,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/msn.c b/src/lib/protocols/msn.c
index 594638c8b..af537d7ff 100644
--- a/src/lib/protocols/msn.c
+++ b/src/lib/protocols/msn.c
@@ -561,12 +561,14 @@ void init_msn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
   
   NDPI_BITMASK_RESET(ndpi_struct->callback_buffer[*id].excluded_protocol_bitmask);
   
-  ndpi_set_bitmask_protocol_detection("MSN", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MSN", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MSN,
 				      ndpi_search_msn,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mssql.c b/src/lib/protocols/mssql.c
index c5c3bdd39..1b82de99f 100644
--- a/src/lib/protocols/mssql.c
+++ b/src/lib/protocols/mssql.c
@@ -55,12 +55,14 @@ void ndpi_search_mssql(struct ndpi_detection_module_struct
 
 void init_mssql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MSSQL", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MSSQL", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MSSQL,
 				      ndpi_search_mssql,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/mysql.c b/src/lib/protocols/mysql.c
index 1190b80f7..9122fdcc3 100644
--- a/src/lib/protocols/mysql.c
+++ b/src/lib/protocols/mysql.c
@@ -70,12 +70,14 @@ void ndpi_search_mysql_tcp(struct ndpi_detection_module_struct *ndpi_struct, str
 
 void init_mysql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("MYSQL", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("MYSQL", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_MYSQL,
 				      ndpi_search_mysql_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c
index 1785d7ce1..a651f9219 100644
--- a/src/lib/protocols/netbios.c
+++ b/src/lib/protocols/netbios.c
@@ -369,12 +369,14 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_netbios_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("NETBIOS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("NETBIOS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_NETBIOS,
 				      ndpi_search_netbios,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/netflow.c b/src/lib/protocols/netflow.c
index 19a6d30ae..d4bdb550a 100644
--- a/src/lib/protocols/netflow.c
+++ b/src/lib/protocols/netflow.c
@@ -93,12 +93,14 @@ void ndpi_search_netflow(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_netflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("NETFLOW", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("NETFLOW", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_NETFLOW,
 				      ndpi_search_netflow,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/nfs.c b/src/lib/protocols/nfs.c
index c1f9a40fc..36fc007d6 100644
--- a/src/lib/protocols/nfs.c
+++ b/src/lib/protocols/nfs.c
@@ -87,12 +87,14 @@ void ndpi_search_nfs(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_nfs_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("NFS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("NFS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_NFS,
 				      ndpi_search_nfs,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/noe.c b/src/lib/protocols/noe.c
index 203680f4b..814cfc4a0 100644
--- a/src/lib/protocols/noe.c
+++ b/src/lib/protocols/noe.c
@@ -53,12 +53,14 @@ void ndpi_search_noe(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_noe_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("NOE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("NOE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_NOE,
 				      ndpi_search_noe,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ntp.c b/src/lib/protocols/ntp.c
index 7ce0900e6..7b65c4c16 100644
--- a/src/lib/protocols/ntp.c
+++ b/src/lib/protocols/ntp.c
@@ -68,12 +68,14 @@ void ndpi_search_ntp_udp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_ntp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("NTP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("NTP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_NTP,
 				      ndpi_search_ntp_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/openft.c b/src/lib/protocols/openft.c
index 1db4fb561..2d3ac2618 100644
--- a/src/lib/protocols/openft.c
+++ b/src/lib/protocols/openft.c
@@ -57,12 +57,14 @@ void ndpi_search_openft_tcp(struct ndpi_detection_module_struct
 
 void init_openft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("OPENFT", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("OPENFT", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_OPENFT,
 				      ndpi_search_openft_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/openvpn.c b/src/lib/protocols/openvpn.c
index b568448e4..0732b5d3b 100644
--- a/src/lib/protocols/openvpn.c
+++ b/src/lib/protocols/openvpn.c
@@ -65,12 +65,14 @@ void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct,
 
 void init_openvpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("OPENVPN", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("OPENVPN", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_OPENVPN,
 				      ndpi_search_openvpn,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/oracle.c b/src/lib/protocols/oracle.c
index 35bc42dec..93ed55127 100644
--- a/src/lib/protocols/oracle.c
+++ b/src/lib/protocols/oracle.c
@@ -63,12 +63,14 @@ void ndpi_search_oracle(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_oracle_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("ORACLE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("ORACLE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_ORACLE,
 				      ndpi_search_oracle,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/oscar.c b/src/lib/protocols/oscar.c
index ba4ddba35..5062706b9 100644
--- a/src/lib/protocols/oscar.c
+++ b/src/lib/protocols/oscar.c
@@ -275,12 +275,14 @@ void ndpi_search_oscar(struct ndpi_detection_module_struct *ndpi_struct, struct
 void init_oscar_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
 
-  ndpi_set_bitmask_protocol_detection("OSCAR", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("OSCAR", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_OSCAR,
 				      ndpi_search_oscar,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/pando.c b/src/lib/protocols/pando.c
index 81294b0ed..b0762a976 100644
--- a/src/lib/protocols/pando.c
+++ b/src/lib/protocols/pando.c
@@ -157,12 +157,14 @@ void ndpi_search_pando(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_pando_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("PANDO", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("PANDO", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_PANDO,
 				      ndpi_search_pando,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/pcanywhere.c b/src/lib/protocols/pcanywhere.c
index 8d2ea7796..2d2c7d0f0 100644
--- a/src/lib/protocols/pcanywhere.c
+++ b/src/lib/protocols/pcanywhere.c
@@ -55,12 +55,14 @@ void ndpi_search_pcanywhere(struct ndpi_detection_module_struct
 
 void init_pcanywhere_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("PCANYWHERE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("PCANYWHERE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_PCANYWHERE,
 				      ndpi_search_pcanywhere,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/postgres.c b/src/lib/protocols/postgres.c
index 2169fad40..d0dca5e40 100644
--- a/src/lib/protocols/postgres.c
+++ b/src/lib/protocols/postgres.c
@@ -120,12 +120,14 @@ void ndpi_search_postgres_tcp(struct ndpi_detection_module_struct
 
 void init_postgres_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("POSTGRES", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("POSTGRES", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_POSTGRES,
 				      ndpi_search_postgres_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/pplive.c b/src/lib/protocols/pplive.c
index 796bfd633..c645f0d1b 100644
--- a/src/lib/protocols/pplive.c
+++ b/src/lib/protocols/pplive.c
@@ -220,12 +220,14 @@ void ndpi_search_pplive(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_pplive_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("PPLIVE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("PPLIVE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_PPLIVE,
 				      ndpi_search_pplive,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ppstream.c b/src/lib/protocols/ppstream.c
index fb0df8d02..ef30d4bed 100644
--- a/src/lib/protocols/ppstream.c
+++ b/src/lib/protocols/ppstream.c
@@ -103,12 +103,14 @@ void ndpi_search_ppstream(struct ndpi_detection_module_struct
 
 void init_ppstream_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("PPSTREAM", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("PPSTREAM", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_PPSTREAM,
 				      ndpi_search_ppstream,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/pptp.c b/src/lib/protocols/pptp.c
index 6f25056dc..393604cbb 100644
--- a/src/lib/protocols/pptp.c
+++ b/src/lib/protocols/pptp.c
@@ -62,12 +62,14 @@ void ndpi_search_pptp(struct ndpi_detection_module_struct
 
 void init_pptp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("PPTP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("PPTP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_PPTP,
 				      ndpi_search_pptp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/qq.c b/src/lib/protocols/qq.c
index 7b9827dc5..d6d22f403 100644
--- a/src/lib/protocols/qq.c
+++ b/src/lib/protocols/qq.c
@@ -665,12 +665,14 @@ void ndpi_search_qq(struct ndpi_detection_module_struct *ndpi_struct, struct ndp
 
 void init_qq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_QQ,
 				      ndpi_search_qq,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/quake.c b/src/lib/protocols/quake.c
index 7fa13c6cf..7c51c4a65 100644
--- a/src/lib/protocols/quake.c
+++ b/src/lib/protocols/quake.c
@@ -91,12 +91,14 @@ void ndpi_search_quake(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_quake_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("QUAKE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("QUAKE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_QUAKE,
 				      ndpi_search_quake,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c
index 7df8d5fe9..af515e3e6 100644
--- a/src/lib/protocols/quic.c
+++ b/src/lib/protocols/quic.c
@@ -171,12 +171,14 @@ void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_quic_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("QUIC", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("QUIC", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_QUIC,
 				      ndpi_search_quic,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/radius.c b/src/lib/protocols/radius.c
index 2daade2db..46076b954 100644
--- a/src/lib/protocols/radius.c
+++ b/src/lib/protocols/radius.c
@@ -76,12 +76,14 @@ void ndpi_search_radius(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_radius_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("RADIUS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RADIUS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RADIUS,
 				      ndpi_search_radius,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/rdp.c b/src/lib/protocols/rdp.c
index 7625caaef..ee3dd3ca6 100644
--- a/src/lib/protocols/rdp.c
+++ b/src/lib/protocols/rdp.c
@@ -56,12 +56,14 @@ void ndpi_search_rdp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_rdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("RDP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RDP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RDP,
 				      ndpi_search_rdp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/redis_net.c b/src/lib/protocols/redis_net.c
index 14e0d9642..eebaaf347 100644
--- a/src/lib/protocols/redis_net.c
+++ b/src/lib/protocols/redis_net.c
@@ -92,12 +92,14 @@ void ndpi_search_redis(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_redis_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("REDIS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("REDIS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_REDIS,
 				      ndpi_search_redis,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/rsync.c b/src/lib/protocols/rsync.c
index ba1df3cdd..11f4aa89c 100644
--- a/src/lib/protocols/rsync.c
+++ b/src/lib/protocols/rsync.c
@@ -57,13 +57,14 @@ void ndpi_search_rsync(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_rsync_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  
-  ndpi_set_bitmask_protocol_detection("RSYNC", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RSYNC", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RSYNC,
 				      ndpi_search_rsync,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/rtcp.c b/src/lib/protocols/rtcp.c
index 1b1f134c0..c8fc90953 100644
--- a/src/lib/protocols/rtcp.c
+++ b/src/lib/protocols/rtcp.c
@@ -68,12 +68,14 @@ void ndpi_search_rtcp(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_rtcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("RTCP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RTCP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RTCP,
 				      ndpi_search_rtcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/rtmp.c b/src/lib/protocols/rtmp.c
index b7e669dab..b6d7db2f1 100644
--- a/src/lib/protocols/rtmp.c
+++ b/src/lib/protocols/rtmp.c
@@ -92,12 +92,14 @@ void ndpi_search_rtmp(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_rtmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("RTMP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RTMP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RTMP,
 				      ndpi_search_rtmp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/rtp.c b/src/lib/protocols/rtp.c
index 8182b53c4..6dae41bbb 100644
--- a/src/lib/protocols/rtp.c
+++ b/src/lib/protocols/rtp.c
@@ -324,13 +324,16 @@ void ndpi_search_rtp(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_rtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("RTP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RTP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RTP,
 				      ndpi_search_rtp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
-#endif							/* NDPI_PROTOCOL_RTP */
+#endif	   
+/* NDPI_PROTOCOL_RTP */
 
diff --git a/src/lib/protocols/rtsp.c b/src/lib/protocols/rtsp.c
index c1e66508b..0f4a71e52 100644
--- a/src/lib/protocols/rtsp.c
+++ b/src/lib/protocols/rtsp.c
@@ -119,12 +119,13 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct
 
 void init_rtsp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("RTSP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("RTSP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_RTSP,
 				      ndpi_search_rtsp_tcp_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/sflow.c b/src/lib/protocols/sflow.c
index 9b6293bfd..0f18bd97e 100644
--- a/src/lib/protocols/sflow.c
+++ b/src/lib/protocols/sflow.c
@@ -49,12 +49,14 @@ void ndpi_search_sflow(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_sflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SFLOW", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SFLOW", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SFLOW,
 				      ndpi_search_sflow,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/shoutcast.c b/src/lib/protocols/shoutcast.c
index af3d80c2e..dd61d29b7 100644
--- a/src/lib/protocols/shoutcast.c
+++ b/src/lib/protocols/shoutcast.c
@@ -108,11 +108,13 @@ void ndpi_search_shoutcast_tcp(struct ndpi_detection_module_struct
 
 void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SHOUTCAST", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SHOUTCAST", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SHOUTCAST,
 				      ndpi_search_shoutcast_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/sip.c b/src/lib/protocols/sip.c
index a7b17700e..3d79561ac 100644
--- a/src/lib/protocols/sip.c
+++ b/src/lib/protocols/sip.c
@@ -194,12 +194,14 @@ void ndpi_search_sip(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_sip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SIP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SIP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SIP,
 				      ndpi_search_sip,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,/* Fix courtesy of Miguel Quesada <mquesadab@gmail.com> */
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/skinny.c b/src/lib/protocols/skinny.c
index a5ea0653e..003ae0dba 100644
--- a/src/lib/protocols/skinny.c
+++ b/src/lib/protocols/skinny.c
@@ -64,12 +64,14 @@ void ndpi_search_skinny(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_skinny_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SKINNY", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SKINNY", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SKINNY,
 				      ndpi_search_skinny,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c
index 2f4d07144..270a85fba 100644
--- a/src/lib/protocols/skype.c
+++ b/src/lib/protocols/skype.c
@@ -121,12 +121,14 @@ void ndpi_search_skype(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) 
 {
-  ndpi_set_bitmask_protocol_detection("Skype", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("Skype", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SKYPE,
 				      ndpi_search_skype,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/smb.c b/src/lib/protocols/smb.c
index 5f4146e84..761b1125a 100644
--- a/src/lib/protocols/smb.c
+++ b/src/lib/protocols/smb.c
@@ -57,12 +57,14 @@ void ndpi_search_smb_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SMB", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SMB", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SMB,
 				      ndpi_search_smb_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/snmp.c b/src/lib/protocols/snmp.c
index 0ee6f61e8..b4af37442 100644
--- a/src/lib/protocols/snmp.c
+++ b/src/lib/protocols/snmp.c
@@ -126,12 +126,14 @@ void ndpi_search_snmp(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_snmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SNMP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SNMP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SNMP,
 				      ndpi_search_snmp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/socrates.c b/src/lib/protocols/socrates.c
index a00265e4d..8435e845c 100644
--- a/src/lib/protocols/socrates.c
+++ b/src/lib/protocols/socrates.c
@@ -77,12 +77,14 @@ void ndpi_search_socrates(struct ndpi_detection_module_struct
 
 void init_socrates_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SOCRATES", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SOCRATES", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SOCRATES,
 				      ndpi_search_socrates,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/sopcast.c b/src/lib/protocols/sopcast.c
index b249ff709..34cc75a55 100644
--- a/src/lib/protocols/sopcast.c
+++ b/src/lib/protocols/sopcast.c
@@ -218,12 +218,14 @@ void ndpi_search_sopcast(struct ndpi_detection_module_struct
 
 void init_sopcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SOPCAST", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SOPCAST", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SOPCAST,
 				      ndpi_search_sopcast,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/soulseek.c b/src/lib/protocols/soulseek.c
index 5d2e1bcfb..2733ef748 100644
--- a/src/lib/protocols/soulseek.c
+++ b/src/lib/protocols/soulseek.c
@@ -286,12 +286,14 @@ void ndpi_search_soulseek_tcp(struct ndpi_detection_module_struct
 
 void init_soulseek_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SOULSEEK", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SOULSEEK", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SOULSEEK,
 				      ndpi_search_soulseek_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/spotify.c b/src/lib/protocols/spotify.c
index 8c6cabd9c..274312163 100644
--- a/src/lib/protocols/spotify.c
+++ b/src/lib/protocols/spotify.c
@@ -126,12 +126,14 @@ void ndpi_search_spotify(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SPOTIFY", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SPOTIFY", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SPOTIFY,
 				      ndpi_search_spotify,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ssdp.c b/src/lib/protocols/ssdp.c
index 5bf82041a..1f6b80023 100644
--- a/src/lib/protocols/ssdp.c
+++ b/src/lib/protocols/ssdp.c
@@ -70,12 +70,14 @@ void ndpi_search_ssdp(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_ssdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SSDP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SSDP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SSDP,
 				      ndpi_search_ssdp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c
index 3e78af72d..20b8b5fe9 100644
--- a/src/lib/protocols/ssh.c
+++ b/src/lib/protocols/ssh.c
@@ -61,11 +61,13 @@ void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SSH", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SSH", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SSH,
 				      ndpi_search_ssh_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 #endif
diff --git a/src/lib/protocols/ssl.c b/src/lib/protocols/ssl.c
index 93d5d2673..12a198498 100644
--- a/src/lib/protocols/ssl.c
+++ b/src/lib/protocols/ssl.c
@@ -645,12 +645,14 @@ void ndpi_search_ssl_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_ssl_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SSL", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SSL", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SSL,
 				      ndpi_search_ssl_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/stealthnet.c b/src/lib/protocols/stealthnet.c
index ba69dd263..7dd56d82a 100644
--- a/src/lib/protocols/stealthnet.c
+++ b/src/lib/protocols/stealthnet.c
@@ -60,12 +60,14 @@ void ndpi_search_stealthnet(struct ndpi_detection_module_struct
 void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
 
-  ndpi_set_bitmask_protocol_detection("STEALTHNET", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("STEALTHNET", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_STEALTHNET,
 				      ndpi_search_stealthnet,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/steam.c b/src/lib/protocols/steam.c
index 369418520..8d50e71ec 100644
--- a/src/lib/protocols/steam.c
+++ b/src/lib/protocols/steam.c
@@ -286,12 +286,14 @@ void ndpi_search_steam(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("STEAM", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("STEAM", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_STEAM,
 				      ndpi_search_steam,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c
index 4712afe6d..d5b1f90ea 100644
--- a/src/lib/protocols/stun.c
+++ b/src/lib/protocols/stun.c
@@ -225,12 +225,14 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("STUN", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("STUN", ndpi_struct, detection_bitmask, *id,
 				       NDPI_PROTOCOL_STUN,
 				       ndpi_search_stun,
 				       NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				       SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				       ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/syslog.c b/src/lib/protocols/syslog.c
index 7c217e6a3..a17714638 100644
--- a/src/lib/protocols/syslog.c
+++ b/src/lib/protocols/syslog.c
@@ -130,12 +130,14 @@ void ndpi_search_syslog(struct ndpi_detection_module_struct
 
 void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("SYSLOG", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("SYSLOG", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_SYSLOG,
 				      ndpi_search_syslog,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/tds.c b/src/lib/protocols/tds.c
index 4e429ec3c..467e3111c 100644
--- a/src/lib/protocols/tds.c
+++ b/src/lib/protocols/tds.c
@@ -91,12 +91,14 @@ void ndpi_search_tds_tcp(struct ndpi_detection_module_struct
 
 void init_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TDS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TDS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TDS,
 				      ndpi_search_tds_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/teamspeak.c b/src/lib/protocols/teamspeak.c
index 8be6104ce..7efa7531a 100644
--- a/src/lib/protocols/teamspeak.c
+++ b/src/lib/protocols/teamspeak.c
@@ -65,12 +65,14 @@ else if (packet->tcp != NULL) {
 
 void init_teamspeak_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TEAMSPEAK", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TEAMSPEAK", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TEAMSPEAK,
 				      ndpi_search_teamspeak,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/teamviewer.c b/src/lib/protocols/teamviewer.c
index 1991121be..c94670eb4 100644
--- a/src/lib/protocols/teamviewer.c
+++ b/src/lib/protocols/teamviewer.c
@@ -101,12 +101,14 @@ void ndpi_search_teamview(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TEAMVIEWER", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TEAMVIEWER", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TEAMVIEWER,
 				      ndpi_search_teamview,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/telegram.c b/src/lib/protocols/telegram.c
index 86f9a1655..3df70672f 100644
--- a/src/lib/protocols/telegram.c
+++ b/src/lib/protocols/telegram.c
@@ -69,12 +69,14 @@ void ndpi_search_telegram(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 void init_telegram_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TELEGRAM", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TELEGRAM", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TELEGRAM,
 				      ndpi_search_telegram,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/telnet.c b/src/lib/protocols/telnet.c
index 5f4034e7d..d2c80035b 100644
--- a/src/lib/protocols/telnet.c
+++ b/src/lib/protocols/telnet.c
@@ -107,12 +107,14 @@ void ndpi_search_telnet_tcp(struct ndpi_detection_module_struct
 
 void init_telnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TELNET", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TELNET", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TELNET,
 				      ndpi_search_telnet_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/tftp.c b/src/lib/protocols/tftp.c
index 33fae48f5..feb37e620 100644
--- a/src/lib/protocols/tftp.c
+++ b/src/lib/protocols/tftp.c
@@ -66,12 +66,14 @@ void ndpi_search_tftp(struct ndpi_detection_module_struct
 
 void init_tftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TFTP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TFTP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TFTP,
 				      ndpi_search_tftp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/thunder.c b/src/lib/protocols/thunder.c
index 8c50324b8..9055bb2b7 100644
--- a/src/lib/protocols/thunder.c
+++ b/src/lib/protocols/thunder.c
@@ -211,12 +211,14 @@ void ndpi_search_thunder(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("THUNDER", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("THUNDER", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_THUNDER,
 				      ndpi_search_thunder,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/tor.c b/src/lib/protocols/tor.c
index 28b186257..036162b1f 100644
--- a/src/lib/protocols/tor.c
+++ b/src/lib/protocols/tor.c
@@ -109,12 +109,14 @@ void ndpi_search_tor(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_tor_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TOR", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("Tor", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TOR,
 				      ndpi_search_tor,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/tvants.c b/src/lib/protocols/tvants.c
index b4f78ea89..2487c2650 100644
--- a/src/lib/protocols/tvants.c
+++ b/src/lib/protocols/tvants.c
@@ -79,12 +79,14 @@ void ndpi_search_tvants_udp(struct ndpi_detection_module_struct
 
 void init_tvants_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TVANTS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TVANTS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TVANTS,
 				      ndpi_search_tvants_udp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/tvuplayer.c b/src/lib/protocols/tvuplayer.c
index c397a2308..fdcb6a1fb 100644
--- a/src/lib/protocols/tvuplayer.c
+++ b/src/lib/protocols/tvuplayer.c
@@ -154,12 +154,14 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
 
 void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TVUPLAYER", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TVUPLAYER", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_TVUPLAYER,
 				      ndpi_search_tvuplayer,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/twitter.c b/src/lib/protocols/twitter.c
index 59744172e..0297bad1e 100644
--- a/src/lib/protocols/twitter.c
+++ b/src/lib/protocols/twitter.c
@@ -63,12 +63,14 @@ void ndpi_search_twitter(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_twitter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("TWITTER", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("TWITTER", ndpi_struct, detection_bitmask, *id,
 				      NDPI_SERVICE_TWITTER,
 				      ndpi_search_twitter,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/usenet.c b/src/lib/protocols/usenet.c
index 33d2af671..2b6515ae3 100644
--- a/src/lib/protocols/usenet.c
+++ b/src/lib/protocols/usenet.c
@@ -105,12 +105,14 @@ void ndpi_search_usenet_tcp(struct ndpi_detection_module_struct
 
 void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("USENET", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("USENET", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_USENET,
 				      ndpi_search_usenet_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/veohtv.c b/src/lib/protocols/veohtv.c
index 54b4ee377..a3ab267b9 100644
--- a/src/lib/protocols/veohtv.c
+++ b/src/lib/protocols/veohtv.c
@@ -117,12 +117,14 @@ void ndpi_search_veohtv_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("HTTP_APPLICATION_VEOHTV", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("HTTP_APPLICATION_VEOHTV", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV,
 				      ndpi_search_veohtv_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/vhua.c b/src/lib/protocols/vhua.c
index 4b9816f8a..e20477573 100644
--- a/src/lib/protocols/vhua.c
+++ b/src/lib/protocols/vhua.c
@@ -68,12 +68,13 @@ void ndpi_search_vhua(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("VHUA", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("VHUA", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_VHUA,
 				      ndpi_search_vhua,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/viber.c b/src/lib/protocols/viber.c
index d9d879b60..111a53007 100644
--- a/src/lib/protocols/viber.c
+++ b/src/lib/protocols/viber.c
@@ -48,12 +48,14 @@ void ndpi_search_viber(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) 
 {
-  ndpi_set_bitmask_protocol_detection("VIBER", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("VIBER", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_VIBER,
 				      ndpi_search_viber,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 
diff --git a/src/lib/protocols/vmware.c b/src/lib/protocols/vmware.c
index 123f1f820..0c2ffaa69 100644
--- a/src/lib/protocols/vmware.c
+++ b/src/lib/protocols/vmware.c
@@ -43,12 +43,14 @@ void ndpi_search_vmware(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_vmware_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("VMWARE", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("VMWARE", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_VMWARE,
 				      ndpi_search_vmware,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/vnc.c b/src/lib/protocols/vnc.c
index 3d0dcbfae..5d793bccf 100644
--- a/src/lib/protocols/vnc.c
+++ b/src/lib/protocols/vnc.c
@@ -68,12 +68,14 @@ void ndpi_search_vnc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
 
 void init_vnc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("VNC", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("VNC", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_VNC,
 				      ndpi_search_vnc_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/warcraft3.c b/src/lib/protocols/warcraft3.c
index 75423aa93..1e2dd7e5d 100644
--- a/src/lib/protocols/warcraft3.c
+++ b/src/lib/protocols/warcraft3.c
@@ -100,12 +100,14 @@ void ndpi_search_warcraft3(struct ndpi_detection_module_struct
 
 void init_warcraft3_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("WARCRAFT3", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("WARCRAFT3", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_WARCRAFT3,
 				      ndpi_search_warcraft3,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/whoisdas.c b/src/lib/protocols/whoisdas.c
index dfe198bb1..fd48de128 100644
--- a/src/lib/protocols/whoisdas.c
+++ b/src/lib/protocols/whoisdas.c
@@ -60,12 +60,14 @@ void ndpi_search_whois_das(struct ndpi_detection_module_struct *ndpi_struct, str
 
 void init_whois_das_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("WHOIS_DAS", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("WHOIS_DAS", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_WHOIS_DAS,
 				      ndpi_search_whois_das,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK); 
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/winmx.c b/src/lib/protocols/winmx.c
index bbddb6b2a..0eb355a30 100644
--- a/src/lib/protocols/winmx.c
+++ b/src/lib/protocols/winmx.c
@@ -104,12 +104,14 @@ void ndpi_search_winmx_tcp(struct ndpi_detection_module_struct *ndpi_struct, str
 
 void init_winmx_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("WINMX", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("WINMX", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_WINMX,
 				      ndpi_search_winmx_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/world_of_kung_fu.c b/src/lib/protocols/world_of_kung_fu.c
index 327ca64f6..aa93f06ff 100644
--- a/src/lib/protocols/world_of_kung_fu.c
+++ b/src/lib/protocols/world_of_kung_fu.c
@@ -58,12 +58,14 @@ void ndpi_search_world_of_kung_fu(struct ndpi_detection_module_struct *ndpi_stru
 
 void init_world_of_kung_fu_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("WORLD_OF_KUNG_FU", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("WORLD_OF_KUNG_FU", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_WORLD_OF_KUNG_FU,
 				      ndpi_search_world_of_kung_fu,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/world_of_warcraft.c b/src/lib/protocols/world_of_warcraft.c
index de405a805..d98a899b7 100644
--- a/src/lib/protocols/world_of_warcraft.c
+++ b/src/lib/protocols/world_of_warcraft.c
@@ -210,12 +210,14 @@ void ndpi_search_worldofwarcraft(struct ndpi_detection_module_struct
 
 void init_world_of_warcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("WORLDOFWARCRAFT", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("WORLDOFWARCRAFT", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_WORLDOFWARCRAFT,
 				      ndpi_search_worldofwarcraft,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/xbox.c b/src/lib/protocols/xbox.c
index c8198c081..b7dfba1a6 100644
--- a/src/lib/protocols/xbox.c
+++ b/src/lib/protocols/xbox.c
@@ -103,12 +103,14 @@ void ndpi_search_xbox(struct ndpi_detection_module_struct *ndpi_struct, struct n
 
 void init_xbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("XBOX", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("XBOX", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_XBOX,
 				      ndpi_search_xbox,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD,
 				      NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/xdmcp.c b/src/lib/protocols/xdmcp.c
index 9842b151b..614e503b1 100644
--- a/src/lib/protocols/xdmcp.c
+++ b/src/lib/protocols/xdmcp.c
@@ -69,12 +69,14 @@ void ndpi_search_xdmcp(struct ndpi_detection_module_struct
 
 void init_xdmcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("XDMCP", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("XDMCP", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_XDMCP,
 				      ndpi_search_xdmcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/yahoo.c b/src/lib/protocols/yahoo.c
index bd3784cf0..40805b1b1 100644
--- a/src/lib/protocols/yahoo.c
+++ b/src/lib/protocols/yahoo.c
@@ -434,12 +434,14 @@ void ndpi_search_yahoo(struct ndpi_detection_module_struct *ndpi_struct, struct
 void init_yahoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
 
-  ndpi_set_bitmask_protocol_detection("YAHOO", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("YAHOO", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_YAHOO,
 				      ndpi_search_yahoo,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/zattoo.c b/src/lib/protocols/zattoo.c
index f14486798..daa27c185 100644
--- a/src/lib/protocols/zattoo.c
+++ b/src/lib/protocols/zattoo.c
@@ -236,12 +236,14 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
 
 void init_zattoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("ZATTOO", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("ZATTOO", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_ZATTOO,
 				      ndpi_search_zattoo,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/src/lib/protocols/zeromq.c b/src/lib/protocols/zeromq.c
index 5c70a0cf9..74b0a5206 100644
--- a/src/lib/protocols/zeromq.c
+++ b/src/lib/protocols/zeromq.c
@@ -100,12 +100,14 @@ void ndpi_search_zmq(struct ndpi_detection_module_struct *ndpi_struct, struct nd
 
 void init_zmq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("ZMQ", ndpi_struct, detection_bitmask, *id++,
+  ndpi_set_bitmask_protocol_detection("ZMQ", ndpi_struct, detection_bitmask, *id,
 				      NDPI_PROTOCOL_ZMQ,
 				      ndpi_search_zmq, /* TODO: add UDP support */
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
 				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
 }
 
 #endif
diff --git a/tests/result/KakaoTalk_talk.pcap.out b/tests/result/KakaoTalk_talk.pcap.out
index cc89066ea..1ec2dbd61 100644
--- a/tests/result/KakaoTalk_talk.pcap.out
+++ b/tests/result/KakaoTalk_talk.pcap.out
@@ -6,7 +6,7 @@ SSL	10	1517	5
 Facebook	2	197	1
 Google	2	220	2
 HTTP_Proxy	31	3565	3
-TOR	40	10538	1
+Tor	40	10538	1
 KakaoTalk_Voice	44	6196	2
 
 	1	TCP 10.24.82.188:34533 <-> 120.28.26.242:80 [proto: 7/HTTP][5 pkts/280 bytes]
@@ -19,7 +19,7 @@ KakaoTalk_Voice	44	6196	2
 	8	TCP 110.76.143.50:8080 <-> 10.24.82.188:32968 [proto: 64/SSL_No_Cert][45 pkts/10108 bytes]
 	9	TCP 139.150.0.125:443 <-> 10.24.82.188:46947 [proto: 91/SSL][5 pkts/1198 bytes]
 	10	TCP 173.194.72.188:5228 <-> 10.24.82.188:34686 [proto: 126/Google][1 pkts/164 bytes]
-	11	TCP 110.76.143.50:9001 <-> 10.24.82.188:58857 [proto: 163/TOR][40 pkts/10538 bytes]
+	11	TCP 110.76.143.50:9001 <-> 10.24.82.188:58857 [proto: 163/Tor][40 pkts/10538 bytes]
 	12	TCP 173.252.122.1:443 <-> 10.24.82.188:52123 [proto: 91/SSL][1 pkts/56 bytes]
 	13	TCP 10.24.82.188:48489 <-> 203.205.147.215:80 [proto: 131/HTTP_Proxy][15 pkts/1727 bytes][Host: hkminorshort.weixin.qq.com]
 	14	UDP 1.201.1.174:23047 <-> 10.24.82.188:10269 [proto: 194/KakaoTalk_Voice][22 pkts/3112 bytes]