From eb6afa17c0200487aeb3a7f3c391e3f77e2015ac Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 2 Sep 2019 10:18:54 +0200 Subject: Added ndpi_serialize_string_binary() call --- src/include/ndpi_api.h | 4 ++++ src/lib/ndpi_serializer.c | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index 9bb767ca7..12387cd70 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -848,6 +848,10 @@ extern "C" { const char *key, u_int64_t value); int ndpi_serialize_string_string(ndpi_serializer *serializer, const char *key, const char *value); + int ndpi_serialize_string_binary(ndpi_serializer *_serializer, + const char *key, const char *_value, + u_int16_t vlen); + int ndpi_serialize_string_float(ndpi_serializer *serializer, const char *key, float value, const char *format /* e.f. "%.2f" */); diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c index 14c96dc5c..81dc6d131 100644 --- a/src/lib/ndpi_serializer.c +++ b/src/lib/ndpi_serializer.c @@ -989,11 +989,12 @@ int ndpi_serialize_string_float(ndpi_serializer *_serializer, /* ********************************** */ -int ndpi_serialize_string_string(ndpi_serializer *_serializer, - const char *key, const char *_value) { +int ndpi_serialize_string_binary(ndpi_serializer *_serializer, + const char *key, const char *_value, + u_int16_t vlen) { ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer; const char *value = _value ? _value : ""; - u_int16_t klen = strlen(key), vlen = strlen(value); + u_int16_t klen = strlen(key); u_int32_t buff_diff = serializer->buffer_size - serializer->size_used; u_int32_t needed; @@ -1041,6 +1042,13 @@ int ndpi_serialize_string_string(ndpi_serializer *_serializer, return(0); } +/* ********************************** */ + +int ndpi_serialize_string_string(ndpi_serializer *_serializer, + const char *key, const char *_value) { + return(ndpi_serialize_string_binary(_serializer, key, _value, strlen(_value))); +} + /* ********************************** */ /* ********************************** */ -- cgit v1.2.3