deleted useless function - change macro name

4 files changed, 69 insertions, 83 deletions

diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h
index 79de7017e..ca295b4e1 100644
--- a/src/include/ndpi_api.h
+++ b/src/include/ndpi_api.h
@@ -1,7 +1,7 @@
 /*
  * ndpi_api.h
  *
- * Copyright (C) 2011-16 - ntop.org
+ * Copyright (C) 2011-17 - ntop.org
  *
  * This file is part of nDPI, an open source deep packet inspection
  * library based on the OpenDPI and PACE technology by ipoque GmbH
@@ -255,20 +255,6 @@ extern "C" {
 				 u_int8_t *l4_protocol_return, u_int32_t flags);
 
 
-#if 0
-  /**
-   * returns true if the protocol history of the flow of the last packet given to the detection
-   * contains the given protocol.
-   *
-   * @param ndpi_struct the detection module
-   * @return 1 if protocol has been found, 0 otherwise
-   *
-   */
-  u_int8_t ndpi_detection_flow_protocol_history_contains_protocol(struct ndpi_detection_module_struct *ndpi_struct,
-  								  struct ndpi_flow_struct *flow,
-  								  u_int16_t protocol_id);
-#endif
-
   /**
    * Search and return the protocol based on matched ports
    * 
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 2e453689b..7eada61e2 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -30,17 +30,17 @@
 #define __NDPI_PROTOCOLS_DEFAULT_H__
 
 #define NDPI_DETECTION_SUPPORT_IPV6
-#define NDPI_PROTOCOL_HISTORY_SIZE				2
+#define NDPI_PROTOCOL_SIZE		 2
 
-#define NDPI_PROTOCOL_UNKNOWN					0
+#define NDPI_PROTOCOL_UNKNOWN		 0
 
-#define NDPI_PROTOCOL_NO_MASTER_PROTO        NDPI_PROTOCOL_UNKNOWN
+#define NDPI_PROTOCOL_NO_MASTER_PROTO      NDPI_PROTOCOL_UNKNOWN
 
-#define NDPI_PROTOCOL_UNKNOWN 	 0
-#define NDPI_PROTOCOL_FTP_CONTROL 	 1 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_MAIL_POP 	 2
-#define NDPI_PROTOCOL_MAIL_SMTP 	 3
-#define NDPI_PROTOCOL_MAIL_IMAP 	 4
+#define NDPI_PROTOCOL_UNKNOWN 	           0
+#define NDPI_PROTOCOL_FTP_CONTROL 	   1 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_MAIL_POP 	           2
+#define NDPI_PROTOCOL_MAIL_SMTP 	   3
+#define NDPI_PROTOCOL_MAIL_IMAP 	   4
 #define NDPI_PROTOCOL_DNS 	 5
 #define NDPI_PROTOCOL_IPP 	 6
 #define NDPI_PROTOCOL_HTTP 	 7
@@ -58,61 +58,61 @@
 #define NDPI_PROTOCOL_POSTGRES 	 19
 #define NDPI_PROTOCOL_MYSQL 	 20
 #define NDPI_PROTOCOL_HOTMAIL 	 21
-#define NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK 	 22
-#define NDPI_PROTOCOL_MAIL_POPS 	 23
-#define NDPI_PROTOCOL_APPLEJUICE 	 24
-#define NDPI_PROTOCOL_DIRECTCONNECT 	 25
-#define NDPI_PROTOCOL_SOCRATES 	 26
-#define NDPI_PROTOCOL_COAP 	 27
-#define NDPI_PROTOCOL_VMWARE 	 28
-#define NDPI_PROTOCOL_MAIL_SMTPS 	 29
-#define NDPI_PROTOCOL_FILETOPIA 	 30
-#define NDPI_PROTOCOL_UBNTAC2 	 31 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
-#define NDPI_PROTOCOL_KONTIKI 	 32
-#define NDPI_PROTOCOL_OPENFT 	 33
-#define NDPI_PROTOCOL_FASTTRACK 	 34
-#define NDPI_PROTOCOL_GNUTELLA 	 35
-#define NDPI_PROTOCOL_EDONKEY 	 36 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_BITTORRENT 	 37
-#define NDPI_PROTOCOL_EPP 	 38
-#define NDPI_CONTENT_AVI 	 39
-#define NDPI_CONTENT_FLASH 	 40
-#define NDPI_CONTENT_OGG 	 41
-#define NDPI_CONTENT_MPEG 	 42
-#define NDPI_CONTENT_QUICKTIME 	 43
-#define NDPI_CONTENT_REALMEDIA 	 44
-#define NDPI_CONTENT_WINDOWSMEDIA 	 45
-#define NDPI_CONTENT_MMS 	 46
-#define NDPI_PROTOCOL_XBOX 	 47
-#define NDPI_PROTOCOL_QQ 	 48
-#define NDPI_PROTOCOL_MOVE 	 49
-#define NDPI_PROTOCOL_RTSP 	 50
-#define NDPI_PROTOCOL_MAIL_IMAPS 	 51
+#define NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK 22
+#define NDPI_PROTOCOL_MAIL_POPS 	   23
+#define NDPI_PROTOCOL_APPLEJUICE 	   24
+#define NDPI_PROTOCOL_DIRECTCONNECT 	   25
+#define NDPI_PROTOCOL_SOCRATES 	           26
+#define NDPI_PROTOCOL_COAP 	           27
+#define NDPI_PROTOCOL_VMWARE 	           28
+#define NDPI_PROTOCOL_MAIL_SMTPS 	   29
+#define NDPI_PROTOCOL_FILETOPIA 	   30
+#define NDPI_PROTOCOL_UBNTAC2 	           31 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
+#define NDPI_PROTOCOL_KONTIKI 	           32
+#define NDPI_PROTOCOL_OPENFT 	           33
+#define NDPI_PROTOCOL_FASTTRACK 	   34
+#define NDPI_PROTOCOL_GNUTELLA 	           35
+#define NDPI_PROTOCOL_EDONKEY 	           36 /* Tomasz Bujlow <tomasz@skatnet.dk> */
+#define NDPI_PROTOCOL_BITTORRENT 	   37
+#define NDPI_PROTOCOL_EPP 	           38
+#define NDPI_CONTENT_AVI 	           39
+#define NDPI_CONTENT_FLASH 	           40
+#define NDPI_CONTENT_OGG 	           41
+#define NDPI_CONTENT_MPEG 	           42
+#define NDPI_CONTENT_QUICKTIME 	           43
+#define NDPI_CONTENT_REALMEDIA 	           44
+#define NDPI_CONTENT_WINDOWSMEDIA 	   45
+#define NDPI_CONTENT_MMS 	           46
+#define NDPI_PROTOCOL_XBOX 	           47
+#define NDPI_PROTOCOL_QQ 	           48
+#define NDPI_PROTOCOL_MOVE 	           49
+#define NDPI_PROTOCOL_RTSP 	           50
+#define NDPI_PROTOCOL_MAIL_IMAPS 	   51
 #define NDPI_PROTOCOL_ICECAST 	 52
 #define NDPI_PROTOCOL_PPLIVE 	 53 /* Tomasz Bujlow <tomasz@skatnet.dk> */
 #define NDPI_PROTOCOL_PPSTREAM 	 54
 #define NDPI_PROTOCOL_ZATTOO 	 55
-#define NDPI_PROTOCOL_SHOUTCAST 	 56
+#define NDPI_PROTOCOL_SHOUTCAST            56
 #define NDPI_PROTOCOL_SOPCAST 	 57
 #define NDPI_PROTOCOL_TVANTS 	 58
-#define NDPI_PROTOCOL_TVUPLAYER 	 59
-#define NDPI_PROTOCOL_HTTP_DOWNLOAD 	 60
+#define NDPI_PROTOCOL_TVUPLAYER 	   59
+#define NDPI_PROTOCOL_HTTP_DOWNLOAD 	   60
 #define NDPI_PROTOCOL_QQLIVE 	 61
 #define NDPI_PROTOCOL_THUNDER 	 62
 #define NDPI_PROTOCOL_SOULSEEK 	 63
-#define NDPI_PROTOCOL_SSL_NO_CERT 	 64 /* SSL without certificate (Skype Ultrasurf?) - ntop.org */
-#define NDPI_PROTOCOL_IRC 	 65
-#define NDPI_PROTOCOL_AYIYA 	 66
-#define NDPI_PROTOCOL_UNENCRYPTED_JABBER 	 67
+#define NDPI_PROTOCOL_SSL_NO_CERT 	   64
+#define NDPI_PROTOCOL_IRC 	           65
+#define NDPI_PROTOCOL_AYIYA 	           66
+#define NDPI_PROTOCOL_UNENCRYPTED_JABBER   67
 #define NDPI_PROTOCOL_MSN 	 68
 #define NDPI_PROTOCOL_OSCAR 	 69
 #define NDPI_PROTOCOL_YAHOO 	 70
-#define NDPI_PROTOCOL_BATTLEFIELD 	 71
+#define NDPI_PROTOCOL_BATTLEFIELD 	   71
 #define NDPI_PROTOCOL_QUAKE 	 72 
 #define NDPI_PROTOCOL_IP_VRRP 	 73
 #define NDPI_PROTOCOL_STEAM 	 74 /* Tomasz Bujlow <tomasz@skatnet.dk> */
-#define NDPI_PROTOCOL_HALFLIFE2 	 75
-#define NDPI_PROTOCOL_WORLDOFWARCRAFT 	 76
+#define NDPI_PROTOCOL_HALFLIFE2 	   75
+#define NDPI_PROTOCOL_WORLDOFWARCRAFT 	   76
 #define NDPI_PROTOCOL_TELNET 	 77
 #define NDPI_PROTOCOL_STUN 	 78
 #define NDPI_PROTOCOL_IP_IPSEC 	 79
@@ -122,11 +122,11 @@
 #define NDPI_PROTOCOL_IP_EGP 	 83
 #define NDPI_PROTOCOL_IP_SCTP 	 84
 #define NDPI_PROTOCOL_IP_OSPF 	 85
-#define NDPI_PROTOCOL_IP_IP_IN_IP 	 86
+#define NDPI_PROTOCOL_IP_IP_IN_IP 	   86
 #define NDPI_PROTOCOL_RTP 	 87
 #define NDPI_PROTOCOL_RDP 	 88
 #define NDPI_PROTOCOL_VNC 	 89
-#define NDPI_PROTOCOL_PCANYWHERE 	 90
+#define NDPI_PROTOCOL_PCANYWHERE 	   90
 #define NDPI_PROTOCOL_SSL 	 91
 #define NDPI_PROTOCOL_SSH 	 92
 #define NDPI_PROTOCOL_USENET 	 93
@@ -134,40 +134,40 @@
 #define NDPI_PROTOCOL_IAX 	 95
 #define NDPI_PROTOCOL_TFTP 	 96
 #define NDPI_PROTOCOL_AFP 	 97
-#define NDPI_PROTOCOL_STEALTHNET 	 98
+#define NDPI_PROTOCOL_STEALTHNET 	   98
 #define NDPI_PROTOCOL_AIMINI 	 99
 #define NDPI_PROTOCOL_SIP 	 100
 #define NDPI_PROTOCOL_TRUPHONE 	 101
-#define NDPI_PROTOCOL_IP_ICMPV6 	 102
+#define NDPI_PROTOCOL_IP_ICMPV6 	   102
 #define NDPI_PROTOCOL_DHCPV6 	 103
-#define NDPI_PROTOCOL_ARMAGETRON 	 104
-#define NDPI_PROTOCOL_CROSSFIRE 	 105
+#define NDPI_PROTOCOL_ARMAGETRON 	   104
+#define NDPI_PROTOCOL_CROSSFIRE 	   105
 #define NDPI_PROTOCOL_DOFUS 	 106
 #define NDPI_PROTOCOL_FIESTA 	 107
-#define NDPI_PROTOCOL_FLORENSIA 	 108
-#define NDPI_PROTOCOL_GUILDWARS 	 109
+#define NDPI_PROTOCOL_FLORENSIA 	   108
+#define NDPI_PROTOCOL_GUILDWARS 	   109
 #define NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC 	 110
 #define NDPI_PROTOCOL_KERBEROS 	 111
 #define NDPI_PROTOCOL_LDAP 	 112
-#define NDPI_PROTOCOL_MAPLESTORY 	 113
-#define NDPI_PROTOCOL_MSSQL_TDS 	 114
+#define NDPI_PROTOCOL_MAPLESTORY 	   113
+#define NDPI_PROTOCOL_MSSQL_TDS 	   114
 #define NDPI_PROTOCOL_PPTP 	 115
-#define NDPI_PROTOCOL_WARCRAFT3 	 116
-#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU 	 117
+#define NDPI_PROTOCOL_WARCRAFT3 	   116
+#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU 	   117
 #define NDPI_PROTOCOL_SLACK 	 118
 #define NDPI_PROTOCOL_FACEBOOK 	 119
 #define NDPI_PROTOCOL_TWITTER 	 120
 #define NDPI_PROTOCOL_DROPBOX 	 121
 #define NDPI_PROTOCOL_GMAIL 	 122
-#define NDPI_PROTOCOL_GOOGLE_MAPS 	 123
+#define NDPI_PROTOCOL_GOOGLE_MAPS 	   123
 #define NDPI_PROTOCOL_YOUTUBE 	 124
 #define NDPI_PROTOCOL_SKYPE 	 125
 #define NDPI_PROTOCOL_GOOGLE 	 126
 #define NDPI_PROTOCOL_DCERPC 	 127
 #define NDPI_PROTOCOL_NETFLOW 	 128
 #define NDPI_PROTOCOL_SFLOW 	 129
-#define NDPI_PROTOCOL_HTTP_CONNECT 	 130
-#define NDPI_PROTOCOL_HTTP_PROXY 	 131
+#define NDPI_PROTOCOL_HTTP_CONNECT 	   130
+#define NDPI_PROTOCOL_HTTP_PROXY 	   131
 #define NDPI_PROTOCOL_CITRIX 	 132
 #define NDPI_PROTOCOL_NETFLIX 	 133
 #define NDPI_PROTOCOL_LASTFM 	 134
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index 96cea5353..490098086 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -654,8 +654,8 @@ struct ndpi_packet_struct {
   u_int32_t tick_timestamp;
   u_int64_t tick_timestamp_l;
 
-  u_int16_t detected_protocol_stack[NDPI_PROTOCOL_HISTORY_SIZE];
-  u_int8_t detected_subprotocol_stack[NDPI_PROTOCOL_HISTORY_SIZE];
+  u_int16_t detected_protocol_stack[NDPI_PROTOCOL_SIZE];
+  u_int8_t detected_subprotocol_stack[NDPI_PROTOCOL_SIZE];
 
 
 #ifndef WIN32
@@ -888,7 +888,7 @@ struct ndpi_detection_module_struct {
 };
 
 struct ndpi_flow_struct {
-  u_int16_t detected_protocol_stack[NDPI_PROTOCOL_HISTORY_SIZE];
+  u_int16_t detected_protocol_stack[NDPI_PROTOCOL_SIZE];
 #ifndef WIN32
   __attribute__ ((__packed__))
 #endif
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index f7346594e..31d2ab435 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -4097,7 +4097,7 @@ void ndpi_int_change_protocol(struct ndpi_detection_module_struct *ndpi_struct,
 void ndpi_int_reset_packet_protocol(struct ndpi_packet_struct *packet) {
   int a;
 
-  for(a = 0; a < NDPI_PROTOCOL_HISTORY_SIZE; a++)
+  for(a = 0; a < NDPI_PROTOCOL_SIZE; a++)
     packet->detected_protocol_stack[a] = NDPI_PROTOCOL_UNKNOWN;
 }
 
@@ -4105,7 +4105,7 @@ void ndpi_int_reset_protocol(struct ndpi_flow_struct *flow) {
   if(flow) {
     int a;
 
-    for(a = 0; a < NDPI_PROTOCOL_HISTORY_SIZE; a++) {
+    for(a = 0; a < NDPI_PROTOCOL_SIZE; a++) {
       flow->detected_protocol_stack[a] = NDPI_PROTOCOL_UNKNOWN;
     }
   }