Added ndpi_deserialize_get_format() to read the serialization format

This commit is contained in:
Alfredo Cardigliano
2019-09-10 15:02:02 +02:00
parent b96b618443
commit 3e1c811780
2 changed files with 9 additions and 1 deletions
+1
View File
@@ -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);
+8 -1
View File
@@ -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;