diff options
Diffstat (limited to 'epan/dissectors/packet-dns.c')
| -rw-r--r-- | epan/dissectors/packet-dns.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index a41460da5d..7916fc6db9 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -421,7 +421,6 @@ static dissector_table_t dns_tsig_dissector_table=NULL; static dissector_handle_t dns_handle; -static range_t *global_dns_tcp_port_range; static range_t *global_dns_udp_port_range; /* desegmentation of DNS over TCP */ @@ -448,9 +447,9 @@ typedef struct _dns_conv_info_t { /* Ports used for DNS. */ #define DEFAULT_DNS_PORT_RANGE "53" +#define DEFAULT_DNS_TCP_PORT_RANGE "53,5353" /* Includes mDNS */ #define SCTP_PORT_DNS 53 #define UDP_PORT_MDNS 5353 -#define TCP_PORT_MDNS 5353 #define UDP_PORT_LLMNR 5355 #define TCP_PORT_DNS_TLS 853 #define UDP_PORT_DNS_DTLS 853 @@ -4079,7 +4078,6 @@ static int dns_stats_tree_packet(stats_tree* st, packet_info* pinfo _U_, epan_di void proto_reg_handoff_dns(void) { - static range_t *dns_tcp_port_range; static range_t *dns_udp_port_range; static gboolean Initialized = FALSE; @@ -4091,7 +4089,6 @@ proto_reg_handoff_dns(void) mdns_udp_handle = create_dissector_handle(dissect_mdns_udp, proto_mdns); llmnr_udp_handle = create_dissector_handle(dissect_llmnr_udp, proto_llmnr); dissector_add_uint("udp.port", UDP_PORT_MDNS, mdns_udp_handle); - dissector_add_uint("tcp.port", TCP_PORT_MDNS, dns_handle); dissector_add_uint("udp.port", UDP_PORT_LLMNR, llmnr_udp_handle); dissector_add_uint("sctp.port", SCTP_PORT_DNS, dns_handle); #if 0 @@ -4102,18 +4099,15 @@ proto_reg_handoff_dns(void) ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_dns); ssl_dissector_add(TCP_PORT_DNS_TLS, dns_handle); dtls_dissector_add(UDP_PORT_DNS_DTLS, dns_handle); + dissector_add_uint_range_with_preference("tcp.port", DEFAULT_DNS_TCP_PORT_RANGE, dns_handle); Initialized = TRUE; } else { - dissector_delete_uint_range("tcp.port", dns_tcp_port_range, dns_handle); dissector_delete_uint_range("udp.port", dns_udp_port_range, dns_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); - dissector_add_uint_range("tcp.port", dns_tcp_port_range, dns_handle); dissector_add_uint_range("udp.port", dns_udp_port_range, dns_handle); } @@ -5578,16 +5572,10 @@ proto_register_dns(void) expert_register_field_array(expert_dns, ei, array_length(ei)); /* Set default ports */ - range_convert_str(&global_dns_tcp_port_range, DEFAULT_DNS_PORT_RANGE, MAX_TCP_PORT); range_convert_str(&global_dns_udp_port_range, DEFAULT_DNS_PORT_RANGE, MAX_UDP_PORT); dns_module = prefs_register_protocol(proto_dns, proto_reg_handoff_dns); - prefs_register_range_preference(dns_module, "tcp.ports", "DNS TCP ports", - "TCP ports to be decoded as DNS (default: " - DEFAULT_DNS_PORT_RANGE ")", - &global_dns_tcp_port_range, MAX_TCP_PORT); - prefs_register_range_preference(dns_module, "udp.ports", "DNS UDP ports", "UDP ports to be decoded as DNS (default: " DEFAULT_DNS_PORT_RANGE ")", |