Fixed shlib xcompile for x86_64-w64-mingw32

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

5 files changed, 18 insertions, 15 deletions

diff --git a/src/lib/ndpi_classify.c b/src/lib/ndpi_classify.c
index 7b410e05f..a7a02cb4e 100644
--- a/src/lib/ndpi_classify.c
+++ b/src/lib/ndpi_classify.c
@@ -51,6 +51,7 @@
 #include <math.h>
 #include "ndpi_main.h"
 #include "ndpi_classify.h"
+#include "ndpi_includes.h"
 
 /** finds the minimum value between to inputs */
 #ifndef min
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index efd8a18a5..20700d648 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -5034,7 +5034,7 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
       }
 
       packet->line[packet->parsed_lines].len =
-	(u_int16_t)(((unsigned long) &packet->payload[a]) - ((unsigned long) packet->line[packet->parsed_lines].ptr));
+	(u_int16_t)(((size_t) &packet->payload[a]) - ((size_t) packet->line[packet->parsed_lines].ptr));
 
       /* First line of a HTTP response parsing. Expected a "HTTP/1.? ???" */
       if(packet->parsed_lines == 0 && packet->line[0].len >= NDPI_STATICSTRING_LEN("HTTP/1.X 200 ") &&
@@ -5256,8 +5256,8 @@ void ndpi_parse_packet_line_info(struct ndpi_detection_module_struct *ndpi_str,
 
   if(packet->parsed_lines >= 1) {
     packet->line[packet->parsed_lines].len =
-      (u_int16_t)(((unsigned long) &packet->payload[packet->payload_packet_len]) -
-		  ((unsigned long) packet->line[packet->parsed_lines].ptr));
+      (u_int16_t)(((size_t) &packet->payload[packet->payload_packet_len]) -
+		  ((size_t) packet->line[packet->parsed_lines].ptr));
     packet->parsed_lines++;
   }
 }
@@ -5284,7 +5284,7 @@ void ndpi_parse_packet_line_info_any(struct ndpi_detection_module_struct *ndpi_s
   for (a = 0; a < end; a++) {
     if(packet->payload[a] == 0x0a) {
       packet->line[packet->parsed_lines].len = (u_int16_t)(
-							   ((unsigned long) &packet->payload[a]) - ((unsigned long) packet->line[packet->parsed_lines].ptr));
+							   ((size_t) &packet->payload[a]) - ((size_t) packet->line[packet->parsed_lines].ptr));
 
       if(a > 0 && packet->payload[a - 1] == 0x0d)
 	packet->line[packet->parsed_lines].len--;
diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
index c1f52f89e..cf2bd8a26 100644
--- a/src/lib/ndpi_serializer.c
+++ b/src/lib/ndpi_serializer.c
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <sys/types.h>
 
 #include "ndpi_api.h"
@@ -803,7 +804,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
 
     serializer->status.buffer.size_used += snprintf((char *) 
       &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%llu", (unsigned long long)value);
+      "%" PRIu64, (unsigned long long)value);
 
     ndpi_serialize_json_post(_serializer);
   } else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -812,7 +813,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
     buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
     serializer->status.buffer.size_used += snprintf((char *)
       &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%llu", (unsigned long long)value);
+      "%" PRIu64, (unsigned long long)value);
   } else {
     if(value <= 0xffffffff) {
       return(ndpi_serialize_uint32_uint32(_serializer, key, value));
@@ -935,7 +936,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
 
     serializer->status.buffer.size_used += snprintf((char *) 
       &serializer->buffer.data[serializer->status.buffer.size_used], 
-      buff_diff, "%lld", (long long int)value);
+      buff_diff, "%" PRId64, (long long int)value);
 
     ndpi_serialize_json_post(_serializer);
   } else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -944,7 +945,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
     buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
     serializer->status.buffer.size_used += snprintf((char *)
       &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%lld", (long long int)value);
+      "%" PRId64, (long long int)value);
   }
   else {
     if((value & 0xFFFFFFFF) == value) {
@@ -1256,7 +1257,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
 
     serializer->status.buffer.size_used += snprintf((char *) 
       &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%lld", (long long int)value);
+      "%" PRId64, (long long int)value);
 
     ndpi_serialize_json_post(_serializer);
   } else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -1264,7 +1265,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
     ndpi_serialize_csv_pre(serializer);
     buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
     serializer->status.buffer.size_used += snprintf((char *) &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%lld", (long long int)value);
+      "%" PRId64, (long long int)value);
   } else {
     if ((value & 0xFFFFFFFF) == value) {
       return(ndpi_serialize_string_int32(_serializer, key, value));
@@ -1429,7 +1430,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
 
     serializer->status.buffer.size_used += snprintf((char *) 
       &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%llu", (unsigned long long)value);
+      "%" PRIu64, (unsigned long long)value);
 
     ndpi_serialize_json_post(_serializer);
   } else if(serializer->fmt == ndpi_serialization_format_csv) {
@@ -1438,7 +1439,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
     buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
     serializer->status.buffer.size_used += snprintf((char *)
       &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff,
-      "%llu", (unsigned long long)value);
+      "%" PRIu64, (unsigned long long)value);
   } else {
     if(value <= 0xffffffff) {
       return(ndpi_serialize_string_uint32(_serializer, key, value));
diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index 897096b70..39b85a5ef 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -31,6 +31,7 @@
 
 #include "ndpi_config.h"
 #include "ndpi_api.h"
+#include "ndpi_includes.h"
 
 #include "ahocorasick.h"
 #include "libcache.h"
@@ -1270,12 +1271,12 @@ int ndpi_dpi2json(struct ndpi_detection_module_struct *ndpi_struct,
 	  ndpi_serialize_string_string(serializer, "server_names", flow->protos.stun_ssl.ssl.server_names);
 
 	if(before) {
-          strftime(notBefore, sizeof(notBefore), "%F %T", before);
+          strftime(notBefore, sizeof(notBefore), "%Y-%m-%d %H:%M:%S", before);
           ndpi_serialize_string_string(serializer, "notbefore", notBefore);
         }
 
 	if(after) {
-	  strftime(notAfter, sizeof(notAfter), "%F %T", after);
+	  strftime(notAfter, sizeof(notAfter), "%Y-%m-%d %H:%M:%S", after);
           ndpi_serialize_string_string(serializer, "notafter", notAfter);
         }
 	ndpi_serialize_string_string(serializer, "ja3", flow->protos.stun_ssl.ssl.ja3_client);
diff --git a/src/lib/protocols/nats.c b/src/lib/protocols/nats.c
index da99a36de..0254a02c4 100644
--- a/src/lib/protocols/nats.c
+++ b/src/lib/protocols/nats.c
@@ -56,7 +56,7 @@ void ndpi_search_nats_tcp(struct ndpi_detection_module_struct *ndpi_struct,
       if(!match) continue;
 
       if(ndpi_strnstr((const char *)match, "\r\n",
-		      flow->packet.payload_packet_len - ((unsigned long)match - (unsigned long)flow->packet.payload)) != NULL) {
+		      flow->packet.payload_packet_len - ((size_t)match - (size_t)flow->packet.payload)) != NULL) {
 	NDPI_LOG_INFO(ndpi_struct, "found NATS\n");
 
 	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NATS, NDPI_PROTOCOL_UNKNOWN);