diff options
| -rw-r--r-- | src/lib/ndpi_main.c | 3 | ||||
| -rw-r--r-- | src/lib/ndpi_serializer.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 01c5287e6..6364f2944 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -3412,6 +3412,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n /* S7 comm */ init_s7comm_dissector(ndpi_str, &a, detection_bitmask); + /* IEC 60870-5-104 */ + init_104_dissector(ndpi_str, &a, detection_bitmask); + #ifdef CUSTOM_NDPI_PROTOCOLS #include "../../../nDPI-custom/custom_ndpi_main_init.c" #endif diff --git a/src/lib/ndpi_serializer.c b/src/lib/ndpi_serializer.c index 521e841d0..d8a0d13fc 100644 --- a/src/lib/ndpi_serializer.c +++ b/src/lib/ndpi_serializer.c @@ -1451,6 +1451,9 @@ int ndpi_serialize_end_of_block(ndpi_serializer *_serializer) { buff_diff = serializer->buffer_size - serializer->status.size_used; } + if(serializer->status.flags & NDPI_SERIALIZER_STATUS_SOB) /* Empty block */ + serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_SOB; + // buff_diff = serializer->buffer_size - serializer->status.size_used; ndpi_serialize_json_post(_serializer); |