From 64121162dd3262eec5d2ebca8b7a3be97f2c552c Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 18 May 2015 16:17:23 +0200 Subject: Win32 fix --- src/lib/third_party/include/ndpi_patricia.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/third_party/include/ndpi_patricia.h b/src/lib/third_party/include/ndpi_patricia.h index bf4a86259..651e52fc9 100644 --- a/src/lib/third_party/include/ndpi_patricia.h +++ b/src/lib/third_party/include/ndpi_patricia.h @@ -44,7 +44,7 @@ #ifndef WIN32 #define PATRICIA_IPV6 HAVE_IPV6 #else -#define PATRICIA_IPV6 0 +#undef PATRICIA_IPV6 #endif /* typedef unsigned int u_int; */ @@ -142,7 +142,11 @@ void ndpi_Clear_Patricia (patricia_tree_t *patricia, void_fn_t func); void ndpi_Destroy_Patricia (patricia_tree_t *patricia, void_fn_t func); void ndpi_patricia_process (patricia_tree_t *patricia, void_fn2_t func); +#ifdef WIN32 +#define PATRICIA_MAXBITS 128 +#else #define PATRICIA_MAXBITS (sizeof(struct in6_addr) * 8) +#endif #define PATRICIA_NBIT(x) (0x80 >> ((x) & 0x7f)) #define PATRICIA_NBYTE(x) ((x) >> 3) -- cgit v1.2.3 From 167c83121262c4621b56f1cb3927bf5f8a5f9a69 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 18 May 2015 18:29:22 +0200 Subject: Fixed compilation warnings --- src/lib/ndpi_main.c | 2 +- src/lib/protocols/warcraft3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 722984953..7719f766e 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -4212,7 +4212,7 @@ unsigned int ndpi_detection_process_packet(struct ndpi_detection_module_struct * flow->packet.tick_timestamp = d; } #else - flow->packet.tick_timestamp = current_tick_l/1000; + flow->packet.tick_timestamp = (u_int32_t)current_tick_l/1000; #endif /* parse packet */ diff --git a/src/lib/protocols/warcraft3.c b/src/lib/protocols/warcraft3.c index 7780dbf6e..39c93378e 100644 --- a/src/lib/protocols/warcraft3.c +++ b/src/lib/protocols/warcraft3.c @@ -43,7 +43,7 @@ void ndpi_search_warcraft3(struct ndpi_detection_module_struct // struct ndpi_id_struct *src=ndpi_struct->src; // struct ndpi_id_struct *dst=ndpi_struct->dst; - u_int32_t l; /* + u_int16_t l; /* Leave it as u_int32_t because otherwise 'u_int16_t temp' might overflood it and thus generate an infinite loop */ -- cgit v1.2.3