aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlfredo Cardigliano <alfredo.cardigliano@gmail.com>2019-09-10 15:02:02 +0200
committerAlfredo Cardigliano <alfredo.cardigliano@gmail.com>2019-09-10 15:02:02 +0200
commit3e1c8117808732af012ae0a811cc0cb534f86b2c (patch)
tree12f9de80fbdd44f0f607814f60699b60614b5f61 /src
parentb96b61844389fbf9334033eae7dfd3f2d6dc3828 (diff)
Added ndpi_deserialize_get_format() to read the serialization format
Diffstat (limited to 'src')
-rw-r--r--src/include/ndpi_api.h1
-rw-r--r--src/lib/ndpi_serializer.c9
2 files changed, 9 insertions, 1 deletions
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h
index b9252fcca..36efd05b6 100644
--- a/src/include/ndpi_api.h
+++ b/src/include/ndpi_api.h
@@ -867,6 +867,7 @@ extern "C" {
u_int8_t *serialized_buffer,
u_int32_t serialized_buffer_len);
+ ndpi_serialization_format ndpi_deserialize_get_format(ndpi_deserializer *_deserializer);
ndpi_serialization_type ndpi_deserialize_get_item_type(ndpi_deserializer *deserializer, ndpi_serialization_type *key_type);
int ndpi_deserialize_next(ndpi_deserializer *deserializer);
diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
index 8f9278410..a32a7c25a 100644
--- a/src/lib/ndpi_serializer.c
+++ b/src/lib/ndpi_serializer.c
@@ -142,7 +142,7 @@ void ndpi_reset_serializer(ndpi_serializer *_serializer) {
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 /* TLV */
+ else /* ndpi_serialization_format_tlv */
serializer->size_used = 2 * sizeof(u_int8_t);
}
@@ -1158,6 +1158,13 @@ int ndpi_init_deserializer(ndpi_deserializer *deserializer,
/* ********************************** */
+ndpi_serialization_format ndpi_deserialize_get_format(ndpi_deserializer *_deserializer) {
+ ndpi_private_deserializer *deserializer = (ndpi_private_deserializer*)_deserializer;
+ return deserializer->fmt;
+}
+
+/* ********************************** */
+
static inline ndpi_serialization_type ndpi_deserialize_get_key_subtype(ndpi_private_deserializer *deserializer) {
u_int8_t type;