osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use dissector_delete_uint_range/dissector_add_uint_range 

svn path=/trunk/; revision=51540
This commit is contained in:
Anders Broman 2013-08-27 19:21:20 +00:00
parent cbae911dca
commit 7e3922cf43
16 changed files with 38 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
asn1/pcap/packet-pcap-template.c
View File

@ -139,21 +139,6 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_PCAP_PDU_PDU(tvb, pinfo, pcap_tree, NULL);
}
static void range_delete_callback(guint32 ssn)
{
if ( ssn ) {
dissector_delete_uint("sccp.ssn", ssn, pcap_handle);
}
}
static void range_add_callback(guint32 ssn)
{
if (ssn) {
dissector_add_uint("sccp.ssn", ssn, pcap_handle);
}
}
/*--- proto_reg_handoff_pcap ---------------------------------------*/
void
proto_reg_handoff_pcap(void)
@ -167,11 +152,11 @@ proto_reg_handoff_pcap(void)
prefs_initialized = TRUE;
#include "packet-pcap-dis-tab.c"
} else {
range_foreach(ssn_range, range_delete_callback);
dissector_delete_uint_range("sccp.ssn", ssn_range, pcap_handle);
g_free(ssn_range);
}
ssn_range = range_copy(global_ssn_range);
range_foreach(ssn_range, range_add_callback);
dissector_add_uint_range("sccp.ssn", ssn_range, pcap_handle);
}
/*--- proto_register_pcap -------------------------------------------*/

25
epan/dissectors/packet-memcache.c
View File

@ -2166,23 +2166,6 @@ proto_register_memcache (void)
65535);
}
static void range_delete_tcp_port_callback(guint32 port) {
dissector_delete_uint("tcp.port", port, memcache_tcp_handle);
}
static void range_delete_udp_port_callback(guint32 port) {
dissector_delete_uint("udp.port", port, memcache_udp_handle);
}
static void range_add_tcp_port_callback(guint32 port) {
dissector_add_uint("tcp.port", port, memcache_tcp_handle);
}
static void range_add_udp_port_callback(guint32 port) {
dissector_add_uint("udp.port", port, memcache_udp_handle);
}
/* Register the tcp and udp memcache dissectors. */
void
proto_reg_handoff_memcache (void)
@ -2196,16 +2179,16 @@ proto_reg_handoff_memcache (void)
memcache_udp_handle = find_dissector("memcache.udp");
initialized = TRUE;
} else {
range_foreach(orig_memcache_tcp_port_range, range_delete_tcp_port_callback);
range_foreach(orig_memcache_udp_port_range, range_delete_udp_port_callback);
dissector_delete_uint_range("tcp.port", orig_memcache_tcp_port_range, memcache_tcp_handle);
dissector_delete_uint_range("udp.port", orig_memcache_udp_port_range, memcache_udp_handle);
g_free(orig_memcache_tcp_port_range);
g_free(orig_memcache_udp_port_range);
}
orig_memcache_tcp_port_range = range_copy(memcache_tcp_port_range);
orig_memcache_udp_port_range = range_copy(memcache_udp_port_range);
range_foreach(orig_memcache_tcp_port_range, range_add_tcp_port_callback);
range_foreach(orig_memcache_udp_port_range, range_add_udp_port_callback);
dissector_add_uint_range("tcp.port", orig_memcache_tcp_port_range, memcache_tcp_handle);
dissector_add_uint_range("udp.port", orig_memcache_udp_port_range, memcache_udp_handle);
}
/*

12
epan/dissectors/packet-nasdaq-soup.c
View File

@ -196,20 +196,12 @@ dissect_nasdaq_soup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
/* Register the protocol with Wireshark */
static void range_delete_nasdaq_soup_tcp_callback(guint32 port) {
dissector_delete_uint("tcp.port", port, nasdaq_soup_handle);
}
static void range_add_nasdaq_soup_tcp_callback(guint32 port) {
dissector_add_uint("tcp.port", port, nasdaq_soup_handle);
}
static void nasdaq_soup_prefs(void)
{
range_foreach(nasdaq_soup_tcp_range, range_delete_nasdaq_soup_tcp_callback);
dissector_delete_uint_range("tcp.port", nasdaq_soup_tcp_range, nasdaq_soup_handle);
g_free(nasdaq_soup_tcp_range);
nasdaq_soup_tcp_range = range_copy(global_nasdaq_soup_tcp_range);
range_foreach(nasdaq_soup_tcp_range, range_add_nasdaq_soup_tcp_callback);
dissector_add_uint_range("tcp.port", nasdaq_soup_tcp_range, nasdaq_soup_handle);
}
void

20
epan/dissectors/packet-netflow.c
View File

@ -8290,22 +8290,6 @@ proto_register_netflow(void)
/*
* protocol/port association
*/
static void
netflow_delete_callback(guint32 port)
{
if ( port ) {
dissector_delete_uint("udp.port", port, netflow_handle);
}
}
static void
netflow_add_callback(guint32 port)
{
if ( port ) {
dissector_add_uint("udp.port", port, netflow_handle);
}
}
static void
ipfix_delete_callback(guint32 port)
{
@ -8338,7 +8322,7 @@ proto_reg_handoff_netflow(void)
netflow_prefs_initialized = TRUE;
dissector_add_uint("wtap_encap", WTAP_ENCAP_RAW_IPFIX, netflow_handle);
} else {
range_foreach(netflow_ports, netflow_delete_callback);
dissector_delete_uint_range("udp.port", netflow_ports, netflow_handle);
g_free(netflow_ports);
range_foreach(ipfix_ports, ipfix_delete_callback);
g_free(ipfix_ports);
@ -8347,7 +8331,7 @@ proto_reg_handoff_netflow(void)
netflow_ports = range_copy(global_netflow_ports);
ipfix_ports = range_copy(global_ipfix_ports);
range_foreach(netflow_ports, netflow_add_callback);
dissector_add_uint_range("udp.port", netflow_ports, netflow_handle);
range_foreach(ipfix_ports, ipfix_add_callback);
}

16
epan/dissectors/packet-nsip.c
View File

@ -1189,18 +1189,6 @@ proto_register_nsip(void)
&global_nsip_udp_port_range, MAX_UDP_PORT);
}
static void
range_delete_callback(guint32 port)
{
dissector_delete_uint("udp.port", port, nsip_handle);
}
static void
range_add_callback(guint32 port)
{
dissector_add_uint("udp.port", port, nsip_handle);
}
void
proto_reg_handoff_nsip(void) {
static gboolean nsip_prefs_initialized = FALSE;
@ -1211,12 +1199,12 @@ proto_reg_handoff_nsip(void) {
bssgp_handle = find_dissector("bssgp");
nsip_prefs_initialized = TRUE;
} else {
range_foreach(nsip_udp_port_range, range_delete_callback);
dissector_delete_uint_range("udp.port", nsip_udp_port_range, nsip_handle);
g_free(nsip_udp_port_range);
}
nsip_udp_port_range = range_copy(global_nsip_udp_port_range);
range_foreach(nsip_udp_port_range, range_add_callback);
dissector_add_uint_range("udp.port", nsip_udp_port_range, nsip_handle);
}

19
epan/dissectors/packet-ouch.c
View File

@ -1268,29 +1268,14 @@ dissect_ouch(
/* Register the protocol with Wireshark */
static void
range_add_ouch_callback(
guint32 port)
{
dissector_add_uint("tcp.port", port, ouch_handle);
}
static void
range_delete_ouch_callback(
guint32 port)
{
dissector_delete_uint("tcp.port", port, ouch_handle);
}
static void
ouch_prefs(void)
{
range_foreach(ouch_range,
range_delete_ouch_callback);
dissector_delete_uint_range("tcp.port", ouch_range, ouch_handle);
g_free(ouch_range);
ouch_range = range_copy(global_ouch_range);
range_foreach(ouch_range,
range_add_ouch_callback);
dissector_add_uint_range("tcp.port", ouch_range, ouch_handle);
}

14
epan/dissectors/packet-p_mul.c
View File

@ -1621,16 +1621,6 @@ void proto_register_p_mul (void)
&decode_option, decode_options, FALSE);
}
static void range_delete_callback (guint32 port)
{
dissector_delete_uint ("udp.port", port, p_mul_handle);
}
static void range_add_callback (guint32 port)
{
dissector_add_uint ("udp.port", port, p_mul_handle);
}
void proto_reg_handoff_p_mul (void)
{
static gboolean p_mul_prefs_initialized = FALSE;
@ -1640,14 +1630,14 @@ void proto_reg_handoff_p_mul (void)
p_mul_prefs_initialized = TRUE;
data_handle = find_dissector ("data");
} else {
range_foreach (p_mul_port_range, range_delete_callback);
dissector_delete_uint_range ("udp.port", p_mul_port_range, p_mul_handle);
g_free (p_mul_port_range);
}
/* Save port number for later deletion */
p_mul_port_range = range_copy (global_p_mul_port_range);
range_foreach (p_mul_port_range, range_add_callback);
dissector_add_uint_range ("udp.port", p_mul_port_range, p_mul_handle);
}
/*

25
epan/dissectors/packet-pcap.c
View File

@ -13565,21 +13565,6 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_PCAP_PDU_PDU(tvb, pinfo, pcap_tree, NULL);
}
static void range_delete_callback(guint32 ssn)
{
if ( ssn ) {
dissector_delete_uint("sccp.ssn", ssn, pcap_handle);
}
}
static void range_add_callback(guint32 ssn)
{
if (ssn) {
dissector_add_uint("sccp.ssn", ssn, pcap_handle);
}
}
/*--- proto_reg_handoff_pcap ---------------------------------------*/
void
proto_reg_handoff_pcap(void)
@ -13725,13 +13710,13 @@ proto_reg_handoff_pcap(void)
/*--- End of included file: packet-pcap-dis-tab.c ---*/
#line 169 "../../asn1/pcap/packet-pcap-template.c"
#line 154 "../../asn1/pcap/packet-pcap-template.c"
} else {
range_foreach(ssn_range, range_delete_callback);
dissector_delete_uint_range("sccp.ssn", ssn_range, pcap_handle);
g_free(ssn_range);
}
ssn_range = range_copy(global_ssn_range);
range_foreach(ssn_range, range_add_callback);
dissector_add_uint_range("sccp.ssn", ssn_range, pcap_handle);
}
/*--- proto_register_pcap -------------------------------------------*/
@ -18306,7 +18291,7 @@ void proto_register_pcap(void) {
NULL, HFILL }},
/*--- End of included file: packet-pcap-hfarr.c ---*/
#line 185 "../../asn1/pcap/packet-pcap-template.c"
#line 170 "../../asn1/pcap/packet-pcap-template.c"
};
/* List of subtrees */
@ -18710,7 +18695,7 @@ void proto_register_pcap(void) {
&ett_pcap_Outcome,
/*--- End of included file: packet-pcap-ettarr.c ---*/
#line 191 "../../asn1/pcap/packet-pcap-template.c"
#line 176 "../../asn1/pcap/packet-pcap-template.c"
};
module_t *pcap_module;

20
epan/dissectors/packet-sflow.c
View File

@ -3178,21 +3178,6 @@ proto_register_sflow(void) {
&global_analyze_samp_ip_headers);
}
static void
sflow_245_delete_callback(guint32 port) {
if (port) {
dissector_delete_uint("udp.port", port, sflow_handle);
}
}
static void
sflow_245_add_callback(guint32 port) {
if (port) {
dissector_add_uint("udp.port", port, sflow_handle);
}
}
void
proto_reg_handoff_sflow_245(void) {
static range_t *sflow_ports;
@ -3203,12 +3188,13 @@ proto_reg_handoff_sflow_245(void) {
data_handle = find_dissector("data");
sflow_245_prefs_initialized = TRUE;
} else {
range_foreach(sflow_ports, sflow_245_delete_callback);
dissector_delete_uint_range("udp.port", sflow_ports, sflow_handle);
g_free(sflow_ports);
}
sflow_ports = range_copy(global_sflow_ports);
range_foreach(sflow_ports, sflow_245_add_callback);
dissector_add_uint_range("udp.port", sflow_ports, sflow_handle);
/*dissector_handle_t sflow_245_handle;*/

15
epan/dissectors/packet-sip.c
View File

@ -4021,17 +4021,6 @@ guint sip_find_invite(packet_info *pinfo,
return result;
}
static void
tcp_range_add_callback(guint32 port)
{
dissector_add_uint("tcp.port", port, sip_tcp_handle);
}
static void
tcp_range_delete_callback(guint32 port)
{
dissector_delete_uint("tcp.port", port, sip_tcp_handle);
}
/* Register the protocol with Wireshark */
void proto_register_sip(void)
@ -5285,13 +5274,13 @@ proto_reg_handoff_sip(void)
heur_dissector_add("stun", dissect_sip_heur, proto_sip);
sip_prefs_initialized = TRUE;
} else {
range_foreach(sip_tcp_port_range, tcp_range_delete_callback);
dissector_delete_uint_range("tcp.port", sip_tcp_port_range, sip_tcp_handle);
g_free(sip_tcp_port_range);
ssl_dissector_delete(saved_sip_tls_port, "sip.tcp", TRUE);
}
/* Set our port number for future use */
sip_tcp_port_range = range_copy(global_sip_tcp_port_range);
range_foreach(sip_tcp_port_range, tcp_range_add_callback);
dissector_add_uint_range("tcp.port", sip_tcp_port_range, sip_tcp_handle);
saved_sip_tls_port = sip_tls_port;
ssl_dissector_add(saved_sip_tls_port, "sip.tcp", TRUE);

23
epan/dissectors/packet-soupbintcp.c
View File

@ -483,32 +483,13 @@ dissect_soupbintcp_tcp(
dissect_soupbintcp_tcp_pdu);
}
static void
range_add_soupbintcp_callback(
guint32 port)
{
dissector_add_uint("tcp.port", port, soupbintcp_handle);
}
static void
range_delete_soupbintcp_callback(
guint32 port)
{
dissector_delete_uint("tcp.port", port, soupbintcp_handle);
}
static void
soupbintcp_prefs(void)
{
range_foreach(soupbintcp_range,
range_delete_soupbintcp_callback);
dissector_delete_uint_range("tcp.port", soupbintcp_range, soupbintcp_handle);
g_free(soupbintcp_range);
soupbintcp_range = range_copy(global_soupbintcp_range);
range_foreach(soupbintcp_range,
range_add_soupbintcp_callback);
dissector_add_uint_range("tcp.port", soupbintcp_range, soupbintcp_handle);
}

20
epan/dissectors/packet-sscop.c
View File

@ -352,21 +352,6 @@ static void dissect_sscop(tvbuff_t* tvb, packet_info* pinfo,proto_tree* tree)
dissect_sscop_and_payload(tvb,pinfo,tree,default_handle);
}
static void range_delete_callback(guint32 port)
{
if (port) {
dissector_delete_uint("udp.port", port, sscop_handle);
}
}
static void range_add_callback(guint32 port)
{
if (port) {
dissector_add_uint("udp.port", port, sscop_handle);
}
}
/* Make sure handles for various protocols are initialized */
static void initialize_handles_once(void) {
static gboolean initialized = FALSE;
@ -403,14 +388,13 @@ proto_reg_handoff_sscop(void)
} else {
range_foreach(udp_port_range, range_delete_callback);
dissector_delete_uint_range("udp.port", udp_port_range, sscop_handle);
g_free(udp_port_range);
}
udp_port_range = range_copy(global_udp_port_range);
range_foreach(udp_port_range, range_add_callback);
dissector_add_uint_range("udp.port", udp_port_range, sscop_handle);
switch(sscop_payload_dissector) {
case DATA_DISSECTOR: default_handle = data_handle; break;

14
epan/dissectors/packet-tftp.c
View File

@ -503,16 +503,6 @@ proto_register_tftp(void)
&global_tftp_port_range, MAX_UDP_PORT);
}
static void range_delete_callback (guint32 port)
{
dissector_delete_uint("udp.port", port, tftp_handle);
}
static void range_add_callback (guint32 port)
{
dissector_add_uint("udp.port", port, tftp_handle);
}
void
proto_reg_handoff_tftp(void)
{
@ -525,12 +515,12 @@ proto_reg_handoff_tftp(void)
heur_dissector_add("stun", dissect_embeddedtftp_heur, proto_tftp);
tftp_initialized = TRUE;
} else {
range_foreach(tftp_port_range, range_delete_callback);
dissector_add_uint_range("udp.port", tftp_port_range, tftp_handle);
g_free(tftp_port_range);
}
tftp_port_range = range_copy(global_tftp_port_range);
range_foreach(tftp_port_range, range_add_callback);
dissector_add_uint_range("udp.port", tftp_port_range, tftp_handle);
}
/*

16
epan/dissectors/packet-tipc.c
View File

@ -2288,18 +2288,6 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /*if (hdr_size <= 5) */
}
static void
udp_range_delete_callback(guint32 port)
{
dissector_delete_uint("udp.port", port, tipc_handle);
}
static void
udp_range_add_callback(guint32 port)
{
dissector_add_uint("udp.port", port, tipc_handle);
}
/* Register TIPC with Wireshark */
void
proto_register_tipc(void)
@ -2985,10 +2973,10 @@ proto_reg_handoff_tipc(void)
dissector_add_uint("tcp.port", tipc_alternate_tcp_port, tipc_tcp_handle);
tipc_alternate_tcp_port_prev = tipc_alternate_tcp_port;
}
range_foreach(tipc_udp_port_range, udp_range_delete_callback);
dissector_add_uint_range("udp.port", tipc_udp_port_range, tipc_handle);
g_free(tipc_udp_port_range);
}
tipc_udp_port_range = range_copy(global_tipc_udp_port_range);
range_foreach(tipc_udp_port_range, udp_range_add_callback);
dissector_add_uint_range("udp.port", tipc_udp_port_range, tipc_handle);
}

16
epan/dissectors/packet-uma.c
View File

@ -1739,18 +1739,6 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
}
static void
range_delete_callback(guint32 port)
{
dissector_delete_uint("tcp.port", port, uma_tcp_handle);
}
static void
range_add_callback(guint32 port)
{
dissector_add_uint("tcp.port", port, uma_tcp_handle);
}
/* Register the protocol with Wireshark */
/* If this dissector uses sub-dissector registration add a registration routine.
This format is required because a script is used to find these routines and
@ -1773,12 +1761,12 @@ proto_reg_handoff_uma(void)
bssap_pdu_type_table = find_dissector_table("bssap.pdu_type");
Initialized=TRUE;
} else {
range_foreach(uma_tcp_port_range, range_delete_callback);
dissector_delete_uint_range("tcp.port", uma_tcp_port_range, uma_tcp_handle);
g_free(uma_tcp_port_range);
}
uma_tcp_port_range = range_copy(global_uma_tcp_port_range);
range_foreach(uma_tcp_port_range, range_add_callback);
dissector_add_uint_range("tcp.port", uma_tcp_port_range, uma_tcp_handle);
}
/* this format is require because a script is used to build the C function

14
epan/dissectors/packet-xml.c
View File

@ -1352,16 +1352,6 @@ static void init_xml_names(void)
g_free(dummy);
}
static void range_delete_xml_tcp_callback(guint32 port)
{
dissector_delete_uint("tcp.port", port, xml_handle);
}
static void range_add_xml_tcp_callback(guint32 port)
{
dissector_add_uint("tcp.port", port, xml_handle);
}
static void apply_prefs(void)
{
if (pref_heuristic_media_save != pref_heuristic_media) {
@ -1398,10 +1388,10 @@ static void apply_prefs(void)
}
}
range_foreach(xml_tcp_range, range_delete_xml_tcp_callback);
dissector_delete_uint_range("tcp.port", xml_tcp_range, xml_handle);
g_free(xml_tcp_range);
xml_tcp_range = range_copy(global_xml_tcp_range);
range_foreach(xml_tcp_range, range_add_xml_tcp_callback);
dissector_add_uint_range("tcp.port", xml_tcp_range, xml_handle);
}
void