diff options
author | Luca Deri <deri@ntop.org> | 2020-06-06 11:30:47 +0200 |
---|---|---|
committer | Luca Deri <deri@ntop.org> | 2020-06-06 11:30:47 +0200 |
commit | 43ddbfdfba9ea16502dd7401aef3a55f36ccb0d5 (patch) | |
tree | f71543db21c776df07fa7b9593972a1c04f2cd0f /example/ndpiReader.c | |
parent | 801c9481cb9c1b55382dc6e14dd0f9f573d3fea7 (diff) | |
parent | 2beecdc8aff30457281e32871c50bfffddc2370b (diff) |
Merge branch 'dev' of https://github.com/ntop/nDPI into dev
Diffstat (limited to 'example/ndpiReader.c')
-rw-r--r-- | example/ndpiReader.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 211019e3b..3409500ef 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -3089,14 +3089,17 @@ void serializerUnitTest() { for(loop_id=0; loop_id<3; loop_id++) { switch(loop_id) { case 0: + if (trace) printf("--- TLV test ---\n"); fmt = ndpi_serialization_format_tlv; break; case 1: + if (trace) printf("--- JSON test ---\n"); fmt = ndpi_serialization_format_json; break; case 2: + if (trace) printf("--- CSV test ---\n"); fmt = ndpi_serialization_format_csv; break; } @@ -3132,7 +3135,6 @@ 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) { @@ -3144,8 +3146,6 @@ void serializerUnitTest() { buffer = ndpi_serializer_get_buffer(&serializer, &buffer_len); printf("%s\n", buffer); - - exit(0); } } else { @@ -3159,9 +3159,11 @@ void serializerUnitTest() { et = ndpi_deserialize_get_item_type(&deserializer, &kt); - if(et == ndpi_serialization_unknown) + if(et == ndpi_serialization_unknown) { break; - else { + } else if(et == ndpi_serialization_end_of_record) { + if (trace) printf("EOR\n"); + } else { u_int32_t k32, v32; ndpi_string ks, vs; float vf; @@ -3182,7 +3184,7 @@ void serializerUnitTest() { break; default: printf("ERROR: Unsupported TLV key type %u\n", kt); - //exit(0); + exit(0); return; } @@ -3220,6 +3222,9 @@ void serializerUnitTest() { ndpi_term_serializer(&serializer); } + + if (trace) + exit(0); } /* *********************************************** */ |