diff options
| author | Luca Deri <deri@ntop.org> | 2024-08-24 16:59:56 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2024-08-24 16:59:56 +0200 |
| commit | 2315f44efaf85bf675f9d64c2e288f1f083f38a8 (patch) | |
| tree | 72c3ba0b966267ef47ed5b684389945535531409 | |
| parent | 53a6bae365618f9b301cf51e5f3f9d5450b0e280 (diff) | |
Compilation fixes
| -rw-r--r-- | example/ndpiSimpleIntegration.c | 16 | ||||
| -rw-r--r-- | python/ndpi/ndpi.py | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/example/ndpiSimpleIntegration.c b/example/ndpiSimpleIntegration.c index dc14928c9..dca3cdd29 100644 --- a/example/ndpiSimpleIntegration.c +++ b/example/ndpiSimpleIntegration.c @@ -886,8 +886,8 @@ static void ndpi_process_packet(uint8_t * const args, workflow->packets_captured, reader_thread->array_index, flow_to_process->flow_id, - ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->guessed_protocol.master_protocol), - ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->guessed_protocol.app_protocol), + ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->guessed_protocol.proto.master_protocol), + ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->guessed_protocol.proto.app_protocol), ndpi_category_get_name(workflow->ndpi_struct, flow_to_process->guessed_protocol.category)); } else { printf("[%8llu, %d, %4d][FLOW NOT CLASSIFIED]\n", @@ -903,8 +903,8 @@ static void ndpi_process_packet(uint8_t * const args, if (ndpi_is_protocol_detected(flow_to_process->detected_l7_protocol) != 0 && flow_to_process->detection_completed == 0) { - if (flow_to_process->detected_l7_protocol.master_protocol != NDPI_PROTOCOL_UNKNOWN || - flow_to_process->detected_l7_protocol.app_protocol != NDPI_PROTOCOL_UNKNOWN) + if (flow_to_process->detected_l7_protocol.proto.master_protocol != NDPI_PROTOCOL_UNKNOWN || + flow_to_process->detected_l7_protocol.proto.app_protocol != NDPI_PROTOCOL_UNKNOWN) { flow_to_process->detection_completed = 1; workflow->detected_flow_protocols++; @@ -913,8 +913,8 @@ static void ndpi_process_packet(uint8_t * const args, workflow->packets_captured, reader_thread->array_index, flow_to_process->flow_id, - ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->detected_l7_protocol.master_protocol), - ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->detected_l7_protocol.app_protocol), + ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->detected_l7_protocol.proto.master_protocol), + ndpi_get_proto_name(workflow->ndpi_struct, flow_to_process->detected_l7_protocol.proto.app_protocol), ndpi_category_get_name(workflow->ndpi_struct, flow_to_process->detected_l7_protocol.category)); } } @@ -948,8 +948,8 @@ static void ndpi_process_packet(uint8_t * const args, } } - if (flow_to_process->detected_l7_protocol.master_protocol == NDPI_PROTOCOL_TLS || - flow_to_process->detected_l7_protocol.app_protocol == NDPI_PROTOCOL_TLS) + if (flow_to_process->detected_l7_protocol.proto.master_protocol == NDPI_PROTOCOL_TLS || + flow_to_process->detected_l7_protocol.proto.app_protocol == NDPI_PROTOCOL_TLS) { if (flow_to_process->tls_client_hello_seen == 0 && flow_to_process->ndpi_flow->protos.tls_quic.hello_processed != 0) diff --git a/python/ndpi/ndpi.py b/python/ndpi/ndpi.py index 3745af94d..22289ed83 100644 --- a/python/ndpi/ndpi.py +++ b/python/ndpi/ndpi.py @@ -18,8 +18,8 @@ from _ndpi import ffi, lib ndpi_protocol = namedtuple('NDPIProtocol', ['C', - 'master_protocol', - 'app_protocol', + 'proto.master_protocol', + 'proto.app_protocol', 'category']) ndpi_confidence = namedtuple('NDPIConfidence', ['id', |