diff options
| author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2025-05-20 21:24:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-20 21:24:40 +0200 |
| commit | 34ee4d0b1d2ed080a85a93780a0eaf68136c109f (patch) | |
| tree | 72cc820e38f588a1e1bd914bfe331feab6ecb017 /src/lib/protocols/non_tcp_udp.c | |
| parent | 896c9ffef1440558401077599f246ff1dc6f856f (diff) | |
Minor simplification on protocol/dissector registration (#2833)
Diffstat (limited to 'src/lib/protocols/non_tcp_udp.c')
| -rw-r--r-- | src/lib/protocols/non_tcp_udp.c | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/src/lib/protocols/non_tcp_udp.c b/src/lib/protocols/non_tcp_udp.c index d1d5950d5..a2f8b518e 100644 --- a/src/lib/protocols/non_tcp_udp.c +++ b/src/lib/protocols/non_tcp_udp.c @@ -157,97 +157,86 @@ static void ndpi_search_in_non_tcp_udp(struct ndpi_detection_module_struct } -void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) +void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct) { /* always add non tcp/udp if one protocol is compiled in */ - NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[*id].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); + NDPI_SAVE_AS_BITMASK(ndpi_struct->callback_buffer[ndpi_struct->callback_buffer_num].detection_bitmask, NDPI_PROTOCOL_UNKNOWN); - ndpi_set_bitmask_protocol_detection("IPSec", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IPSec", ndpi_struct, NDPI_PROTOCOL_IPSEC, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_GRE", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_GRE", ndpi_struct, NDPI_PROTOCOL_IP_GRE, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_ICMP", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_ICMP", ndpi_struct, NDPI_PROTOCOL_IP_ICMP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_IGMP", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_IGMP", ndpi_struct, NDPI_PROTOCOL_IP_IGMP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_EGP", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_EGP", ndpi_struct, NDPI_PROTOCOL_IP_EGP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_SCTP", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_SCTP", ndpi_struct, NDPI_PROTOCOL_IP_SCTP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_PGM", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_PGM", ndpi_struct, NDPI_PROTOCOL_IP_PGM, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_OSPF", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_OSPF", ndpi_struct, NDPI_PROTOCOL_IP_OSPF, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_IP_IN_IP", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_IP_IN_IP", ndpi_struct, NDPI_PROTOCOL_IP_IP_IN_IP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_ICMPV6", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_ICMPV6", ndpi_struct, NDPI_PROTOCOL_IP_ICMPV6, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; - ndpi_set_bitmask_protocol_detection("IP_PIM", ndpi_struct, *id, + ndpi_set_bitmask_protocol_detection("IP_PIM", ndpi_struct, NDPI_PROTOCOL_IP_PIM, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); - *id += 1; } |