Split serialization code from ndpi_utils
This commit is contained in:
@@ -844,7 +844,9 @@ extern "C" {
|
||||
const char *key, float value,
|
||||
const char *format /* e.f. "%.2f" */);
|
||||
int ndpi_serialize_end_of_record(ndpi_serializer *serializer);
|
||||
|
||||
char* ndpi_serializer_get_buffer(ndpi_serializer *_serializer, u_int32_t *buffer_len);
|
||||
u_int32_t ndpi_serializer_get_buffer_len(ndpi_serializer *_serializer);
|
||||
|
||||
/* Deserializer */
|
||||
int ndpi_init_deserializer(ndpi_deserializer *deserializer,
|
||||
ndpi_serializer *serializer);
|
||||
|
||||
@@ -1327,13 +1327,7 @@ typedef enum {
|
||||
#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
|
||||
#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
|
||||
|
||||
typedef struct {
|
||||
u_int32_t buffer_size, size_used;
|
||||
ndpi_serialization_format fmt;
|
||||
u_int32_t status;
|
||||
u_int8_t *buffer;
|
||||
char *json_buffer, csv_separator[2];
|
||||
} ndpi_serializer;
|
||||
typedef void* ndpi_serializer;
|
||||
|
||||
#define ndpi_deserializer ndpi_serializer
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+1
-985
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* ndpi_utils.cc
|
||||
* ndpi_utils.c
|
||||
*
|
||||
* Copyright (C) 2011-19 - ntop.org
|
||||
*
|
||||
@@ -728,987 +728,3 @@ char* ndpi_ssl_version2str(u_int16_t version) {
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
/* ********************************** */
|
||||
|
||||
static u_int64_t ndpi_htonll(u_int64_t v) {
|
||||
union { u_int32_t lv[2]; u_int64_t llv; } u;
|
||||
u.lv[0] = htonl(v >> 32);
|
||||
u.lv[1] = htonl(v & 0xFFFFFFFFULL);
|
||||
return u.llv;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static u_int64_t ndpi_ntohll(u_int64_t v) {
|
||||
union { u_int32_t lv[2]; u_int64_t llv; } u;
|
||||
u.llv = v;
|
||||
return ((u_int64_t)ntohl(u.lv[0]) << 32) | (u_int64_t)ntohl(u.lv[1]);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
/*
|
||||
* Escapes a string to be suitable for a JSON value, adding double quotes, and terminating the string with a null byte.
|
||||
* It is recommended to provide a destination buffer (dst) which is as large as double the source buffer (src) at least.
|
||||
* Upon successful return, these functions return the number of characters printed (excluding the null byte used to terminate the string).
|
||||
*/
|
||||
static int ndpi_json_string_escape(const char *src, int src_len, char *dst, int dst_max_len) {
|
||||
char c = 0;
|
||||
int i, j = 0;
|
||||
|
||||
dst[j++] = '"';
|
||||
|
||||
for (i = 0; i < src_len && j < dst_max_len; i++) {
|
||||
|
||||
c = src[i];
|
||||
|
||||
switch (c) {
|
||||
case '\\':
|
||||
case '"':
|
||||
case '/':
|
||||
dst[j++] = '\\';
|
||||
dst[j++] = c;
|
||||
break;
|
||||
case '\b':
|
||||
dst[j++] = '\\';
|
||||
dst[j++] = 'b';
|
||||
break;
|
||||
case '\t':
|
||||
dst[j++] = '\\';
|
||||
dst[j++] = 't';
|
||||
break;
|
||||
case '\n':
|
||||
dst[j++] = '\\';
|
||||
dst[j++] = 'n';
|
||||
break;
|
||||
case '\f':
|
||||
dst[j++] = '\\';
|
||||
dst[j++] = 'f';
|
||||
break;
|
||||
case '\r':
|
||||
dst[j++] = '\\';
|
||||
dst[j++] = 'r';
|
||||
break;
|
||||
default:
|
||||
if(c < ' ')
|
||||
; /* non printable */
|
||||
else
|
||||
dst[j++] = c;
|
||||
}
|
||||
}
|
||||
|
||||
dst[j++] = '"';
|
||||
dst[j+1] = '\0';
|
||||
|
||||
return j;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
void ndpi_reset_serializer(ndpi_serializer *serializer) {
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
u_int32_t buff_diff;
|
||||
|
||||
serializer->size_used = 2 * sizeof(u_int8_t);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
/* Note: please keep a space at the beginning as it is used for arrays when an end-of-record is used */
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff, " {}");
|
||||
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv)
|
||||
serializer->size_used = 0;
|
||||
else
|
||||
serializer->size_used = 2 * sizeof(u_int8_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_init_serializer(ndpi_serializer *serializer,
|
||||
ndpi_serialization_format fmt) {
|
||||
memset(serializer, 0, sizeof(ndpi_serializer));
|
||||
|
||||
serializer->buffer_size = 8192;
|
||||
serializer->buffer = (u_int8_t *) malloc(serializer->buffer_size * sizeof(u_int8_t));
|
||||
|
||||
if(serializer->buffer == NULL)
|
||||
return(-1);
|
||||
|
||||
serializer->fmt = fmt;
|
||||
|
||||
serializer->buffer[0] = 1; /* version */
|
||||
serializer->buffer[1] = (u_int8_t) fmt;
|
||||
|
||||
serializer->csv_separator[0] = ',';
|
||||
serializer->csv_separator[1] = '\0';
|
||||
|
||||
ndpi_reset_serializer(serializer);
|
||||
|
||||
if(fmt == ndpi_serialization_format_json)
|
||||
serializer->json_buffer = (char *) &serializer->buffer[2];
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
char* ndpi_serializer_get_buffer(ndpi_serializer *serializer, u_int32_t *buffer_len) {
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
|
||||
} else {
|
||||
*buffer_len = serializer->size_used;
|
||||
return(serializer->buffer);
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
void ndpi_serializer_set_csv_separator(ndpi_serializer *serializer, char separator) {
|
||||
serializer->csv_separator[0] = separator;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
void ndpi_term_serializer(ndpi_serializer *serializer) {
|
||||
if(serializer->buffer) {
|
||||
free(serializer->buffer);
|
||||
serializer->buffer_size = 0;
|
||||
serializer->buffer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static int ndpi_extend_serializer_buffer(ndpi_serializer *serializer, u_int32_t min_len) {
|
||||
u_int32_t new_size;
|
||||
void *r;
|
||||
|
||||
if(min_len < 1024)
|
||||
min_len = 1024;
|
||||
|
||||
new_size = serializer->buffer_size + min_len;
|
||||
|
||||
r = realloc((void *) serializer->buffer, new_size);
|
||||
|
||||
if(r == NULL)
|
||||
return(-1);
|
||||
|
||||
serializer->buffer = r;
|
||||
serializer->buffer_size = new_size;
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_serialize_single_uint32(ndpi_serializer *serializer,
|
||||
u_int32_t s) {
|
||||
|
||||
u_int32_t v = htonl(s);
|
||||
|
||||
memcpy(&serializer->buffer[serializer->size_used], &v, sizeof(u_int32_t));
|
||||
serializer->size_used += sizeof(u_int32_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_serialize_single_uint64(ndpi_serializer *serializer,
|
||||
u_int64_t s) {
|
||||
|
||||
u_int64_t v = ndpi_htonll(s);
|
||||
|
||||
memcpy(&serializer->buffer[serializer->size_used], &v, sizeof(u_int64_t));
|
||||
serializer->size_used += sizeof(u_int64_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
/* TODO: fix portability across platforms */
|
||||
static void ndpi_serialize_single_float(ndpi_serializer *serializer, float s) {
|
||||
|
||||
memcpy(&serializer->buffer[serializer->size_used], &s, sizeof(s));
|
||||
serializer->size_used += sizeof(float);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_serialize_single_string(ndpi_serializer *serializer,
|
||||
const char *s, u_int16_t slen) {
|
||||
u_int16_t l = htons(slen);
|
||||
|
||||
memcpy(&serializer->buffer[serializer->size_used], &l, sizeof(u_int16_t));
|
||||
serializer->size_used += sizeof(u_int16_t);
|
||||
|
||||
if(slen > 0)
|
||||
memcpy(&serializer->buffer[serializer->size_used], s, slen);
|
||||
|
||||
serializer->size_used += slen;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_deserialize_single_uint32(ndpi_serializer *deserializer,
|
||||
u_int32_t *s) {
|
||||
*s = ntohl(*((u_int32_t *) &deserializer->buffer[deserializer->size_used]));
|
||||
deserializer->size_used += sizeof(u_int32_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_deserialize_single_int32(ndpi_serializer *deserializer,
|
||||
int32_t *s) {
|
||||
*s = ntohl(*((int32_t *) &deserializer->buffer[deserializer->size_used]));
|
||||
deserializer->size_used += sizeof(int32_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_deserialize_single_uint64(ndpi_serializer *deserializer,
|
||||
u_int64_t *s) {
|
||||
*s = ndpi_ntohll(*(u_int64_t*)&deserializer->buffer[deserializer->size_used]);
|
||||
deserializer->size_used += sizeof(u_int64_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_deserialize_single_int64(ndpi_serializer *deserializer,
|
||||
int64_t *s) {
|
||||
*s = ndpi_ntohll(*(int64_t*)&deserializer->buffer[deserializer->size_used]);
|
||||
deserializer->size_used += sizeof(int64_t);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
/* TODO: fix portability across platforms */
|
||||
static void ndpi_deserialize_single_float(ndpi_serializer *deserializer,
|
||||
float *s) {
|
||||
*s = *(float*)&deserializer->buffer[deserializer->size_used];
|
||||
deserializer->size_used += sizeof(float);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_deserialize_single_string(ndpi_serializer *deserializer,
|
||||
ndpi_string *v) {
|
||||
v->str_len = ntohs(*((u_int16_t *) &deserializer->buffer[deserializer->size_used]));
|
||||
deserializer->size_used += sizeof(u_int16_t);
|
||||
|
||||
v->str = (char *) &deserializer->buffer[deserializer->size_used];
|
||||
deserializer->size_used += v->str_len;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_end_of_record(ndpi_serializer *serializer) {
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int16_t needed =
|
||||
sizeof(u_int8_t) /* type */;
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 1;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
if(!(serializer->status & NDPI_SERIALIZER_STATUS_ARRAY)) {
|
||||
serializer->json_buffer[0] = '[';
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff, "]");
|
||||
}
|
||||
serializer->status |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
|
||||
serializer->status &= ~NDPI_SERIALIZER_STATUS_COMMA;
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_end_of_record;
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_serialize_json_pre(ndpi_serializer *serializer) {
|
||||
if(serializer->status & NDPI_SERIALIZER_STATUS_EOR) {
|
||||
serializer->size_used--; /* Remove ']' */
|
||||
serializer->status &= ~NDPI_SERIALIZER_STATUS_EOR;
|
||||
serializer->buffer[serializer->size_used++] = ',';
|
||||
serializer->buffer[serializer->size_used++] = '{';
|
||||
} else {
|
||||
if(serializer->status & NDPI_SERIALIZER_STATUS_ARRAY)
|
||||
serializer->size_used--; /* Remove ']'*/
|
||||
serializer->size_used--; /* Remove '}'*/
|
||||
}
|
||||
if(serializer->status & NDPI_SERIALIZER_STATUS_COMMA)
|
||||
serializer->buffer[serializer->size_used++] = ',';
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static void ndpi_serialize_json_post(ndpi_serializer *serializer) {
|
||||
serializer->buffer[serializer->size_used++] = '}';
|
||||
if(serializer->status & NDPI_SERIALIZER_STATUS_ARRAY)
|
||||
serializer->buffer[serializer->size_used++] = ']';
|
||||
|
||||
serializer->status |= NDPI_SERIALIZER_STATUS_COMMA;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_uint32_uint32(ndpi_serializer *serializer,
|
||||
u_int32_t key, u_int32_t value) {
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int16_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int32_t) /* key */ +
|
||||
sizeof(u_int32_t);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 24;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"\"%u\":%u", key, value);
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%u", (serializer->size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_uint32_uint32;
|
||||
|
||||
ndpi_serialize_single_uint32(serializer, key);
|
||||
ndpi_serialize_single_uint32(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_uint32_uint64(ndpi_serializer *serializer,
|
||||
u_int32_t key, u_int64_t value) {
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int16_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int32_t) /* key */ +
|
||||
sizeof(u_int64_t);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 32;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"\"%u\":%llu", key, (unsigned long long)value);
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%llu",
|
||||
(serializer->size_used > 0) ? serializer->csv_separator : "",
|
||||
(unsigned long long)value);
|
||||
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_uint32_uint64;
|
||||
|
||||
ndpi_serialize_single_uint32(serializer, key);
|
||||
ndpi_serialize_single_uint64(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_uint32_string(ndpi_serializer *serializer,
|
||||
u_int32_t key, const char *value) {
|
||||
u_int16_t slen = strlen(value);
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int32_t) /* key */ +
|
||||
sizeof(u_int16_t) /* len */ +
|
||||
slen;
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 24 + slen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"\"%u\":", key);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += ndpi_json_string_escape(value, slen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%s", (serializer->size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_uint32_string;
|
||||
|
||||
ndpi_serialize_single_uint32(serializer, key);
|
||||
ndpi_serialize_single_string(serializer, value, slen);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_int32(ndpi_serializer *serializer,
|
||||
const char *key, int32_t value) {
|
||||
u_int16_t klen = strlen(key);
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
klen /* key */ +
|
||||
sizeof(u_int32_t);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 16 + klen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += ndpi_json_string_escape(key, klen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
":%d", value);
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%d", (serializer->size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_string_int32;
|
||||
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint32(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_int64(ndpi_serializer *serializer,
|
||||
const char *key, int64_t value) {
|
||||
u_int16_t klen = strlen(key);
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
klen /* key */ +
|
||||
sizeof(u_int32_t);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 16 + klen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += ndpi_json_string_escape(key, klen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
":%lld", value);
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%lld", (serializer->size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_string_int64;
|
||||
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint32(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_uint32(ndpi_serializer *serializer,
|
||||
const char *key, u_int32_t value) {
|
||||
u_int16_t klen = strlen(key);
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
klen /* key */ +
|
||||
sizeof(u_int32_t);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 16 + klen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += ndpi_json_string_escape(key, klen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
":%u", value);
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%u", (serializer->size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_string_uint32;
|
||||
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint32(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_uint32_format(ndpi_serializer *serializer,
|
||||
const char *key, u_int32_t value,
|
||||
const char *format) {
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
/*
|
||||
JSON supports base 10 numbers only
|
||||
http://cjihrig.com/blog/json-overview/
|
||||
*/
|
||||
|
||||
return(ndpi_serialize_string_uint32(serializer, key, value));
|
||||
} else
|
||||
return(ndpi_serialize_string_uint32_format(serializer, key, value, format));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_uint64(ndpi_serializer *serializer,
|
||||
const char *key, u_int64_t value) {
|
||||
u_int16_t klen = strlen(key);
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
klen /* key */ +
|
||||
sizeof(u_int64_t);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 32 + klen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += ndpi_json_string_escape(key, klen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
":%llu", (unsigned long long)value);
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%llu", (serializer->size_used > 0) ? serializer->csv_separator : "",
|
||||
(unsigned long long)value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_string_uint64;
|
||||
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint64(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_float(ndpi_serializer *serializer,
|
||||
const char *key, float value,
|
||||
const char *format /* e.f. "%.2f" */) {
|
||||
u_int16_t klen = strlen(key);
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
klen /* key */ +
|
||||
sizeof(float);
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 32 + klen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += ndpi_json_string_escape(key, klen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
|
||||
serializer->buffer[serializer->size_used] = ':';
|
||||
serializer->size_used++;
|
||||
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff, format, value);
|
||||
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
if(serializer->size_used > 0)
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff, "%s", serializer->csv_separator);
|
||||
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff, format, value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_string_float;
|
||||
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_float(serializer, value);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_serialize_string_string(ndpi_serializer *serializer,
|
||||
const char *key, const char *value) {
|
||||
u_int16_t klen = strlen(key), vlen = strlen(value);
|
||||
u_int32_t needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
klen +
|
||||
sizeof(u_int16_t) /* len */ +
|
||||
vlen;
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json)
|
||||
needed += 16 + klen + vlen;
|
||||
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
}
|
||||
|
||||
if(serializer->fmt == ndpi_serialization_format_json) {
|
||||
ndpi_serialize_json_pre(serializer);
|
||||
serializer->size_used += ndpi_json_string_escape(key, klen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff, ":");
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
serializer->size_used += ndpi_json_string_escape(value, vlen,
|
||||
(char *) &serializer->buffer[serializer->size_used], buff_diff);
|
||||
buff_diff = serializer->buffer_size - serializer->size_used;
|
||||
ndpi_serialize_json_post(serializer);
|
||||
} else if(serializer->fmt == ndpi_serialization_format_csv) {
|
||||
serializer->size_used += snprintf((char *) &serializer->buffer[serializer->size_used], buff_diff,
|
||||
"%s%s", (serializer->size_used > 0) ? serializer->csv_separator : "",
|
||||
value);
|
||||
} else {
|
||||
serializer->buffer[serializer->size_used++] = ndpi_serialization_string_string;
|
||||
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_string(serializer, value, vlen);
|
||||
}
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_init_deserializer_buf(ndpi_deserializer *deserializer,
|
||||
u_int8_t *serialized_buffer,
|
||||
u_int32_t serialized_buffer_len) {
|
||||
if(serialized_buffer_len < (2 * sizeof(u_int8_t)))
|
||||
return(-1);
|
||||
|
||||
deserializer->buffer = serialized_buffer;
|
||||
|
||||
if(deserializer->buffer[0] != 1)
|
||||
return(-2); /* Invalid version */
|
||||
|
||||
deserializer->buffer_size = serialized_buffer_len;
|
||||
deserializer->fmt = deserializer->buffer[1];
|
||||
ndpi_reset_serializer(deserializer);
|
||||
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_init_deserializer(ndpi_deserializer *deserializer,
|
||||
ndpi_serializer *serializer) {
|
||||
return(ndpi_init_deserializer_buf(deserializer,
|
||||
serializer->buffer,
|
||||
serializer->size_used));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
ndpi_serialization_element_type ndpi_deserialize_get_nextitem_type(ndpi_deserializer *deserializer) {
|
||||
ndpi_serialization_element_type et;
|
||||
|
||||
if(deserializer->size_used >= deserializer->buffer_size)
|
||||
return(ndpi_serialization_unknown);
|
||||
|
||||
et = (ndpi_serialization_element_type) deserializer->buffer[deserializer->size_used];
|
||||
|
||||
return et;
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_end_of_record(ndpi_deserializer *deserializer) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_end_of_record) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int16_t expected =
|
||||
sizeof(u_int8_t) /* type */;
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_uint32_uint32(ndpi_deserializer *deserializer,
|
||||
u_int32_t *key, u_int32_t *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_uint32_uint32) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int16_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int32_t) /* key */ +
|
||||
sizeof(u_int32_t);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_uint32(deserializer, key);
|
||||
ndpi_deserialize_single_uint32(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_uint32_uint64(ndpi_deserializer *deserializer,
|
||||
u_int32_t *key, u_int64_t *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_uint32_uint64) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int16_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int32_t) /* key */ +
|
||||
sizeof(u_int64_t);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_uint32(deserializer, key);
|
||||
ndpi_deserialize_single_uint64(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_uint32_string(ndpi_deserializer *deserializer,
|
||||
u_int32_t *key, ndpi_string *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_uint32_string) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int32_t) /* key */ +
|
||||
sizeof(u_int16_t) /* len */;
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_uint32(deserializer, key);
|
||||
ndpi_deserialize_single_string(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_string_int32(ndpi_deserializer *deserializer,
|
||||
ndpi_string *key, int32_t *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_string_int32) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
sizeof(int32_t);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_string(deserializer, key);
|
||||
ndpi_deserialize_single_int32(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_string_int64(ndpi_deserializer *deserializer,
|
||||
ndpi_string *key, int64_t *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_string_int64) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
sizeof(int64_t);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_string(deserializer, key);
|
||||
ndpi_deserialize_single_int64(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_string_uint32(ndpi_deserializer *deserializer,
|
||||
ndpi_string *key, u_int32_t *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_string_uint32) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
sizeof(u_int32_t);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_string(deserializer, key);
|
||||
ndpi_deserialize_single_uint32(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_string_uint64(ndpi_deserializer *deserializer,
|
||||
ndpi_string *key, u_int64_t *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_string_uint64) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
sizeof(u_int64_t);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_string(deserializer, key);
|
||||
ndpi_deserialize_single_uint64(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_string_float(ndpi_deserializer *deserializer,
|
||||
ndpi_string *key, float *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_string_float) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
sizeof(float);
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_string(deserializer, key);
|
||||
ndpi_deserialize_single_float(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
int ndpi_deserialize_string_string(ndpi_deserializer *deserializer,
|
||||
ndpi_string *key, ndpi_string *value) {
|
||||
if(ndpi_deserialize_get_nextitem_type(deserializer) == ndpi_serialization_string_string) {
|
||||
u_int32_t buff_diff = deserializer->buffer_size - deserializer->size_used;
|
||||
u_int32_t expected =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
sizeof(u_int16_t) /* key len */ +
|
||||
sizeof(u_int16_t) /* len */;
|
||||
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
deserializer->size_used++; /* Skip element type */
|
||||
ndpi_deserialize_single_string(deserializer, key);
|
||||
ndpi_deserialize_single_string(deserializer, value);
|
||||
|
||||
return(0);
|
||||
} else
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
Reference in New Issue
Block a user