diff options
| author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2022-12-18 09:10:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-18 08:10:57 +0000 |
| commit | ad6bfbad4d0b8ae6c0c6b2d58c68eee542110e8a (patch) | |
| tree | 999ca90928ef9c410807b1376ce7539beeec810c /src/lib/protocols | |
| parent | fb0a73c0c7725fbeafda18b816d72f0d2fd6bd02 (diff) | |
Add protocol disabling feature (#1808)
The application may enable only some protocols.
Disabling a protocol means:
*) don't register/use the protocol dissector code (if any)
*) disable classification by-port for such a protocol
*) disable string matchings for domains/certificates involving this protocol
*) disable subprotocol registration (if any)
This feature can be tested with `ndpiReader -B list_of_protocols_to_disable`.
Custom protocols are always enabled.
Technically speaking, this commit doesn't introduce any API/ABI
incompatibility. However, calling `ndpi_set_protocol_detection_bitmask2()`
is now mandatory, just after having called `ndpi_init_detection_module()`.
Most of the diffs (and all the diffs in `/src/lib/protocols/`) are due to
the removing of some function parameters.
Fix the low level macro `NDPI_LOG`. This issue hasn't been detected
sooner simply because almost all the code uses only the helpers `NDPI_LOG_*`
Diffstat (limited to 'src/lib/protocols')
188 files changed, 387 insertions, 414 deletions
diff --git a/src/lib/protocols/activision.c b/src/lib/protocols/activision.c index 7ef7d23c2..570779dfa 100644 --- a/src/lib/protocols/activision.c +++ b/src/lib/protocols/activision.c @@ -98,9 +98,9 @@ void ndpi_search_activision(struct ndpi_detection_module_struct *ndpi_struct, } void init_activision_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Activision", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Activision", ndpi_struct, *id, NDPI_PROTOCOL_ACTIVISION, ndpi_search_activision, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/afp.c b/src/lib/protocols/afp.c index 37bf259b5..8c47dc2ad 100644 --- a/src/lib/protocols/afp.c +++ b/src/lib/protocols/afp.c @@ -87,9 +87,9 @@ void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_afp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("AFP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("AFP", ndpi_struct, *id, NDPI_PROTOCOL_AFP, ndpi_search_afp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/aimini.c b/src/lib/protocols/aimini.c index b6ddb78ee..4e08612c6 100644 --- a/src/lib/protocols/aimini.c +++ b/src/lib/protocols/aimini.c @@ -257,9 +257,9 @@ void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_aimini_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Aimini", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Aimini", ndpi_struct, *id, NDPI_PROTOCOL_AIMINI, ndpi_search_aimini, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ajp.c b/src/lib/protocols/ajp.c index 192cc40cb..5a8dd00dd 100644 --- a/src/lib/protocols/ajp.c +++ b/src/lib/protocols/ajp.c @@ -126,9 +126,9 @@ void ndpi_search_ajp(struct ndpi_detection_module_struct *ndpi_struct, void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("AJP", ndpi_struct, detection_bitmask, + ndpi_set_bitmask_protocol_detection("AJP", ndpi_struct, *id, NDPI_PROTOCOL_AJP, ndpi_search_ajp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, diff --git a/src/lib/protocols/alicloud.c b/src/lib/protocols/alicloud.c index 8530db4a2..80817b78a 100644 --- a/src/lib/protocols/alicloud.c +++ b/src/lib/protocols/alicloud.c @@ -68,9 +68,9 @@ void ndpi_search_alicloud(struct ndpi_detection_module_struct *ndpi_struct, } void init_alicloud_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("AliCloud", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("AliCloud", ndpi_struct, *id, NDPI_PROTOCOL_ALICLOUD, ndpi_search_alicloud, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/amazon_video.c b/src/lib/protocols/amazon_video.c index afe1e2095..8c8cb0b1c 100644 --- a/src/lib/protocols/amazon_video.c +++ b/src/lib/protocols/amazon_video.c @@ -67,8 +67,8 @@ void ndpi_search_amazon_video(struct ndpi_detection_module_struct *ndpi_struct, void init_amazon_video_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("AMAZON_VIDEO", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("AMAZON_VIDEO", ndpi_struct, *id, NDPI_PROTOCOL_AMAZON_VIDEO, ndpi_search_amazon_video, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/among_us.c b/src/lib/protocols/among_us.c index 68ce00605..a6c066386 100644 --- a/src/lib/protocols/among_us.c +++ b/src/lib/protocols/among_us.c @@ -46,11 +46,10 @@ void ndpi_search_among_us(struct ndpi_detection_module_struct *ndpi_struct, } } -void init_among_us_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_among_us_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection( - "AmongUs", ndpi_struct, detection_bitmask, *id, + "AmongUs", ndpi_struct, *id, NDPI_PROTOCOL_AMONG_US, ndpi_search_among_us, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); *id += 1; diff --git a/src/lib/protocols/amqp.c b/src/lib/protocols/amqp.c index 853b191d7..610abaa7a 100644 --- a/src/lib/protocols/amqp.c +++ b/src/lib/protocols/amqp.c @@ -72,8 +72,8 @@ void ndpi_search_amqp(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("AMQP", ndpi_struct, detection_bitmask, *id, +void init_amqp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("AMQP", ndpi_struct, *id, NDPI_PROTOCOL_AMQP, ndpi_search_amqp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/apple_push.c b/src/lib/protocols/apple_push.c index 04fa11a80..f39ad7838 100644 --- a/src/lib/protocols/apple_push.c +++ b/src/lib/protocols/apple_push.c @@ -95,9 +95,9 @@ void ndpi_search_apple_push(struct ndpi_detection_module_struct *ndpi_struct, st } -void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("APPLE_PUSH", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("APPLE_PUSH", ndpi_struct, *id, NDPI_PROTOCOL_APPLE_PUSH, ndpi_search_apple_push, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/applejuice.c b/src/lib/protocols/applejuice.c index d403c968e..a8d2e810c 100644 --- a/src/lib/protocols/applejuice.c +++ b/src/lib/protocols/applejuice.c @@ -54,9 +54,9 @@ void ndpi_search_applejuice_tcp(struct ndpi_detection_module_struct *ndpi_struct } -void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_applejuice_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("AppleJuice", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("AppleJuice", ndpi_struct, *id, NDPI_PROTOCOL_APPLEJUICE, ndpi_search_applejuice_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/armagetron.c b/src/lib/protocols/armagetron.c index 9dc441d7e..40110d8b8 100644 --- a/src/lib/protocols/armagetron.c +++ b/src/lib/protocols/armagetron.c @@ -96,9 +96,9 @@ void ndpi_search_armagetron_udp(struct ndpi_detection_module_struct *ndpi_struct -void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_armagetron_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Armagetron", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Armagetron", ndpi_struct, *id, NDPI_PROTOCOL_ARMAGETRON, ndpi_search_armagetron_udp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/avast.c b/src/lib/protocols/avast.c index b94c5ad62..e133f8cf2 100644 --- a/src/lib/protocols/avast.c +++ b/src/lib/protocols/avast.c @@ -52,11 +52,10 @@ static void ndpi_search_avast(struct ndpi_detection_module_struct *ndpi_struct, NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_avast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_avast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection("AVAST", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_AVAST, ndpi_search_avast, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/avast_securedns.c b/src/lib/protocols/avast_securedns.c index a640d6815..5eb9a430f 100644 --- a/src/lib/protocols/avast_securedns.c +++ b/src/lib/protocols/avast_securedns.c @@ -53,11 +53,10 @@ static void ndpi_search_avast_securedns(struct ndpi_detection_module_struct *ndp NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_avast_securedns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_avast_securedns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection("AVAST SecureDNS", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_AVAST_SECUREDNS, ndpi_search_avast_securedns, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/ayiya.c b/src/lib/protocols/ayiya.c index abc5f3336..43b0c84c9 100644 --- a/src/lib/protocols/ayiya.c +++ b/src/lib/protocols/ayiya.c @@ -74,9 +74,9 @@ void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ayiya_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Ayiya", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Ayiya", ndpi_struct, *id, NDPI_PROTOCOL_AYIYA, ndpi_search_ayiya, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/bgp.c b/src/lib/protocols/bgp.c index e9fc4ccba..860473b54 100644 --- a/src/lib/protocols/bgp.c +++ b/src/lib/protocols/bgp.c @@ -54,9 +54,9 @@ void ndpi_search_bgp(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_bgp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("BGP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("BGP", ndpi_struct, *id, NDPI_PROTOCOL_BGP, ndpi_search_bgp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/bittorrent.c b/src/lib/protocols/bittorrent.c index cac66b6be..c618ea905 100644 --- a/src/lib/protocols/bittorrent.c +++ b/src/lib/protocols/bittorrent.c @@ -575,9 +575,9 @@ static void ndpi_search_bittorrent(struct ndpi_detection_module_struct *ndpi_str /* ************************************* */ void init_bittorrent_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("BitTorrent", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("BitTorrent", ndpi_struct, *id, NDPI_PROTOCOL_BITTORRENT, ndpi_search_bittorrent, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/bjnp.c b/src/lib/protocols/bjnp.c index c5fad5abd..17ec9b1d5 100644 --- a/src/lib/protocols/bjnp.c +++ b/src/lib/protocols/bjnp.c @@ -45,9 +45,9 @@ void ndpi_search_bjnp(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_bjnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_bjnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("BJNP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("BJNP", ndpi_struct, *id, NDPI_PROTOCOL_BJNP, ndpi_search_bjnp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/capwap.c b/src/lib/protocols/capwap.c index 954612940..eff193154 100644 --- a/src/lib/protocols/capwap.c +++ b/src/lib/protocols/capwap.c @@ -131,9 +131,9 @@ void ndpi_search_capwap(struct ndpi_detection_module_struct *ndpi_struct, struct void init_capwap_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("CAPWAP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("CAPWAP", ndpi_struct, *id, NDPI_PROTOCOL_CAPWAP, ndpi_search_capwap, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/cassandra.c b/src/lib/protocols/cassandra.c index 07231ac65..ff050b7d9 100644 --- a/src/lib/protocols/cassandra.c +++ b/src/lib/protocols/cassandra.c @@ -137,11 +137,10 @@ void ndpi_search_cassandra(struct ndpi_detection_module_struct *ndpi_struct, void init_cassandra_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { + u_int32_t *id) { ndpi_set_bitmask_protocol_detection("Cassandra", - ndpi_struct, detection_bitmask, + ndpi_struct, *id, NDPI_PROTOCOL_CASSANDRA, ndpi_search_cassandra, diff --git a/src/lib/protocols/checkmk.c b/src/lib/protocols/checkmk.c index f02e32265..f057ef7d9 100644 --- a/src/lib/protocols/checkmk.c +++ b/src/lib/protocols/checkmk.c @@ -70,9 +70,9 @@ void ndpi_search_checkmk(struct ndpi_detection_module_struct *ndpi_struct, void init_checkmk_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("CHECKMK", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("CHECKMK", ndpi_struct, *id, NDPI_PROTOCOL_CHECKMK, ndpi_search_checkmk, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ciscovpn.c b/src/lib/protocols/ciscovpn.c index d33fedbef..7151631f9 100644 --- a/src/lib/protocols/ciscovpn.c +++ b/src/lib/protocols/ciscovpn.c @@ -70,9 +70,9 @@ void ndpi_search_ciscovpn(struct ndpi_detection_module_struct *ndpi_struct, stru } -void init_ciscovpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ciscovpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("CiscoVPN", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("CiscoVPN", ndpi_struct, *id, NDPI_PROTOCOL_CISCOVPN, ndpi_search_ciscovpn, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/citrix.c b/src/lib/protocols/citrix.c index 740dfca8b..e1807f684 100644 --- a/src/lib/protocols/citrix.c +++ b/src/lib/protocols/citrix.c @@ -67,9 +67,9 @@ void ndpi_search_citrix(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_citrix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_citrix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Citrix", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Citrix", ndpi_struct, *id, NDPI_PROTOCOL_CITRIX, ndpi_search_citrix, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/coap.c b/src/lib/protocols/coap.c index b7dd73caf..e5513b8ba 100644 --- a/src/lib/protocols/coap.c +++ b/src/lib/protocols/coap.c @@ -147,9 +147,9 @@ void ndpi_search_coap (struct ndpi_detection_module_struct *ndpi_struct, * Entry point for the ndpi library */ void init_coap_dissector (struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection ("COAP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection ("COAP", ndpi_struct, *id, NDPI_PROTOCOL_COAP, ndpi_search_coap, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/collectd.c b/src/lib/protocols/collectd.c index a97f8e287..1908ac015 100644 --- a/src/lib/protocols/collectd.c +++ b/src/lib/protocols/collectd.c @@ -195,9 +195,9 @@ void ndpi_search_collectd(struct ndpi_detection_module_struct *ndpi_struct, } void init_collectd_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("collectd", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("collectd", ndpi_struct, *id, NDPI_PROTOCOL_COLLECTD, ndpi_search_collectd, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/corba.c b/src/lib/protocols/corba.c index fcb7ff2e6..355039db4 100644 --- a/src/lib/protocols/corba.c +++ b/src/lib/protocols/corba.c @@ -46,9 +46,9 @@ void ndpi_search_corba(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_corba_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_corba_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Corba", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Corba", ndpi_struct, *id, NDPI_PROTOCOL_CORBA, ndpi_search_corba, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/cpha.c b/src/lib/protocols/cpha.c index d1dcc6f66..5874b0f9e 100644 --- a/src/lib/protocols/cpha.c +++ b/src/lib/protocols/cpha.c @@ -51,9 +51,8 @@ void ndpi_search_cpha(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_cpha_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("CPHA", ndpi_struct, detection_bitmask, *id, +void init_cpha_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("CPHA", ndpi_struct, *id, NDPI_PROTOCOL_CPHA, ndpi_search_cpha, NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD, /* TODO: ipv6 support? */ diff --git a/src/lib/protocols/crossfire.c b/src/lib/protocols/crossfire.c index 51072d609..cc853e773 100644 --- a/src/lib/protocols/crossfire.c +++ b/src/lib/protocols/crossfire.c @@ -76,9 +76,9 @@ void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_str } -void init_crossfire_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_crossfire_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Crossfire", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Crossfire", ndpi_struct, *id, NDPI_PROTOCOL_CROSSFIRE, ndpi_search_crossfire_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/crynet.c b/src/lib/protocols/crynet.c index 2b7203b1f..b1ef7a443 100644 --- a/src/lib/protocols/crynet.c +++ b/src/lib/protocols/crynet.c @@ -67,9 +67,9 @@ void ndpi_search_crynet(struct ndpi_detection_module_struct *ndpi_struct, } void init_crynet_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("CryNetwork", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("CryNetwork", ndpi_struct, *id, NDPI_PROTOCOL_CRYNET, ndpi_search_crynet, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/csgo.c b/src/lib/protocols/csgo.c index 4bd541bcd..4d98c59e8 100644 --- a/src/lib/protocols/csgo.c +++ b/src/lib/protocols/csgo.c @@ -130,9 +130,9 @@ void ndpi_search_csgo(struct ndpi_detection_module_struct* ndpi_struct, struct n NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_csgo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_csgo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("CSGO", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("CSGO", ndpi_struct, *id, NDPI_PROTOCOL_CSGO, ndpi_search_csgo, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/dcerpc.c b/src/lib/protocols/dcerpc.c index 198d27b38..175c3189a 100644 --- a/src/lib/protocols/dcerpc.c +++ b/src/lib/protocols/dcerpc.c @@ -93,9 +93,9 @@ void ndpi_search_dcerpc(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_dcerpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_dcerpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RPC", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RPC", ndpi_struct, *id, NDPI_PROTOCOL_RPC, ndpi_search_dcerpc, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/dhcp.c b/src/lib/protocols/dhcp.c index a212844a4..56295c760 100644 --- a/src/lib/protocols/dhcp.c +++ b/src/lib/protocols/dhcp.c @@ -191,8 +191,8 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, void init_dhcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("DHCP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("DHCP", ndpi_struct, *id, NDPI_PROTOCOL_DHCP, ndpi_search_dhcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/dhcpv6.c b/src/lib/protocols/dhcpv6.c index 7336669ce..8e665c742 100644 --- a/src/lib/protocols/dhcpv6.c +++ b/src/lib/protocols/dhcpv6.c @@ -56,9 +56,9 @@ void ndpi_search_dhcpv6_udp(struct ndpi_detection_module_struct *ndpi_struct, st } -void init_dhcpv6_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_dhcpv6_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("DHCPV6", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("DHCPV6", ndpi_struct, *id, NDPI_PROTOCOL_DHCPV6, ndpi_search_dhcpv6_udp, NDPI_SELECTION_BITMASK_PROTOCOL_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/diameter.c b/src/lib/protocols/diameter.c index ee6c7ec6a..901d3035b 100644 --- a/src/lib/protocols/diameter.c +++ b/src/lib/protocols/diameter.c @@ -104,10 +104,9 @@ void ndpi_search_diameter(struct ndpi_detection_module_struct *ndpi_struct, } -void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_diameter_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Diameter", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Diameter", ndpi_struct, *id, NDPI_PROTOCOL_DIAMETER, ndpi_search_diameter, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); diff --git a/src/lib/protocols/directconnect.c b/src/lib/protocols/directconnect.c index ea418f36d..01caf79ff 100644 --- a/src/lib/protocols/directconnect.c +++ b/src/lib/protocols/directconnect.c @@ -193,9 +193,9 @@ void ndpi_search_directconnect(struct ndpi_detection_module_struct } -void init_directconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_directconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("DirectConnect", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("DirectConnect", ndpi_struct, *id, NDPI_PROTOCOL_DIRECTCONNECT, ndpi_search_directconnect, /* TODO: UDP?*/ diff --git a/src/lib/protocols/directdownloadlink.c b/src/lib/protocols/directdownloadlink.c index e11498c51..2821490b6 100644 --- a/src/lib/protocols/directdownloadlink.c +++ b/src/lib/protocols/directdownloadlink.c @@ -712,9 +712,9 @@ void ndpi_search_direct_download_link_tcp(struct ndpi_detection_module_struct *n } -void init_directdownloadlink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_directdownloadlink_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Direct_Download_Link", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Direct_Download_Link", ndpi_struct, *id, NDPI_PROTOCOL_DIRECT_DOWNLOAD_LINK, ndpi_search_direct_download_link_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/discord.c b/src/lib/protocols/discord.c index 26e751ded..36ba8274e 100644 --- a/src/lib/protocols/discord.c +++ b/src/lib/protocols/discord.c @@ -74,9 +74,9 @@ void ndpi_search_discord(struct ndpi_detection_module_struct *ndpi_struct, } void init_discord_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Discord", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Discord", ndpi_struct, *id, NDPI_PROTOCOL_DISCORD, ndpi_search_discord, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/dnp3.c b/src/lib/protocols/dnp3.c index 9aa04cc24..b81ca3161 100644 --- a/src/lib/protocols/dnp3.c +++ b/src/lib/protocols/dnp3.c @@ -55,9 +55,9 @@ void ndpi_search_dnp3_tcp(struct ndpi_detection_module_struct *ndpi_struct, /* ******************************************************** */ void init_dnp3_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("DNP3", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("DNP3", ndpi_struct, *id, NDPI_PROTOCOL_DNP3, ndpi_search_dnp3_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/dns.c b/src/lib/protocols/dns.c index 69153ce8b..855232ecd 100644 --- a/src/lib/protocols/dns.c +++ b/src/lib/protocols/dns.c @@ -685,8 +685,8 @@ static void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, st /* *********************************************** */ void init_dns_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("DNS", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("DNS", ndpi_struct, *id, NDPI_PROTOCOL_DNS, ndpi_search_dns, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/dnscrypt.c b/src/lib/protocols/dnscrypt.c index 3191c305b..61bd9241a 100644 --- a/src/lib/protocols/dnscrypt.c +++ b/src/lib/protocols/dnscrypt.c @@ -66,11 +66,10 @@ void ndpi_search_dnscrypt(struct ndpi_detection_module_struct *ndpi_struct, } } -void init_dnscrypt_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_dnscrypt_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection( - "DNScrypt", ndpi_struct, detection_bitmask, *id, + "DNScrypt", ndpi_struct, *id, NDPI_PROTOCOL_DNSCRYPT, ndpi_search_dnscrypt, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); *id += 1; diff --git a/src/lib/protocols/dofus.c b/src/lib/protocols/dofus.c index 1313749e8..436f84f51 100644 --- a/src/lib/protocols/dofus.c +++ b/src/lib/protocols/dofus.c @@ -138,9 +138,9 @@ maybe_dofus: } -void init_dofus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_dofus_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Dofus", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Dofus", ndpi_struct, *id, NDPI_PROTOCOL_DOFUS, ndpi_search_dofus, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/drda.c b/src/lib/protocols/drda.c index 1b76b6049..67afacb95 100644 --- a/src/lib/protocols/drda.c +++ b/src/lib/protocols/drda.c @@ -89,10 +89,9 @@ void ndpi_search_drda(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************************** */ -void init_drda_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_drda_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("DRDA", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("DRDA", ndpi_struct, *id, NDPI_PROTOCOL_DRDA, ndpi_search_drda, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/dropbox.c b/src/lib/protocols/dropbox.c index 6dd7693ed..092238aaa 100644 --- a/src/lib/protocols/dropbox.c +++ b/src/lib/protocols/dropbox.c @@ -81,9 +81,9 @@ void ndpi_search_dropbox(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_dropbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_dropbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("DROPBOX", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("DROPBOX", ndpi_struct, *id, NDPI_PROTOCOL_DROPBOX, ndpi_search_dropbox, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/eaq.c b/src/lib/protocols/eaq.c index dfff42924..e999e76ee 100644 --- a/src/lib/protocols/eaq.c +++ b/src/lib/protocols/eaq.c @@ -79,9 +79,9 @@ void ndpi_search_eaq(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("EAQ", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("EAQ", ndpi_struct, *id, NDPI_PROTOCOL_EAQ, ndpi_search_eaq, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/edonkey.c b/src/lib/protocols/edonkey.c index 54ccbbeca..98e3474df 100644 --- a/src/lib/protocols/edonkey.c +++ b/src/lib/protocols/edonkey.c @@ -208,9 +208,9 @@ void ndpi_search_edonkey(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("eDonkey", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("eDonkey", ndpi_struct, *id, NDPI_PROTOCOL_EDONKEY, ndpi_search_edonkey, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/elasticsearch.c b/src/lib/protocols/elasticsearch.c index 153a17e76..278809b27 100644 --- a/src/lib/protocols/elasticsearch.c +++ b/src/lib/protocols/elasticsearch.c @@ -71,9 +71,9 @@ void ndpi_search_elasticsearch(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************** */ void init_elasticsearch_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Elasticsearch", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Elasticsearch", ndpi_struct, *id, NDPI_PROTOCOL_ELASTICSEARCH, ndpi_search_elasticsearch, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ethernet_ip.c b/src/lib/protocols/ethernet_ip.c index 73993c3e2..0c96d7e5c 100644 --- a/src/lib/protocols/ethernet_ip.c +++ b/src/lib/protocols/ethernet_ip.c @@ -60,8 +60,8 @@ void ndpi_search_ethernet_ip(struct ndpi_detection_module_struct *ndpi_struct, void init_ethernet_ip_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("EthernetIP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("EthernetIP", ndpi_struct, *id, NDPI_PROTOCOL_ETHERNET_IP, ndpi_search_ethernet_ip, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/fastcgi.c b/src/lib/protocols/fastcgi.c index f70bd6cf5..6726a49c7 100644 --- a/src/lib/protocols/fastcgi.c +++ b/src/lib/protocols/fastcgi.c @@ -243,9 +243,9 @@ static int ndpi_search_fastcgi_extra(struct ndpi_detection_module_struct * ndpi_ } void init_fastcgi_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("FastCGI", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("FastCGI", ndpi_struct, *id, NDPI_PROTOCOL_FASTCGI, ndpi_search_fastcgi, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/fasttrack.c b/src/lib/protocols/fasttrack.c index 59752a907..88693967a 100644 --- a/src/lib/protocols/fasttrack.c +++ b/src/lib/protocols/fasttrack.c @@ -82,9 +82,9 @@ void ndpi_search_fasttrack_tcp(struct ndpi_detection_module_struct *ndpi_struct, } -void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("FastTrack", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("FastTrack", ndpi_struct, *id, NDPI_PROTOCOL_FASTTRACK, ndpi_search_fasttrack_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/fiesta.c b/src/lib/protocols/fiesta.c index 4ba5f3082..40e813bf1 100644 --- a/src/lib/protocols/fiesta.c +++ b/src/lib/protocols/fiesta.c @@ -92,9 +92,9 @@ void ndpi_search_fiesta(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Fiesta", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Fiesta", ndpi_struct, *id, NDPI_PROTOCOL_FIESTA, ndpi_search_fiesta, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/fix.c b/src/lib/protocols/fix.c index dc477341a..89d10f760 100644 --- a/src/lib/protocols/fix.c +++ b/src/lib/protocols/fix.c @@ -62,9 +62,9 @@ void ndpi_search_fix(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_fix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_fix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("FIX", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("FIX", ndpi_struct, *id, NDPI_PROTOCOL_FIX, ndpi_search_fix, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/florensia.c b/src/lib/protocols/florensia.c index 8617f3741..13bbe7d4d 100644 --- a/src/lib/protocols/florensia.c +++ b/src/lib/protocols/florensia.c @@ -117,9 +117,9 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str } -void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Florensia", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Florensia", ndpi_struct, *id, NDPI_PROTOCOL_FLORENSIA, ndpi_search_florensia, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ftp_control.c b/src/lib/protocols/ftp_control.c index 44911b2d2..2566e55da 100644 --- a/src/lib/protocols/ftp_control.c +++ b/src/lib/protocols/ftp_control.c @@ -685,8 +685,8 @@ void ndpi_search_ftp_control(struct ndpi_detection_module_struct *ndpi_struct, /* *************************************************************** */ void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("FTP_CONTROL", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("FTP_CONTROL", ndpi_struct, *id, NDPI_PROTOCOL_FTP_CONTROL, ndpi_search_ftp_control, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ftp_data.c b/src/lib/protocols/ftp_data.c index 2c3f06d97..11c04744b 100644 --- a/src/lib/protocols/ftp_data.c +++ b/src/lib/protocols/ftp_data.c @@ -261,9 +261,9 @@ void ndpi_search_ftp_data(struct ndpi_detection_module_struct *ndpi_struct, stru } -void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("FTP_DATA", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("FTP_DATA", ndpi_struct, *id, NDPI_PROTOCOL_FTP_DATA, ndpi_search_ftp_data, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/genshin_impact.c b/src/lib/protocols/genshin_impact.c index 68cba225b..e837747a4 100644 --- a/src/lib/protocols/genshin_impact.c +++ b/src/lib/protocols/genshin_impact.c @@ -72,11 +72,10 @@ static void ndpi_search_genshin_impact(struct ndpi_detection_module_struct *ndpi /* ***************************************************************** */ -void init_genshin_impact_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_genshin_impact_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection("GenshinImpact", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_GENSHIN_IMPACT, ndpi_search_genshin_impact, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/git.c b/src/lib/protocols/git.c index 6c3621bab..fce698def 100644 --- a/src/lib/protocols/git.c +++ b/src/lib/protocols/git.c @@ -73,10 +73,9 @@ void ndpi_search_git(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************************** */ -void init_git_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_git_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Git", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Git", ndpi_struct, *id, NDPI_PROTOCOL_GIT, ndpi_search_git, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/gnutella.c b/src/lib/protocols/gnutella.c index a5ab04c3c..20c21052d 100644 --- a/src/lib/protocols/gnutella.c +++ b/src/lib/protocols/gnutella.c @@ -314,9 +314,9 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru } -void init_gnutella_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_gnutella_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Gnutella", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Gnutella", ndpi_struct, *id, NDPI_PROTOCOL_GNUTELLA, ndpi_search_gnutella, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/gtp.c b/src/lib/protocols/gtp.c index 1a40784ef..59f6860bd 100644 --- a/src/lib/protocols/gtp.c +++ b/src/lib/protocols/gtp.c @@ -128,9 +128,9 @@ void ndpi_search_gtp(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_gtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_gtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("GTP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("GTP", ndpi_struct, *id, NDPI_PROTOCOL_GTP, ndpi_search_gtp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/guildwars.c b/src/lib/protocols/guildwars.c index 1420ed954..03779dd0e 100644 --- a/src/lib/protocols/guildwars.c +++ b/src/lib/protocols/guildwars.c @@ -65,9 +65,9 @@ void ndpi_search_guildwars_tcp(struct ndpi_detection_module_struct *ndpi_struct, } -void init_guildwars_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_guildwars_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Guildwars", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Guildwars", ndpi_struct, *id, NDPI_PROTOCOL_GUILDWARS, ndpi_search_guildwars_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/h323.c b/src/lib/protocols/h323.c index 8cb819448..8917ec1ad 100644 --- a/src/lib/protocols/h323.c +++ b/src/lib/protocols/h323.c @@ -117,9 +117,9 @@ void ndpi_search_h323(struct ndpi_detection_module_struct *ndpi_struct, struct n NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_h323_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_h323_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("H323", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("H323", ndpi_struct, *id, NDPI_PROTOCOL_H323, ndpi_search_h323, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/halflife2_and_mods.c b/src/lib/protocols/halflife2_and_mods.c index c28899f35..f6304f42a 100644 --- a/src/lib/protocols/halflife2_and_mods.c +++ b/src/lib/protocols/halflife2_and_mods.c @@ -64,9 +64,9 @@ void ndpi_search_halflife2(struct ndpi_detection_module_struct *ndpi_struct, str } -void init_halflife2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_halflife2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("HalfLife2", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("HalfLife2", ndpi_struct, *id, NDPI_PROTOCOL_HALFLIFE2, ndpi_search_halflife2, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/hangout.c b/src/lib/protocols/hangout.c index 867e0544f..b5bde02da 100644 --- a/src/lib/protocols/hangout.c +++ b/src/lib/protocols/hangout.c @@ -94,9 +94,8 @@ void ndpi_search_hangout(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************************** */ -void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("GoogleHangout", ndpi_struct, detection_bitmask, *id, +void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("GoogleHangout", ndpi_struct, *id, NDPI_PROTOCOL_HANGOUT_DUO, ndpi_search_hangout, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/hpvirtgrp.c b/src/lib/protocols/hpvirtgrp.c index 8b6c70b77..df2da5faa 100644 --- a/src/lib/protocols/hpvirtgrp.c +++ b/src/lib/protocols/hpvirtgrp.c @@ -56,11 +56,10 @@ static void ndpi_search_hpvirtgrp(struct ndpi_detection_module_struct *ndpi_stru /* ***************************************************************** */ -void init_hpvirtgrp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_hpvirtgrp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection("HP Virtual Machine Group Management", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_HPVIRTGRP, ndpi_search_hpvirtgrp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/hsrp.c b/src/lib/protocols/hsrp.c index a34205f99..e03db7688 100644 --- a/src/lib/protocols/hsrp.c +++ b/src/lib/protocols/hsrp.c @@ -81,8 +81,8 @@ void ndpi_search_hsrp(struct ndpi_detection_module_struct *ndpi_struct, void init_hsrp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("HSRP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("HSRP", ndpi_struct, *id, NDPI_PROTOCOL_HSRP, ndpi_search_hsrp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c index 2c8f474fa..50df30830 100644 --- a/src/lib/protocols/http.c +++ b/src/lib/protocols/http.c @@ -1522,9 +1522,8 @@ char* ndpi_get_http_content_type(struct ndpi_detection_module_struct *ndpi_struc } -void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("HTTP",ndpi_struct, detection_bitmask, *id, +void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("HTTP",ndpi_struct, *id, NDPI_PROTOCOL_HTTP, ndpi_search_http_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/i3d.c b/src/lib/protocols/i3d.c index 8b6fdf093..08483f37d 100644 --- a/src/lib/protocols/i3d.c +++ b/src/lib/protocols/i3d.c @@ -75,9 +75,9 @@ void ndpi_search_i3d(struct ndpi_detection_module_struct *ndpi_struct, } void init_i3d_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("i3D", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("i3D", ndpi_struct, *id, NDPI_PROTOCOL_I3D, ndpi_search_i3d, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/iax.c b/src/lib/protocols/iax.c index 48df17b38..428dd3a67 100644 --- a/src/lib/protocols/iax.c +++ b/src/lib/protocols/iax.c @@ -95,9 +95,9 @@ void ndpi_search_iax(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_iax_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_iax_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("IAX", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IAX", ndpi_struct, *id, NDPI_PROTOCOL_IAX, ndpi_search_iax, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/icecast.c b/src/lib/protocols/icecast.c index fa7ecaa2b..1e96054aa 100644 --- a/src/lib/protocols/icecast.c +++ b/src/lib/protocols/icecast.c @@ -87,9 +87,9 @@ void ndpi_search_icecast_tcp(struct ndpi_detection_module_struct *ndpi_struct, s } -void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_icecast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("IceCast", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IceCast", ndpi_struct, *id, NDPI_PROTOCOL_ICECAST, ndpi_search_icecast_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/iec60870-5-104.c b/src/lib/protocols/iec60870-5-104.c index dbb5e5b19..15921a76c 100644 --- a/src/lib/protocols/iec60870-5-104.c +++ b/src/lib/protocols/iec60870-5-104.c @@ -72,8 +72,8 @@ void ndpi_search_iec60870_tcp(struct ndpi_detection_module_struct *ndpi_struct, void init_104_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("IEC60870", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("IEC60870", ndpi_struct, *id, NDPI_PROTOCOL_IEC60870, ndpi_search_iec60870_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/imo.c b/src/lib/protocols/imo.c index effb40826..d3c9c23ca 100644 --- a/src/lib/protocols/imo.c +++ b/src/lib/protocols/imo.c @@ -68,8 +68,8 @@ void ndpi_search_imo(struct ndpi_detection_module_struct *ndpi_struct, struct nd void init_imo_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("IMO", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("IMO", ndpi_struct, *id, NDPI_PROTOCOL_IMO, ndpi_search_imo, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/ipp.c b/src/lib/protocols/ipp.c index b88b52708..2cb1d64fd 100644 --- a/src/lib/protocols/ipp.c +++ b/src/lib/protocols/ipp.c @@ -55,9 +55,9 @@ void ndpi_search_ipp(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_ipp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ipp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("IPP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IPP", ndpi_struct, *id, NDPI_PROTOCOL_IPP, ndpi_search_ipp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ipsec.c b/src/lib/protocols/ipsec.c index c2fb62c4a..de7e91288 100644 --- a/src/lib/protocols/ipsec.c +++ b/src/lib/protocols/ipsec.c @@ -183,9 +183,9 @@ void ndpi_search_ipsec(struct ndpi_detection_module_struct *ndpi_struct, } void init_ipsec_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("IPSec", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IPSec", ndpi_struct, *id, NDPI_PROTOCOL_IPSEC, ndpi_search_ipsec, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/irc.c b/src/lib/protocols/irc.c index a5da28ef1..8dac45ea4 100644 --- a/src/lib/protocols/irc.c +++ b/src/lib/protocols/irc.c @@ -616,9 +616,9 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc } void init_irc_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("IRC", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IRC", ndpi_struct, *id, NDPI_PROTOCOL_IRC, ndpi_search_irc_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/jabber.c b/src/lib/protocols/jabber.c index 389d33625..54d13a6fb 100644 --- a/src/lib/protocols/jabber.c +++ b/src/lib/protocols/jabber.c @@ -139,9 +139,9 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st } -void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Jabber", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Jabber", ndpi_struct, *id, NDPI_PROTOCOL_JABBER, ndpi_search_jabber_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/kakaotalk_voice.c b/src/lib/protocols/kakaotalk_voice.c index 36a8cdc3b..5919ef914 100644 --- a/src/lib/protocols/kakaotalk_voice.c +++ b/src/lib/protocols/kakaotalk_voice.c @@ -65,9 +65,9 @@ void ndpi_search_kakaotalk_voice(struct ndpi_detection_module_struct *ndpi_struc void init_kakaotalk_voice_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("KakaoTalk_Voice", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("KakaoTalk_Voice", ndpi_struct, *id, NDPI_PROTOCOL_KAKAOTALK_VOICE, ndpi_search_kakaotalk_voice, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c index 943ebe168..040f51d8a 100644 --- a/src/lib/protocols/kerberos.c +++ b/src/lib/protocols/kerberos.c @@ -697,8 +697,8 @@ static int ndpi_search_kerberos_extra(struct ndpi_detection_module_struct *ndpi_ } void init_kerberos_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Kerberos", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Kerberos", ndpi_struct, *id, NDPI_PROTOCOL_KERBEROS, ndpi_search_kerberos, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/kismet.c b/src/lib/protocols/kismet.c index 664b0cd3d..dbbbe04a2 100644 --- a/src/lib/protocols/kismet.c +++ b/src/lib/protocols/kismet.c @@ -58,9 +58,9 @@ void ndpi_search_kismet(struct ndpi_detection_module_struct *ndpi_struct, } void init_kismet_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("kismet", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("kismet", ndpi_struct, *id, NDPI_PROTOCOL_KISMET, ndpi_search_kismet, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/kontiki.c b/src/lib/protocols/kontiki.c index c9822f4bf..acb57ca7d 100644 --- a/src/lib/protocols/kontiki.c +++ b/src/lib/protocols/kontiki.c @@ -65,9 +65,9 @@ void ndpi_search_kontiki(struct ndpi_detection_module_struct *ndpi_struct, struc void init_kontiki_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Kontiki", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Kontiki", ndpi_struct, *id, NDPI_PROTOCOL_KONTIKI, ndpi_search_kontiki, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/ldap.c b/src/lib/protocols/ldap.c index 35ea2e199..ffd2fc306 100644 --- a/src/lib/protocols/ldap.c +++ b/src/lib/protocols/ldap.c @@ -69,9 +69,9 @@ void ndpi_search_ldap(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_ldap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ldap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("LDAP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("LDAP", ndpi_struct, *id, NDPI_PROTOCOL_LDAP, ndpi_search_ldap, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/line.c b/src/lib/protocols/line.c index a94b39037..64cb7253b 100644 --- a/src/lib/protocols/line.c +++ b/src/lib/protocols/line.c @@ -78,9 +78,9 @@ void ndpi_search_line(struct ndpi_detection_module_struct *ndpi_struct, } void init_line_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("LineCall", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("LineCall", ndpi_struct, *id, NDPI_PROTOCOL_LINE_CALL, ndpi_search_line, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/lisp.c b/src/lib/protocols/lisp.c index a1a2dafbb..48b5e34ba 100644 --- a/src/lib/protocols/lisp.c +++ b/src/lib/protocols/lisp.c @@ -85,9 +85,9 @@ void ndpi_search_lisp(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_lisp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_lisp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("LISP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("LISP", ndpi_struct, *id, NDPI_PROTOCOL_LISP, ndpi_search_lisp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/lotus_notes.c b/src/lib/protocols/lotus_notes.c index 4c9124388..e7e72cfdc 100644 --- a/src/lib/protocols/lotus_notes.c +++ b/src/lib/protocols/lotus_notes.c @@ -59,9 +59,9 @@ void ndpi_search_lotus_notes(struct ndpi_detection_module_struct *ndpi_struct, s } -void init_lotus_notes_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_lotus_notes_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("LotusNotes", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("LotusNotes", ndpi_struct, *id, NDPI_PROTOCOL_LOTUS_NOTES, ndpi_search_lotus_notes, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mail_imap.c b/src/lib/protocols/mail_imap.c index 2ae04f24b..08df418e5 100644 --- a/src/lib/protocols/mail_imap.c +++ b/src/lib/protocols/mail_imap.c @@ -359,9 +359,9 @@ void ndpi_search_mail_imap_tcp(struct ndpi_detection_module_struct *ndpi_struct, } -void init_mail_imap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_mail_imap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MAIL_IMAP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MAIL_IMAP", ndpi_struct, *id, NDPI_PROTOCOL_MAIL_IMAP, ndpi_search_mail_imap_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mail_pop.c b/src/lib/protocols/mail_pop.c index 1474af1be..cbcc65a5b 100644 --- a/src/lib/protocols/mail_pop.c +++ b/src/lib/protocols/mail_pop.c @@ -270,8 +270,8 @@ static void popInitExtraPacketProcessing(struct ndpi_flow_struct *flow) { /* **************************************** */ void init_mail_pop_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("MAIL_POP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("MAIL_POP", ndpi_struct, *id, NDPI_PROTOCOL_MAIL_POP, ndpi_search_mail_pop_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mail_smtp.c b/src/lib/protocols/mail_smtp.c index f6b0af060..af87e2b58 100644 --- a/src/lib/protocols/mail_smtp.c +++ b/src/lib/protocols/mail_smtp.c @@ -472,8 +472,8 @@ static void smtpInitExtraPacketProcessing(struct ndpi_flow_struct *flow) { /* **************************************** */ void init_mail_smtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("MAIL_SMTP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("MAIL_SMTP", ndpi_struct, *id, NDPI_PROTOCOL_MAIL_SMTP, ndpi_search_mail_smtp_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/maplestory.c b/src/lib/protocols/maplestory.c index 2c5adf290..33e2540a6 100644 --- a/src/lib/protocols/maplestory.c +++ b/src/lib/protocols/maplestory.c @@ -81,9 +81,9 @@ void ndpi_search_maplestory(struct ndpi_detection_module_struct *ndpi_struct, st } -void init_maplestory_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_maplestory_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MapleStory", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MapleStory", ndpi_struct, *id, NDPI_PROTOCOL_MAPLESTORY, ndpi_search_maplestory, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/megaco.c b/src/lib/protocols/megaco.c index e9430b377..addff2535 100644 --- a/src/lib/protocols/megaco.c +++ b/src/lib/protocols/megaco.c @@ -50,9 +50,9 @@ void ndpi_search_megaco(struct ndpi_detection_module_struct *ndpi_struct, } -void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Megaco", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Megaco", ndpi_struct, *id, NDPI_PROTOCOL_MEGACO, ndpi_search_megaco, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/memcached.c b/src/lib/protocols/memcached.c index ca25e3252..b727c6034 100644 --- a/src/lib/protocols/memcached.c +++ b/src/lib/protocols/memcached.c @@ -175,10 +175,10 @@ void ndpi_search_memcached( void init_memcached_dissector( struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { ndpi_set_bitmask_protocol_detection("MEMCACHED", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_MEMCACHED, ndpi_search_memcached, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mgcp.c b/src/lib/protocols/mgcp.c index 94da86a37..dfbbbcec5 100644 --- a/src/lib/protocols/mgcp.c +++ b/src/lib/protocols/mgcp.c @@ -98,9 +98,9 @@ void ndpi_search_mgcp(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_mgcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_mgcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MGCP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MGCP", ndpi_struct, *id, NDPI_PROTOCOL_MGCP, ndpi_search_mgcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/mining.c b/src/lib/protocols/mining.c index 1f6fecd7b..4ea3e0a27 100644 --- a/src/lib/protocols/mining.c +++ b/src/lib/protocols/mining.c @@ -185,9 +185,9 @@ void ndpi_search_mining(struct ndpi_detection_module_struct *ndpi_struct, /* ************************************************************************** */ void init_mining_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Mining", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Mining", ndpi_struct, *id, NDPI_PROTOCOL_MINING, ndpi_search_mining, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/modbus.c b/src/lib/protocols/modbus.c index 867bfa166..d00b5aa01 100644 --- a/src/lib/protocols/modbus.c +++ b/src/lib/protocols/modbus.c @@ -59,9 +59,9 @@ void ndpi_search_modbus_tcp(struct ndpi_detection_module_struct *ndpi_struct, void init_modbus_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Modbus", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Modbus", ndpi_struct, *id, NDPI_PROTOCOL_MODBUS, ndpi_search_modbus_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mongodb.c b/src/lib/protocols/mongodb.c index dd7ecba70..fe820dd46 100644 --- a/src/lib/protocols/mongodb.c +++ b/src/lib/protocols/mongodb.c @@ -138,8 +138,8 @@ void ndpi_search_mongodb(struct ndpi_detection_module_struct *ndpi_struct, void init_mongodb_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("MongoDB", ndpi_struct, detection_bitmask, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("MongoDB", ndpi_struct, *id, NDPI_PROTOCOL_MONGODB, ndpi_search_mongodb, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, diff --git a/src/lib/protocols/mpegdash.c b/src/lib/protocols/mpegdash.c index 147057ac3..fa39961b6 100644 --- a/src/lib/protocols/mpegdash.c +++ b/src/lib/protocols/mpegdash.c @@ -87,9 +87,9 @@ void ndpi_search_mpegdash_http(struct ndpi_detection_module_struct *ndpi_struct, } void init_mpegdash_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MpegDash", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MpegDash", ndpi_struct, *id, NDPI_PROTOCOL_MPEGDASH, ndpi_search_mpegdash_http, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mpegts.c b/src/lib/protocols/mpegts.c index 2a46ea4fa..88472fc01 100644 --- a/src/lib/protocols/mpegts.c +++ b/src/lib/protocols/mpegts.c @@ -51,9 +51,9 @@ void ndpi_search_mpegts(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_mpegts_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MPEG_TS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MPEG_TS", ndpi_struct, *id, NDPI_PROTOCOL_MPEGTS, ndpi_search_mpegts, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/mqtt.c b/src/lib/protocols/mqtt.c index 25594ad33..66eebc8a7 100644 --- a/src/lib/protocols/mqtt.c +++ b/src/lib/protocols/mqtt.c @@ -263,9 +263,9 @@ void ndpi_search_mqtt (struct ndpi_detection_module_struct *ndpi_struct, * Entry point for the ndpi library */ void init_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection ("MQTT", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection ("MQTT", ndpi_struct, *id, NDPI_PROTOCOL_MQTT, ndpi_search_mqtt, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mssql_tds.c b/src/lib/protocols/mssql_tds.c index 5962c7724..1f8b89b57 100644 --- a/src/lib/protocols/mssql_tds.c +++ b/src/lib/protocols/mssql_tds.c @@ -75,9 +75,9 @@ void ndpi_search_mssql_tds(struct ndpi_detection_module_struct *ndpi_struct, str } -void init_mssql_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_mssql_tds_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MsSQL_TDS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MsSQL_TDS", ndpi_struct, *id, NDPI_PROTOCOL_MSSQL_TDS, ndpi_search_mssql_tds, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/munin.c b/src/lib/protocols/munin.c index 0a6cce2dc..b99b5edae 100644 --- a/src/lib/protocols/munin.c +++ b/src/lib/protocols/munin.c @@ -79,9 +79,9 @@ void ndpi_search_munin(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************** */ void init_munin_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Munin", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Munin", ndpi_struct, *id, NDPI_PROTOCOL_MUNIN, ndpi_search_munin, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/mysql.c b/src/lib/protocols/mysql.c index 83c5d9787..4aba95798 100644 --- a/src/lib/protocols/mysql.c +++ b/src/lib/protocols/mysql.c @@ -79,9 +79,9 @@ void ndpi_search_mysql_tcp(struct ndpi_detection_module_struct *ndpi_struct, str } -void init_mysql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_mysql_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("MySQL", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("MySQL", ndpi_struct, *id, NDPI_PROTOCOL_MYSQL, ndpi_search_mysql_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/natpmp.c b/src/lib/protocols/natpmp.c index 100ff17c0..6dcc017e1 100644 --- a/src/lib/protocols/natpmp.c +++ b/src/lib/protocols/natpmp.c @@ -188,9 +188,9 @@ void ndpi_search_natpmp(struct ndpi_detection_module_struct *ndpi_struct, } void init_natpmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("NAT-PMP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("NAT-PMP", ndpi_struct, *id, NDPI_PROTOCOL_NATPMP, ndpi_search_natpmp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/nats.c b/src/lib/protocols/nats.c index a544ef66d..6048b1e43 100644 --- a/src/lib/protocols/nats.c +++ b/src/lib/protocols/nats.c @@ -70,8 +70,8 @@ void ndpi_search_nats_tcp(struct ndpi_detection_module_struct *ndpi_struct, void init_nats_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Nats", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Nats", ndpi_struct, *id, NDPI_PROTOCOL_NATS, ndpi_search_nats_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/nest_log_sink.c b/src/lib/protocols/nest_log_sink.c index 01bce9e64..c26fc722a 100644 --- a/src/lib/protocols/nest_log_sink.c +++ b/src/lib/protocols/nest_log_sink.c @@ -65,10 +65,10 @@ void ndpi_search_nest_log_sink( void init_nest_log_sink_dissector( struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { ndpi_set_bitmask_protocol_detection("NEST_LOG_SINK", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_NEST_LOG_SINK, ndpi_search_nest_log_sink, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/netbios.c b/src/lib/protocols/netbios.c index 45119ecbf..fbfbea277 100644 --- a/src/lib/protocols/netbios.c +++ b/src/lib/protocols/netbios.c @@ -414,9 +414,9 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, /* ****************************************************************** */ -void init_netbios_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_netbios_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("NETBIOS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("NETBIOS", ndpi_struct, *id, NDPI_PROTOCOL_NETBIOS, ndpi_search_netbios, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/netflow.c b/src/lib/protocols/netflow.c index 963741c18..239e7e29f 100644 --- a/src/lib/protocols/netflow.c +++ b/src/lib/protocols/netflow.c @@ -181,9 +181,9 @@ void ndpi_search_netflow(struct ndpi_detection_module_struct *ndpi_struct, struc NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_netflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_netflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("NetFlow", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("NetFlow", ndpi_struct, *id, NDPI_PROTOCOL_NETFLOW, ndpi_search_netflow, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/nfs.c b/src/lib/protocols/nfs.c index fefd15997..68e3d07bf 100644 --- a/src/lib/protocols/nfs.c +++ b/src/lib/protocols/nfs.c @@ -87,9 +87,9 @@ void ndpi_search_nfs(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_nfs_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_nfs_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("NFS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("NFS", ndpi_struct, *id, NDPI_PROTOCOL_NFS, ndpi_search_nfs, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/nintendo.c b/src/lib/protocols/nintendo.c index b81fc61a2..ca12124e2 100644 --- a/src/lib/protocols/nintendo.c +++ b/src/lib/protocols/nintendo.c @@ -55,8 +55,8 @@ void ndpi_search_nintendo(struct ndpi_detection_module_struct *ndpi_struct, stru } void init_nintendo_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Nintendo", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Nintendo", ndpi_struct, *id, NDPI_PROTOCOL_NINTENDO, ndpi_search_nintendo, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/noe.c b/src/lib/protocols/noe.c index 23c2b663a..cafe50df2 100644 --- a/src/lib/protocols/noe.c +++ b/src/lib/protocols/noe.c @@ -70,9 +70,9 @@ void ndpi_search_noe(struct ndpi_detection_module_struct *ndpi_struct, } -void init_noe_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_noe_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("NOE", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("NOE", ndpi_struct, *id, NDPI_PROTOCOL_NOE, ndpi_search_noe, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/non_tcp_udp.c b/src/lib/protocols/non_tcp_udp.c index f219ccb3e..44ae5ac01 100644 --- a/src/lib/protocols/non_tcp_udp.c +++ b/src/lib/protocols/non_tcp_udp.c @@ -100,13 +100,13 @@ 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, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { /* 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_set_bitmask_protocol_detection("IPSec", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IPSec", ndpi_struct, *id, NDPI_PROTOCOL_IPSEC, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -114,7 +114,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_GRE", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_GRE", ndpi_struct, *id, NDPI_PROTOCOL_IP_GRE, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -122,7 +122,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_ICMP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_ICMP", ndpi_struct, *id, NDPI_PROTOCOL_IP_ICMP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -130,7 +130,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_IGMP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_IGMP", ndpi_struct, *id, NDPI_PROTOCOL_IP_IGMP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -138,7 +138,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_EGP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_EGP", ndpi_struct, *id, NDPI_PROTOCOL_IP_EGP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -146,7 +146,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_SCTP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_SCTP", ndpi_struct, *id, NDPI_PROTOCOL_IP_SCTP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -154,7 +154,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_PGM", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_PGM", ndpi_struct, *id, NDPI_PROTOCOL_IP_PGM, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -162,7 +162,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_OSPF", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_OSPF", ndpi_struct, *id, NDPI_PROTOCOL_IP_OSPF, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -170,7 +170,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_IP_IN_IP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_IP_IN_IP", ndpi_struct, *id, NDPI_PROTOCOL_IP_IP_IN_IP, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -178,7 +178,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_ICMPV6", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_ICMPV6", ndpi_struct, *id, NDPI_PROTOCOL_IP_ICMPV6, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, @@ -186,7 +186,7 @@ void init_non_tcp_udp_dissector(struct ndpi_detection_module_struct *ndpi_struct ADD_TO_DETECTION_BITMASK); *id += 1; - ndpi_set_bitmask_protocol_detection("IP_PIM", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("IP_PIM", ndpi_struct, *id, NDPI_PROTOCOL_IP_PIM, ndpi_search_in_non_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_IPV4_OR_IPV6, diff --git a/src/lib/protocols/ntp.c b/src/lib/protocols/ntp.c index e67638cbf..e4552968f 100644 --- a/src/lib/protocols/ntp.c +++ b/src/lib/protocols/ntp.c @@ -63,9 +63,9 @@ void ndpi_search_ntp_udp(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_ntp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ntp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("NTP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("NTP", ndpi_struct, *id, NDPI_PROTOCOL_NTP, ndpi_search_ntp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/ookla.c b/src/lib/protocols/ookla.c index a57231c30..f3aec6e68 100644 --- a/src/lib/protocols/ookla.c +++ b/src/lib/protocols/ookla.c @@ -134,8 +134,8 @@ void ndpi_search_ookla(struct ndpi_detection_module_struct* ndpi_struct, struct /* ************************************************************* */ void init_ookla_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Ookla", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Ookla", ndpi_struct, *id, NDPI_PROTOCOL_OOKLA, ndpi_search_ookla, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/openft.c b/src/lib/protocols/openft.c index 52d18c7c7..c9bfd4ea8 100644 --- a/src/lib/protocols/openft.c +++ b/src/lib/protocols/openft.c @@ -54,9 +54,9 @@ void ndpi_search_openft_tcp(struct ndpi_detection_module_struct } -void init_openft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_openft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("OpenFT", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("OpenFT", ndpi_struct, *id, NDPI_PROTOCOL_OPENFT, ndpi_search_openft_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/openvpn.c b/src/lib/protocols/openvpn.c index 0ecef5cc8..d124c24f1 100644 --- a/src/lib/protocols/openvpn.c +++ b/src/lib/protocols/openvpn.c @@ -177,8 +177,8 @@ void ndpi_search_openvpn(struct ndpi_detection_module_struct* ndpi_struct, } void init_openvpn_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("OpenVPN", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("OpenVPN", ndpi_struct, *id, NDPI_PROTOCOL_OPENVPN, ndpi_search_openvpn, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/oracle.c b/src/lib/protocols/oracle.c index 341a801f2..7049c7db0 100644 --- a/src/lib/protocols/oracle.c +++ b/src/lib/protocols/oracle.c @@ -60,9 +60,9 @@ void ndpi_search_oracle(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_oracle_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_oracle_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Oracle", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Oracle", ndpi_struct, *id, NDPI_PROTOCOL_ORACLE, ndpi_search_oracle, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/postgres.c b/src/lib/protocols/postgres.c index 43645daf7..fbefd44b5 100644 --- a/src/lib/protocols/postgres.c +++ b/src/lib/protocols/postgres.c @@ -117,9 +117,9 @@ void ndpi_search_postgres_tcp(struct ndpi_detection_module_struct } -void init_postgres_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_postgres_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("PostgreSQL", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("PostgreSQL", ndpi_struct, *id, NDPI_PROTOCOL_POSTGRES, ndpi_search_postgres_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ppstream.c b/src/lib/protocols/ppstream.c index b5af62e5c..d54a994af 100644 --- a/src/lib/protocols/ppstream.c +++ b/src/lib/protocols/ppstream.c @@ -223,9 +223,9 @@ void ndpi_search_ppstream(struct ndpi_detection_module_struct } -void init_ppstream_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ppstream_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("PPStream", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("PPStream", ndpi_struct, *id, NDPI_PROTOCOL_PPSTREAM, ndpi_search_ppstream, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/pptp.c b/src/lib/protocols/pptp.c index 083bdb337..69a067f1b 100644 --- a/src/lib/protocols/pptp.c +++ b/src/lib/protocols/pptp.c @@ -56,9 +56,9 @@ void ndpi_search_pptp(struct ndpi_detection_module_struct } -void init_pptp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_pptp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("PPTP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("PPTP", ndpi_struct, *id, NDPI_PROTOCOL_PPTP, ndpi_search_pptp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/qq.c b/src/lib/protocols/qq.c index 6d7396156..ffbbb3e3b 100644 --- a/src/lib/protocols/qq.c +++ b/src/lib/protocols/qq.c @@ -58,10 +58,9 @@ void ndpi_search_qq(struct ndpi_detection_module_struct *ndpi_struct, struct ndp } -void init_qq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_qq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("QQ", ndpi_struct, *id, NDPI_PROTOCOL_QQ, ndpi_search_qq, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c index 2f9a0927c..b9b10b9c1 100644 --- a/src/lib/protocols/quic.c +++ b/src/lib/protocols/quic.c @@ -1795,10 +1795,9 @@ static void ndpi_search_quic(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************************** */ -void init_quic_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_quic_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("QUIC", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("QUIC", ndpi_struct, *id, NDPI_PROTOCOL_QUIC, ndpi_search_quic, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); diff --git a/src/lib/protocols/radius.c b/src/lib/protocols/radius.c index b1115e6d8..2107bc442 100644 --- a/src/lib/protocols/radius.c +++ b/src/lib/protocols/radius.c @@ -76,9 +76,9 @@ void ndpi_search_radius(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_radius_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_radius_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Radius", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Radius", ndpi_struct, *id, NDPI_PROTOCOL_RADIUS, ndpi_search_radius, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/raknet.c b/src/lib/protocols/raknet.c index 66fa0d066..260a74e54 100644 --- a/src/lib/protocols/raknet.c +++ b/src/lib/protocols/raknet.c @@ -339,9 +339,9 @@ void ndpi_search_raknet(struct ndpi_detection_module_struct *ndpi_struct, } void init_raknet_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RakNet", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RakNet", ndpi_struct, *id, NDPI_PROTOCOL_RAKNET, ndpi_search_raknet, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/rdp.c b/src/lib/protocols/rdp.c index b63c5a6a6..9f6a6a530 100644 --- a/src/lib/protocols/rdp.c +++ b/src/lib/protocols/rdp.c @@ -97,9 +97,9 @@ void ndpi_search_rdp(struct ndpi_detection_module_struct *ndpi_struct, } -void init_rdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_rdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RDP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RDP", ndpi_struct, *id, NDPI_PROTOCOL_RDP, ndpi_search_rdp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/redis_net.c b/src/lib/protocols/redis_net.c index 4ddcf13ef..1fedafdea 100644 --- a/src/lib/protocols/redis_net.c +++ b/src/lib/protocols/redis_net.c @@ -83,9 +83,9 @@ void ndpi_search_redis(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_redis_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_redis_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Redis", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Redis", ndpi_struct, *id, NDPI_PROTOCOL_REDIS, ndpi_search_redis, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/riotgames.c b/src/lib/protocols/riotgames.c index d73af8276..24e101f10 100644 --- a/src/lib/protocols/riotgames.c +++ b/src/lib/protocols/riotgames.c @@ -67,9 +67,9 @@ void ndpi_search_riotgames(struct ndpi_detection_module_struct *ndpi_struct, } void init_riotgames_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RiotGames", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RiotGames", ndpi_struct, *id, NDPI_PROTOCOL_RIOTGAMES, ndpi_search_riotgames, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/rsh.c b/src/lib/protocols/rsh.c index a3414562c..e2431dfb6 100644 --- a/src/lib/protocols/rsh.c +++ b/src/lib/protocols/rsh.c @@ -150,9 +150,9 @@ void ndpi_search_rsh(struct ndpi_detection_module_struct * ndpi_struct, void init_rsh_dissector(struct ndpi_detection_module_struct * ndpi_struct, - u_int32_t * id, NDPI_PROTOCOL_BITMASK * detection_bitmask) + u_int32_t * id) { - ndpi_set_bitmask_protocol_detection("RSH", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RSH", ndpi_struct, *id, NDPI_PROTOCOL_RSH, ndpi_search_rsh, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, diff --git a/src/lib/protocols/rsync.c b/src/lib/protocols/rsync.c index 769c56d5e..eeda3dce8 100644 --- a/src/lib/protocols/rsync.c +++ b/src/lib/protocols/rsync.c @@ -56,9 +56,9 @@ void ndpi_search_rsync(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_rsync_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_rsync_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RSYNC", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RSYNC", ndpi_struct, *id, NDPI_PROTOCOL_RSYNC, ndpi_search_rsync, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/rtcp.c b/src/lib/protocols/rtcp.c index 0c0205ba6..e09432711 100644 --- a/src/lib/protocols/rtcp.c +++ b/src/lib/protocols/rtcp.c @@ -68,9 +68,9 @@ void ndpi_search_rtcp(struct ndpi_detection_module_struct *ndpi_struct, } -void init_rtcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_rtcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RTCP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RTCP", ndpi_struct, *id, NDPI_PROTOCOL_RTCP, ndpi_search_rtcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/rtmp.c b/src/lib/protocols/rtmp.c index 0b92ca7fa..8bcb57e18 100644 --- a/src/lib/protocols/rtmp.c +++ b/src/lib/protocols/rtmp.c @@ -87,9 +87,9 @@ void ndpi_search_rtmp(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_rtmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_rtmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RTMP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RTMP", ndpi_struct, *id, NDPI_PROTOCOL_RTMP, ndpi_search_rtmp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/rtp.c b/src/lib/protocols/rtp.c index ba62a2379..779c6b9f8 100644 --- a/src/lib/protocols/rtp.c +++ b/src/lib/protocols/rtp.c @@ -284,8 +284,8 @@ static void ndpi_search_rtp(struct ndpi_detection_module_struct *ndpi_struct, st /* *************************************************************** */ void init_rtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("RTP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("RTP", ndpi_struct, *id, NDPI_PROTOCOL_RTP, ndpi_search_rtp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/rtsp.c b/src/lib/protocols/rtsp.c index f49530ecf..4eee837eb 100644 --- a/src/lib/protocols/rtsp.c +++ b/src/lib/protocols/rtsp.c @@ -104,9 +104,9 @@ void ndpi_search_rtsp_tcp_udp(struct ndpi_detection_module_struct } -void init_rtsp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_rtsp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RTSP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RTSP", ndpi_struct, *id, NDPI_PROTOCOL_RTSP, ndpi_search_rtsp_tcp_udp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/rx.c b/src/lib/protocols/rx.c index 5022d55a7..53e9182c9 100644 --- a/src/lib/protocols/rx.c +++ b/src/lib/protocols/rx.c @@ -212,10 +212,9 @@ void ndpi_search_rx(struct ndpi_detection_module_struct *ndpi_struct, } void init_rx_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("RX", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("RX", ndpi_struct, *id, NDPI_PROTOCOL_RX, ndpi_search_rx, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/s7comm.c b/src/lib/protocols/s7comm.c index c0aba2119..052796bc0 100644 --- a/src/lib/protocols/s7comm.c +++ b/src/lib/protocols/s7comm.c @@ -45,9 +45,9 @@ void ndpi_search_s7comm_tcp(struct ndpi_detection_module_struct *ndpi_struct, }
void init_s7comm_dissector(struct ndpi_detection_module_struct *ndpi_struct,
- u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) {
+ u_int32_t *id) {
- ndpi_set_bitmask_protocol_detection("S7COMM", ndpi_struct, detection_bitmask, *id,
+ ndpi_set_bitmask_protocol_detection("S7COMM", ndpi_struct, *id,
NDPI_PROTOCOL_S7COMM,
ndpi_search_s7comm_tcp,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
diff --git a/src/lib/protocols/sd_rtn.c b/src/lib/protocols/sd_rtn.c index 1ddd6af06..7302a883c 100644 --- a/src/lib/protocols/sd_rtn.c +++ b/src/lib/protocols/sd_rtn.c @@ -83,9 +83,9 @@ void ndpi_search_sd_rtn(struct ndpi_detection_module_struct *ndpi_struct, } void init_sd_rtn_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SD-RTN", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SD-RTN", ndpi_struct, *id, NDPI_PROTOCOL_SD_RTN, ndpi_search_sd_rtn, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/sflow.c b/src/lib/protocols/sflow.c index cf0b9fcad..37187b194 100644 --- a/src/lib/protocols/sflow.c +++ b/src/lib/protocols/sflow.c @@ -54,9 +54,9 @@ void ndpi_search_sflow(struct ndpi_detection_module_struct *ndpi_struct, struct NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_sflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_sflow_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("sFlow", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("sFlow", ndpi_struct, *id, NDPI_PROTOCOL_SFLOW, ndpi_search_sflow, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/shoutcast.c b/src/lib/protocols/shoutcast.c index 4a9f282d8..155e2cea7 100644 --- a/src/lib/protocols/shoutcast.c +++ b/src/lib/protocols/shoutcast.c @@ -104,9 +104,9 @@ void ndpi_search_shoutcast_tcp(struct ndpi_detection_module_struct } -void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("ShoutCast", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("ShoutCast", ndpi_struct, *id, NDPI_PROTOCOL_SHOUTCAST, ndpi_search_shoutcast_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/sip.c b/src/lib/protocols/sip.c index 6352b27d7..5389fadba 100644 --- a/src/lib/protocols/sip.c +++ b/src/lib/protocols/sip.c @@ -200,9 +200,9 @@ void ndpi_search_sip(struct ndpi_detection_module_struct *ndpi_struct, struct nd ndpi_search_sip_handshake(ndpi_struct, flow); } -void init_sip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_sip_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SIP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SIP", ndpi_struct, *id, NDPI_PROTOCOL_SIP, ndpi_search_sip, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,/* Fix courtesy of Miguel Quesada <mquesadab@gmail.com> */ diff --git a/src/lib/protocols/skinny.c b/src/lib/protocols/skinny.c index c9b4ebe45..ec4e18483 100644 --- a/src/lib/protocols/skinny.c +++ b/src/lib/protocols/skinny.c @@ -90,9 +90,9 @@ void ndpi_search_skinny(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_skinny_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_skinny_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("CiscoSkinny", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("CiscoSkinny", ndpi_struct, *id, NDPI_PROTOCOL_SKINNY, ndpi_search_skinny, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c index 4bfe342a4..6b9c3cf69 100644 --- a/src/lib/protocols/skype.c +++ b/src/lib/protocols/skype.c @@ -115,9 +115,9 @@ void ndpi_search_skype(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Skype_Teams", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Skype_Teams", ndpi_struct, *id, NDPI_PROTOCOL_SKYPE_TEAMS, ndpi_search_skype, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/smb.c b/src/lib/protocols/smb.c index 2633fc9b7..92db71836 100644 --- a/src/lib/protocols/smb.c +++ b/src/lib/protocols/smb.c @@ -68,9 +68,9 @@ void ndpi_search_smb_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SMB", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SMB", ndpi_struct, *id, NDPI_PROTOCOL_SMBV23, ndpi_search_smb_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/smpp.c b/src/lib/protocols/smpp.c index 2b3542a9b..0ff1f4de4 100644 --- a/src/lib/protocols/smpp.c +++ b/src/lib/protocols/smpp.c @@ -310,10 +310,9 @@ void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct, void init_smpp_dissector(struct ndpi_detection_module_struct* ndpi_struct, - u_int32_t* id, - NDPI_PROTOCOL_BITMASK* detection_bitmask) + u_int32_t* id) { - ndpi_set_bitmask_protocol_detection("SMPP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SMPP", ndpi_struct, *id, NDPI_PROTOCOL_SMPP, ndpi_search_smpp_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/snmp_proto.c b/src/lib/protocols/snmp_proto.c index 010d79521..c59509c48 100644 --- a/src/lib/protocols/snmp_proto.c +++ b/src/lib/protocols/snmp_proto.c @@ -144,8 +144,8 @@ void ndpi_search_snmp(struct ndpi_detection_module_struct *ndpi_struct, } void init_snmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("SNMP", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("SNMP", ndpi_struct, *id, NDPI_PROTOCOL_SNMP, ndpi_search_snmp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/soap.c b/src/lib/protocols/soap.c index 82e2ab428..9b51a84d4 100644 --- a/src/lib/protocols/soap.c +++ b/src/lib/protocols/soap.c @@ -79,11 +79,10 @@ void ndpi_search_soap(struct ndpi_detection_module_struct *ndpi_struct, } } -void init_soap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_soap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection( - "SOAP", ndpi_struct, detection_bitmask, *id, + "SOAP", ndpi_struct, *id, NDPI_PROTOCOL_SOAP, ndpi_search_soap, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); *id += 1; diff --git a/src/lib/protocols/socks45.c b/src/lib/protocols/socks45.c index e4f4e7ff6..72703db96 100644 --- a/src/lib/protocols/socks45.c +++ b/src/lib/protocols/socks45.c @@ -130,9 +130,9 @@ void ndpi_search_socks(struct ndpi_detection_module_struct *ndpi_struct, struct } } -void init_socks_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_socks_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SOCKS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SOCKS", ndpi_struct, *id, NDPI_PROTOCOL_SOCKS, ndpi_search_socks, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/softether.c b/src/lib/protocols/softether.c index ea59a9a99..57a2fddff 100644 --- a/src/lib/protocols/softether.c +++ b/src/lib/protocols/softether.c @@ -341,8 +341,8 @@ static int ndpi_search_softether_again(struct ndpi_detection_module_struct *ndpi /* ***************************************************** */ void init_softether_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Softether", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Softether", ndpi_struct, *id, NDPI_PROTOCOL_SOFTETHER, ndpi_search_softether, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/someip.c b/src/lib/protocols/someip.c index 8d7baa230..30c21dee8 100644 --- a/src/lib/protocols/someip.c +++ b/src/lib/protocols/someip.c @@ -193,9 +193,9 @@ void ndpi_search_someip (struct ndpi_detection_module_struct *ndpi_struct, * Entry point for the ndpi library */ void init_someip_dissector (struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection ("SOME/IP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection ("SOME/IP", ndpi_struct, *id, NDPI_PROTOCOL_SOMEIP, ndpi_search_someip, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/sopcast.c b/src/lib/protocols/sopcast.c index 789e662e1..7d44cabaa 100644 --- a/src/lib/protocols/sopcast.c +++ b/src/lib/protocols/sopcast.c @@ -212,9 +212,9 @@ void ndpi_search_sopcast(struct ndpi_detection_module_struct } -void init_sopcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_sopcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Sopcast", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Sopcast", ndpi_struct, *id, NDPI_PROTOCOL_SOPCAST, ndpi_search_sopcast, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/spotify.c b/src/lib/protocols/spotify.c index 87a9a2542..b09a7b595 100644 --- a/src/lib/protocols/spotify.c +++ b/src/lib/protocols/spotify.c @@ -79,9 +79,9 @@ void ndpi_search_spotify(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SPOTIFY", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SPOTIFY", ndpi_struct, *id, NDPI_PROTOCOL_SPOTIFY, ndpi_search_spotify, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ssdp.c b/src/lib/protocols/ssdp.c index 6fe96309a..45d2b8aa8 100644 --- a/src/lib/protocols/ssdp.c +++ b/src/lib/protocols/ssdp.c @@ -91,9 +91,9 @@ void ndpi_search_ssdp(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_ssdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ssdp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SSDP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SSDP", ndpi_struct, *id, NDPI_PROTOCOL_SSDP, ndpi_search_ssdp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/ssh.c b/src/lib/protocols/ssh.c index 935ec3cc7..0ad010a10 100644 --- a/src/lib/protocols/ssh.c +++ b/src/lib/protocols/ssh.c @@ -530,9 +530,9 @@ static void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct /* ************************************************************************ */ -void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("SSH", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("SSH", ndpi_struct, *id, NDPI_PROTOCOL_SSH, ndpi_search_ssh_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/starcraft.c b/src/lib/protocols/starcraft.c index 0a761fb4c..d7368c4ca 100644 --- a/src/lib/protocols/starcraft.c +++ b/src/lib/protocols/starcraft.c @@ -145,9 +145,9 @@ void ndpi_search_starcraft(struct ndpi_detection_module_struct* ndpi_struct, str } } -void init_starcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_starcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Starcraft", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Starcraft", ndpi_struct, *id, NDPI_PROTOCOL_STARCRAFT, ndpi_search_starcraft, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, diff --git a/src/lib/protocols/stealthnet.c b/src/lib/protocols/stealthnet.c index cba9cbf30..f4099e194 100644 --- a/src/lib/protocols/stealthnet.c +++ b/src/lib/protocols/stealthnet.c @@ -54,10 +54,10 @@ void ndpi_search_stealthnet(struct ndpi_detection_module_struct } -void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_stealthnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Stealthnet", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Stealthnet", ndpi_struct, *id, NDPI_PROTOCOL_STEALTHNET, ndpi_search_stealthnet, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/steam.c b/src/lib/protocols/steam.c index 3a2c47db5..0dc993245 100644 --- a/src/lib/protocols/steam.c +++ b/src/lib/protocols/steam.c @@ -300,8 +300,8 @@ void ndpi_search_steam(struct ndpi_detection_module_struct *ndpi_struct, struct void init_steam_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Steam", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Steam", ndpi_struct, *id, NDPI_PROTOCOL_STEAM, ndpi_search_steam, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c index 28f740180..8610565ba 100644 --- a/src/lib/protocols/stun.c +++ b/src/lib/protocols/stun.c @@ -501,9 +501,8 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("STUN", ndpi_struct, detection_bitmask, *id, +void init_stun_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("STUN", ndpi_struct, *id, NDPI_PROTOCOL_STUN, ndpi_search_stun, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/syncthing.c b/src/lib/protocols/syncthing.c index 904cad44a..9ccb3d97f 100644 --- a/src/lib/protocols/syncthing.c +++ b/src/lib/protocols/syncthing.c @@ -60,9 +60,9 @@ void ndpi_search_syncthing(struct ndpi_detection_module_struct *ndpi_struct, } void init_syncthing_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Syncthing", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Syncthing", ndpi_struct, *id, NDPI_PROTOCOL_SYNCTHING, ndpi_search_syncthing, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/syslog.c b/src/lib/protocols/syslog.c index 1b072de07..e6e8079e0 100644 --- a/src/lib/protocols/syslog.c +++ b/src/lib/protocols/syslog.c @@ -103,9 +103,9 @@ void ndpi_search_syslog(struct ndpi_detection_module_struct } -void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_syslog_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Syslog", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Syslog", ndpi_struct, *id, NDPI_PROTOCOL_SYSLOG, ndpi_search_syslog, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/teamspeak.c b/src/lib/protocols/teamspeak.c index 1a3acdb22..a017ff1d2 100644 --- a/src/lib/protocols/teamspeak.c +++ b/src/lib/protocols/teamspeak.c @@ -96,10 +96,9 @@ ts3_license_weblist: } } -void init_teamspeak_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_teamspeak_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TeamSpeak", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TeamSpeak", ndpi_struct, *id, NDPI_PROTOCOL_TEAMSPEAK, ndpi_search_teamspeak, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/teamviewer.c b/src/lib/protocols/teamviewer.c index 37aa01052..6f9b6270c 100644 --- a/src/lib/protocols/teamviewer.c +++ b/src/lib/protocols/teamviewer.c @@ -103,9 +103,9 @@ void ndpi_search_teamview(struct ndpi_detection_module_struct *ndpi_struct, stru } -void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_teamviewer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TeamViewer", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TeamViewer", ndpi_struct, *id, NDPI_PROTOCOL_TEAMVIEWER, ndpi_search_teamview, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/telegram.c b/src/lib/protocols/telegram.c index 93c308304..ec9179b93 100644 --- a/src/lib/protocols/telegram.c +++ b/src/lib/protocols/telegram.c @@ -104,9 +104,9 @@ void ndpi_search_telegram(struct ndpi_detection_module_struct *ndpi_struct, } -void init_telegram_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_telegram_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Telegram", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Telegram", ndpi_struct, *id, NDPI_PROTOCOL_TELEGRAM, ndpi_search_telegram, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/telnet.c b/src/lib/protocols/telnet.c index 5bec572e6..9f967a8d8 100644 --- a/src/lib/protocols/telnet.c +++ b/src/lib/protocols/telnet.c @@ -216,9 +216,9 @@ void ndpi_search_telnet_tcp(struct ndpi_detection_module_struct *ndpi_struct, } -void init_telnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_telnet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Telnet", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Telnet", ndpi_struct, *id, NDPI_PROTOCOL_TELNET, ndpi_search_telnet_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/teredo.c b/src/lib/protocols/teredo.c index 4f75d300d..00be54715 100644 --- a/src/lib/protocols/teredo.c +++ b/src/lib/protocols/teredo.c @@ -43,9 +43,9 @@ void ndpi_search_teredo(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_teredo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_teredo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TEREDO", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TEREDO", ndpi_struct, *id, NDPI_PROTOCOL_TEREDO, ndpi_search_teredo, /* Teredo is inherently IPV4 only */ diff --git a/src/lib/protocols/tftp.c b/src/lib/protocols/tftp.c index 2366bbe1f..58e585461 100644 --- a/src/lib/protocols/tftp.c +++ b/src/lib/protocols/tftp.c @@ -156,9 +156,9 @@ void ndpi_search_tftp(struct ndpi_detection_module_struct } -void init_tftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_tftp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TFTP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TFTP", ndpi_struct, *id, NDPI_PROTOCOL_TFTP, ndpi_search_tftp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/threema.c b/src/lib/protocols/threema.c index 348b70988..464710ba5 100644 --- a/src/lib/protocols/threema.c +++ b/src/lib/protocols/threema.c @@ -89,10 +89,9 @@ static void ndpi_search_threema(struct ndpi_detection_module_struct *ndpi_struct } void init_threema_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Threema", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Threema", ndpi_struct, *id, NDPI_PROTOCOL_THREEMA, ndpi_search_threema, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/thunder.c b/src/lib/protocols/thunder.c index caafa4e4c..258e7750f 100644 --- a/src/lib/protocols/thunder.c +++ b/src/lib/protocols/thunder.c @@ -180,9 +180,9 @@ void ndpi_search_thunder(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_thunder_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Thunder", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Thunder", ndpi_struct, *id, NDPI_PROTOCOL_THUNDER, ndpi_search_thunder, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/tinc.c b/src/lib/protocols/tinc.c index 4b3282bec..55fcc3d86 100644 --- a/src/lib/protocols/tinc.c +++ b/src/lib/protocols/tinc.c @@ -140,9 +140,9 @@ void ndpi_search_tinc(struct ndpi_detection_module_struct* ndpi_struct, struct n } } -void init_tinc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_tinc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TINC", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TINC", ndpi_struct, *id, NDPI_PROTOCOL_TINC, ndpi_search_tinc, NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, /* TODO: IPv6? */ diff --git a/src/lib/protocols/tivoconnect.c b/src/lib/protocols/tivoconnect.c index 2d4d59e4c..de0417feb 100644 --- a/src/lib/protocols/tivoconnect.c +++ b/src/lib/protocols/tivoconnect.c @@ -133,9 +133,9 @@ void ndpi_search_tivoconnect(struct ndpi_detection_module_struct *ndpi_struct, } void init_tivoconnect_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TiVoConnect", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TiVoConnect", ndpi_struct, *id, NDPI_PROTOCOL_TIVOCONNECT, ndpi_search_tivoconnect, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index 6bc6bf059..49c465bae 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -2645,8 +2645,8 @@ static void ndpi_search_tls_wrapper(struct ndpi_detection_module_struct *ndpi_st /* **************************************** */ void init_tls_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("TLS", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("TLS", ndpi_struct, *id, NDPI_PROTOCOL_TLS, ndpi_search_tls_wrapper, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, @@ -2657,7 +2657,7 @@ void init_tls_dissector(struct ndpi_detection_module_struct *ndpi_struct, /* *************************************************** */ - ndpi_set_bitmask_protocol_detection("DTLS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("DTLS", ndpi_struct, *id, NDPI_PROTOCOL_DTLS, ndpi_search_tls_wrapper, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/tocaboca.c b/src/lib/protocols/tocaboca.c index 378f1b753..cbea2ad81 100644 --- a/src/lib/protocols/tocaboca.c +++ b/src/lib/protocols/tocaboca.c @@ -76,9 +76,9 @@ void ndpi_search_toca_boca(struct ndpi_detection_module_struct *ndpi_struct, } void init_toca_boca_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TocaBoca", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TocaBoca", ndpi_struct, *id, NDPI_PROTOCOL_TOCA_BOCA, ndpi_search_toca_boca, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/tvuplayer.c b/src/lib/protocols/tvuplayer.c index 3843c153b..0268d79b9 100644 --- a/src/lib/protocols/tvuplayer.c +++ b/src/lib/protocols/tvuplayer.c @@ -147,9 +147,9 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str } -void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("TVUplayer", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("TVUplayer", ndpi_struct, *id, NDPI_PROTOCOL_TVUPLAYER, ndpi_search_tvuplayer, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/ubntac2.c b/src/lib/protocols/ubntac2.c index 7e56c022f..f36370555 100644 --- a/src/lib/protocols/ubntac2.c +++ b/src/lib/protocols/ubntac2.c @@ -82,9 +82,9 @@ void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_ubntac2_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("UBNTAC2", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("UBNTAC2", ndpi_struct, *id, NDPI_PROTOCOL_UBNTAC2, ndpi_search_ubntac2, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/ultrasurf.c b/src/lib/protocols/ultrasurf.c index cac25f84e..4875e8204 100644 --- a/src/lib/protocols/ultrasurf.c +++ b/src/lib/protocols/ultrasurf.c @@ -58,9 +58,9 @@ void ndpi_search_ultrasurf(struct ndpi_detection_module_struct *ndpi_struct, } void init_ultrasurf_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("UltraSurf", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("UltraSurf", ndpi_struct, *id, NDPI_PROTOCOL_ULTRASURF, ndpi_search_ultrasurf, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/usenet.c b/src/lib/protocols/usenet.c index 67dc7d9de..7ab580335 100644 --- a/src/lib/protocols/usenet.c +++ b/src/lib/protocols/usenet.c @@ -95,9 +95,9 @@ void ndpi_search_usenet_tcp(struct ndpi_detection_module_struct } -void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Usenet", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Usenet", ndpi_struct, *id, NDPI_PROTOCOL_USENET, ndpi_search_usenet_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/vhua.c b/src/lib/protocols/vhua.c index 9a910fc78..9a97d7563 100644 --- a/src/lib/protocols/vhua.c +++ b/src/lib/protocols/vhua.c @@ -61,9 +61,9 @@ void ndpi_search_vhua(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("VHUA", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("VHUA", ndpi_struct, *id, NDPI_PROTOCOL_VHUA, ndpi_search_vhua, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/viber.c b/src/lib/protocols/viber.c index d554dd8dc..78a214605 100644 --- a/src/lib/protocols/viber.c +++ b/src/lib/protocols/viber.c @@ -86,9 +86,9 @@ void ndpi_search_viber(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Viber", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Viber", ndpi_struct, *id, NDPI_PROTOCOL_VIBER, ndpi_search_viber, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/vmware.c b/src/lib/protocols/vmware.c index 8150f5f60..7f69bd50c 100644 --- a/src/lib/protocols/vmware.c +++ b/src/lib/protocols/vmware.c @@ -43,9 +43,9 @@ void ndpi_search_vmware(struct ndpi_detection_module_struct *ndpi_struct, struct NDPI_EXCLUDE_PROTO(ndpi_struct, flow); } -void init_vmware_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_vmware_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("VMWARE", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("VMWARE", ndpi_struct, *id, NDPI_PROTOCOL_VMWARE, ndpi_search_vmware, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/vnc.c b/src/lib/protocols/vnc.c index 0d351d213..6a30f3f46 100644 --- a/src/lib/protocols/vnc.c +++ b/src/lib/protocols/vnc.c @@ -60,9 +60,9 @@ void ndpi_search_vnc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc } -void init_vnc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_vnc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("VNC", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("VNC", ndpi_struct, *id, NDPI_PROTOCOL_VNC, ndpi_search_vnc_tcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/vxlan.c b/src/lib/protocols/vxlan.c index 9a04435bb..9f4bca85d 100644 --- a/src/lib/protocols/vxlan.c +++ b/src/lib/protocols/vxlan.c @@ -66,9 +66,9 @@ void ndpi_search_vxlan(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_check_vxlan(ndpi_struct, flow); } -void init_vxlan_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_vxlan_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("VXLAN", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("VXLAN", ndpi_struct, *id, NDPI_PROTOCOL_VXLAN, ndpi_search_vxlan, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/warcraft3.c b/src/lib/protocols/warcraft3.c index 22311d157..8e0bca51f 100644 --- a/src/lib/protocols/warcraft3.c +++ b/src/lib/protocols/warcraft3.c @@ -92,9 +92,9 @@ void ndpi_search_warcraft3(struct ndpi_detection_module_struct } -void init_warcraft3_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_warcraft3_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Warcraft3", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Warcraft3", ndpi_struct, *id, NDPI_PROTOCOL_WARCRAFT3, ndpi_search_warcraft3, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/websocket.c b/src/lib/protocols/websocket.c index a6c566ac1..bfa754536 100644 --- a/src/lib/protocols/websocket.c +++ b/src/lib/protocols/websocket.c @@ -110,10 +110,9 @@ void ndpi_search_websocket(struct ndpi_detection_module_struct *ndpi_struct, str /* ********************************* */ -void init_websocket_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_websocket_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("WEBSOCKET", ndpi_struct, detection_bitmask, *id, NDPI_PROTOCOL_WEBSOCKET, + ndpi_set_bitmask_protocol_detection("WEBSOCKET", ndpi_struct, *id, NDPI_PROTOCOL_WEBSOCKET, ndpi_search_websocket, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); diff --git a/src/lib/protocols/whatsapp.c b/src/lib/protocols/whatsapp.c index d85bab56d..3a9787028 100644 --- a/src/lib/protocols/whatsapp.c +++ b/src/lib/protocols/whatsapp.c @@ -120,11 +120,10 @@ void ndpi_search_whatsapp(struct ndpi_detection_module_struct *ndpi_struct, void init_whatsapp_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) + u_int32_t *id) { ndpi_set_bitmask_protocol_detection( - "WhatsApp", ndpi_struct, detection_bitmask, *id, + "WhatsApp", ndpi_struct, *id, NDPI_PROTOCOL_WHATSAPP, ndpi_search_whatsapp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/whoisdas.c b/src/lib/protocols/whoisdas.c index f3ced8862..8d34c8af0 100644 --- a/src/lib/protocols/whoisdas.c +++ b/src/lib/protocols/whoisdas.c @@ -52,9 +52,9 @@ void ndpi_search_whois_das(struct ndpi_detection_module_struct *ndpi_struct, str } -void init_whois_das_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_whois_das_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Whois-DAS", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Whois-DAS", ndpi_struct, *id, NDPI_PROTOCOL_WHOIS_DAS, ndpi_search_whois_das, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/wireguard.c b/src/lib/protocols/wireguard.c index 8a0d15e00..62bb6aae7 100644 --- a/src/lib/protocols/wireguard.c +++ b/src/lib/protocols/wireguard.c @@ -163,9 +163,9 @@ void ndpi_search_wireguard(struct ndpi_detection_module_struct } } -void init_wireguard_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_wireguard_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("WireGuard", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("WireGuard", ndpi_struct, *id, NDPI_PROTOCOL_WIREGUARD, ndpi_search_wireguard, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/world_of_kung_fu.c b/src/lib/protocols/world_of_kung_fu.c index 104315b16..8b6d0b2c1 100644 --- a/src/lib/protocols/world_of_kung_fu.c +++ b/src/lib/protocols/world_of_kung_fu.c @@ -52,9 +52,9 @@ void ndpi_search_world_of_kung_fu(struct ndpi_detection_module_struct *ndpi_stru } -void init_world_of_kung_fu_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_world_of_kung_fu_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("WorldOfKungFu", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("WorldOfKungFu", ndpi_struct, *id, NDPI_PROTOCOL_WORLD_OF_KUNG_FU, ndpi_search_world_of_kung_fu, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/world_of_warcraft.c b/src/lib/protocols/world_of_warcraft.c index 8b6da51f9..89316b872 100644 --- a/src/lib/protocols/world_of_warcraft.c +++ b/src/lib/protocols/world_of_warcraft.c @@ -195,9 +195,9 @@ void ndpi_search_worldofwarcraft(struct ndpi_detection_module_struct } -void init_world_of_warcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_world_of_warcraft_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("WorldOfWarcraft", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("WorldOfWarcraft", ndpi_struct, *id, NDPI_PROTOCOL_WORLDOFWARCRAFT, ndpi_search_worldofwarcraft, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/wsd.c b/src/lib/protocols/wsd.c index 89efdd83a..d0326762e 100644 --- a/src/lib/protocols/wsd.c +++ b/src/lib/protocols/wsd.c @@ -52,9 +52,8 @@ void ndpi_search_wsd(struct ndpi_detection_module_struct *ndpi_struct, } -void init_wsd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("WSD", ndpi_struct, detection_bitmask, *id, +void init_wsd_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("WSD", ndpi_struct, *id, NDPI_PROTOCOL_WSD, ndpi_search_wsd, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/xbox.c b/src/lib/protocols/xbox.c index 8b2ed2b84..57931f2d8 100644 --- a/src/lib/protocols/xbox.c +++ b/src/lib/protocols/xbox.c @@ -101,9 +101,9 @@ void ndpi_search_xbox(struct ndpi_detection_module_struct *ndpi_struct, struct n } -void init_xbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_xbox_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Xbox", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Xbox", ndpi_struct, *id, NDPI_PROTOCOL_XBOX, ndpi_search_xbox, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD, diff --git a/src/lib/protocols/xdmcp.c b/src/lib/protocols/xdmcp.c index c3c908ce4..3e9423046 100644 --- a/src/lib/protocols/xdmcp.c +++ b/src/lib/protocols/xdmcp.c @@ -64,9 +64,9 @@ void ndpi_search_xdmcp(struct ndpi_detection_module_struct } -void init_xdmcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_xdmcp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("XDMCP", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("XDMCP", ndpi_struct, *id, NDPI_PROTOCOL_XDMCP, ndpi_search_xdmcp, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/xiaomi.c b/src/lib/protocols/xiaomi.c index f18c6202b..dc658481e 100644 --- a/src/lib/protocols/xiaomi.c +++ b/src/lib/protocols/xiaomi.c @@ -110,9 +110,8 @@ static void ndpi_search_xiaomi(struct ndpi_detection_module_struct *ndpi_struct, } void init_xiaomi_dissector(struct ndpi_detection_module_struct *ndpi_struct, - u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Xiaomi", ndpi_struct, detection_bitmask, *id, + u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Xiaomi", ndpi_struct, *id, NDPI_PROTOCOL_XIAOMI, ndpi_search_xiaomi, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/z3950.c b/src/lib/protocols/z3950.c index 8a30b52cf..18a06c1ec 100644 --- a/src/lib/protocols/z3950.c +++ b/src/lib/protocols/z3950.c @@ -122,10 +122,9 @@ static void ndpi_search_z3950(struct ndpi_detection_module_struct *ndpi_struct, /* ***************************************************************** */ -void init_z3950_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { +void init_z3950_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { ndpi_set_bitmask_protocol_detection("Z3950", - ndpi_struct, detection_bitmask, *id, + ndpi_struct, *id, NDPI_PROTOCOL_Z3950, ndpi_search_z3950, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/zabbix.c b/src/lib/protocols/zabbix.c index 5e9209151..718b06e37 100644 --- a/src/lib/protocols/zabbix.c +++ b/src/lib/protocols/zabbix.c @@ -51,9 +51,8 @@ void ndpi_search_zabbix(struct ndpi_detection_module_struct *ndpi_struct, /* *************************************************** */ -void init_zabbix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, - NDPI_PROTOCOL_BITMASK *detection_bitmask) { - ndpi_set_bitmask_protocol_detection("Zabbix", ndpi_struct, detection_bitmask, *id, +void init_zabbix_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { + ndpi_set_bitmask_protocol_detection("Zabbix", ndpi_struct, *id, NDPI_PROTOCOL_ZABBIX, ndpi_search_zabbix, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/zattoo.c b/src/lib/protocols/zattoo.c index dc7d1ae5a..6f0b77c3d 100644 --- a/src/lib/protocols/zattoo.c +++ b/src/lib/protocols/zattoo.c @@ -218,9 +218,9 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct } -void init_zattoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_zattoo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("Zattoo", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("Zattoo", ndpi_struct, *id, NDPI_PROTOCOL_ZATTOO, ndpi_search_zattoo, NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, diff --git a/src/lib/protocols/zeromq.c b/src/lib/protocols/zeromq.c index 32335eeb0..9d8e105fc 100644 --- a/src/lib/protocols/zeromq.c +++ b/src/lib/protocols/zeromq.c @@ -91,9 +91,9 @@ void ndpi_search_zmq(struct ndpi_detection_module_struct *ndpi_struct, struct nd } -void init_zmq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) +void init_zmq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("ZeroMQ", ndpi_struct, detection_bitmask, *id, + ndpi_set_bitmask_protocol_detection("ZeroMQ", ndpi_struct, *id, NDPI_PROTOCOL_ZMQ, ndpi_search_zmq, /* TODO: add UDP support */ NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, |