diff options
| -rw-r--r-- | example/ndpiReader.c | 6 | ||||
| -rwxr-xr-x | tests/do.sh.in | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 9fa63c8bf..d7d720fff 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -1624,8 +1624,8 @@ static void printFlowSerialized(u_int16_t thread_id, ndpi_serialize_string_float(serializer, "duration_ms", (l-f)/1000.0, "%.3f"); ndpi_serialize_string_string(serializer, "src_name", flow->src_name); ndpi_serialize_string_string(serializer, "dst_name", flow->dst_name); - ndpi_serialize_string_uint32(serializer, "src_port", flow->src_port); - ndpi_serialize_string_uint32(serializer, "dst_port", flow->dst_port); + ndpi_serialize_string_uint32(serializer, "src_port", ntohs(flow->src_port)); + ndpi_serialize_string_uint32(serializer, "dst_port", ntohs(flow->dst_port)); ndpi_serialize_string_uint32(serializer, "ip_version", flow->ip_version); ndpi_serialize_string_uint32(serializer, "vlan_id", flow->vlan_id); ndpi_serialize_string_uint32(serializer, "bidirectional", flow->bidirectional); @@ -3406,8 +3406,6 @@ static void printFlowsStats() { ndpi_twalk(ndpi_thread_info[thread_id].workflow->ndpi_flows_root[i], node_print_known_proto_walker, &thread_id); ndpi_twalk(ndpi_thread_info[thread_id].workflow->ndpi_flows_root[i], - node_proto_guess_walker, &thread_id); - ndpi_twalk(ndpi_thread_info[thread_id].workflow->ndpi_flows_root[i], node_print_unknown_proto_walker, &thread_id); } } diff --git a/tests/do.sh.in b/tests/do.sh.in index 63d2fa591..ba16045a0 100755 --- a/tests/do.sh.in +++ b/tests/do.sh.in @@ -45,7 +45,7 @@ build_results() { #echo $f # create result files if not present if [ ! -f result/$f.out ]; then - CMD="$READER -q -t -i pcap/$f -w result/$f.out -v 2" + CMD="$READER -q -K JSON -k /dev/null -t -i pcap/$f -w result/$f.out -v 2" $CMD fi done @@ -73,7 +73,7 @@ check_results() { fi if [ -f result/$f.out ]; then - CMD="$READER -q -t -i pcap/$f -w /tmp/reader.out -v 2" + CMD="$READER -q -K JSON -k /dev/null -t -i pcap/$f -w /tmp/reader.out -v 2" $CMD CMD_RET=$? if [ $CMD_RET -eq 0 ]; then |