diff options
| -rw-r--r-- | src/include/ndpi_api.h.in | 6 | ||||
| -rw-r--r-- | src/lib/ndpi_serializer.c | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/include/ndpi_api.h.in b/src/include/ndpi_api.h.in index 0ace029d0..243b16ad8 100644 --- a/src/include/ndpi_api.h.in +++ b/src/include/ndpi_api.h.in @@ -1081,6 +1081,12 @@ extern "C" { void ndpi_reset_serializer(ndpi_serializer *serializer); /** + * Hint to not create the header (used to avoid creaign the header when not used) + * @param serializer The serializer handle + */ + void ndpi_serializer_skip_header(ndpi_serializer *serializer); + + /** * Serialize a 32-bit unsigned int key and a 32-bit unsigned int value * @param serializer The serializer handle * @param key The field name or ID diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c index 493b37c5e..0801b7c98 100644 --- a/src/lib/ndpi_serializer.c +++ b/src/lib/ndpi_serializer.c @@ -188,6 +188,14 @@ void ndpi_reset_serializer(ndpi_serializer *_serializer) { /* ********************************** */ +void ndpi_serializer_skip_header(ndpi_serializer *_serializer) { + ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer; + + serializer->status.flags |= NDPI_SERIALIZER_STATUS_HDR_DONE; +} + +/* ********************************** */ + static int ndpi_init_serializer_buffer(ndpi_private_serializer_buffer *buffer, u_int32_t buffer_size) { buffer->initial_size = buffer->size = buffer_size; buffer->data = (u_int8_t *) calloc(buffer->size, sizeof(u_int8_t)); @@ -665,10 +673,10 @@ static inline void ndpi_serialize_csv_pre(ndpi_private_serializer *serializer) { } else if (serializer->status.buffer.size_used == 0) { /* nothing to do */ } else { - u_int32_t buff_diff = serializer->buffer.size - serializer->status.buffer.size_used; - serializer->status.buffer.size_used += snprintf((char *) - &serializer->buffer.data[serializer->status.buffer.size_used], buff_diff, "%s", - serializer->csv_separator); + if(serializer->buffer.size > serializer->status.buffer.size_used) + serializer->buffer.data[serializer->status.buffer.size_used] = serializer->csv_separator[0]; + + serializer->status.buffer.size_used++; } } |