diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_api.h | 39 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 34 |
2 files changed, 23 insertions, 50 deletions
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index 03b26e808..b9252fcca 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -867,33 +867,18 @@ extern "C" { u_int8_t *serialized_buffer, u_int32_t serialized_buffer_len); - ndpi_serialization_element_type ndpi_deserialize_get_nextitem_type(ndpi_deserializer *deserializer); - - int ndpi_deserialize_uint32_uint32(ndpi_deserializer *deserializer, - u_int32_t *key, u_int32_t *value); - int ndpi_deserialize_uint32_uint64(ndpi_deserializer *deserializer, - u_int32_t *key, u_int64_t *value); - int ndpi_deserialize_uint32_int32(ndpi_deserializer *deserializer, - u_int32_t *key, int32_t *value); - int ndpi_deserialize_uint32_int64(ndpi_deserializer *deserializer, - u_int32_t *key, int64_t *value); - int ndpi_deserialize_uint32_float(ndpi_deserializer *deserializer, - u_int32_t *key, float *value); - int ndpi_deserialize_uint32_string(ndpi_deserializer *deserializer, - u_int32_t *key, ndpi_string *value); - int ndpi_deserialize_string_int32(ndpi_deserializer *deserializer, - ndpi_string *key, int32_t *value); - int ndpi_deserialize_string_int64(ndpi_deserializer *deserializer, - ndpi_string *key, int64_t *value); - int ndpi_deserialize_string_uint32(ndpi_deserializer *deserializer, - ndpi_string *key, u_int32_t *value); - int ndpi_deserialize_string_uint64(ndpi_deserializer *deserializer, - ndpi_string *key, u_int64_t *value); - int ndpi_deserialize_string_string(ndpi_deserializer *deserializer, - ndpi_string *key, ndpi_string *value); - int ndpi_deserialize_string_float(ndpi_deserializer *deserializer, - ndpi_string *key, float *value); - int ndpi_deserialize_end_of_record(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); + + int ndpi_deserialize_key_uint32(ndpi_deserializer *deserializer, u_int32_t *key); + int ndpi_deserialize_key_string(ndpi_deserializer *deserializer, ndpi_string *key); + + int ndpi_deserialize_value_uint32(ndpi_deserializer *deserializer, u_int32_t *value); + int ndpi_deserialize_value_uint64(ndpi_deserializer *deserializer, u_int64_t *value); + int ndpi_deserialize_value_int32(ndpi_deserializer *deserializer, int32_t *value); + int ndpi_deserialize_value_int64(ndpi_deserializer *deserializer, int64_t *value); + int ndpi_deserialize_value_float(ndpi_deserializer *deserializer, float *value); + int ndpi_deserialize_value_string(ndpi_deserializer *deserializer, ndpi_string *value); /* Data analysis */ struct ndpi_analyze_struct* ndpi_alloc_data_analysis(u_int16_t _max_series_len); diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 163bdd053..57d985ebf 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1343,29 +1343,17 @@ typedef enum { typedef enum { ndpi_serialization_unknown = 0, ndpi_serialization_end_of_record, - ndpi_serialization_uint32_uint32, - ndpi_serialization_uint32_uint64, - ndpi_serialization_uint32_string, - ndpi_serialization_string_int32, - ndpi_serialization_string_int64, - ndpi_serialization_string_uint32, - ndpi_serialization_string_uint64, - ndpi_serialization_string_float, - ndpi_serialization_string_string, - ndpi_serialization_uint32_int32, - ndpi_serialization_uint32_int64, - ndpi_serialization_uint32_float, - - /* 32/64 bit types are automatically encoded/decoded as 8/16 bit */ - ndpi_serialization_uint32_uint16, - ndpi_serialization_uint32_uint8, - ndpi_serialization_uint32_int16, - ndpi_serialization_uint32_int8, - ndpi_serialization_string_uint16, - ndpi_serialization_string_uint8, - ndpi_serialization_string_int16, - ndpi_serialization_string_int8 -} ndpi_serialization_element_type; + ndpi_serialization_uint8, + ndpi_serialization_uint16, + ndpi_serialization_uint32, + ndpi_serialization_uint64, + ndpi_serialization_int8, + ndpi_serialization_int16, + ndpi_serialization_int32, + ndpi_serialization_int64, + ndpi_serialization_float, + ndpi_serialization_string +} ndpi_serialization_type; #define NDPI_SERIALIZER_STATUS_COMMA (1 << 0) #define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1) |