aboutsummaryrefslogtreecommitdiff
path: root/src/lib/ndpi_serializer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ndpi_serializer.c')
-rw-r--r--src/lib/ndpi_serializer.c288
1 files changed, 233 insertions, 55 deletions
diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
index d8a0d13fc..5c4807eb6 100644
--- a/src/lib/ndpi_serializer.c
+++ b/src/lib/ndpi_serializer.c
@@ -522,13 +522,22 @@ static inline void ndpi_serialize_json_pre(ndpi_serializer *_serializer) {
serializer->buffer[serializer->status.size_used++] = '{';
} else {
if(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)
- serializer->status.size_used--; /* Remove ']'*/
- serializer->status.size_used--; /* Remove '}'*/
+ serializer->status.size_used--; /* Remove ']' */
- if(serializer->status.flags & NDPI_SERIALIZER_STATUS_SOB)
- serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_SOB;
- else if(serializer->status.flags & NDPI_SERIALIZER_STATUS_COMMA)
- serializer->buffer[serializer->status.size_used++] = ',';
+ serializer->status.size_used--; /* Remove '}' */
+
+ if(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST) {
+ serializer->status.size_used--; /* Remove ']' */
+ if(serializer->status.flags & NDPI_SERIALIZER_STATUS_SOL)
+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_SOL;
+ else
+ serializer->buffer[serializer->status.size_used++] = ',';
+ } else {
+ if(serializer->status.flags & NDPI_SERIALIZER_STATUS_SOB)
+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_SOB;
+ else if(serializer->status.flags & NDPI_SERIALIZER_STATUS_COMMA)
+ serializer->buffer[serializer->status.size_used++] = ',';
+ }
}
}
@@ -537,7 +546,11 @@ static inline void ndpi_serialize_json_pre(ndpi_serializer *_serializer) {
static inline void ndpi_serialize_json_post(ndpi_serializer *_serializer) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
+ if(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)
+ serializer->buffer[serializer->status.size_used++] = ']';
+
serializer->buffer[serializer->status.size_used++] = '}';
+
if(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)
serializer->buffer[serializer->status.size_used++] = ']';
@@ -585,8 +598,18 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- "\"%u\":%u", key, value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "%u", value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -639,8 +662,18 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- "\"%u\":%llu", key, (unsigned long long)value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff,
+ "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff,
+ "%llu", (unsigned long long)value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -691,8 +724,18 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- "\"%u\":%d", key, value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "%d", value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -745,8 +788,18 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- "\"%u\":%lld", key, (long long int)value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "%lld", (long long int)value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -800,8 +853,14 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, "\"%u\":", key);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, format, value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, "%s",
@@ -849,9 +908,12 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- "\"%u\":", key);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
+ buff_diff, "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
serializer->status.size_used += ndpi_json_string_escape(value, slen,
(char *) &serializer->buffer[serializer->status.size_used], buff_diff);
buff_diff = serializer->buffer_size - serializer->status.size_used;
@@ -905,8 +967,18 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- "\"%u\":%s", key, value ? "true" : "false");
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "\"%u\":", key);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "%s", value ? "true" : "false");
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -947,11 +1019,19 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- ":%d", value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff, ":");
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff, "%d", value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -1013,11 +1093,21 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- ":%lld", (long long int)value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff,
+ ":");
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff,
+ "%lld", (long long int)value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -1072,11 +1162,22 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- ":%u", value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, ":");
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used],
+ buff_diff, "%u", value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -1159,11 +1260,21 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
- ":%llu", (unsigned long long)value);
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff,
+ ":");
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff,
+ "%llu", (unsigned long long)value);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -1221,12 +1332,14 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->buffer[serializer->status.size_used] = ':';
- serializer->status.size_used++;
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ serializer->buffer[serializer->status.size_used] = ':';
+ serializer->status.size_used++;
+ }
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, format, value);
@@ -1287,11 +1400,14 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, ":");
- buff_diff = serializer->buffer_size - serializer->status.size_used;
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, ":");
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
if (escape)
serializer->status.size_used += ndpi_json_string_escape(value, vlen,
@@ -1299,6 +1415,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
else
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
value, vlen);
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -1383,11 +1500,20 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
if(serializer->fmt == ndpi_serialization_format_json) {
ndpi_serialize_json_pre(_serializer);
- serializer->status.size_used += ndpi_json_string_escape(key, klen,
- (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
- buff_diff = serializer->buffer_size - serializer->status.size_used;
- serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, ":%s",
+
+ if (!(serializer->status.flags & NDPI_SERIALIZER_STATUS_LIST)) {
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff, ":");
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+ }
+
+ serializer->status.size_used += snprintf((char *)
+ &serializer->buffer[serializer->status.size_used], buff_diff, "%s",
value ? "true" : "false");
+
ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
@@ -1401,6 +1527,58 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
/* ********************************** */
+/* Serialize start of simple list (JSON only)*/
+int ndpi_serialize_start_of_list(ndpi_serializer *_serializer,
+ const char *key) {
+ ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
+ u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
+ u_int32_t needed, klen = strlen(key);
+
+ if(serializer->fmt != ndpi_serialization_format_json)
+ return(-1);
+
+ 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->status.size_used;
+ }
+
+ ndpi_serialize_json_pre(_serializer);
+
+ serializer->status.size_used += ndpi_json_string_escape(key, klen,
+ (char *) &serializer->buffer[serializer->status.size_used], buff_diff);
+ buff_diff = serializer->buffer_size - serializer->status.size_used;
+
+ serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, ": [");
+
+ serializer->status.flags |= NDPI_SERIALIZER_STATUS_LIST | NDPI_SERIALIZER_STATUS_SOL;
+
+ ndpi_serialize_json_post(_serializer);
+
+ return(0);
+}
+
+/* ********************************** */
+
+/* Serialize start of simple list (JSON only)*/
+int ndpi_serialize_end_of_list(ndpi_serializer *_serializer) {
+ ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
+
+ if(serializer->fmt != ndpi_serialization_format_json)
+ return(-1);
+
+ if(serializer->status.flags & NDPI_SERIALIZER_STATUS_SOL) /* Empty list */
+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_SOL;
+
+ serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_LIST;
+
+ return(0);
+}
+
+/* ********************************** */
+
/* Serialize start of nested block (JSON only)*/
int ndpi_serialize_start_of_block(ndpi_serializer *_serializer,
const char *key) {
@@ -1434,7 +1612,7 @@ int ndpi_serialize_start_of_block(ndpi_serializer *_serializer,
/* ********************************** */
-/* Serialize start of nested block (JSON only)*/
+/* Serialize end of nested block (JSON only)*/
int ndpi_serialize_end_of_block(ndpi_serializer *_serializer) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
Powered by cgit, Themed by Ted Yin.