summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-aruba-erm.c3
-rw-r--r--epan/dissectors/packet-banana.c14
-rw-r--r--epan/dissectors/packet-dcm.c14
-rw-r--r--epan/dissectors/packet-dmp.c14
-rw-r--r--epan/dissectors/packet-dns.c32
-rw-r--r--epan/dissectors/packet-fix.c14
-rw-r--r--epan/dissectors/packet-gsm_ipa.c32
-rw-r--r--epan/dissectors/packet-http.c13
8 files changed, 21 insertions, 115 deletions
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c
index cbabd3ab59..4839fa0601 100644
--- a/epan/dissectors/packet-aruba-erm.c
+++ b/epan/dissectors/packet-aruba-erm.c
@@ -149,11 +149,12 @@ proto_reg_handoff_aruba_erm(void)
initialized = TRUE;
} else {
range_foreach(aruba_erm_port_range, range_delete_callback);
+ dissector_delete_uint_range("udp.port", aruba_erm_port_range, aruba_erm_handle);
g_free(aruba_erm_port_range);
}
aruba_erm_port_range = range_copy(global_aruba_erm_port_range);
- range_foreach(aruba_erm_port_range, range_add_callback);
+ dissector_add_uint_range("udp.port", aruba_erm_port_range, aruba_erm_handle);
}
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index 18f78aee90..5eff7cad4c 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -261,21 +261,11 @@ dissect_banana(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
}
static void
-range_delete_banana_tcp_callback(guint32 port) {
- dissector_delete_uint("tcp.port", port, banana_handle);
-}
-
-static void
-range_add_banana_tcp_callback(guint32 port) {
- dissector_add_uint("tcp.port", port, banana_handle);
-}
-
-static void
banana_prefs(void) {
- range_foreach(banana_tcp_range, range_delete_banana_tcp_callback);
+ dissector_delete_uint_range("tcp.port", banana_tcp_range, banana_handle);
g_free(banana_tcp_range);
banana_tcp_range = range_copy(global_banana_tcp_range);
- range_foreach(banana_tcp_range, range_add_banana_tcp_callback);
+ dissector_add_uint_range("tcp.port", banana_tcp_range, banana_handle);
}
/* Register the protocol with Wireshark */
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 6c86508de1..46bdc17057 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -7060,18 +7060,10 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 off
return offset; /* return the number of processed bytes */
}
-static void range_delete_dcm_tcp_callback(guint32 port) {
- dissector_delete_uint("tcp.port", port, dcm_handle);
-}
-
-static void range_add_dcm_tcp_callback(guint32 port) {
- dissector_add_uint("tcp.port", port, dcm_handle);
-}
-
static void dcm_apply_settings(void) {
/* deregister first */
- range_foreach(global_dcm_tcp_range_backup, range_delete_dcm_tcp_callback);
+ dissector_delete_uint_range("tcp.port", global_dcm_tcp_range_backup, dcm_handle);
g_free(global_dcm_tcp_range_backup);
heur_dissector_delete("tcp", dissect_dcm_heuristic, proto_dcm);
@@ -7082,7 +7074,7 @@ static void dcm_apply_settings(void) {
We would never be called, by just having the heuristic registration
*/
- range_foreach(global_dcm_tcp_range, range_add_dcm_tcp_callback);
+ dissector_add_uint_range("tcp.port", global_dcm_tcp_range_backup, dcm_handle);
/* remember settings for next time */
global_dcm_tcp_range_backup = range_copy(global_dcm_tcp_range);
@@ -7090,7 +7082,7 @@ static void dcm_apply_settings(void) {
/* Add heuristic search, if user selected it */
if (global_dcm_heuristic)
- heur_dissector_add("tcp", dissect_dcm_heuristic, proto_dcm);
+ heur_dissector_add("tcp", dissect_dcm_heuristic, proto_dcm);
}
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 38fe0d8b47..94b4433d87 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -5058,16 +5058,6 @@ void proto_register_dmp (void)
10, &dmp_struct_length);
}
-static void range_delete_callback (guint32 port)
-{
- dissector_delete_uint ("udp.port", port, dmp_handle);
-}
-
-static void range_add_callback (guint32 port)
-{
- dissector_add_uint ("udp.port", port, dmp_handle);
-}
-
void proto_reg_handoff_dmp (void)
{
static range_t *dmp_port_range;
@@ -5076,14 +5066,14 @@ void proto_reg_handoff_dmp (void)
if (!dmp_prefs_initialized) {
dmp_prefs_initialized = TRUE;
} else {
- range_foreach (dmp_port_range, range_delete_callback);
+ dissector_delete_uint_range ("udp.port", dmp_port_range, dmp_handle);
g_free (dmp_port_range);
}
/* Save port number for later deletion */
dmp_port_range = range_copy (global_dmp_port_range);
- range_foreach (dmp_port_range, range_add_callback);
+ dissector_add_uint_range ("udp.port", dmp_port_range, dmp_handle);
}
/*
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index c4bd80a389..2a2ff6c3a0 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -3845,30 +3845,6 @@ dissect_dns_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_dns_tcp_pdu);
}
-static void
-tcp_range_delete_callback(guint32 port)
-{
- dissector_delete_uint("tcp.port", port, dns_tcp_handle);
-}
-
-static void
-udp_range_delete_callback(guint32 port)
-{
- dissector_delete_uint("udp.port", port, dns_udp_handle);
-}
-
-static void
-tcp_range_add_callback(guint32 port)
-{
- dissector_add_uint("tcp.port", port, dns_tcp_handle);
-}
-
-static void
-udp_range_add_callback(guint32 port)
-{
- dissector_add_uint("udp.port", port, dns_udp_handle);
-}
-
void
proto_reg_handoff_dns(void)
{
@@ -3887,16 +3863,16 @@ proto_reg_handoff_dns(void)
Initialized = TRUE;
} else {
- range_foreach(dns_tcp_port_range, tcp_range_delete_callback);
- range_foreach(dns_udp_port_range, udp_range_delete_callback);
+ dissector_delete_uint_range("tcp.port", dns_tcp_port_range, dns_tcp_handle);
+ dissector_delete_uint_range("udp.port", dns_udp_port_range, dns_udp_handle);
g_free(dns_tcp_port_range);
g_free(dns_udp_port_range);
}
dns_tcp_port_range = range_copy(global_dns_tcp_port_range);
dns_udp_port_range = range_copy(global_dns_udp_port_range);
- range_foreach(dns_tcp_port_range, tcp_range_add_callback);
- range_foreach(dns_udp_port_range, udp_range_add_callback);
+ dissector_add_uint_range("tcp.port", dns_tcp_port_range, dns_tcp_handle);
+ dissector_add_uint_range("udp.port", dns_udp_port_range, dns_udp_handle);
dns_sctp_handle = create_dissector_handle(dissect_dns_sctp, proto_dns);
mdns_udp_handle = create_dissector_handle(dissect_mdns_udp, proto_dns);
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index b2ce4e317b..31b8cd296f 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -443,22 +443,12 @@ dissect_fix_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
}
/* Register the protocol with Wireshark */
-static void range_delete_fix_tcp_callback(guint32 port) {
- dissector_delete_uint("tcp.port", port, fix_handle);
- ssl_dissector_delete(port, "fix", TRUE);
-}
-
-static void range_add_fix_tcp_callback(guint32 port) {
- dissector_add_uint("tcp.port", port, fix_handle);
- ssl_dissector_add(port, "fix", TRUE);
-}
-
static void fix_prefs(void)
{
- range_foreach(fix_tcp_range, range_delete_fix_tcp_callback);
+ dissector_delete_uint_range("tcp.port", fix_tcp_range, fix_handle);
g_free(fix_tcp_range);
fix_tcp_range = range_copy(global_fix_tcp_range);
- range_foreach(fix_tcp_range, range_add_fix_tcp_callback);
+ dissector_add_uint_range("tcp.port", fix_tcp_range, fix_handle);
}
/* this format is require because a script is used to build the C function
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index 6f4c1b34eb..2de31bc8cd 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -470,30 +470,6 @@ void proto_register_ipa(void)
NULL, &global_ipa_in_info);
}
-static void ipa_tcp_delete_callback(guint32 port)
-{
- if (port)
- dissector_delete_uint("tcp.port", port, ipa_handle);
-}
-
-static void ipa_udp_delete_callback(guint32 port)
-{
- if (port)
- dissector_delete_uint("udp.port", port, ipa_handle);
-}
-
-static void ipa_tcp_add_callback(guint32 port)
-{
- if (port)
- dissector_add_uint("tcp.port", port, ipa_handle);
-}
-
-static void ipa_udp_add_callback(guint32 port)
-{
- if (port)
- dissector_add_uint("udp.port", port, ipa_handle);
-}
-
void proto_reg_handoff_gsm_ipa(void)
{
static gboolean ipa_initialized = FALSE;
@@ -509,15 +485,15 @@ void proto_reg_handoff_gsm_ipa(void)
ipa_handle = create_dissector_handle(dissect_ipa, proto_ipa);
ipa_initialized = TRUE;
} else {
- range_foreach(ipa_tcp_ports, ipa_tcp_delete_callback);
+ dissector_delete_uint_range("tcp.port", ipa_tcp_ports, ipa_handle);
g_free(ipa_tcp_ports);
- range_foreach(ipa_udp_ports, ipa_udp_delete_callback);
+ dissector_delete_uint_range("udp.port", ipa_udp_ports, ipa_handle);
g_free(ipa_udp_ports);
}
ipa_tcp_ports = range_copy(global_ipa_tcp_ports);
ipa_udp_ports = range_copy(global_ipa_udp_ports);
- range_foreach(ipa_tcp_ports, ipa_tcp_add_callback);
- range_foreach(ipa_udp_ports, ipa_udp_add_callback);
+ dissector_add_uint_range("udp.port", ipa_udp_ports, ipa_handle);
+ dissector_add_uint_range("tcp.port", ipa_tcp_ports, ipa_handle);
}
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index f461b23e5e..36bd1c7539 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -2689,15 +2689,6 @@ dissect_http_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_http_message(tvb, 0, pinfo, tree, conv_data);
}
-static void
-range_delete_http_tcp_callback(guint32 port) {
- dissector_delete_uint("tcp.port", port, http_handle);
-}
-
-static void
-range_add_http_tcp_callback(guint32 port) {
- dissector_add_uint("tcp.port", port, http_handle);
-}
static void
range_delete_http_ssl_callback(guint32 port) {
@@ -2710,10 +2701,10 @@ range_add_http_ssl_callback(guint32 port) {
}
static void reinit_http(void) {
- range_foreach(http_tcp_range, range_delete_http_tcp_callback);
+ dissector_delete_uint_range("tcp.port", http_tcp_range, http_handle);
g_free(http_tcp_range);
http_tcp_range = range_copy(global_http_tcp_range);
- range_foreach(http_tcp_range, range_add_http_tcp_callback);
+ dissector_add_uint_range("tcp.port", http_tcp_range, http_handle);
range_foreach(http_ssl_range, range_delete_http_ssl_callback);
g_free(http_ssl_range);
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-27 04:53:00 +0000