From b2f7a52f9865099aa0130c7a02d3a876d250a016 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Tue, 30 Jul 2019 23:46:20 +0200 Subject: Serialization fix --- src/include/ndpi_typedefs.h | 12 +++++++++++- src/lib/ndpi_serializer.c | 10 ---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 399f92456..eb9130585 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1327,7 +1327,17 @@ typedef enum { #define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1) #define NDPI_SERIALIZER_STATUS_EOR (1 << 2) -typedef void* ndpi_serializer; +typedef struct { + u_int32_t buffer_size, size_used; + ndpi_serialization_format fmt; + u_int32_t status; + u_int8_t *buffer; + char csv_separator[2]; +} ndpi_private_serializer; + +#define ndpi_private_deserializer ndpi_private_serializer + +typedef struct { char c[sizeof(ndpi_private_serializer)]; } ndpi_serializer; #define ndpi_deserializer ndpi_serializer diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c index 744bde524..7b2b6f140 100644 --- a/src/lib/ndpi_serializer.c +++ b/src/lib/ndpi_serializer.c @@ -41,16 +41,6 @@ #include #endif -typedef struct { - u_int32_t buffer_size, size_used; - ndpi_serialization_format fmt; - u_int32_t status; - u_int8_t *buffer; - char csv_separator[2]; -} ndpi_private_serializer; - -#define ndpi_private_deserializer ndpi_private_serializer - /* ********************************** */ static u_int64_t ndpi_htonll(u_int64_t v) { -- cgit v1.2.3