Add ndpi_serializer_get_header API (CSV only)

This commit is contained in:
Alfredo Cardigliano
2020-06-05 16:52:26 +02:00
parent 07c54f9992
commit 67c72a8cb5
4 changed files with 510 additions and 356 deletions
+26 -6
View File
@@ -3084,22 +3084,26 @@ void serializerUnitTest() {
ndpi_serializer serializer, deserializer;
int i;
u_int8_t trace = 0;
u_int8_t use_json = 0;
ndpi_serialization_format fmt = ndpi_serialization_format_tlv;
assert(ndpi_init_serializer(&serializer, use_json ? ndpi_serialization_format_json : ndpi_serialization_format_tlv) != -1);
//trace = 1;
//fmt = ndpi_serialization_format_json;
//fmt = ndpi_serialization_format_csv;
assert(ndpi_init_serializer(&serializer, fmt) != -1);
for(i=0; i<16; i++) {
char kbuf[32], vbuf[32];
snprintf(kbuf, sizeof(kbuf), "Hello %d", i);
snprintf(vbuf, sizeof(vbuf), "World %d", i);
snprintf(kbuf, sizeof(kbuf), "Key %d", i);
snprintf(vbuf, sizeof(vbuf), "Value %d", i);
assert(ndpi_serialize_uint32_uint32(&serializer, i, i*i) != -1);
assert(ndpi_serialize_uint32_string(&serializer, i, "Hello") != -1);
assert(ndpi_serialize_uint32_string(&serializer, i, "Data") != -1);
assert(ndpi_serialize_string_string(&serializer, kbuf, vbuf) != -1);
assert(ndpi_serialize_string_uint32(&serializer, kbuf, i*i) != -1);
assert(ndpi_serialize_string_float(&serializer, kbuf, (float)(i*i), "%f") != -1);
}
if (use_json) {
if (fmt == ndpi_serialization_format_json) {
assert(ndpi_serialize_start_of_list(&serializer, "List") != -1);
@@ -3118,6 +3122,22 @@ void serializerUnitTest() {
u_int32_t buffer_len = 0;
char *buffer = ndpi_serializer_get_buffer(&serializer, &buffer_len);
printf("%s\n", buffer);
exit(0);
}
} else if (fmt == ndpi_serialization_format_csv) {
if(trace) {
u_int32_t buffer_len = 0;
char *buffer;
buffer = ndpi_serializer_get_header(&serializer, &buffer_len);
printf("%s\n", buffer);
buffer = ndpi_serializer_get_buffer(&serializer, &buffer_len);
printf("%s\n", buffer);
exit(0);
}
} else {
+1
View File
@@ -987,6 +987,7 @@ extern "C" {
u_int32_t ndpi_serializer_get_internal_buffer_size(ndpi_serializer *serializer);
int ndpi_serializer_set_buffer_len(ndpi_serializer *serializer, u_int32_t l);
void ndpi_serializer_set_csv_separator(ndpi_serializer *serializer, char separator);
char* ndpi_serializer_get_header(ndpi_serializer *serializer, u_int32_t *buffer_len);
void ndpi_serializer_create_snapshot(ndpi_serializer *serializer);
void ndpi_serializer_rollback_snapshot(ndpi_serializer *serializer);
+16 -4
View File
@@ -1435,6 +1435,7 @@ typedef enum {
ndpi_serialization_string
} ndpi_serialization_type;
#define NDPI_SERIALIZER_DEFAULT_HEADER_SIZE 1024
#define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
#define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
@@ -1445,18 +1446,29 @@ typedef enum {
#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
#define NDPI_SERIALIZER_STATUS_LIST (1 << 5)
#define NDPI_SERIALIZER_STATUS_SOL (1 << 6)
#define NDPI_SERIALIZER_STATUS_HDR_DONE (1 << 7)
typedef struct {
u_int32_t size_used;
} ndpi_private_serializer_buffer_status;
typedef struct {
u_int32_t flags;
u_int32_t size_used;
ndpi_private_serializer_buffer_status buffer;
ndpi_private_serializer_buffer_status header;
} ndpi_private_serializer_status;
typedef struct {
u_int32_t initial_size;
u_int32_t size;
u_int8_t *data;
} ndpi_private_serializer_buffer;
typedef struct {
ndpi_private_serializer_status status;
u_int32_t initial_buffer_size;
u_int32_t buffer_size;
ndpi_private_serializer_buffer buffer;
ndpi_private_serializer_buffer header;
ndpi_serialization_format fmt;
u_int8_t *buffer;
char csv_separator[2];
u_int8_t has_snapshot;
ndpi_private_serializer_status snapshot;
+467 -346
View File
File diff suppressed because it is too large Load Diff