aboutsummaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
Diffstat (limited to 'windows')
-rw-r--r--windows/nDPI.vcxproj20
-rw-r--r--windows/nDPI.vcxproj.filters18
-rw-r--r--windows/src/ndpi_define.h50
3 files changed, 25 insertions, 63 deletions
diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj
index c5a2c522b..abc0c682d 100644
--- a/windows/nDPI.vcxproj
+++ b/windows/nDPI.vcxproj
@@ -134,6 +134,7 @@
<ClCompile Include="..\src\lib\ndpi_memory.c" />
<ClCompile Include="..\src\lib\ndpi_serializer.c" />
<ClCompile Include="..\src\lib\ndpi_utils.c" />
+ <ClCompile Include="..\src\lib\ndpi_fingerprint.c" />
<ClCompile Include="..\src\lib\ndpi_domains.c" />
<ClCompile Include="..\src\lib\ndpi_binary_bitmap.c" />
<ClCompile Include="..\src\lib\ndpi_hash.c" />
@@ -245,12 +246,12 @@
<ClCompile Include="..\src\lib\protocols\edonkey.c" />
<ClCompile Include="..\src\lib\protocols\ftp_control.c" />
<ClCompile Include="..\src\lib\protocols\ftp_data.c" />
+ <ClCompile Include="..\src\lib\protocols\gearup_booster.c" />
<ClCompile Include="..\src\lib\protocols\git.c" />
<ClCompile Include="..\src\lib\protocols\gnutella.c" />
<ClCompile Include="..\src\lib\protocols\gtp.c" />
- <ClCompile Include="..\src\lib\protocols\guildwars.c" />
+ <ClCompile Include="..\src\lib\protocols\guildwars2.c" />
<ClCompile Include="..\src\lib\protocols\h323.c" />
- <ClCompile Include="..\src\lib\protocols\halflife2_and_mods.c" />
<ClCompile Include="..\src\lib\protocols\hots.c" />
<ClCompile Include="..\src\lib\protocols\http.c" />
<ClCompile Include="..\src\lib\protocols\http2.c" />
@@ -262,12 +263,13 @@
<ClCompile Include="..\src\lib\protocols\kakaotalk_voice.c" />
<ClCompile Include="..\src\lib\protocols\kcp.c" />
<ClCompile Include="..\src\lib\protocols\kerberos.c" />
+ <ClCompile Include="..\src\lib\protocols\lagofast.c" />
<ClCompile Include="..\src\lib\protocols\ldap.c" />
- <ClCompile Include="..\src\lib\protocols\lotus_notes.c" />
+ <ClCompile Include="..\src\lib\protocols\hcl_notes.c" />
<ClCompile Include="..\src\lib\protocols\mail_imap.c" />
<ClCompile Include="..\src\lib\protocols\mail_pop.c" />
<ClCompile Include="..\src\lib\protocols\mail_smtp.c" />
- <ClCompile Include="..\src\lib\protocols\maplestory.c" />
+ <ClCompile Include="..\src\lib\protocols\nexon.c" />
<ClCompile Include="..\src\lib\protocols\megaco.c" />
<ClCompile Include="..\src\lib\protocols\mgcp.c" />
<ClCompile Include="..\src\lib\protocols\monero.c" />
@@ -313,7 +315,7 @@
<ClCompile Include="..\src\lib\protocols\spotify.c" />
<ClCompile Include="..\src\lib\protocols\ssdp.c" />
<ClCompile Include="..\src\lib\protocols\ssh.c" />
- <ClCompile Include="..\src\lib\protocols\starcraft.c" />
+ <ClCompile Include="..\src\lib\protocols\blizzard.c" />
<ClCompile Include="..\src\lib\protocols\steam.c" />
<ClCompile Include="..\src\lib\protocols\stun.c" />
<ClCompile Include="..\src\lib\protocols\syslog.c" />
@@ -330,14 +332,10 @@
<ClCompile Include="..\src\lib\protocols\tuya_lp.c" />
<ClCompile Include="..\src\lib\protocols\ubntac2.c" />
<ClCompile Include="..\src\lib\protocols\usenet.c" />
- <ClCompile Include="..\src\lib\protocols\vhua.c" />
<ClCompile Include="..\src\lib\protocols\viber.c" />
<ClCompile Include="..\src\lib\protocols\vmware.c" />
<ClCompile Include="..\src\lib\protocols\vnc.c" />
- <ClCompile Include="..\src\lib\protocols\warcraft3.c" />
<ClCompile Include="..\src\lib\protocols\whoisdas.c" />
- <ClCompile Include="..\src\lib\protocols\world_of_kung_fu.c" />
- <ClCompile Include="..\src\lib\protocols\world_of_warcraft.c" />
<ClCompile Include="..\src\lib\protocols\xbox.c" />
<ClCompile Include="..\src\lib\protocols\xdmcp.c" />
<ClCompile Include="..\src\lib\protocols\zattoo.c" />
@@ -396,6 +394,10 @@
<ClCompile Include="..\src\lib\protocols\lustre.c" />
<ClCompile Include="..\src\lib\protocols\dingtalk.c" />
<ClCompile Include="..\src\lib\protocols\paltalk.c" />
+ <ClCompile Include="..\src\lib\protocols\msdo.c" />
+ <ClCompile Include="..\src\lib\protocols\melsec.c" />
+ <ClCompile Include="..\src\lib\protocols\hamachi.c" />
+ <ClCompile Include="..\src\lib\protocols\glbp.c" />
<ClCompile Include="..\src\lib\third_party\src\gcrypt_light.c" />
<ClCompile Include="..\src\lib\third_party\src\libcache.c" />
<ClCompile Include="..\src\lib\third_party\src\libinjection_html5.c" />
diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters
index e0366b32e..fbd9ddb41 100644
--- a/windows/nDPI.vcxproj.filters
+++ b/windows/nDPI.vcxproj.filters
@@ -28,9 +28,8 @@
<ClCompile Include="..\src\lib\protocols\git.c" />
<ClCompile Include="..\src\lib\protocols\gnutella.c" />
<ClCompile Include="..\src\lib\protocols\gtp.c" />
- <ClCompile Include="..\src\lib\protocols\guildwars.c" />
+ <ClCompile Include="..\src\lib\protocols\guildwars2.c" />
<ClCompile Include="..\src\lib\protocols\h323.c" />
- <ClCompile Include="..\src\lib\protocols\halflife2_and_mods.c" />
<ClCompile Include="..\src\lib\protocols\http.c" />
<ClCompile Include="..\src\lib\protocols\http2.c" />
<ClCompile Include="..\src\lib\protocols\iax.c" />
@@ -41,11 +40,11 @@
<ClCompile Include="..\src\lib\protocols\kakaotalk_voice.c" />
<ClCompile Include="..\src\lib\protocols\kerberos.c" />
<ClCompile Include="..\src\lib\protocols\ldap.c" />
- <ClCompile Include="..\src\lib\protocols\lotus_notes.c" />
+ <ClCompile Include="..\src\lib\protocols\hcl_notes.c" />
<ClCompile Include="..\src\lib\protocols\mail_imap.c" />
<ClCompile Include="..\src\lib\protocols\mail_pop.c" />
<ClCompile Include="..\src\lib\protocols\mail_smtp.c" />
- <ClCompile Include="..\src\lib\protocols\maplestory.c" />
+ <ClCompile Include="..\src\lib\protocols\nexon.c" />
<ClCompile Include="..\src\lib\protocols\megaco.c" />
<ClCompile Include="..\src\lib\protocols\mgcp.c" />
<ClCompile Include="..\src\lib\protocols\mikrotik.c" />
@@ -82,7 +81,7 @@
<ClCompile Include="..\src\lib\protocols\spotify.c" />
<ClCompile Include="..\src\lib\protocols\ssdp.c" />
<ClCompile Include="..\src\lib\protocols\ssh.c" />
- <ClCompile Include="..\src\lib\protocols\starcraft.c" />
+ <ClCompile Include="..\src\lib\protocols\blizzard.c" />
<ClCompile Include="..\src\lib\protocols\steam.c" />
<ClCompile Include="..\src\lib\protocols\stun.c" />
<ClCompile Include="..\src\lib\protocols\syslog.c" />
@@ -98,14 +97,10 @@
<ClCompile Include="..\src\lib\protocols\tuya_lp.c" />
<ClCompile Include="..\src\lib\protocols\ubntac2.c" />
<ClCompile Include="..\src\lib\protocols\usenet.c" />
- <ClCompile Include="..\src\lib\protocols\vhua.c" />
<ClCompile Include="..\src\lib\protocols\viber.c" />
<ClCompile Include="..\src\lib\protocols\vmware.c" />
<ClCompile Include="..\src\lib\protocols\vnc.c" />
- <ClCompile Include="..\src\lib\protocols\warcraft3.c" />
<ClCompile Include="..\src\lib\protocols\whoisdas.c" />
- <ClCompile Include="..\src\lib\protocols\world_of_kung_fu.c" />
- <ClCompile Include="..\src\lib\protocols\world_of_warcraft.c" />
<ClCompile Include="..\src\lib\protocols\xbox.c" />
<ClCompile Include="..\src\lib\protocols\xdmcp.c" />
<ClCompile Include="..\src\lib\protocols\zattoo.c" />
@@ -161,6 +156,10 @@
<ClCompile Include="..\src\lib\protocols\lustre.c" />
<ClCompile Include="..\src\lib\protocols\dingtalk.c" />
<ClCompile Include="..\src\lib\protocols\paltalk.c" />
+ <ClCompile Include="..\src\lib\protocols\msdo.c" />
+ <ClCompile Include="..\src\lib\protocols\melsec.c" />
+ <ClCompile Include="..\src\lib\protocols\hamachi.c" />
+ <ClCompile Include="..\src\lib\protocols\glbp.c" />
<ClCompile Include="src\getopt.c" />
<ClCompile Include="src\win-gettimeofday.c" />
<ClCompile Include="..\src\lib\ndpi_analyze.c" />
@@ -173,6 +172,7 @@
<ClCompile Include="..\src\lib\ndpi_memory.c" />
<ClCompile Include="..\src\lib\ndpi_serializer.c" />
<ClCompile Include="..\src\lib\ndpi_utils.c" />
+ <ClCompile Include="..\src\lib\ndpi_fingerprint.c" />
<ClCompile Include="..\src\lib\ndpi_binary_bitmap.c" />
<ClCompile Include="..\src\lib\ndpi_hash.c" />
<ClCompile Include="..\src\lib\ndpi_domain_classify.c" />
diff --git a/windows/src/ndpi_define.h b/windows/src/ndpi_define.h
index f03f41cb5..375be8d9f 100644
--- a/windows/src/ndpi_define.h
+++ b/windows/src/ndpi_define.h
@@ -85,19 +85,9 @@
#define NDPI_SELECTION_BITMASK_PROTOCOL_SIZE u_int32_t
-/**
- * convenience macro to check for excluded protocol
- * a protocol is excluded if the flow is known and either the protocol is not detected at all
- * or the excluded bitmask contains the protocol
- */
-#define NDPI_FLOW_PROTOCOL_EXCLUDED(ndpi_struct,flow,protocol) ((flow) != NULL && \
- ( NDPI_COMPARE_PROTOCOL_TO_BITMASK((ndpi_struct)->detection_bitmask, (protocol)) == 0 || \
- NDPI_COMPARE_PROTOCOL_TO_BITMASK((flow)->excluded_protocol_bitmask, (protocol)) != 0 ) )
-
#define MAX_DEFAULT_PORTS 5
-#define NDPI_EXCLUDE_PROTO(mod,flow) ndpi_exclude_protocol(mod, flow, NDPI_CURRENT_PROTO, __FILE__, __FUNCTION__, __LINE__)
-#define NDPI_EXCLUDE_PROTO_EXT(mod,flow,proto) ndpi_exclude_protocol(mod, flow, proto, __FILE__, __FUNCTION__, __LINE__)
+#define NDPI_EXCLUDE_DISSECTOR(mod,flow) exclude_dissector(mod, flow, mod->current_dissector_idx, __FILE__, __FUNCTION__, __LINE__)
/**
* macro for getting the string len of a static string
@@ -110,44 +100,14 @@
#define NDPI_COMPARE_IPV6_ADDRESS_STRUCTS(x,y) \
((x.u6_addr.u6_addr64[0] < y.u6_addr.u6_addr64[0]) || ((x.u6_addr.u6_addr64[0] == y.u6_addr.u6_addr64[0]) && (x.u6_addr.u6_addr64[1] < y.u6_addr.u6_addr64[1])))
-#define NDPI_NUM_BITS 512
-#define NDPI_NUM_BITS_MASK (512-1)
-
-#define NDPI_BITS /* 32 */ (sizeof(ndpi_ndpi_mask) * 8 /* number of bits in a byte */) /* bits per mask */
#define howmanybits(x, y) (((x)+((y)-1))/(y))
-
-#define NDPI_SET(p, n) ((p)->fds_bits[(n)/NDPI_BITS] |= (1ul << (((u_int32_t)n) % NDPI_BITS)))
-#define NDPI_CLR(p, n) ((p)->fds_bits[(n)/NDPI_BITS] &= ~(1ul << (((u_int32_t)n) % NDPI_BITS)))
-#define NDPI_ISSET(p, n) ((p)->fds_bits[(n)/NDPI_BITS] & (1ul << (((u_int32_t)n) % NDPI_BITS)))
-#define NDPI_ZERO(p) memset((char *)(p), 0, sizeof(*(p)))
-#define NDPI_ONE(p) memset((char *)(p), 0xFF, sizeof(*(p)))
-
-#define NDPI_NUM_FDS_BITS howmanybits(NDPI_NUM_BITS, NDPI_BITS)
-
-#define NDPI_PROTOCOL_BITMASK ndpi_protocol_bitmask_struct_t
-
-#define NDPI_BITMASK_ADD(a,b) NDPI_SET(&a,b)
-#define NDPI_BITMASK_DEL(a,b) NDPI_CLR(&a,b)
-#define NDPI_BITMASK_RESET(a) NDPI_ZERO(&a)
-#define NDPI_BITMASK_SET_ALL(a) NDPI_ONE(&a)
-#define NDPI_BITMASK_SET(a, b) { memcpy(&a, &b, sizeof(NDPI_PROTOCOL_BITMASK)); }
-
#define NDPI_SET_BIT(num, n) num |= 1ULL << ( n )
#define NDPI_CLR_BIT(num, n) num &= ~(1ULL << ( n ))
#define NDPI_CLR_BIT(num, n) num &= ~(1ULL << ( n ))
#define NDPI_ISSET_BIT(num, n) (num & (1ULL << ( n )))
#define NDPI_ZERO_BIT(num) num = 0
-
-/* this is a very very tricky macro *g*,
- * the compiler will remove all shifts here if the protocol is static...
- */
-#define NDPI_ADD_PROTOCOL_TO_BITMASK(bmask,value) NDPI_SET(&bmask, value & NDPI_NUM_BITS_MASK)
-#define NDPI_DEL_PROTOCOL_FROM_BITMASK(bmask,value) NDPI_CLR(&bmask, value & NDPI_NUM_BITS_MASK)
-#define NDPI_COMPARE_PROTOCOL_TO_BITMASK(bmask,value) NDPI_ISSET(&bmask, value & NDPI_NUM_BITS_MASK)
-
-#define NDPI_SAVE_AS_BITMASK(bmask,value) { NDPI_ZERO(&bmask) ; NDPI_ADD_PROTOCOL_TO_BITMASK(bmask, value); }
-
+#define NDPI_ONES_BIT(num) num = -1;
#define ndpi_min(a,b) ((a < b) ? a : b)
#define ndpi_max(a,b) ((a > b) ? a : b)
@@ -215,9 +175,6 @@ static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O)
#endif /* WIN32 */
-#define NDPI_MAX_DNS_REQUESTS 16
-#define NDPI_MIN_NUM_STUN_DETECTION 8
-
/*
* Not supported for Visual Studio.
*/
@@ -225,6 +182,9 @@ static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O)
#define NDPI_MINOR 0
#define NDPI_PATCH 0
+#define NDPI_MAX_DNS_REQUESTS 48
+#define NDPI_MIN_NUM_STUN_DETECTION 8
+
/* IMPORTANT: order according to its severity */
#define NDPI_CIPHER_SAFE 0
#define NDPI_CIPHER_WEAK 1
Powered by cgit, Themed by Ted Yin.