Add missing low-level serializer calls to the API

2 files changed, 45 insertions, 64 deletions

diff --git a/src/include/ndpi_api.h.in b/src/include/ndpi_api.h.in
index 25c16a56d..79cfdd9a7 100644
--- a/src/include/ndpi_api.h.in
+++ b/src/include/ndpi_api.h.in
@@ -954,54 +954,35 @@ extern "C" {
   void ndpi_term_serializer(ndpi_serializer *serializer);
   void ndpi_reset_serializer(ndpi_serializer *serializer);
 
-  int ndpi_serialize_uint32_uint32(ndpi_serializer *serializer,
-				   u_int32_t key, u_int32_t value);
-  int ndpi_serialize_uint32_uint64(ndpi_serializer *serializer,
-				   u_int32_t key, u_int64_t value);
-  int ndpi_serialize_uint32_int32(ndpi_serializer *serializer,
-				  u_int32_t key, int32_t value);
-  int ndpi_serialize_uint32_int64(ndpi_serializer *serializer,
-				  u_int32_t key, int64_t value);
-  int ndpi_serialize_uint32_float(ndpi_serializer *serializer,
-				  u_int32_t key, float value,
-				  const char *format /* e.f. "%.2f" */);
-  int ndpi_serialize_uint32_string(ndpi_serializer *serializer,
-				   u_int32_t key, const char *value);
-  int ndpi_serialize_uint32_boolean(ndpi_serializer *serializer,
-				    u_int32_t key, u_int8_t value);
-
-  int ndpi_serialize_string_int32(ndpi_serializer *serializer,
-				  const char *key, int32_t value);
-  int ndpi_serialize_string_int64(ndpi_serializer *serializer,
-				  const char *key, int64_t value);
-  int ndpi_serialize_string_uint32(ndpi_serializer *serializer,
-				   const char *key, u_int32_t value);
-  int ndpi_serialize_string_uint32_format(ndpi_serializer *serializer,
-					  const char *key, u_int32_t value,
-					  const char *format);
-  int ndpi_serialize_string_uint64(ndpi_serializer *serializer,
-				   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_raw(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" */);
-  int ndpi_serialize_string_boolean(ndpi_serializer *serializer,
-				    const char *key, u_int8_t value);
-  int ndpi_serialize_raw_record(ndpi_serializer *_serializer,
-				u_char *record, u_int32_t record_len);
+  int ndpi_serialize_uint32_uint32(ndpi_serializer *serializer, u_int32_t key, u_int32_t value);
+  int ndpi_serialize_uint32_uint64(ndpi_serializer *serializer, u_int32_t key, u_int64_t value);
+  int ndpi_serialize_uint32_int32(ndpi_serializer *serializer, u_int32_t key, int32_t value);
+  int ndpi_serialize_uint32_int64(ndpi_serializer *serializer, u_int32_t key, int64_t value);
+  int ndpi_serialize_uint32_float(ndpi_serializer *serializer, u_int32_t key, float value, const char *format /* e.f. "%.2f" */);
+  int ndpi_serialize_uint32_string(ndpi_serializer *serializer, u_int32_t key, const char *value);
+  int ndpi_serialize_uint32_boolean(ndpi_serializer *serializer, u_int32_t key, u_int8_t value);
+  int ndpi_serialize_binary_int32(ndpi_serializer *_serializer, const char *key, u_int16_t klen, int32_t value);
+  int ndpi_serialize_string_int32(ndpi_serializer *serializer, const char *key, int32_t value);
+  int ndpi_serialize_binary_int64(ndpi_serializer *_serializer, const char *key, u_int16_t klen, int64_t value);
+  int ndpi_serialize_string_int64(ndpi_serializer *serializer, const char *key, int64_t value);
+  int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer, const char *key, u_int16_t klen, u_int32_t value);
+  int ndpi_serialize_string_uint32(ndpi_serializer *serializer, const char *key, u_int32_t value);
+  int ndpi_serialize_string_uint32_format(ndpi_serializer *serializer, const char *key, u_int32_t value, const char *format);
+  int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer, const char *key, u_int16_t klen, u_int64_t value);
+  int ndpi_serialize_string_uint64(ndpi_serializer *serializer, const char *key, u_int64_t value);
+  int ndpi_serialize_binary_binary(ndpi_serializer *_serializer, const char *key, u_int16_t klen, const char *_value, u_int16_t vlen);
+  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_raw(ndpi_serializer *_serializer, const char *key, const char *_value, u_int16_t vlen);
+  int ndpi_serialize_binary_float(ndpi_serializer *_serializer, const char *key, u_int16_t klen, float value, const char *format /* e.f. "%.2f" */);
+  int ndpi_serialize_string_float(ndpi_serializer *serializer, const char *key, float value, const char *format /* e.f. "%.2f" */);
+  int ndpi_serialize_string_boolean(ndpi_serializer *serializer, const char *key, u_int8_t value);
+  int ndpi_serialize_raw_record(ndpi_serializer *_serializer, u_char *record, u_int32_t record_len);
   int ndpi_serialize_end_of_record(ndpi_serializer *serializer);
-  int ndpi_serialize_start_of_list(ndpi_serializer *serializer,
-				   const char *key);
+  int ndpi_serialize_start_of_list(ndpi_serializer *serializer, const char *key);
   int ndpi_serialize_end_of_list(ndpi_serializer *serializer);
-  int ndpi_serialize_start_of_block(ndpi_serializer *serializer,
-				    const char *key);
+  int ndpi_serialize_start_of_block_binary(ndpi_serializer *_serializer, const char *key, u_int16_t klen);
+  int ndpi_serialize_start_of_block(ndpi_serializer *serializer, const char *key);
   int ndpi_serialize_end_of_block(ndpi_serializer *serializer);
   char* ndpi_serializer_get_buffer(ndpi_serializer *serializer, u_int32_t *buffer_len);
   u_int32_t ndpi_serializer_get_buffer_len(ndpi_serializer *serializer);
diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c
index c1f52f89e..bfbd56eb6 100644
--- a/src/lib/ndpi_serializer.c
+++ b/src/lib/ndpi_serializer.c
@@ -1138,9 +1138,9 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
 
 /* ********************************** */
 
-static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
-				       const char *key, u_int16_t klen,
-				       int32_t value) {
+int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
+			        const char *key, u_int16_t klen,
+			        int32_t value) {
   ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
   u_int32_t buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
   u_int32_t needed;
@@ -1288,8 +1288,8 @@ int ndpi_serialize_string_int64(ndpi_serializer *_serializer,
 
 /* ********************************** */
 
-static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
-					const char *key, u_int16_t klen, u_int32_t value) {
+int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
+				const char *key, u_int16_t klen, u_int32_t value) {
   ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
   u_int32_t buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
   u_int32_t needed;
@@ -1389,9 +1389,9 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
 
 /* ********************************** */
 
-static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
-					const char *key, u_int16_t klen,
-					u_int64_t value) {
+int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
+				const char *key, u_int16_t klen,
+				u_int64_t value) {
   ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
   u_int32_t buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
   u_int32_t needed;
@@ -1462,11 +1462,11 @@ int ndpi_serialize_string_uint64(ndpi_serializer *_serializer,
 
 /* ********************************** */
 
-static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
-				       const char *key,
-				       u_int16_t klen,
-				       float value,
-				       const char *format /* e.f. "%.2f" */) {
+int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
+			        const char *key,
+			        u_int16_t klen,
+			        float value,
+			        const char *format /* e.f. "%.2f" */) {
   ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
   u_int32_t buff_diff = serializer->buffer.size - serializer->status.buffer.size_used;
   u_int32_t needed;
@@ -1597,11 +1597,11 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
 /* ********************************** */
 
 /* Key is a <string, len> pair, value is a <string, len> pair */ 
-static int ndpi_serialize_binary_binary(ndpi_serializer *_serializer,
-					const char *key,
-					u_int16_t klen,
-					const char *_value,
-					u_int16_t vlen) {
+int ndpi_serialize_binary_binary(ndpi_serializer *_serializer,
+				 const char *key,
+				 u_int16_t klen,
+				 const char *_value,
+				 u_int16_t vlen) {
   const char *value = _value ? _value : "";
 
   if(ndpi_is_number(key, klen))