osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/dissectors/packet-dns.c

5361 lines
174 KiB
C
Raw Normal View History

Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* packet-dns.c
* Routines for DNS packet disassembly
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
* Copyright 2004, Nicolas DICHTEL - 6WIND - <nicolas.dichtel@6wind.com>
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
*
Set the svn:eol-style property on all text files to "native", so that they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
* $Id$
Added ID tags to the beginning of each source file. svn path=/trunk/; revision=7
1998-09-16 03:22:19 +00:00
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* Copyright 1998 Gerald Combs
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
*
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
* RFC 1034, RFC 1035
* RFC 2136 for dynamic DNS
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
* http://datatracker.ietf.org/doc/draft-cheshire-dnsext-multicastdns/
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
* for multicast DNS
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
* RFC 4795 for link-local multicast name resolution (LLMNR)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
*/
We always HAVE_CONFIG_H so don't bother checking whether we have it or not. svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
#include "config.h"
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#include <string.h>
#include <memory.h>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
1999-03-23 03:14:46 +00:00
#include <glib.h>
Include files from the "epan" directory and subdirectories thereof with "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
#include <epan/conversation.h>
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
#include <epan/wmem/wmem.h>
Move various tables into the epan directory. svn path=/trunk/; revision=12130
2004-09-29 00:52:45 +00:00
#include <epan/ipproto.h>
From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an include of <resolv.h> in any system header file gets the system <resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]). svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
#include <epan/addr_resolv.h>
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
#include "packet-dns.h"
Make a "tcp_dissect_pdus()" with the standard loop for a TCP segment, extracting PDUs from it and possibly doing reassembly. Make the COPS, DNS, DSI, Gryphon, and SCCP dissectors use it. Add "set_actual_length()", "tcp_dissect_pdus()", "decode_boolean_bitfield()", "decode_numeric_bitfield()", and "decode_enumerated_bitfield()" to the list of routines available to dissectors on platforms where routines in the main program aren't available to dynamically-loaded code. Declare routines in "to_str.h" as "extern"; as I remember, that's necessary to allow the "decode_XXX_bitfield()" routines declared therein to be made available to plugins as per the above. Note that new exported routines should be added to the end of the table if that's the only change being made to the table. Create a new "plugin_api_decls.h" header file, used to declare both the "p_" variables and the "p_" structure members in the routine-exporting mechanism; this reduces the number of places you have to change to change the list of exported routines. svn path=/trunk/; revision=5394
2002-05-05 00:16:38 +00:00
#include "packet-tcp.h"
Move prefs.c and prefs.h into the epan subdirectory. svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
#include <epan/prefs.h>
fix #201: add format_text before output of the DNS name, in case it contains invalid chars svn path=/trunk/; revision=14479
2005-05-29 13:02:57 +00:00
#include <epan/strutil.h>
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#include <epan/expert.h>
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
#include <epan/afn.h>
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
[-Wmissing-prototypes] Use explicit casts. svn path=/trunk/; revision=48341
2013-03-16 16:25:41 +00:00
void proto_register_dns(void);
void proto_reg_handoff_dns(void);
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int proto_dns = -1;
For DNS-over-TCP, put the length indicator into the tree for the DNS request/response. svn path=/trunk/; revision=3633
2001-07-02 07:29:03 +00:00
static int hf_dns_length = -1;
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
static int hf_dns_flags = -1;
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static int hf_dns_flags_response = -1;
static int hf_dns_flags_opcode = -1;
static int hf_dns_flags_authoritative = -1;
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
static int hf_dns_flags_conflict_query = -1;
static int hf_dns_flags_conflict_response = -1;
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static int hf_dns_flags_truncated = -1;
static int hf_dns_flags_recdesired = -1;
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
static int hf_dns_flags_tentative = -1;
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static int hf_dns_flags_recavail = -1;
From Yaniv Kaul: show MBZ flags as either OK if 0 or incorrect if not 0. svn path=/trunk/; revision=7645
2003-05-07 03:00:32 +00:00
static int hf_dns_flags_z = -1;
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static int hf_dns_flags_authenticated = -1;
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
static int hf_dns_flags_ad = -1;
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static int hf_dns_flags_checkdisable = -1;
static int hf_dns_flags_rcode = -1;
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
static int hf_dns_transaction_id = -1;
static int hf_dns_count_questions = -1;
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
static int hf_dns_count_zones = -1;
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
static int hf_dns_count_answers = -1;
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
static int hf_dns_count_prerequisites = -1;
static int hf_dns_count_updates = -1;
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
static int hf_dns_count_auth_rr = -1;
static int hf_dns_count_add_rr = -1;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static int hf_dns_qry_name = -1;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
static int hf_dns_qry_name_len = -1;
static int hf_dns_count_labels = -1;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static int hf_dns_qry_type = -1;
static int hf_dns_qry_class = -1;
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
static int hf_dns_qry_class_mdns = -1;
static int hf_dns_qry_qu = -1;
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
static int hf_dns_srv_service = -1;
static int hf_dns_srv_proto = -1;
static int hf_dns_srv_name = -1;
- Make dns srv elemnts filterable (were: text only) - Don't suppress first character in srv service and protocol as some services don't use _ as first character svn path=/trunk/; revision=43774
2012-07-17 21:10:02 +00:00
static int hf_dns_srv_priority = -1;
static int hf_dns_srv_weight = -1;
static int hf_dns_srv_port = -1;
static int hf_dns_srv_target = -1;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
static int hf_dns_naptr_order = -1;
static int hf_dns_naptr_preference = -1;
static int hf_dns_naptr_flags_length = -1;
static int hf_dns_naptr_flags = -1;
static int hf_dns_naptr_service_length = -1;
static int hf_dns_naptr_service = -1;
static int hf_dns_naptr_regex_length = -1;
static int hf_dns_naptr_regex = -1;
static int hf_dns_naptr_replacement_length = -1;
static int hf_dns_naptr_replacement = -1;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static int hf_dns_rr_name = -1;
static int hf_dns_rr_type = -1;
static int hf_dns_rr_class = -1;
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
static int hf_dns_rr_class_mdns = -1;
static int hf_dns_rr_cache_flush = -1;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static int hf_dns_rr_ttl = -1;
static int hf_dns_rr_len = -1;
From Alex Kirk via bug 4366: Add DNS response addresses to tshark fields list. svn path=/trunk/; revision=31394
2009-12-31 15:36:40 +00:00
static int hf_dns_rr_addr = -1;
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
static int hf_dns_md = -1;
static int hf_dns_mf = -1;
static int hf_dns_mb = -1;
static int hf_dns_mg = -1;
static int hf_dns_mr = -1;
Enhance NULL type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51707
2013-09-03 06:34:52 +00:00
static int hf_dns_null = -1;
Enhance AAAA DNS Type svn path=/trunk/; revision=49713
2013-06-03 13:10:02 +00:00
static int hf_dns_aaaa = -1;
Make the Primary name element filterable in response records. Same for Nameserver names. svn path=/trunk/; revision=35058
2010-11-28 21:45:15 +00:00
static int hf_dns_rr_primaryname = -1;
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything. svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
static int hf_dns_rr_udp_payload_size = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
static int hf_dns_soa_mname = -1;
static int hf_dns_soa_rname = -1;
static int hf_dns_soa_serial_number = -1;
static int hf_dns_soa_refresh_interval = -1;
static int hf_dns_soa_retry_interval = -1;
static int hf_dns_soa_expire_limit = -1;
static int hf_dns_soa_minimum_ttl = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make PTR Type filterable svn path=/trunk/; revision=44848
2012-09-10 15:52:37 +00:00
static int hf_dns_ptr_domain_name = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
static int hf_dns_wks_address = -1;
static int hf_dns_wks_protocol = -1;
static int hf_dns_wks_bits = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make HINFO filtereable svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
static int hf_dns_hinfo_cpu_length = -1;
static int hf_dns_hinfo_cpu = -1;
static int hf_dns_hinfo_os_length = -1;
static int hf_dns_hinfo_os = -1;
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
static int hf_dns_minfo_r_mailbox = -1;
static int hf_dns_minfo_e_mailbox = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make MX filtereable svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
static int hf_dns_mx_preference = -1;
static int hf_dns_mx_mail_exchange = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make TXT, SPF type filterable svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
static int hf_dns_txt_length = -1;
static int hf_dns_txt = -1;
static int hf_dns_spf_length = -1;
static int hf_dns_spf = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
static int hf_dns_rrsig_type_covered = -1;
static int hf_dns_rrsig_algorithm = -1;
static int hf_dns_rrsig_labels = -1;
static int hf_dns_rrsig_original_ttl = -1;
static int hf_dns_rrsig_signature_expiration = -1;
static int hf_dns_rrsig_signature_inception = -1;
static int hf_dns_rrsig_key_tag = -1;
static int hf_dns_rrsig_signers_name = -1;
static int hf_dns_rrsig_signature = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
static int hf_dns_dnskey_flags = -1;
static int hf_dns_dnskey_flags_zone_key = -1;
static int hf_dns_dnskey_flags_key_revoked = -1;
static int hf_dns_dnskey_flags_secure_entry_point = -1;
static int hf_dns_dnskey_flags_reserved = -1;
static int hf_dns_dnskey_protocol = -1;
static int hf_dns_dnskey_algorithm = -1;
static int hf_dns_dnskey_key_id = -1;
static int hf_dns_dnskey_public_key = -1;
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
static int hf_dns_key_flags = -1;
static int hf_dns_key_flags_authentication = -1;
static int hf_dns_key_flags_confidentiality = -1;
static int hf_dns_key_flags_key_required = -1;
static int hf_dns_key_flags_associated_user = -1;
static int hf_dns_key_flags_associated_named_entity = -1;
static int hf_dns_key_flags_ipsec = -1;
static int hf_dns_key_flags_mime = -1;
static int hf_dns_key_flags_signatory = -1;
static int hf_dns_key_protocol = -1;
static int hf_dns_key_algorithm = -1;
static int hf_dns_key_key_id = -1;
static int hf_dns_key_public_key = -1;
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
static int hf_dns_px_preference = -1;
static int hf_dns_px_map822 = -1;
static int hf_dns_px_mapx400 = -1;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
static int hf_dns_tkey_algo_name = -1;
static int hf_dns_tkey_signature_expiration = -1;
static int hf_dns_tkey_signature_inception = -1;
static int hf_dns_tkey_mode = -1;
static int hf_dns_tkey_error = -1;
static int hf_dns_tkey_key_size = -1;
static int hf_dns_tkey_key_data = -1;
static int hf_dns_tkey_other_size = -1;
static int hf_dns_tkey_other_data = -1;
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
static int hf_dns_ipseckey_gateway_precedence = -1;
static int hf_dns_ipseckey_gateway_type = -1;
static int hf_dns_ipseckey_gateway_algorithm = -1;
static int hf_dns_ipseckey_gateway_ipv4 = -1;
static int hf_dns_ipseckey_gateway_ipv6 = -1;
static int hf_dns_ipseckey_gateway_dns = -1;
static int hf_dns_ipseckey_public_key = -1;
Enhance A6 DNS Type svn path=/trunk/; revision=49714
2013-06-03 13:10:12 +00:00
static int hf_dns_a6_prefix_len = -1;
static int hf_dns_a6_address_suffix = -1;
static int hf_dns_a6_prefix_name = -1;
Enhance DNAME DNS Type svn path=/trunk/; revision=49715
2013-06-03 13:10:22 +00:00
static int hf_dns_dname = -1;
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
static int hf_dns_loc_version = -1;
static int hf_dns_loc_size = -1;
static int hf_dns_loc_horizontal_precision = -1;
static int hf_dns_loc_vertical_precision = -1;
static int hf_dns_loc_latitude = -1;
static int hf_dns_loc_longitude = -1;
static int hf_dns_loc_altitude = -1;
static int hf_dns_loc_unknown_data = -1;
Enhance NXT DNS Type svn path=/trunk/; revision=49718
2013-06-03 13:10:53 +00:00
static int hf_dns_nxt_next_domain_name = -1;
Enhance KX DNS Type (and fix a minor bug.. KX Preference is always = 0...) svn path=/trunk/; revision=49719
2013-06-03 13:11:02 +00:00
static int hf_dns_kx_preference = -1;
static int hf_dns_kx_key_exchange = -1;
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
static int hf_dns_cert_type = -1;
static int hf_dns_cert_key_tag = -1;
static int hf_dns_cert_algorithm = -1;
static int hf_dns_cert_certificate = -1;
Enhance NSEC DNS Type svn path=/trunk/; revision=49717
2013-06-03 13:10:39 +00:00
static int hf_dns_nsec_next_domain_name = -1;
Make the Primary name element filterable in response records. Same for Nameserver names. svn path=/trunk/; revision=35058
2010-11-28 21:45:15 +00:00
static int hf_dns_rr_ns = -1;
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
static int hf_dns_rr_opt = -1;
static int hf_dns_rr_opt_code = -1;
static int hf_dns_rr_opt_len = -1;
static int hf_dns_rr_opt_data = -1;
Add RFC6975 (Signaling Cryptographic Algorithm Understanding in DNS Security Extensions (DNSSEC)) support ( DAU, DHU and N3U OPT(ion)) svn path=/trunk/; revision=50840
2013-07-23 14:54:18 +00:00
static int hf_dns_rr_opt_dau = -1;
static int hf_dns_rr_opt_dhu = -1;
static int hf_dns_rr_opt_n3u = -1;
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
static int hf_dns_rr_opt_client_family = -1;
static int hf_dns_rr_opt_client_netmask = -1;
static int hf_dns_rr_opt_client_scope = -1;
static int hf_dns_rr_opt_client_addr = -1;
static int hf_dns_rr_opt_client_addr4 = -1;
static int hf_dns_rr_opt_client_addr6 = -1;
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
static int hf_dns_nsec3_algo = -1;
static int hf_dns_nsec3_flags = -1;
static int hf_dns_nsec3_flag_optout = -1;
static int hf_dns_nsec3_iterations = -1;
static int hf_dns_nsec3_salt_length = -1;
static int hf_dns_nsec3_salt_value = -1;
static int hf_dns_nsec3_hash_length = -1;
static int hf_dns_nsec3_hash_value = -1;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
static int hf_dns_tlsa_certificate_usage = -1;
static int hf_dns_tlsa_selector = -1;
static int hf_dns_tlsa_matching_type = -1;
static int hf_dns_tlsa_certificate_association_data = -1;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
static int hf_dns_tsig_algorithm_name = -1;
static int hf_dns_tsig_time_signed = -1;
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
static int hf_dns_tsig_error = -1;
static int hf_dns_tsig_fudge = -1;
static int hf_dns_tsig_mac_size = -1;
static int hf_dns_tsig_mac = -1;
static int hf_dns_tsig_original_id = -1;
static int hf_dns_tsig_other_len = -1;
static int hf_dns_tsig_other_data = -1;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
static int hf_dns_response_in = -1;
static int hf_dns_response_to = -1;
static int hf_dns_time = -1;
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
static int hf_dns_sshfp_algorithm = -1;
static int hf_dns_sshfp_fingerprint_type = -1;
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
static int hf_dns_sshfp_fingerprint = -1;
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
static int hf_dns_hip_hit_length = -1;
static int hf_dns_hip_pk_algo = -1;
static int hf_dns_hip_pk_length = -1;
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
static int hf_dns_hip_hit = -1;
static int hf_dns_hip_pk = -1;
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
static int hf_dns_hip_rendezvous_server = -1;
As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
static int hf_dns_dhcid_rdata = -1;
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
static int hf_dns_ds_key_id = -1;
static int hf_dns_ds_algorithm = -1;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
static int hf_dns_apl_coded_prefix = -1;
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
static int hf_dns_ds_digest_type = -1;
static int hf_dns_ds_digest = -1;
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
static int hf_dns_apl_address_family = -1;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
static int hf_dns_apl_negation = -1;
static int hf_dns_apl_afdlength = -1;
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
static int hf_dns_apl_afdpart_ipv4 = -1;
static int hf_dns_apl_afdpart_ipv6 = -1;
static int hf_dns_apl_afdpart_data = -1;
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
static int hf_dns_gpos_longitude_length = -1;
static int hf_dns_gpos_longitude = -1;
static int hf_dns_gpos_latitude_length = -1;
static int hf_dns_gpos_latitude = -1;
static int hf_dns_gpos_altitude_length = -1;
static int hf_dns_gpos_altitude = -1;
Enhance RP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
static int hf_dns_rp_mailbox = -1;
static int hf_dns_rp_txt_rr = -1;
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
static int hf_dns_afsdb_subtype = -1;
static int hf_dns_afsdb_hostname = -1;
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
static int hf_dns_x25_length = -1;
static int hf_dns_x25_psdn_address = -1;
static int hf_dns_isdn_length = -1;
static int hf_dns_isdn_address = -1;
static int hf_dns_isdn_sa_length = -1;
static int hf_dns_isdn_sa = -1;
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
static int hf_dns_rt_preference = -1;
static int hf_dns_rt_intermediate_host = -1;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
static int hf_dns_nsap_rdata = -1;
Enhance NSAP and NSAP PTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
static int hf_dns_nsap_ptr_owner = -1;
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
static int hf_dns_caa_flags = -1;
static int hf_dns_caa_flag_issuer_critical = -1;
static int hf_dns_caa_issue = -1;
static int hf_dns_caa_issuewild = -1;
static int hf_dns_caa_iodef = -1;
static int hf_dns_caa_unknown = -1;
static int hf_dns_caa_tag_length = -1;
static int hf_dns_caa_tag = -1;
static int hf_dns_caa_value = -1;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
static int hf_dns_wins_local_flag = -1;
static int hf_dns_wins_lookup_timeout = -1;
static int hf_dns_wins_cache_timeout = -1;
static int hf_dns_wins_nb_wins_servers = -1;
static int hf_dns_wins_server = -1;
static int hf_dns_winsr_local_flag = -1;
static int hf_dns_winsr_lookup_timeout = -1;
static int hf_dns_winsr_cache_timeout = -1;
static int hf_dns_winsr_name_result_domain = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_dns = -1;
static gint ett_dns_qd = -1;
static gint ett_dns_rr = -1;
static gint ett_dns_qry = -1;
static gint ett_dns_ans = -1;
static gint ett_dns_flags = -1;
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
static gint ett_dns_opts = -1;
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
static gint ett_nsec3_flags = -1;
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
static gint ett_key_flags = -1;
Call the GSSAPI dissector when disecting GSSAPI transaction keys. The TKEY request works quite nicely but I'm not sure what to call for the response. Currently it just displays "Unknown header: (cls=2, cons=1, tag=1) which looks like it's some more ASN.1 data. svn path=/trunk/; revision=7002
2003-01-26 01:00:05 +00:00
static gint ett_t_key = -1;
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
static gint ett_dns_mac = -1;
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
static gint ett_caa_flags = -1;
static gint ett_caa_data = -1;
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
Batch of filterable expert_infos. svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
static expert_field ei_dns_rr_opt_bad_length = EI_INIT;
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
static expert_field ei_dns_depr_opc = EI_INIT;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
static expert_field ei_ttl_negative = EI_INIT;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
static expert_field ei_dns_tsig_alg = EI_INIT;
Batch of filterable expert_infos. svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
static dissector_table_t dns_tsig_dissector_table=NULL;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
/* Added to be able to configure DNS ports. */
static dissector_handle_t dns_tcp_handle;
static dissector_handle_t dns_udp_handle;
static range_t *global_dns_tcp_port_range;
static range_t *global_dns_udp_port_range;
Add support for desegmentation of DNS messages. Make the default for NBSS and ONC RPC-over-TCP desegmentation "on", rather than "off"; the default for desegmentation in general is "off", so this won't change the default behavior, but it lets you turn desegmentation on by flipping only one switch (and turn it off for particular protocols if you desire). svn path=/trunk/; revision=3943
2001-09-17 02:07:00 +00:00
/* desegmentation of DNS over TCP */
static gboolean dns_desegment = TRUE;
Add a preference for whether to use names found in DNS packets for address resolution. svn path=/trunk/; revision=51584
2013-08-30 01:29:46 +00:00
/* whether or not to use DNS data we see in packets to resolve addresses */
static gboolean dns_use_for_addr_resolution = TRUE;
Call the GSSAPI dissector when disecting GSSAPI transaction keys. The TKEY request works quite nicely but I'm not sure what to call for the response. Currently it just displays "Unknown header: (cls=2, cons=1, tag=1) which looks like it's some more ASN.1 data. svn path=/trunk/; revision=7002
2003-01-26 01:00:05 +00:00
/* Dissector handle for GSSAPI */
static dissector_handle_t gssapi_handle;
From Yaniv Kaul: yet *another* place where an NTLMSSP rather than GSSAPI blob can appear. svn path=/trunk/; revision=12563
2004-11-21 21:23:30 +00:00
static dissector_handle_t ntlmssp_handle;
Call the GSSAPI dissector when disecting GSSAPI transaction keys. The TKEY request works quite nicely but I'm not sure what to call for the response. Currently it just displays "Unknown header: (cls=2, cons=1, tag=1) which looks like it's some more ASN.1 data. svn path=/trunk/; revision=7002
2003-01-26 01:00:05 +00:00
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
/* Structure containing transaction specific information */
typedef struct _dns_transaction_t {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint32 req_frame;
guint32 rep_frame;
nstime_t req_time;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
} dns_transaction_t;
/* Structure containing conversation specific information */
typedef struct _dns_conv_info_t {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_tree_t *pdus;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
} dns_conv_info_t;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* DNS structs and definitions */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
/* Ports used for DNS. */
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
#define DEFAULT_DNS_PORT_RANGE "53"
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define SCTP_PORT_DNS 53
Add initial support for DNS/SCTP. svn path=/trunk/; revision=30035
2009-09-21 12:00:03 +00:00
#define UDP_PORT_MDNS 5353
#define TCP_PORT_MDNS 5353
#define UDP_PORT_LLMNR 5355
#if 0
Fix some typos. svn path=/trunk/; revision=40788
2012-02-01 02:23:51 +00:00
/* PPID used for DNS/SCTP (will be changed when IANA assigned) */
Add initial support for DNS/SCTP. svn path=/trunk/; revision=30035
2009-09-21 12:00:03 +00:00
#define DNS_PAYLOAD_PROTOCOL_ID 1000
#endif
Make "make-reg-dotc" generate a "register_all_protocol_handoffs()" routine, which calls all routines found in the dissector source files with names that match " proto_reg_handoff_[a-z_0-9A-Z]*". Call "register_all_protocol_handoffs()" after calling "register_all_protocols()" - "register_all_protocols()" needs to be called first, so that all protocols can register their fields, because registering a dissector as being called if field "proto.port" is equal to N requires that "proto.port" be a registered field. Give DNS a handoff registration routine, and register its dissector to be called if "udp.port" is UDP_PORT_DNS; remove the registration of DNS from "packet-udp.c", and make "dissect_dns()" static (as nobody else need know that it exists). svn path=/trunk/; revision=1788
2000-04-04 06:17:30 +00:00
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
/* Offsets of fields in the DNS header. */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define DNS_ID 0
#define DNS_FLAGS 2
#define DNS_QUEST 4
#define DNS_ANS 6
#define DNS_AUTH 8
#define DNS_ADD 10
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
/* Length of DNS header. */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define DNS_HDRLEN 12
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
/* type values */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define T_A 1 /* host address */
#define T_NS 2 /* authoritative name server */
#define T_MD 3 /* mail destination (obsolete) */
#define T_MF 4 /* mail forwarder (obsolete) */
#define T_CNAME 5 /* canonical name */
#define T_SOA 6 /* start of authority zone */
#define T_MB 7 /* mailbox domain name (experimental) */
#define T_MG 8 /* mail group member (experimental) */
#define T_MR 9 /* mail rename domain name (experimental) */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
#define T_NULL 10 /* null RR (experimental) */
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
#define T_WKS 11 /* well known service */
#define T_PTR 12 /* domain name pointer */
#define T_HINFO 13 /* host information */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
#define T_MINFO 14 /* mailbox or mail list information */
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
#define T_MX 15 /* mail routing information */
#define T_TXT 16 /* text strings */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
#define T_RP 17 /* responsible person (RFC 1183) */
#define T_AFSDB 18 /* AFS data base location (RFC 1183) */
#define T_X25 19 /* X.25 address (RFC 1183) */
#define T_ISDN 20 /* ISDN address (RFC 1183) */
#define T_RT 21 /* route-through (RFC 1183) */
#define T_NSAP 22 /* OSI NSAP (RFC 1706) */
#define T_NSAP_PTR 23 /* PTR equivalent for OSI NSAP (RFC 1348 - obsolete) */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
#define T_SIG 24 /* digital signature (RFC 2535) */
#define T_KEY 25 /* public key (RFC 2535) */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
#define T_PX 26 /* pointer to X.400/RFC822 mapping info (RFC 1664) */
#define T_GPOS 27 /* geographical position (RFC 1712) */
#define T_AAAA 28 /* IPv6 address (RFC 1886) */
#define T_LOC 29 /* geographical location (RFC 1876) */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
#define T_NXT 30 /* "next" name (RFC 2535) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_EID 31 /* Endpoint Identifier */
#define T_NIMLOC 32 /* Nimrod Locator */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
#define T_SRV 33 /* service location (RFC 2052) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_ATMA 34 /* ATM Address */
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
#define T_NAPTR 35 /* naming authority pointer (RFC 3403) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define T_KX 36 /* Key Exchange (RFC 2230) */
#define T_CERT 37 /* Certificate (RFC 4398) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_A6 38 /* IPv6 address with indirection (RFC 2874 - obsolete) */
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
#define T_DNAME 39 /* Non-terminal DNS name redirection (RFC 2672) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_SINK 40 /* SINK */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define T_OPT 41 /* OPT pseudo-RR (RFC 2671) */
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
#define T_APL 42 /* Lists of Address Prefixes (APL RR) (RFC 3123) */
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
#define T_DS 43 /* Delegation Signature (RFC 4034) */
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
#define T_SSHFP 44 /* Using DNS to Securely Publish SSH Key Fingerprints (RFC 4255) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_IPSECKEY 45 /* RFC 4025 */
#define T_RRSIG 46 /* RFC 4034 */
#define T_NSEC 47 /* RFC 4034 */
#define T_DNSKEY 48 /* RFC 4034 */
From Ivan Sy: Add support for Support for DHCID RR (RFC 4701). svn path=/trunk/; revision=29305
2009-08-05 18:17:18 +00:00
#define T_DHCID 49 /* DHCID RR (RFC 4701) */
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
#define T_NSEC3 50 /* Next secure hash (RFC 5155) */
#define T_NSEC3PARAM 51 /* NSEC3 parameters (RFC 5155) */
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
#define T_TLSA 52 /* TLSA (RFC 6698) */
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
#define T_HIP 55 /* Host Identity Protocol (HIP) RR (RFC 5205) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_NINFO 56 /* NINFO */
#define T_RKEY 57 /* RKEY */
#define T_TALINK 58 /* Trust Anchor LINK */
#define T_CDS 59 /* Child DS */
From Ivan Sy via bug 3797: Support for SPF RR (RFC 4408) - this has the same format as TXT RR (see section 3.1.1) below. Currently wireshark 1.2.1 shows this as Unknown type 99 svn path=/trunk/; revision=29253
2009-07-31 16:37:53 +00:00
#define T_SPF 99 /* SPF RR (RFC 4408) section 3 */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define T_TKEY 249 /* Transaction Key (RFC 2930) */
#define T_TSIG 250 /* Transaction Signature (RFC 2845) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_IXFR 251 /* incremental transfer (RFC 1995) */
#define T_AXFR 252 /* transfer of an entire zone (RFC 5936) */
#define T_MAILB 253 /* mailbox-related RRs (MB, MG or MR) (RFC 1035) */
#define T_MAILA 254 /* mail agent RRs (OBSOLETE - see MX) (RFC 1035) */
#define T_ANY 255 /* A request for all records (RFC 1035) */
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
#define T_CAA 257 /* Certification Authority Authorization (RFC 6844) */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
#define T_DLV 32769 /* DNSSEC Lookaside Validation (DLV) DNS Resource Record (RFC 4431) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define T_WINS 65281 /* Microsoft's WINS RR */
#define T_WINS_R 65282 /* Microsoft's WINS-R RR */
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Add #defines for class values, and use them rather than using the numeric values. (Also, just for laughs and for completeness, turn the CS class into "csnet", even though it's obsolete and supposedly used only in some examples in obsolete RFCs.) svn path=/trunk/; revision=2240
2000-08-09 07:15:19 +00:00
/* Class values */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define C_IN 1 /* the Internet */
#define C_CS 2 /* CSNET (obsolete) */
#define C_CH 3 /* CHAOS */
#define C_HS 4 /* Hesiod */
#define C_NONE 254 /* none */
#define C_ANY 255 /* any */
#define C_QU (1<<15) /* High bit is set in queries for unicast queries */
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
#define C_FLUSH (1<<15) /* High bit is set for MDNS cache flush */
Add #defines for class values, and use them rather than using the numeric values. (Also, just for laughs and for completeness, turn the CS class into "csnet", even though it's obsolete and supposedly used only in some examples in obsolete RFCs.) svn path=/trunk/; revision=2240
2000-08-09 07:15:19 +00:00
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
/* Bit fields in the flags */
#define F_RESPONSE (1<<15) /* packet is response */
#define F_OPCODE (0xF<<11) /* query opcode */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define OPCODE_SHIFT 11
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
#define F_AUTHORITATIVE (1<<10) /* response is authoritative */
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
#define F_CONFLICT (1<<10) /* conflict detected */
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
#define F_TRUNCATED (1<<9) /* response is truncated */
#define F_RECDESIRED (1<<8) /* recursion desired */
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
#define F_TENTATIVE (1<<8) /* response is tentative */
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
#define F_RECAVAIL (1<<7) /* recursion available */
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
#define F_Z (1<<6) /* Z */
support A6 packet (IPv6 name resolution). support AD and CD bit in RFC2535 (DNS security extension) section 6. (seen on packets from BIND9 named) svn path=/trunk/; revision=1890
2000-04-26 12:01:50 +00:00
#define F_AUTHENTIC (1<<5) /* authentic data (RFC2535) */
#define F_CHECKDISABLE (1<<4) /* checking disabled (RFC2535) */
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
#define F_RCODE (0xF<<0) /* reply code */
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
/* Optcode values for EDNS0 options (RFC 2671) */
#define O_LLQ 1 /* Long-lived query (on-hold, draft-sekar-dns-llq) */
#define O_UL 2 /* Update lease (on-hold, draft-sekar-dns-ul) */
#define O_NSID 3 /* Name Server Identifier (RFC 5001) */
#define O_OWNER 4 /* Owner, reserved (draft-cheshire-edns0-owner-option) */
Add RFC6975 (Signaling Cryptographic Algorithm Understanding in DNS Security Extensions (DNSSEC)) support ( DAU, DHU and N3U OPT(ion)) svn path=/trunk/; revision=50840
2013-07-23 14:54:18 +00:00
#define O_DAU 5 /* DNSSEC Algorithm Understood (RFC6975) */
#define O_DHU 6 /* DS Hash Understood (RFC6975) */
#define O_N3U 7 /* NSEC3 Hash Understood (RFC6975) */
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
#define O_CLIENT_SUBNET 8 /* Client subnet as assigned by IANA */
#define O_CLIENT_SUBNET_EXP 0x50fa /* Client subnet (placeholder value, draft-vandergaast-edns-client-subnet) */
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static const true_false_string tfs_flags_response = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Message is a response",
"Message is a query"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
static const true_false_string tfs_flags_authoritative = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Server is an authority for domain",
"Server is not an authority for domain"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
static const true_false_string tfs_flags_conflict_query = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"The sender received multiple responses",
"None"
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
};
static const true_false_string tfs_flags_conflict_response = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"The name is not considered unique",
"The name is considered unique"
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
};
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static const true_false_string tfs_flags_truncated = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Message is truncated",
"Message is not truncated"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
static const true_false_string tfs_flags_recdesired = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Do query recursively",
"Don't do query recursively"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
static const true_false_string tfs_flags_tentative = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Tentative",
"Not tentative"
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
};
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static const true_false_string tfs_flags_recavail = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Server can do recursive queries",
"Server can't do recursive queries"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
From Yaniv Kaul: show MBZ flags as either OK if 0 or incorrect if not 0. svn path=/trunk/; revision=7645
2003-05-07 03:00:32 +00:00
static const true_false_string tfs_flags_z = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"reserved - incorrect!",
"reserved (0)"
From Yaniv Kaul: show MBZ flags as either OK if 0 or incorrect if not 0. svn path=/trunk/; revision=7645
2003-05-07 03:00:32 +00:00
};
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
static const true_false_string tfs_flags_authenticated = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Answer/authority portion was authenticated by the server",
"Answer/authority portion was not authenticated by the server"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
static const true_false_string tfs_flags_checkdisable = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Acceptable",
"Unacceptable"
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
};
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
/* Opcodes */
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
#define OPCODE_QUERY 0 /* standard query */
#define OPCODE_IQUERY 1 /* inverse query */
#define OPCODE_STATUS 2 /* server status request */
#define OPCODE_NOTIFY 4 /* zone change notification */
#define OPCODE_UPDATE 5 /* dynamic update */
static const value_string opcode_vals[] = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ OPCODE_QUERY, "Standard query" },
{ OPCODE_IQUERY, "Inverse query" },
{ OPCODE_STATUS, "Server status request" },
{ OPCODE_NOTIFY, "Zone change notification" },
{ OPCODE_UPDATE, "Dynamic update" },
{ 0, NULL } };
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
/* Reply codes */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define RCODE_NOERROR 0
#define RCODE_FORMERR 1
#define RCODE_SERVFAIL 2
#define RCODE_NXDOMAIN 3
#define RCODE_NOTIMPL 4
#define RCODE_REFUSED 5
#define RCODE_YXDOMAIN 6
#define RCODE_YXRRSET 7
#define RCODE_NXRRSET 8
#define RCODE_NOTAUTH 9
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
#define RCODE_NOTZONE 10
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
#define RCODE_BAD 16
#define RCODE_BADKEY 17
#define RCODE_BADTIME 18
#define RCODE_BADMODE 19
#define RCODE_BADNAME 20
#define RCODE_BADALG 21
#define RCODE_BADTRUNC 22
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
static const value_string rcode_vals[] = {
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
{ RCODE_NOERROR, "No error" },
{ RCODE_FORMERR, "Format error" },
{ RCODE_SERVFAIL, "Server failure" },
{ RCODE_NXDOMAIN, "No such name" },
{ RCODE_NOTIMPL, "Not implemented" },
{ RCODE_REFUSED, "Refused" },
{ RCODE_YXDOMAIN, "Name exists" },
{ RCODE_YXRRSET, "RRset exists" },
{ RCODE_NXRRSET, "RRset does not exist" },
{ RCODE_NOTAUTH, "Not authoritative" },
{ RCODE_NOTZONE, "Name out of zone" },
/* 11-15 Unassigned */
{ RCODE_BAD, "Bad OPT Version or TSIG Signature Failure" },
{ RCODE_BADKEY, "Key not recognized" },
{ RCODE_BADTIME, "Signature out of time window" },
{ RCODE_BADMODE, "Bad TKEY Mode" },
{ RCODE_BADNAME, "Duplicate key name" },
{ RCODE_BADALG, "Algorithm not supported" },
{ RCODE_BADTRUNC, "Bad Truncation" },
{ 0, NULL }
};
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define NSEC3_HASH_RESERVED 0
#define NSEC3_HASH_SHA1 1
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
#define NSEC3_FLAG_OPTOUT 1
static const value_string hash_algorithms[] = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ NSEC3_HASH_RESERVED, "Reserved" },
{ NSEC3_HASH_SHA1, "SHA-1" },
{ 0, NULL } };
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
static const true_false_string tfs_flags_nsec3_optout = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Additional insecure delegations allowed",
"Additional insecure delegations forbidden"
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
};
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
static const true_false_string tfs_required_experimental = { "Experimental or optional", "Required" };
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
#define TKEYMODE_SERVERASSIGNED (1)
#define TKEYMODE_DIFFIEHELLMAN (2)
#define TKEYMODE_GSSAPI (3)
#define TKEYMODE_RESOLVERASSIGNED (4)
#define TKEYMODE_DELETE (5)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
static const value_string tkey_mode_vals[] = {
{ TKEYMODE_SERVERASSIGNED, "Server assigned" },
{ TKEYMODE_DIFFIEHELLMAN, "Diffie Hellman" },
{ TKEYMODE_GSSAPI, "GSSAPI" },
{ TKEYMODE_RESOLVERASSIGNED, "Resolver assigned" },
{ TKEYMODE_DELETE, "Delete" },
{ 0, NULL }
};
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
/*
* SSHFP (RFC 4255) algorithm number and fingerprint types
*/
#define TSSHFP_ALGO_RESERVED (0)
#define TSSHFP_ALGO_RSA (1)
#define TSSHFP_ALGO_DSA (2)
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
#define TSSHFP_FTYPE_RESERVED (0)
#define TSSHFP_FTYPE_SHA1 (1)
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
static const value_string sshfp_algo_vals[] = {
{ TSSHFP_ALGO_RESERVED, "Reserved" },
{ TSSHFP_ALGO_RSA, "RSA" },
{ TSSHFP_ALGO_DSA, "DSA" },
{ 0, NULL }
};
static const value_string sshfp_fingertype_vals[] = {
{ TSSHFP_FTYPE_RESERVED, "Reserved" },
{ TSSHFP_FTYPE_SHA1, "SHA1" },
{ 0, NULL }
};
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
/* HIP PK ALGO RFC 5205 */
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
#define THIP_ALGO_RESERVED (0)
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
#define THIP_ALGO_DSA (1)
#define THIP_ALGO_RSA (2)
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
static const value_string hip_algo_vals[] = {
{ THIP_ALGO_DSA, "DSA" },
{ THIP_ALGO_RSA, "RSA" },
{ THIP_ALGO_RESERVED, "Reserved" },
{ 0, NULL }
};
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
/* RFC 3123 */
#define TAPL_ADDR_FAMILY_IPV4 (AFNUM_INET)
#define TAPL_ADDR_FAMILY_IPV6 (AFNUM_INET6)
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
#define DNS_APL_NEGATION (1<<7)
#define DNS_APL_AFDLENGTH (0x7F<<0)
static const true_false_string tfs_dns_apl_negation = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Yes (!)",
"No (0)"
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
};
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
static const value_string afamily_vals[] = {
{ AFNUM_INET, "IPv4" },
{ AFNUM_INET6, "IPv6" },
{ 0, NULL }
};
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
/* RFC 6844 */
#define CAA_FLAG_ISSUER_CRITICAL (1<<7)
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
/* See RFC 1035 for all RR types for which no RFC is listed, except for
the ones with "???", and for the Microsoft WINS and WINS-R RRs, for
which one should look at
Give a URL that goes directly to the W2K Server documentation information on WINS and WINS-R records. svn path=/trunk/; revision=2146
2000-07-21 01:40:41 +00:00
http://www.windows.com/windows2000/en/server/help/sag_DNS_imp_UsingWinsLookup.htm
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
and
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
http://www.microsoft.com/windows2000/library/resources/reskit/samplechapters/cncf/cncf_imp_wwaw.asp
which discuss them to some extent. */
Tweek dns_types. svn path=/trunk/; revision=34810
2010-11-08 18:05:42 +00:00
/* http://www.iana.org/assignments/dns-parameters */
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static const value_string dns_types[] = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ 0, "Unused" },
{ T_A, "A" },
{ T_NS, "NS" },
{ T_MD, "MD" },
{ T_MF, "MF" },
{ T_CNAME, "CNAME" },
{ T_SOA, "SOA" },
{ T_MB, "MB" },
{ T_MG, "MG" },
{ T_MR, "MR" },
{ T_NULL, "NULL" },
{ T_WKS, "WKS" },
{ T_PTR, "PTR" },
{ T_HINFO, "HINFO" },
{ T_MINFO, "MINFO" },
{ T_MX, "MX" },
{ T_TXT, "TXT" },
{ T_RP, "RP" }, /* RFC 1183 */
{ T_AFSDB, "AFSDB" }, /* RFC 1183 */
{ T_X25, "X25" }, /* RFC 1183 */
{ T_ISDN, "ISDN" }, /* RFC 1183 */
{ T_RT, "RT" }, /* RFC 1183 */
{ T_NSAP, "NSAP" }, /* RFC 1706 */
{ T_NSAP_PTR, "NSAP-PTR" }, /* RFC 1348 */
{ T_SIG, "SIG" }, /* RFC 2535 */
{ T_KEY, "KEY" }, /* RFC 2535 */
{ T_PX, "PX" }, /* RFC 1664 */
{ T_GPOS, "GPOS" }, /* RFC 1712 */
{ T_AAAA, "AAAA" }, /* RFC 1886 */
{ T_LOC, "LOC" }, /* RFC 1886 */
{ T_NXT, "NXT" }, /* RFC 1876 */
{ T_EID, "EID" },
{ T_NIMLOC, "NIMLOC" },
{ T_SRV, "SRV" }, /* RFC 2052 */
{ T_ATMA, "ATMA" },
{ T_NAPTR, "NAPTR" }, /* RFC 3403 */
{ T_KX, "KX" }, /* RFC 2230 */
{ T_CERT, "CERT" }, /* RFC 4398 */
{ T_A6, "A6" }, /* RFC 2874 */
{ T_DNAME, "DNAME" }, /* RFC 2672 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
{ T_SINK, "SINK" },
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ T_OPT, "OPT" }, /* RFC 2671 */
{ T_APL, "APL" }, /* RFC 3123 */
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
{ T_DS, "DS" }, /* RFC 4034 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
{ T_SSHFP, "SSHFP" }, /* RFC 4255 */
{ T_IPSECKEY, "IPSECKEY" }, /* RFC 4025 */
{ T_RRSIG, "RRSIG" }, /* RFC 4034 */
{ T_NSEC, "NSEC" }, /* RFC 4034 */
{ T_DNSKEY, "DNSKEY" }, /* RFC 4034 */
{ T_DHCID, "DHCID" }, /* RFC 4701 */
{ T_NSEC3, "NSEC3" }, /* RFC 5155 */
{ T_NSEC3PARAM, "NSEC3PARAM" }, /* RFC 5155 */
{ T_TLSA, "TLSA" },
{ T_HIP, "HIP" }, /* RFC 5205 */
{ T_RKEY, "RKEY" },
{ T_TALINK, "TALINK" },
{ T_CDS, "CDS" },
{ T_SPF, "SPF" }, /* RFC 4408 */
{ 100, "UINFO" }, /* IANA reserved */
{ 101, "UID" }, /* IANA reserved */
{ 102, "GID" }, /* IANA reserved */
{ 103, "UNSPEC" }, /* IANA reserved */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ T_TKEY, "TKEY" },
{ T_TSIG, "TSIG" },
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
{ T_IXFR, "IXFR" },
{ T_AXFR, "AXFR" },
{ T_MAILA, "MAILB" },
{ T_MAILB, "MAILA" },
{ T_ANY, "ANY" },
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
{ T_CAA, "CAA" }, /* RFC 6844 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
{ T_DLV, "DLV" }, /* RFC 4431 */
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ T_WINS, "WINS" },
{ T_WINS_R, "WINS-R" },
{0, NULL}
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
};
Get rid of the private "my_match_strval()" routine in many dissectors; add a "match_strval_idx()" routine that does the same thing, and have "match_strval()" call it. Make those routines, and "val_to_str()", return a "const" pointer. Update dissectors as necessary to squelch compiler warnings produced by that. Use "val_to_str()" rather than using "match_strval()" and then, if the result is null, substituting a specific string. Clean up some other "match_strval()"/"val_to_str()" usages. Add a null pointer check in the NDPS dissector's "attribute_value()" routine, as it's not clear that "global_attribute_name" won't be null at that point. Make some global variables in the AFS4INT dissector local. Make some routines not used outside the module they're in static. Make some tables "static const". Clean up white space. Fix Gerald's address in some files. svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
static const char *
Replace the types from sys/types.h and netinet/in.h by their glib.h equivalents for the toplevel directory. The removal of winsock2.h will hopefully not cause any problems under MSVC++, as those files using struct timeval still include wtap.h, which still includes winsock2.h. svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
dns_type_name (guint type)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
return val_to_str(type, dns_types, "Unknown (%u)");
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Fix a bunch of warnings. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
static const char *
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
dns_type_description (guint type)
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
{
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static const char *type_names[] = {
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
"unused",
Reverse r34810 other than the comment because the re-ordering of dns_types[] caused the numbering to no longer be lined up so the "SRV" record (#33) type T_SRV was being given the description "EID" instead of "Service Location" svn path=/trunk/; revision=35367
2011-01-05 00:48:40 +00:00
"Host address",
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
"Authoritative name server",
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
"Mail destination",
"Mail forwarder",
"Canonical name for an alias",
"Start of zone of authority",
"Mailbox domain name",
"Mail group member",
"Mail rename domain name",
"Null resource record",
"Well-known service description",
"Domain name pointer",
"Host information",
"Mailbox or mail list information",
"Mail exchange",
"Text strings",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Responsible person", /* RFC 1183 */
"AFS data base location", /* RFC 1183 */
"X.25 address", /* RFC 1183 */
"ISDN number", /* RFC 1183 */
"Route through", /* RFC 1183 */
"OSI NSAP", /* RFC 1706 */
"OSI NSAP name pointer", /* RFC 1348 */
"Signature", /* RFC 2535 */
"Public key", /* RFC 2535 */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
"Pointer to X.400/RFC822 mapping info", /* RFC 1664 */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Geographical position", /* RFC 1712 */
"IPv6 address", /* RFC 1886 */
"Location", /* RFC 1876 */
"Next", /* RFC 2535 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
"Endpoint identifier",
"Nimrod locator",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Service location", /* RFC 2052 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
"ATM address",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Naming authority pointer", /* RFC 2168 */
"Key Exchange", /* RFC 2230 */
"Certificate", /* RFC 4398 */
"IPv6 address with indirection", /* RFC 2874 */
"Non-terminal DNS name redirection", /* RFC 2672 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
"SINK",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"EDNS0 option", /* RFC 2671 */
"Lists of Address Prefixes", /* RFC 3123 */
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
"Delegation Signer", /* RFC 4034 */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"SSH public host key fingerprint", /* RFC 4255 */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
"Key to use with IPSEC", /* draft-ietf-ipseckey-rr */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"RR signature", /* future RFC 2535bis */
"Next secured", /* future RFC 2535bis */
"DNS public key", /* future RFC 2535bis */
"DHCP Information", /* RFC 4701 */
"Next secured hash", /* RFC 5155 */
"NSEC3 parameters", /* RFC 5155 */
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
"TLSA", /* RFC 6698 */
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
NULL,
NULL,
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
"Host Identity Protocol", /* RFC 5205 */
"NINFO",
"RKEY",
"Trust Anchor LINK",
"Child DS"
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
};
Get rid of the private "my_match_strval()" routine in many dissectors; add a "match_strval_idx()" routine that does the same thing, and have "match_strval()" call it. Make those routines, and "val_to_str()", return a "const" pointer. Update dissectors as necessary to squelch compiler warnings produced by that. Use "val_to_str()" rather than using "match_strval()" and then, if the result is null, substituting a specific string. Clean up some other "match_strval()"/"val_to_str()" usages. Add a null pointer check in the NDPS dissector's "attribute_value()" routine, as it's not clear that "global_attribute_name" won't be null at that point. Make some global variables in the AFS4INT dissector local. Make some routines not used outside the module they're in static. Make some tables "static const". Clean up white space. Fix Gerald's address in some files. svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
const char *short_name;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
const char *long_name;
short_name = dns_type_name(type);
if (short_name == NULL) {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
return wmem_strdup_printf(wmem_packet_scope(), "Unknown (%u)", type);
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (type < array_length(type_names)) {
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
long_name = type_names[type];
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
/* special cases */
switch (type) {
/* meta */
case T_TKEY:
long_name = "Transaction Key";
break;
case T_TSIG:
long_name = "Transaction Signature";
break;
/* queries */
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
case T_IXFR:
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
long_name = "Request for incremental zone transfer"; /* RFC 1995 */
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
break;
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
case T_AXFR:
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
long_name = "Request for full zone transfer";
break;
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
case T_MAILB:
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
long_name = "Request for mailbox-related records";
break;
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
case T_MAILA:
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
long_name = "Request for mail agent resource records";
break;
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
case T_ANY:
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
long_name = "Request for all records";
break;
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
case T_CAA:
long_name = "Certification Authority Authorization";
break;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
default:
long_name = NULL;
break;
}
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (long_name != NULL) {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
return wmem_strdup_printf(wmem_packet_scope(), "%s (%s)", short_name, long_name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
return wmem_strdup(wmem_packet_scope(), short_name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
}
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
static const value_string edns0_opt_code_vals[] = {
{0, "Reserved"},
{O_LLQ, "LLQ - Long-lived query"},
{O_UL, "UL - Update lease"},
{O_NSID, "NSID - Name Server Identifier"},
{O_OWNER, "Owner (reserved)"},
Add RFC6975 (Signaling Cryptographic Algorithm Understanding in DNS Security Extensions (DNSSEC)) support ( DAU, DHU and N3U OPT(ion)) svn path=/trunk/; revision=50840
2013-07-23 14:54:18 +00:00
{O_DAU, "DAU - DNSSEC Algorithm Understood (RFC6975)"},
{O_DHU, "DHU - DS Hash Understood (RFC6975)"},
{O_N3U, "N3U - NSEC3 Hash Understood (RFC6975)"},
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
{O_CLIENT_SUBNET_EXP, "Experimental - CSUBNET - Client subnet" },
{O_CLIENT_SUBNET, "CSUBNET - Client subnet" },
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
{0, NULL}
};
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
/* DNS-Based Authentication of Named Entities (DANE) Parameters
http://www.iana.org/assignments/dane-parameters (last updated 2012-08-14)
*/
/* TLSA Certificate Usages */
#define TLSA_CU_CA 0
#define TLSA_CU_SC 1
#define TLSA_CU_TA 2
#define TLSA_CU_DI 3
static const value_string tlsa_certificate_usage_vals[] = {
{TLSA_CU_CA, "CA constraint"},
{TLSA_CU_SC, "Service certificate constraint"},
{TLSA_CU_TA, "Trust anchor assertion"},
{TLSA_CU_DI, "Domain-issued certificate"},
{0, NULL}
};
/* TLSA Selectors */
#define TLSA_S_FC 0
#define TLSA_S_SPKI 1
static const value_string tlsa_selector_vals[] = {
{TLSA_S_FC, "Full certificate"},
{TLSA_S_SPKI, "SubjectPublicKeyInfo"},
{0, NULL}
};
/* TLSA Matching Types */
#define TLSA_MT_NHU 0
#define TLSA_MT_S256 1
#define TLSA_MT_S512 2
static const value_string tlsa_matching_type_vals[] = {
{TLSA_MT_NHU, "No Hash Used"},
{TLSA_MT_S256, "SHA-256"},
{TLSA_MT_S512, "SHA-512"},
{0, NULL}
};
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
/* IPSECKEY RFC4025 */
static const value_string gw_algo_vals[] = {
{ 1, "DSA" },
{ 2, "RSA" },
{ 0, NULL }
};
static const value_string gw_type_vals[] = {
{ 0, "No Gateway" },
{ 1, "IPv4 Gateway" },
{ 2, "IPv6 Gateway" },
{ 3, "DNS Gateway" },
{ 0, NULL }
};
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static const value_string dns_classes[] = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{C_IN, "IN"},
{C_CS, "CS"},
{C_CH, "CH"},
{C_HS, "HS"},
{C_NONE, "NONE"},
{C_ANY, "ANY"},
{0,NULL}
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
};
Get rid of the private "my_match_strval()" routine in many dissectors; add a "match_strval_idx()" routine that does the same thing, and have "match_strval()" call it. Make those routines, and "val_to_str()", return a "const" pointer. Update dissectors as necessary to squelch compiler warnings produced by that. Use "val_to_str()" rather than using "match_strval()" and then, if the result is null, substituting a specific string. Clean up some other "match_strval()"/"val_to_str()" usages. Add a null pointer check in the NDPS dissector's "attribute_value()" routine, as it's not clear that "global_attribute_name" won't be null at that point. Make some global variables in the AFS4INT dissector local. Make some routines not used outside the module they're in static. Make some tables "static const". Clean up white space. Fix Gerald's address in some files. svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
const char *
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
dns_class_name(int dns_class)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
return val_to_str(dns_class, dns_classes, "Unknown (%u)");
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
improve get_dns_name now that we have cheap emem allocated buffers and get rid of a few strcpy() a whole lot of arrays from the stack and make the function prototype slightly nicer. svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
/* This function returns the number of bytes consumed and the expanded string
* in *name.
* The string is allocated with ep scope and does not need to be free()d.
* it will be automatically free()d when the packet has been dissected.
*/
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
int
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
expand_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar **name)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int start_offset = offset;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
guchar *np;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int len = -1;
int chars_processed = 0;
int data_size = tvb_reported_length_remaining(tvb, dns_data_offset);
int component_len;
int indir_offset;
int maxname;
const int min_len = 1; /* Minimum length of encoded name (for root) */
/* If we're about to return a value (probably negative) which is less
* than the minimum length, we're looking at bad data and we're liable
* to put the dissector into a loop. Instead we throw an exception */
From Graeme Hewson: add some sanity checks to DNS dissector to avoid loops. svn path=/trunk/; revision=5443
2002-05-11 18:46:38 +00:00
improve get_dns_name now that we have cheap emem allocated buffers and get rid of a few strcpy() a whole lot of arrays from the stack and make the function prototype slightly nicer. svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
maxname=MAXDNAME;
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
np=(guchar *)wmem_alloc(wmem_packet_scope(), maxname);
Add some GCC warnings to the standard set, and add some others to the --enable-extra-gcc-checks set. If we turn on -pedantic, try turning on -Wno-long-long as well, so that it's not *so* pedantic that it rejects the 64-bit integral data types that we explicitly require. Constify a bunch of stuff, and make some other changes, to get rid of warnings. Clean up some indentation. svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
*name=np;
improve get_dns_name now that we have cheap emem allocated buffers and get rid of a few strcpy() a whole lot of arrays from the stack and make the function prototype slightly nicer. svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
maxname--; /* reserve space for the trailing '\0' */
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
for (;;) {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (max_len && offset - start_offset > max_len - 1) {
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
break;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
component_len = tvb_get_guint8(tvb, offset);
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
offset++;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (component_len == 0) {
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
break;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Catch "loops" in compressed DNS names the same way the BSD DNS resolver, and BIND, do, by counting the number of characters we look at and, if when we see a pointer, we see we've already looked at as many characters as there are in the DNS packet, we conclude that we're looping. Also, check for pointers that point past the end of the packet (not just past the end of the captured portion of the packet, i.e. cases where we didn't capture all of the packet, but cases where the packet is actually malformed). svn path=/trunk/; revision=1830
2000-04-12 06:59:28 +00:00
chars_processed++;
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
switch (component_len & 0xc0) {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case 0x00:
/* Label */
if (np != *name) {
/* Not the first component - put in a '.'. */
if (maxname > 0) {
*np++ = '.';
maxname--;
}
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
while (component_len > 0) {
if (max_len && offset - start_offset > max_len - 1) {
THROW(ReportedBoundsError);
}
if (maxname > 0) {
*np++ = tvb_get_guint8(tvb, offset);
maxname--;
}
component_len--;
offset++;
chars_processed++;
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
break;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case 0x40:
/* Extended label (RFC 2673) */
switch (component_len & 0x3f) {
case 0x01:
/* Bitstring label */
{
int bit_count;
int label_len;
int print_len;
bit_count = tvb_get_guint8(tvb, offset);
offset++;
label_len = (bit_count - 1) / 8 + 1;
if (maxname > 0) {
print_len = g_snprintf(np, maxname + 1, "\\[x");
if (print_len != -1 && print_len <= maxname) {
/* Some versions of g_snprintf return -1 if they'd truncate
the output. Others return <buf_size> or greater. */
np += print_len;
maxname -= print_len;
} else {
/* Nothing printed, as there's no room.
Suppress all subsequent printing. */
maxname = 0;
}
}
while (label_len--) {
if (maxname > 0) {
print_len = g_snprintf(np, maxname + 1, "%02x",
tvb_get_guint8(tvb, offset));
if (print_len != -1 && print_len <= maxname) {
/* Some versions of g_snprintf return -1 if they'd truncate
the output. Others return <buf_size> or greater. */
np += print_len;
maxname -= print_len;
} else {
/* Nothing printed, as there's no room.
Suppress all subsequent printing. */
maxname = 0;
}
}
offset++;
}
if (maxname > 0) {
print_len = g_snprintf(np, maxname + 1, "/%d]", bit_count);
if (print_len != -1 && print_len <= maxname) {
/* Some versions of g_snprintf return -1 if they'd truncate
the output. Others return <buf_size> or greater. */
np += print_len;
maxname -= print_len;
} else {
/* Nothing printed, as there's no room.
Suppress all subsequent printing. */
maxname = 0;
}
}
}
break;
default:
*name="<Unknown extended label>";
/* Parsing will probably fail from here on, since the */
/* label length is unknown... */
len = offset - start_offset;
if (len < min_len) {
THROW(ReportedBoundsError);
}
return len;
}
break;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case 0x80:
THROW(ReportedBoundsError);
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case 0xc0:
/* Pointer. */
indir_offset = dns_data_offset +
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
(((component_len & ~0xc0) << 8) | tvb_get_guint8(tvb, offset));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset++;
chars_processed++;
Catch "loops" in compressed DNS names the same way the BSD DNS resolver, and BIND, do, by counting the number of characters we look at and, if when we see a pointer, we see we've already looked at as many characters as there are in the DNS packet, we conclude that we're looping. Also, check for pointers that point past the end of the packet (not just past the end of the captured portion of the packet, i.e. cases where we didn't capture all of the packet, but cases where the packet is actually malformed). svn path=/trunk/; revision=1830
2000-04-12 06:59:28 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
/* If "len" is negative, we are still working on the original name,
not something pointed to by a pointer, and so we should set "len"
to the length of the original name. */
if (len < 0) {
len = offset - start_offset;
}
/* If we've looked at every character in the message, this pointer
will make us look at some character again, which means we're
looping. */
if (chars_processed >= data_size) {
*name="<Name contains a pointer that loops>";
if (len < min_len) {
THROW(ReportedBoundsError);
}
return len;
}
Catch "loops" in compressed DNS names the same way the BSD DNS resolver, and BIND, do, by counting the number of characters we look at and, if when we see a pointer, we see we've already looked at as many characters as there are in the DNS packet, we conclude that we're looping. Also, check for pointers that point past the end of the packet (not just past the end of the captured portion of the packet, i.e. cases where we didn't capture all of the packet, but cases where the packet is actually malformed). svn path=/trunk/; revision=1830
2000-04-12 06:59:28 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset = indir_offset;
break; /* now continue processing from there */
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
*np = '\0';
/* If "len" is negative, we haven't seen a pointer, and thus haven't
set the length, so set it. */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (len < 0) {
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
len = offset - start_offset;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
if (len < min_len) {
From Graeme Hewson: add some sanity checks to DNS dissector to avoid loops. svn path=/trunk/; revision=5443
2002-05-11 18:46:38 +00:00
THROW(ReportedBoundsError);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
return len;
}
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
int
get_dns_name(tvbuff_t *tvb, int offset, int max_len, int dns_data_offset,
const guchar **name)
{
int len;
len = expand_dns_name(tvb, offset, max_len, dns_data_offset, name);
/* Zero-length name means "root server" */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (**name == '\0') {
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
*name="<Root>";
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Split get_dns_name() into get_dns_name() and expand_dns_name(). In dissect_ms_compressed_string() dissect_mscldap_string() simply call expand_dns_name() instead of using duplicate (and insecure) code. This *might* break CLDAP and SMB dissection. If that's the case we should probably revert get_dns_name() and simplify expand_dns_name(). Fixes infinite recursion errors found by joernchen of Phenoelit. svn path=/trunk/; revision=36029
2011-02-23 00:51:02 +00:00
return len;
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
static int
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
get_dns_name_type_class(tvbuff_t *tvb, int offset, int dns_data_offset,
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar **name_ret, int *name_len_ret, int *type_ret, int *class_ret)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
int len;
int name_len;
int type;
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
int dns_class;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
int start_offset = offset;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
name_len = get_dns_name(tvb, offset, 0, dns_data_offset, name_ret);
A DNS or NBNS name may contain pointers to other names in the packet; if the stuff referred to by those pointers goes past the end of the packet, that's not a reason not to return the length of the DNS or NBNS name itself - you can tag that name even though it's bad. Therefore, "get_dns_name()" should return the length of the part of the name it's looked at even if that name contains a pointer to stuff that goes past the end of the packet. This means you can't check its return value to see if it's negative, and treat it as an error if it is; remove that stuff. Add checks to make sure the type and class fields in an RR don't go past the end of the packet. svn path=/trunk/; revision=781
1999-10-07 09:21:38 +00:00
offset += name_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
type = tvb_get_ntohs(tvb, offset);
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
offset += 2;
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
dns_class = tvb_get_ntohs(tvb, offset);
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
offset += 2;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
*type_ret = type;
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
*class_ret = dns_class;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
*name_len_ret = name_len;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
len = offset - start_offset;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
return len;
}
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
static double
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
rfc1867_size(tvbuff_t *tvb, int offset)
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint8 val;
double size;
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
guint32 exponent;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
val = tvb_get_guint8(tvb, offset);
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
size = (val & 0xF0) >> 4;
exponent = (val & 0x0F);
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
while (exponent != 0) {
size *= 10;
exponent--;
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
return size / 100; /* return size in meters, not cm */
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
}
static char *
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
rfc1867_angle(tvbuff_t *tvb, int offset, const char *nsew)
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint32 angle;
char direction;
guint32 degrees, minutes, secs, tsecs;
/* "%u deg %u min %u.%03u sec %c" */
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
static char buf[10+1+3+1 + 2+1+3+1 + 2+1+3+1+3+1 + 1 + 1];
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
angle = tvb_get_ntohl(tvb, offset);
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
if (angle < 0x80000000U) {
angle = 0x80000000U - angle;
direction = nsew[1];
} else {
angle = angle - 0x80000000U;
direction = nsew[0];
}
tsecs = angle % 1000;
angle = angle / 1000;
secs = angle % 60;
angle = angle / 60;
minutes = angle % 60;
degrees = angle / 60;
several times replacing: sprintf -> g_snprintf snprintf -> g_snprintf vsnprintf -> g_vsnprintf strdup -> g_strdup svn path=/trunk/; revision=15412
2005-08-18 19:31:15 +00:00
g_snprintf(buf, sizeof(buf), "%u deg %u min %u.%03u sec %c", degrees, minutes, secs,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tsecs, direction);
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
return buf;
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
static int
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
column_info *cinfo, proto_tree *dns_tree, gboolean is_mdns)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
gchar *name_out;
int name_len;
int type;
int dns_class;
int qu;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
unsigned i;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
const char *type_name;
int data_start;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
guint16 labels;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree *q_tree;
proto_item *tq;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40887
2012-02-06 22:01:04 +00:00
data_start = offset;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
improve get_dns_name now that we have cheap emem allocated buffers and get rid of a few strcpy() a whole lot of arrays from the stack and make the function prototype slightly nicer. svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
len = get_dns_name_type_class(tvb, offset, dns_data_offset, &name, &name_len,
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
&type, &dns_class);
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
if (is_mdns) {
/* Split the QU flag and the class */
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
qu = dns_class & C_QU;
dns_class &= ~C_QU;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
qu = 0;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Fixed the infinite-loop problem in the DNS dissector, at least for the random packets I generated. I'm not convinced that all the problems are gone. We now: 1. Check that the bytes are indded in the frame before accessing them in dissect_dns_query() and dissect_dns_answer(). If not, we return 0, which means "0-byte increment". 2. Check the return value of the two functions above in dissect_query_records() and dissect_answer_records(), which have loops that call those two functions above. If a 0-byte increment is found, the loop is broken to avoid an infinite loop. svn path=/trunk/; revision=778
1999-10-07 02:26:45 +00:00
Show queries as a summary line (as was the case before my DNS checkins) which can be expanded into a detailed name/type/class description. svn path=/trunk/; revision=58
1998-10-15 06:40:51 +00:00
type_name = dns_type_name(type);
The name returned by "get_dns_name()" (and thus by "get_dns_name_type_class()") is null-terminated - and the length returned is *NOT* the length of the string, it's the length of the chunk of DNS data extracted by "get_dns_name()", and that chunk could just point to a later chunk as part of DNS compression. When running the name through "format_text()", just use "strlen()" to get the length, so you don't get a value that's too large *OR* too small (both are possible - "too large" if it's uncompressed and includes length informatioin, "too small" if it contains a pointer to a string longer than the pointer). When adding a string value to the protocol tree, add the *raw* name, not the formatted name - the Ethereal display code will format the string's value as necessary. Add formatting code for DNS names in replies. svn path=/trunk/; revision=14793
2005-06-27 07:50:11 +00:00
/*
* The name might contain octets that aren't printable characters,
* format it for display.
*/
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(name, strlen(name));
fix #201 second part: adapt the string length of the unformatted text, so it won't show \000 and beyond svn path=/trunk/; revision=14550
2005-06-04 11:47:38 +00:00
fix #201: add format_text before output of the DNS name, in case it contains invalid chars svn path=/trunk/; revision=14479
2005-05-29 13:02:57 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s %s", type_name, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (is_mdns) {
Flag the question as a "QM" question if the QU flag isn't set. svn path=/trunk/; revision=19881
2006-11-12 22:35:21 +00:00
col_append_fstr(cinfo, COL_INFO, ", \"%s\" question", qu ? "QU" : "QM");
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
fix #201: add format_text before output of the DNS name, in case it contains invalid chars svn path=/trunk/; revision=14479
2005-05-29 13:02:57 +00:00
}
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
if (dns_tree != NULL) {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
tq = proto_tree_add_text(dns_tree, tvb, offset, len, "%s: type %s, class %s",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
name_out, type_name, dns_class_name(dns_class));
if (is_mdns) {
Flag the question as a "QM" question if the QU flag isn't set. svn path=/trunk/; revision=19881
2006-11-12 22:35:21 +00:00
proto_item_append_text(tq, ", \"%s\" question", qu ? "QU" : "QM");
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
q_tree = proto_item_add_subtree(tq, ett_dns_qd);
Show queries as a summary line (as was the case before my DNS checkins) which can be expanded into a detailed name/type/class description. svn path=/trunk/; revision=58
1998-10-15 06:40:51 +00:00
The name returned by "get_dns_name()" (and thus by "get_dns_name_type_class()") is null-terminated - and the length returned is *NOT* the length of the string, it's the length of the chunk of DNS data extracted by "get_dns_name()", and that chunk could just point to a later chunk as part of DNS compression. When running the name through "format_text()", just use "strlen()" to get the length, so you don't get a value that's too large *OR* too small (both are possible - "too large" if it's uncompressed and includes length informatioin, "too small" if it contains a pointer to a string longer than the pointer). When adding a string value to the protocol tree, add the *raw* name, not the formatted name - the Ethereal display code will format the string's value as necessary. Add formatting code for DNS names in replies. svn path=/trunk/; revision=14793
2005-06-27 07:50:11 +00:00
proto_tree_add_string(q_tree, hf_dns_qry_name, tvb, offset, name_len, name);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776) From Dario Lombardo svn path=/trunk/; revision=50169
2013-06-26 14:09:10 +00:00
tq = proto_tree_add_uint(q_tree, hf_dns_qry_name_len, tvb, offset, name_len, (guint32)strlen(name));
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
PROTO_ITEM_SET_GENERATED(tq);
/* Count how many '.' are in the string, plus 1, in order to count the number
of labels */
labels = 0;
for (i = 0; i < strlen(name); i++) {
if (name[i] == '.')
labels++;
}
labels++;
Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776) From Dario Lombardo svn path=/trunk/; revision=50169
2013-06-26 14:09:10 +00:00
tq = proto_tree_add_uint(q_tree, hf_dns_count_labels, tvb, offset, name_len, labels);
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
PROTO_ITEM_SET_GENERATED(tq);
Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776) From Dario Lombardo svn path=/trunk/; revision=50169
2013-06-26 14:09:10 +00:00
offset += name_len;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
proto_tree_add_uint_format(q_tree, hf_dns_qry_type, tvb, offset, 2, type,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Type: %s", dns_type_description(type));
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
offset += 2;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
if (is_mdns) {
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
proto_tree_add_uint(q_tree, hf_dns_qry_class_mdns, tvb, offset, 2, dns_class);
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
proto_tree_add_boolean(q_tree, hf_dns_qry_qu, tvb, offset, 2, qu);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
proto_tree_add_uint(q_tree, hf_dns_qry_class, tvb, offset, 2, dns_class);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
offset += 2;
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_start + len != offset) {
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40887
2012-02-06 22:01:04 +00:00
/* Add expert info ? (about incorrect len...)*/
}
return len;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
static proto_tree *
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
add_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset,
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
const guchar *name, int namelen, int type, int dns_class, int flush,
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
guint ttl, gushort data_len, packet_info *pinfo, gboolean is_mdns)
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree *rr_tree;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
proto_tree *ttl_tree;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
gchar **srv_rr_info;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
Created a new protocol tree implementation and a new display filter mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
1999-07-07 22:52:57 +00:00
rr_tree = proto_item_add_subtree(trr, rr_type);
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (type == T_SRV) {
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 : Don't assume that g_strsplit() found and returned 3 strings. svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
srv_rr_info = g_strsplit(name, ".", 3);
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 : Don't assume that g_strsplit() found and returned 3 strings. svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
/* The + 1 on the strings is to skip the leading '_' */
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 : Don't assume that g_strsplit() found and returned 3 strings. svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
proto_tree_add_string(rr_tree, hf_dns_srv_service, tvb, offset,
- Make dns srv elemnts filterable (were: text only) - Don't suppress first character in srv service and protocol as some services don't use _ as first character svn path=/trunk/; revision=43774
2012-07-17 21:10:02 +00:00
namelen, srv_rr_info[0]);
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 : Don't assume that g_strsplit() found and returned 3 strings. svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
if (srv_rr_info[1]) {
proto_tree_add_string(rr_tree, hf_dns_srv_proto, tvb, offset,
- Make dns srv elemnts filterable (were: text only) - Don't suppress first character in srv service and protocol as some services don't use _ as first character svn path=/trunk/; revision=43774
2012-07-17 21:10:02 +00:00
namelen, srv_rr_info[1]);
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (srv_rr_info[2]) {
proto_tree_add_string(rr_tree, hf_dns_srv_name, tvb, offset,
namelen, srv_rr_info[2]);
}
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 : Don't assume that g_strsplit() found and returned 3 strings. svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
}
g_strfreev(srv_rr_info);
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
} else {
Fix the fuzz failure in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5554 : Don't assume that g_strsplit() found and returned 3 strings. svn path=/trunk/; revision=35418
2011-01-07 15:59:26 +00:00
proto_tree_add_string(rr_tree, hf_dns_rr_name, tvb, offset, namelen, name);
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
}
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
offset += namelen;
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
proto_tree_add_uint_format(rr_tree, hf_dns_rr_type, tvb, offset, 2, type,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Type: %s", dns_type_description(type));
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
offset += 2;
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
if (is_mdns) {
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
proto_tree_add_uint(rr_tree, hf_dns_rr_class_mdns, tvb, offset, 2, dns_class);
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
proto_tree_add_boolean(rr_tree, hf_dns_rr_cache_flush, tvb, offset, 2, flush);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
proto_tree_add_uint(rr_tree, hf_dns_rr_class, tvb, offset, 2, dns_class);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
offset += 2;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
ttl_tree = proto_tree_add_uint_format(rr_tree, hf_dns_rr_ttl, tvb, offset, 4, ttl,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Time to live: %s", time_secs_to_str(ttl));
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
if (ttl & 0x80000000) {
expert_add_info(pinfo, ttl_tree, &ei_ttl_negative);
}
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
offset += 4;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
proto_tree_add_uint(rr_tree, hf_dns_rr_len, tvb, offset, 2, data_len);
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
return rr_tree;
}
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
"add_rr_to_tree()" is exported from "packet-dns.c" for use by the NBNS protocol, which is DNS-derived; hopefully, Microsoft won't shovel any more stuff into NBNS (I suspect that they ultimately want to make DNS replace it completely), so it won't pick up stuff such as OPT RRs. As such, we don't need to export "add_opt_rr_to_tree()", so make it static to "packet-dns.c". svn path=/trunk/; revision=1766
2000-03-30 01:52:40 +00:00
static proto_tree *
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
add_opt_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset,
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
const char *name, int namelen, int type, int dns_class, int flush,
Mark Krochmal says that the class field should be treated in mDNS as a flag and a 15-bit field even for OPT RRs. svn path=/trunk/; revision=19882
2006-11-12 23:42:08 +00:00
guint ttl, gushort data_len, gboolean is_mdns)
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
{
From Yaniv Kaul: handle DNSSEC DO/OK bit in OPT pseudo-RR. svn path=/trunk/; revision=7643
2003-05-05 08:14:31 +00:00
proto_tree *rr_tree, *Z_tree;
proto_item *Z_item = NULL;
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
rr_tree = proto_item_add_subtree(trr, rr_type);
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
proto_tree_add_string(rr_tree, hf_dns_rr_name, tvb, offset, namelen, name);
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
offset += namelen;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
proto_tree_add_uint_format(rr_tree, hf_dns_rr_type, tvb, offset, 2, type,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Type: %s", dns_type_description(type));
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
offset += 2;
Mark Krochmal says that the class field should be treated in mDNS as a flag and a 15-bit field even for OPT RRs. svn path=/trunk/; revision=19882
2006-11-12 23:42:08 +00:00
if (is_mdns) {
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything. svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
proto_tree_add_uint(rr_tree, hf_dns_rr_udp_payload_size, tvb, offset, 2, dns_class);
Mark Krochmal says that the class field should be treated in mDNS as a flag and a 15-bit field even for OPT RRs. svn path=/trunk/; revision=19882
2006-11-12 23:42:08 +00:00
proto_tree_add_boolean(rr_tree, hf_dns_rr_cache_flush, tvb, offset, 2,
flush);
} else {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree_add_text(rr_tree, tvb, offset, 2, "UDP payload size: %u", dns_class & 0xffff);
Mark Krochmal says that the class field should be treated in mDNS as a flag and a 15-bit field even for OPT RRs. svn path=/trunk/; revision=19882
2006-11-12 23:42:08 +00:00
}
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
offset += 2;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
proto_tree_add_text(rr_tree, tvb, offset, 1, "Higher bits in extended RCODE: 0x%x",
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
(ttl >> 24) & 0xff0);
offset++;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
proto_tree_add_text(rr_tree, tvb, offset, 1, "EDNS0 version: %u",
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
(ttl >> 16) & 0xff);
offset++;
From Yaniv Kaul: handle DNSSEC DO/OK bit in OPT pseudo-RR. svn path=/trunk/; revision=7643
2003-05-05 08:14:31 +00:00
Z_item = proto_tree_add_text(rr_tree, tvb, offset, 2, "Z: 0x%x", ttl & 0xffff);
if (ttl & 0x8000) {
Z_tree = proto_item_add_subtree(Z_item, rr_type);
proto_tree_add_text(Z_tree, tvb, offset, 2, "Bit 0 (DO bit): 1 (Accepts DNSSEC security RRs)");
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7045 : use right bitmask to get the Z reserved bits svn path=/trunk/; revision=41985
2012-04-08 17:17:07 +00:00
proto_tree_add_text(Z_tree, tvb, offset, 2, "Bits 1-15: 0x%x (reserved)", ttl & 0x7fff);
From Yaniv Kaul: handle DNSSEC DO/OK bit in OPT pseudo-RR. svn path=/trunk/; revision=7643
2003-05-05 08:14:31 +00:00
}
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
offset += 2;
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
proto_tree_add_uint(rr_tree, hf_dns_rr_len, tvb, offset, 2, data_len);
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
return rr_tree;
}
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
static int
dissect_type_bitmap(proto_tree *rr_tree, tvbuff_t *tvb, int cur_offset, int rr_len)
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int mask, blockbase, blocksize;
int i, initial_offset, rr_type;
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
guint8 bits;
initial_offset = cur_offset;
while (rr_len != 0) {
blockbase = tvb_get_guint8(tvb, cur_offset);
blocksize = tvb_get_guint8(tvb, cur_offset + 1);
cur_offset += 2;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
rr_len -= 2;
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
rr_type = blockbase * 256;
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
for( ; blocksize; blocksize-- ) {
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
bits = tvb_get_guint8(tvb, cur_offset);
mask = 1<<7;
for (i = 0; i < 8; i++) {
if (bits & mask) {
proto_tree_add_text(rr_tree, tvb, cur_offset, 1,
"RR type in bit map: %s",
dns_type_description(rr_type));
}
mask >>= 1;
rr_type++;
}
cur_offset += 1;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
rr_len -= 1;
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
}
}
return(initial_offset - cur_offset);
}
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
/*
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
* SIG, KEY, and CERT RR algorithms.
Update Domain Name System Security (DNSSEC) Algorithm Numbers and Delegation Signer (DS) Resource Record (RR) Add RFC5933 : Use of GOST Signature Algorithms in DNSKEY and RRSIG Resource Records for DNSSEC Add RFC6605 : Elliptic Curve Digital Signature Algorithm (DSA) for DNSSEC svn path=/trunk/; revision=42124
2012-04-18 07:33:57 +00:00
* http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.txt (last updated 2012-04-13)
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
*/
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define DNS_ALGO_RSAMD5 1 /* RSA/MD5 */
#define DNS_ALGO_DH 2 /* Diffie-Hellman */
#define DNS_ALGO_DSA 3 /* DSA */
#define DNS_ALGO_ECC 4 /* Elliptic curve crypto */
#define DNS_ALGO_RSASHA1 5 /* RSA/SHA1 */
#define DNS_ALGO_DSA_NSEC3_SHA1 6 /* DSA + NSEC3/SHA1 */
#define DNS_ALGO_RSASHA1_NSEC3_SHA1 7 /* RSA/SHA1 + NSEC3/SHA1 */
#define DNS_ALGO_RSASHA256 8 /* RSA/SHA-256 */
#define DNS_ALGO_RSASHA512 10 /* RSA/SHA-512 */
#define DNS_ALGO_ECCGOST 12 /* GOST R 34.10-2001 */
#define DNS_ALGO_ECDSAP256SHA256 13 /* ECDSA Curve P-256 with SHA-256 */
#define DNS_ALGO_ECDSAP386SHA386 14 /* ECDSA Curve P-386 with SHA-386 */
#define DNS_ALGO_HMACMD5 157 /* HMAC/MD5 */
#define DNS_ALGO_INDIRECT 252 /* Indirect key */
#define DNS_ALGO_PRIVATEDNS 253 /* Private, domain name */
#define DNS_ALGO_PRIVATEOID 254 /* Private, OID */
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
static const value_string dnssec_algo_vals[] = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ DNS_ALGO_RSAMD5, "RSA/MD5" },
{ DNS_ALGO_DH, "Diffie-Hellman" },
{ DNS_ALGO_DSA, "DSA" },
{ DNS_ALGO_ECC, "Elliptic curve crypto" },
{ DNS_ALGO_RSASHA1, "RSA/SHA1" },
{ DNS_ALGO_DSA_NSEC3_SHA1, "DSA + NSEC3/SHA1" },
{ DNS_ALGO_RSASHA1_NSEC3_SHA1,"RSA/SHA1 + NSEC3/SHA1" },
{ DNS_ALGO_RSASHA256, "RSA/SHA-256" },
{ DNS_ALGO_RSASHA512, "RSA/SHA-512" },
{ DNS_ALGO_ECCGOST, "GOST R 34.10-2001" },
{ DNS_ALGO_ECDSAP256SHA256, "ECDSA Curve P-256 with SHA-256" },
{ DNS_ALGO_ECDSAP386SHA386, "ECDSA Curve P-386 with SHA-386" },
{ DNS_ALGO_HMACMD5, "HMAC/MD5" },
{ DNS_ALGO_INDIRECT, "Indirect key" },
{ DNS_ALGO_PRIVATEDNS, "Private, domain name" },
{ DNS_ALGO_PRIVATEOID, "Private, OID" },
{ 0, NULL }
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
};
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
/*
Delegation Signer (DS) Resource Record (RR) Type Digest Algorithms
https://www.iana.org/assignments/ds-rr-types/ds-rr-types.txt (last-updated 2012-04-13)
*/
#define DS_DIGEST_RESERVED 0
#define DS_DIGEST_SHA1 1 /* MANDATORY [RFC3658] */
#define DS_DIGEST_SHA256 2 /* MANDATORY [RFC4509] */
#define DS_DIGEST_GOST 3 /* OPTIONAL [RFC5933] */
#define DS_DIGEST_SHA384 4 /*OPTIONAL [RFC6605] */
static const value_string dns_ds_digest_vals[] = {
{ DS_DIGEST_RESERVED, "Reserved digest" },
{ DS_DIGEST_SHA1, "SHA-1" },
{ DS_DIGEST_SHA256, "SHA-256" },
{ DS_DIGEST_GOST, "GOST R 34.11-94" },
{ DS_DIGEST_SHA384, "SHA-384" },
{ 0, NULL }
};
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
/* DNSKEY : RFC4034 */
#define DNSKEY_FLAGS_ZK 0x0100
#define DNSKEY_FLAGS_KR 0x0080
#define DNSKEY_FLAGS_SEP 0x0001
#define DNSKEY_FLAGS_RSV 0xFE7E
static const true_false_string dns_dnskey_zone_key_tfs = { "This is the zone key for specified zone", "This it not a zone key" };
From Bertho Stultiens: Use certificate values from RFC 4398 From me: rename fields according to RFC and update references to RFC https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7130 svn path=/trunk/; revision=42108
2012-04-17 12:44:04 +00:00
/* See RFC 4398 */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
#define DNS_CERT_PKIX 1 /* X509 certificate */
#define DNS_CERT_SPKI 2 /* Simple public key certificate */
#define DNS_CERT_PGP 3 /* OpenPGP packet */
#define DNS_CERT_IPKIX 4 /* Indirect PKIX */
#define DNS_CERT_ISPKI 5 /* Indirect SPKI */
#define DNS_CERT_IPGP 6 /* Indirect PGP */
#define DNS_CERT_ACPKIX 7 /* Attribute certificate */
#define DNS_CERT_IACPKIX 8 /* Indirect ACPKIX */
#define DNS_CERT_PRIVATEURI 253 /* Private, URI */
#define DNS_CERT_PRIVATEOID 254 /* Private, OID */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
static const value_string dns_cert_type_vals[] = {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ DNS_CERT_PKIX, "PKIX" },
{ DNS_CERT_SPKI, "SPKI" },
{ DNS_CERT_PGP, "PGP" },
{ DNS_CERT_IPKIX, "IPKIX" },
{ DNS_CERT_ISPKI, "ISPKI" },
{ DNS_CERT_IPGP, "IPGP" },
{ DNS_CERT_ACPKIX, "ACPKIX" },
{ DNS_CERT_IACPKIX, "IACPKIX" },
{ DNS_CERT_PRIVATEURI, "Private, URI" },
{ DNS_CERT_PRIVATEOID, "Private, OID" },
{ 0, NULL }
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
};
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
/**
* Compute the key id of a KEY RR depending of the algorithm used.
*/
From David Fort: use the checksum algorithm when computing the key ID for all algorithms other than RSAMD5. Make "compute_key_id()" return a "guint16", as the key IDs are 16-bit and as it can no longer return -1 meaning "I don't know how to compute the key ID for that algorithm". svn path=/trunk/; revision=9746
2004-01-20 00:11:59 +00:00
static guint16
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
compute_key_id(tvbuff_t *tvb, int offset, int size, guint8 algo)
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
{
replaced type u_int32_t by glib's guint32 (to satisfy MSVC) svn path=/trunk/; revision=9241
2003-12-11 08:54:19 +00:00
guint32 ac;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint8 c1, c2;
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
just to get things straight: a dissector should *never* do any g_assert() calls! in a simple approach, I've replaced all g_assert() and g_assert_not_reached() calls by their exception throwing counterparts DISSECTOR_ASSERT() and DISSECTOR_ASSERT_NOT_REACHED() this will replace application crash by showing a dissector bug, which is the desired behaviour there were some g_assert calls in the protocol registering functions, which might not be acting as expected now, but to be able to simply search for g_assert in the future I've replaced that calls too one g_assert remained, the one when someone throws an unknown exception "into" packet_frame.c, but IMHO this one should remain. svn path=/trunk/; revision=14608
2005-06-10 18:28:22 +00:00
DISSECTOR_ASSERT(size >= 4);
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
switch( algo ) {
case DNS_ALGO_RSAMD5:
From David Fort: use the checksum algorithm when computing the key ID for all algorithms other than RSAMD5. Make "compute_key_id()" return a "guint16", as the key IDs are 16-bit and as it can no longer return -1 meaning "I don't know how to compute the key ID for that algorithm". svn path=/trunk/; revision=9746
2004-01-20 00:11:59 +00:00
return (guint16)(tvb_get_guint8(tvb, offset + size - 3) << 8) + tvb_get_guint8( tvb, offset + size - 2 );
default:
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
for (ac = 0; size > 1; size -= 2, offset += 2) {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
c1 = tvb_get_guint8( tvb, offset );
c2 = tvb_get_guint8( tvb, offset + 1 );
ac += (c1 << 8) + c2 ;
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
}
if (size > 0) {
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
c1 = tvb_get_guint8( tvb, offset );
ac += c1 << 8;
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
}
ac += (ac >> 16) & 0xffff;
From David Fort: use the checksum algorithm when computing the key ID for all algorithms other than RSAMD5. Make "compute_key_id()" return a "guint16", as the key IDs are 16-bit and as it can no longer return -1 meaning "I don't know how to compute the key ID for that algorithm". svn path=/trunk/; revision=9746
2004-01-20 00:11:59 +00:00
return (guint16)(ac & 0xffff);
From David Fort: compute and display the key ID in a DNS KEY RR, if possible. svn path=/trunk/; revision=9232
2003-12-10 19:35:03 +00:00
}
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
static int
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
column_info *cinfo, proto_tree *dns_tree, packet_info *pinfo,
gboolean is_mdns)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
gchar *name_out;
int name_len;
int type;
int dns_class;
int flush;
const char *class_name;
const char *type_name;
int data_offset;
int cur_offset;
int data_start;
guint ttl;
gushort data_len;
proto_tree *rr_tree = NULL;
proto_item *trr = NULL;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
data_start = data_offset = offsetx;
cur_offset = offsetx;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
len = get_dns_name_type_class(tvb, offsetx, dns_data_offset, &name, &name_len,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
&type, &dns_class);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
data_offset += len;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
cur_offset += len;
Mark Krochmal says that the class field should be treated in mDNS as a flag and a 15-bit field even for OPT RRs. svn path=/trunk/; revision=19882
2006-11-12 23:42:08 +00:00
if (is_mdns) {
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
/* Split the FLUSH flag and the class */
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
flush = dns_class & C_FLUSH;
dns_class &= ~C_FLUSH;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
flush = 0;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
type_name = dns_type_name(type);
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
class_name = dns_class_name(dns_class);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
ttl = tvb_get_ntohl(tvb, data_offset);
data_offset += 4;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
cur_offset += 4;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
data_len = tvb_get_ntohs(tvb, data_offset);
data_offset += 2;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
if (cinfo != NULL) {
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", type_name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (is_mdns && flush) {
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
col_append_str(cinfo, COL_INFO, ", cache flush");
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
}
Create the tree entry for resource records in DNS replies, and add the record type to the info column, before parsing the reply; add the text for the entry, and any additional information for the info column, in the code that handles the reply. Don't use stuff from the resource record if you ran past the end of the packet. Fix some bit-scanning code. svn path=/trunk/; revision=1736
2000-03-21 06:21:37 +00:00
if (dns_tree != NULL) {
The name returned by "get_dns_name()" (and thus by "get_dns_name_type_class()") is null-terminated - and the length returned is *NOT* the length of the string, it's the length of the chunk of DNS data extracted by "get_dns_name()", and that chunk could just point to a later chunk as part of DNS compression. When running the name through "format_text()", just use "strlen()" to get the length, so you don't get a value that's too large *OR* too small (both are possible - "too large" if it's uncompressed and includes length informatioin, "too small" if it contains a pointer to a string longer than the pointer). When adding a string value to the protocol tree, add the *raw* name, not the formatted name - the Ethereal display code will format the string's value as necessary. Add formatting code for DNS names in replies. svn path=/trunk/; revision=14793
2005-06-27 07:50:11 +00:00
/*
* The name might contain octets that aren't printable characters,
* format it for display.
*/
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(name, strlen(name));
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
if (type != T_OPT) {
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
trr = proto_tree_add_text(dns_tree, tvb, offsetx,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
(data_offset - data_start) + data_len,
"%s: type %s, class %s",
name_out, type_name, class_name);
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
rr_tree = add_rr_to_tree(trr, ett_dns_rr, tvb, offsetx, name, name_len,
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
type, dns_class, flush, ttl, data_len, pinfo, is_mdns);
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
} else {
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
trr = proto_tree_add_text(dns_tree, tvb, offsetx,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
(data_offset - data_start) + data_len,
"%s: type %s", name_out, type_name);
Fix some warnings reported by gcc -Wshadow ... Fix some spacing in packet-dcom.c svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
rr_tree = add_opt_rr_to_tree(trr, ett_dns_rr, tvb, offsetx, name, name_len,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
type, dns_class, flush, ttl, data_len, is_mdns);
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (is_mdns && flush) {
Mark Krochmal says that the class field should be treated in mDNS as a flag and a 15-bit field even for OPT RRs. svn path=/trunk/; revision=19882
2006-11-12 23:42:08 +00:00
proto_item_append_text(trr, ", cache flush");
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Create the tree entry for resource records in DNS replies, and add the record type to the info column, before parsing the reply; add the text for the entry, and any additional information for the info column, in the code that handles the reply. Don't use stuff from the resource record if you ran past the end of the packet. Fix some bit-scanning code. svn path=/trunk/; revision=1736
2000-03-21 06:21:37 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len == 0) {
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
return data_offset - data_start;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
switch (type) {
Create the tree entry for resource records in DNS replies, and add the record type to the info column, before parsing the reply; add the text for the entry, and any additional information for the info column, in the code that handles the reply. Don't use stuff from the resource record if you ran past the end of the packet. Fix some bit-scanning code. svn path=/trunk/; revision=1736
2000-03-21 06:21:37 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_A:
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
{
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
const char *addr;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
addr = tvb_ip_to_str(tvb, cur_offset);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", addr);
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_item_append_text(trr, ", addr %s", addr);
proto_tree_add_item(rr_tree, hf_dns_rr_addr, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add a preference for whether to use names found in DNS packets for address resolution. svn path=/trunk/; revision=51584
2013-08-30 01:29:46 +00:00
if (dns_use_for_addr_resolution && (dns_class & 0x7f) == C_IN) {
guint32 addr_int;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb_memcpy(tvb, &addr_int, cur_offset, sizeof(addr_int));
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
add_ipv4_name(addr_int, name);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
}
- improve/fix add_host_name - add hostname/IP in host hashtable from DNS answers (currently only type A RR). svn path=/trunk/; revision=2228
2000-08-08 16:21:24 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
break;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_NS:
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *ns_name;
Tag NetBIOS Name Service-over-UDP packets as "NBNS (UDP)". Give a detailed display of the innards of NBNS-over-UDP packets. Export some stuff from the DNS decoder for the use of the NBNS decoder (NBNS is DNS-like). Give a more detailed display of the innards of DNS packets as well. Fix a couple of minor NBNS bugs. svn path=/trunk/; revision=55
1998-10-14 19:35:00 +00:00
int ns_name_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
ns_name_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &ns_name);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(ns_name, strlen(ns_name));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", ns %s", name_out);
proto_tree_add_string(rr_tree, hf_dns_rr_ns, tvb, cur_offset, ns_name_len, name_out);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
break;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_CNAME:
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *cname;
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
int cname_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
cname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &cname);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(cname, strlen(cname));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", cname %s", name_out);
proto_tree_add_string(rr_tree, hf_dns_rr_primaryname, tvb, cur_offset, cname_len, name_out);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
case T_SOA: /* Start Of Authority zone (6) */
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *mname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int mname_len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *rname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rname_len;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
proto_item *ti_soa;
Correctly handle the case of the root showing up as a name in a DNS request or reply. (Redid "get_dns_name()" along the lines of the code in the BSD resolver.) Add code to dissect SOA RRs. svn path=/trunk/; revision=297
1999-05-27 05:35:08 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
mname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &mname);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(mname, strlen(mname));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", mname %s", name_out);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
proto_tree_add_string(rr_tree, hf_dns_soa_mname, tvb, cur_offset, mname_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += mname_len;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
/* XXX Fix data length */
rname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &rname);
name_out = format_text(rname, strlen(rname));
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
proto_tree_add_string(rr_tree, hf_dns_soa_rname, tvb, cur_offset, rname_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += rname_len;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
proto_tree_add_item(rr_tree, hf_dns_soa_serial_number, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
ti_soa = proto_tree_add_item(rr_tree, hf_dns_soa_refresh_interval, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_soa, " (%s)", time_secs_to_str(tvb_get_ntohl(tvb, cur_offset)));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
ti_soa = proto_tree_add_item(rr_tree, hf_dns_soa_retry_interval, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_soa, " (%s)", time_secs_to_str(tvb_get_ntohl(tvb, cur_offset)));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
ti_soa = proto_tree_add_item(rr_tree, hf_dns_soa_expire_limit, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_soa, " (%s)", time_secs_to_str(tvb_get_ntohl(tvb, cur_offset)));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
ti_soa = proto_tree_add_item(rr_tree, hf_dns_soa_minimum_ttl, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti_soa, " (%s)", time_secs_to_str(tvb_get_ntohl(tvb, cur_offset)));
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make PTR Type filterable svn path=/trunk/; revision=44848
2012-09-10 15:52:37 +00:00
case T_PTR: /* Domain Name Pointer (12) */
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *pname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int pname_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
pname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &pname);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(pname, strlen(pname));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", %s", name_out);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make PTR Type filterable svn path=/trunk/; revision=44848
2012-09-10 15:52:37 +00:00
proto_tree_add_string(rr_tree, hf_dns_ptr_domain_name, tvb, cur_offset, pname_len, name_out);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
}
break;
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
case T_WKS: /* well known service (11) */
Add support for TXT and WKS records to the DNS dissector. Add EIGRP and VINES to the list of protocols "ipprotostr()" knows about. Get rid of the "proto_vals" table in "packet-ip.c" - it's not used, and the two entries it had that weren't in the table in "ipproto.c" have been moved there. svn path=/trunk/; revision=1735
2000-03-21 05:15:12 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
const char *wks_addr;
guint8 protocol;
guint8 bits;
int mask;
int port_num;
int i;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
proto_item *ti_wks;
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_strbuf_t *bitnames = wmem_strbuf_new_label(wmem_packet_scope());
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
goto bad_rr;
}
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
wks_addr = tvb_ip_to_str(tvb, cur_offset);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", wks_addr);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", addr %s", wks_addr);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
proto_tree_add_item(rr_tree, hf_dns_wks_address, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
proto_tree_add_item(rr_tree, hf_dns_wks_protocol, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
protocol = tvb_get_guint8(tvb, cur_offset);
cur_offset += 1;
rr_len -= 1;
port_num = 0;
while (rr_len != 0) {
bits = tvb_get_guint8(tvb, cur_offset);
if (bits != 0) {
mask = 1<<7;
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_strbuf_truncate(bitnames, 0);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
for (i = 0; i < 8; i++) {
if (bits & mask) {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
if (wmem_strbuf_get_len(bitnames) > 0) {
wmem_strbuf_append(bitnames, ", ");
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
switch (protocol) {
case IP_PROTO_TCP:
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_strbuf_append(bitnames, get_tcp_port(port_num));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
break;
case IP_PROTO_UDP:
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_strbuf_append(bitnames, get_udp_port(port_num));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
break;
default:
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_strbuf_append_printf(bitnames, "%u", port_num);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
break;
}
}
mask >>= 1;
port_num++;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
ti_wks = proto_tree_add_item(rr_tree, hf_dns_wks_bits, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
proto_item_append_text(ti_wks, " (%s)", wmem_strbuf_get_str(bitnames));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
port_num += 8;
}
cur_offset += 1;
rr_len -= 1;
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add support for TXT and WKS records to the DNS dissector. Add EIGRP and VINES to the list of protocols "ipprotostr()" knows about. Get rid of the "proto_vals" table in "packet-ip.c" - it's not used, and the two entries it had that weren't in the table in "ipproto.c" have been moved there. svn path=/trunk/; revision=1735
2000-03-21 05:15:12 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make HINFO filtereable svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
case T_HINFO: /* Host Information (13) */
Add support for HINFO records. svn path=/trunk/; revision=1019
1999-11-12 22:43:32 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int cpu_offset;
int cpu_len;
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
const char *cpu;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int os_offset;
int os_len;
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
const char *os;
Add support for HINFO records. svn path=/trunk/; revision=1019
1999-11-12 22:43:32 +00:00
cpu_offset = cur_offset;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
cpu_len = tvb_get_guint8(tvb, cpu_offset);
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
cpu = tvb_get_ephemeral_string(tvb, cpu_offset + 1, cpu_len);
Add support for HINFO records. svn path=/trunk/; revision=1019
1999-11-12 22:43:32 +00:00
os_offset = cpu_offset + 1 + cpu_len;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
os_len = tvb_get_guint8(tvb, os_offset);
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
os = tvb_get_ephemeral_string(tvb, os_offset + 1, os_len);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %.*s %.*s", cpu_len, cpu,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
os_len, os);
}
proto_item_append_text(trr, ", CPU %.*s, OS %.*s",
cpu_len, cpu, os_len, os);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make HINFO filtereable svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
proto_tree_add_item(rr_tree, hf_dns_hinfo_cpu_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_hinfo_cpu, tvb, cur_offset, cpu_len, ENC_ASCII|ENC_NA);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make HINFO filtereable svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
cur_offset += cpu_len;
proto_tree_add_item(rr_tree, hf_dns_hinfo_os_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_hinfo_os, tvb, cur_offset, os_len, ENC_ASCII|ENC_NA);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make HINFO filtereable svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
/* cur_offset += os_len;*/
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add support for HINFO records. svn path=/trunk/; revision=1019
1999-11-12 22:43:32 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make MX filtereable svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
case T_MX: /* Mail Exchange (15) */
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint16 preference = 0;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *mx_name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int mx_name_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
preference = tvb_get_ntohs(tvb, cur_offset);
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
mx_name_len = get_dns_name(tvb, cur_offset + 2, 0, dns_data_offset, &mx_name);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(mx_name, strlen(mx_name));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %u %s", preference, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", preference %u, mx %s",
preference, name_out);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make MX filtereable svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
proto_tree_add_item(rr_tree, hf_dns_mx_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
proto_tree_add_string(rr_tree, hf_dns_mx_mail_exchange, tvb, cur_offset, mx_name_len, name_out);
/* cur_offset += mx_name_len; */
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
}
break;
Dissect AAAA resource records. svn path=/trunk/; revision=1127
1999-11-27 07:46:44 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make TXT, SPF type filterable svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
case T_TXT: /* Text Strings (16) */
Add support for TXT and WKS records to the DNS dissector. Add EIGRP and VINES to the list of protocols "ipprotostr()" knows about. Get rid of the "proto_vals" table in "packet-ip.c" - it's not used, and the two entries it had that weren't in the table in "ipproto.c" have been moved there. svn path=/trunk/; revision=1735
2000-03-21 05:15:12 +00:00
{
int rr_len = data_len;
int txt_offset;
int txt_len;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
txt_offset = cur_offset;
while (rr_len != 0) {
txt_len = tvb_get_guint8(tvb, txt_offset);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make TXT, SPF type filterable svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
proto_tree_add_item(rr_tree, hf_dns_txt_length, tvb, txt_offset, 1, ENC_BIG_ENDIAN);
txt_offset += 1;
rr_len -= 1;
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_txt, tvb, txt_offset, txt_len, ENC_ASCII|ENC_NA);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make TXT, SPF type filterable svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
txt_offset += txt_len;
rr_len -= txt_len;
}
}
break;
case T_SPF: /* Sender Policy Framework (99) */
{
int rr_len = data_len;
int spf_offset;
int spf_len;
spf_offset = cur_offset;
while (rr_len != 0) {
spf_len = tvb_get_guint8(tvb, spf_offset);
proto_tree_add_item(rr_tree, hf_dns_spf_length, tvb, spf_offset, 1, ENC_BIG_ENDIAN);
spf_offset += 1;
rr_len -= 1;
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_spf, tvb, spf_offset, spf_len, ENC_ASCII|ENC_NA);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make TXT, SPF type filterable svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
spf_offset += spf_len;
rr_len -= spf_len;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add support for TXT and WKS records to the DNS dissector. Add EIGRP and VINES to the list of protocols "ipprotostr()" knows about. Get rid of the "proto_vals" table in "packet-ip.c" - it's not used, and the two entries it had that weren't in the table in "ipproto.c" have been moved there. svn path=/trunk/; revision=1735
2000-03-21 05:15:12 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
case T_RRSIG: /* RRSIG (46) */
case T_SIG: /* Security Signature (24) */
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *signer_name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int signer_name_len;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_item *ti;
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 2) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_rrsig_type_covered, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
/* Fix me : need to remove dns_type_description and replace by value_string */
proto_item_append_text(ti, " (%s)", dns_type_description(tvb_get_ntohs(tvb, cur_offset)));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_tree_add_item(rr_tree, hf_dns_rrsig_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
if (rr_len < 1) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_tree_add_item(rr_tree, hf_dns_rrsig_labels, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
if (rr_len < 4) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_rrsig_original_ttl, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, " (%s)", time_secs_to_str(tvb_get_ntohl(tvb, cur_offset)));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
if (rr_len < 4) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_tree_add_item(rr_tree, hf_dns_rrsig_signature_expiration, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_tree_add_item(rr_tree, hf_dns_rrsig_signature_inception, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
if (rr_len < 2) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_tree_add_item(rr_tree, hf_dns_rrsig_key_tag, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
/* XXX Fix data length */
signer_name_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &signer_name);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
proto_tree_add_string(rr_tree, hf_dns_rrsig_signers_name, tvb, cur_offset, signer_name_len, signer_name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += signer_name_len;
rr_len -= signer_name_len;
if (rr_len != 0) {
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_rrsig_signature, tvb, cur_offset, rr_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
case T_DNSKEY: /* DNSKEY (48) */
From Derek Morr: The DNS dissector conflates KEY (used for TSIG) and DNSKEY records. Also, the DNSKEY dissector doesn't parse the REVOKED flag, defined in RFC 5011. The attached patch splits KEY and DNSKEY parsing, and adds support for REVOKED. svn path=/trunk/; revision=26298
2008-09-29 21:40:53 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6704 DNS KEY RDATA contains an extra "Key id" field Set Key Id is a generated item (in KEY and DNSKEY dns types) svn path=/trunk/; revision=40877
2012-02-06 16:36:20 +00:00
proto_item *tf, *ti_gen;
From Derek Morr: The DNS dissector conflates KEY (used for TSIG) and DNSKEY records. Also, the DNSKEY dissector doesn't parse the REVOKED flag, defined in RFC 5011. The attached patch splits KEY and DNSKEY parsing, and adds support for REVOKED. svn path=/trunk/; revision=26298
2008-09-29 21:40:53 +00:00
proto_tree *flags_tree;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint16 key_id;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
guint8 algo;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 2) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
tf = proto_tree_add_item(rr_tree, hf_dns_dnskey_flags, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
flags_tree = proto_item_add_subtree(tf, ett_key_flags);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
proto_tree_add_item(flags_tree, hf_dns_dnskey_flags_zone_key, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_dnskey_flags_key_revoked, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_dnskey_flags_secure_entry_point, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_dnskey_flags_reserved, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
if (rr_len < 1) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
/* Must have value 3, Add check ? */
proto_tree_add_item(flags_tree, hf_dns_dnskey_protocol, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
if (rr_len < 1) {
goto bad_rr;
}
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
proto_tree_add_item(flags_tree, hf_dns_dnskey_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
algo = tvb_get_guint8(tvb, cur_offset);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
key_id = compute_key_id(tvb, cur_offset-4, rr_len+4, algo);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
ti_gen = proto_tree_add_uint(rr_tree, hf_dns_dnskey_key_id, tvb, 0, 0, key_id);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
PROTO_ITEM_SET_GENERATED(ti_gen);
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_dnskey_public_key, tvb, cur_offset, rr_len, ENC_NA);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
From Derek Morr: The DNS dissector conflates KEY (used for TSIG) and DNSKEY records. Also, the DNSKEY dissector doesn't parse the REVOKED flag, defined in RFC 5011. The attached patch splits KEY and DNSKEY parsing, and adds support for REVOKED. svn path=/trunk/; revision=26298
2008-09-29 21:40:53 +00:00
}
break;
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
case T_KEY: /* Public Key (25) */
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
guint16 flags;
From https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6704 DNS KEY RDATA contains an extra "Key id" field Set Key Id is a generated item (in KEY and DNSKEY dns types) svn path=/trunk/; revision=40877
2012-02-06 16:36:20 +00:00
proto_item *tf, *ti_gen;
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
proto_tree *flags_tree;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint8 algo;
guint16 key_id;
if (rr_len < 2) {
goto bad_rr;
}
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
tf = proto_tree_add_item(rr_tree, hf_dns_key_flags, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
flags_tree = proto_item_add_subtree(tf, ett_key_flags);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
flags = tvb_get_ntohs(tvb, cur_offset);
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
proto_tree_add_item(flags_tree, hf_dns_key_flags_authentication, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_key_flags_confidentiality, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if ((flags & 0xC000) != 0xC000) {
/* We have a key */
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
proto_tree_add_item(flags_tree, hf_dns_key_flags_key_required, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_key_flags_associated_user, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_key_flags_associated_named_entity, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_key_flags_ipsec, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_key_flags_mime, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(flags_tree, hf_dns_key_flags_signatory, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
cur_offset += 2;
rr_len -= 2;
if (rr_len < 1) {
goto bad_rr;
}
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
proto_tree_add_item(rr_tree, hf_dns_key_protocol, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
if (rr_len < 1) {
goto bad_rr;
}
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
proto_tree_add_item(rr_tree, hf_dns_key_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
algo = tvb_get_guint8(tvb, cur_offset);
cur_offset += 1;
rr_len -= 1;
key_id = compute_key_id(tvb, cur_offset-4, rr_len+4, algo);
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
ti_gen = proto_tree_add_uint(rr_tree, hf_dns_key_key_id, tvb, 0, 0, key_id);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
PROTO_ITEM_SET_GENERATED(ti_gen);
if (rr_len != 0) {
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
proto_tree_add_item(rr_tree, hf_dns_key_public_key, tvb, cur_offset, rr_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
}
break;
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
case T_IPSECKEY: /* IPsec Key (45) */
From David Fort: ipseckey DNS RR support. svn path=/trunk/; revision=12120
2004-09-28 10:28:01 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
guint8 gw_type;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *gw;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int gw_name_len;
if (rr_len < 3) {
goto bad_rr;
}
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
proto_tree_add_item(rr_tree, hf_dns_ipseckey_gateway_precedence, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
proto_tree_add_item(rr_tree, hf_dns_ipseckey_gateway_type, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
gw_type = tvb_get_guint8(tvb, cur_offset);
cur_offset += 1;
rr_len -= 1;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
proto_tree_add_item(rr_tree, hf_dns_ipseckey_gateway_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
switch( gw_type ) {
case 0:
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
/* No Gateway */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
break;
case 1:
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
proto_tree_add_item(rr_tree, hf_dns_ipseckey_gateway_ipv4, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
break;
case 2:
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_ipseckey_gateway_ipv6, tvb, cur_offset, 16, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 16;
rr_len -= 16;
break;
case 3:
/* XXX Fix data length */
gw_name_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &gw);
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
proto_tree_add_string(rr_tree, hf_dns_ipseckey_gateway_dns, tvb, cur_offset, gw_name_len, gw);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += gw_name_len;
rr_len -= gw_name_len;
break;
default:
break;
}
if (rr_len != 0) {
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
proto_tree_add_item(rr_tree, hf_dns_ipseckey_public_key, tvb, cur_offset, rr_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From David Fort: ipseckey DNS RR support. svn path=/trunk/; revision=12120
2004-09-28 10:28:01 +00:00
}
break;
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
Enhance AAAA DNS Type svn path=/trunk/; revision=49713
2013-06-03 13:10:02 +00:00
case T_AAAA: /* IPv6 Address (28) */
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
const char *addr6;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str(). Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str(). There's no need to pass the result of tvb_get_ptr() as the 'value' in proto_tree_add_*(): just use proto_tree_add_item(). Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s. Replace some memcpy()+tvb_get_ptr() with tvb_memcpy(). svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +00:00
addr6 = tvb_ip6_to_str(tvb, cur_offset);
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", addr6);
Create the tree entry for resource records in DNS replies, and add the record type to the info column, before parsing the reply; add the text for the entry, and any additional information for the info column, in the code that handles the reply. Don't use stuff from the resource record if you ran past the end of the packet. Fix some bit-scanning code. svn path=/trunk/; revision=1736
2000-03-21 06:21:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_item_append_text(trr, ", addr %s", addr6);
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_aaaa, tvb, cur_offset, 16, ENC_NA);
Enhance AAAA DNS Type svn path=/trunk/; revision=49713
2013-06-03 13:10:02 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add a preference for whether to use names found in DNS packets for address resolution. svn path=/trunk/; revision=51584
2013-08-30 01:29:46 +00:00
if (dns_use_for_addr_resolution && (dns_class & 0x7f) == C_IN) {
struct e_in6_addr addr_in6;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
tvb_memcpy(tvb, &addr_in6, cur_offset, sizeof(addr_in6));
add_ipv6_name(&addr_in6, name);
Add IPv6 address<->name mappings for AAAA records. svn path=/trunk/; revision=12538
2004-11-17 10:03:14 +00:00
}
Dissect AAAA resource records. svn path=/trunk/; revision=1127
1999-11-27 07:46:44 +00:00
}
break;
Enhance A6 DNS Type svn path=/trunk/; revision=49714
2013-06-03 13:10:12 +00:00
case T_A6: /* IPv6 address with indirection (38) Obso */
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
unsigned short pre_len;
unsigned short suf_len;
unsigned short suf_octet_count;
const guchar *pname;
int pname_len;
int a6_offset;
int suf_offset;
struct e_in6_addr suffix;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
a6_offset = cur_offset;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
pre_len = tvb_get_guint8(tvb, cur_offset);
cur_offset++;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
suf_len = 128 - pre_len;
Fix from Per Flock to A6 RR decoding. svn path=/trunk/; revision=2509
2000-10-18 00:37:54 +00:00
suf_octet_count = suf_len ? (suf_len - 1) / 8 + 1 : 0;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
/* Pad prefix */
for (suf_offset = 0; suf_offset < 16 - suf_octet_count; suf_offset++) {
Don't collide with the "regular" IPv6 defintions in at least some platforms in ipv6-utils.h. svn path=/trunk/; revision=15764
2005-09-12 06:21:35 +00:00
suffix.bytes[suf_offset] = 0;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
}
for (; suf_offset < 16; suf_offset++) {
Don't collide with the "regular" IPv6 defintions in at least some platforms in ipv6-utils.h. svn path=/trunk/; revision=15764
2005-09-12 06:21:35 +00:00
suffix.bytes[suf_offset] = tvb_get_guint8(tvb, cur_offset);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
cur_offset++;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
}
Fix from Per Flock to A6 RR decoding. svn path=/trunk/; revision=2509
2000-10-18 00:37:54 +00:00
if (pre_len > 0) {
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
pname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
improve get_dns_name now that we have cheap emem allocated buffers and get rid of a few strcpy() a whole lot of arrays from the stack and make the function prototype slightly nicer. svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
&pname);
Fix from Per Flock to A6 RR decoding. svn path=/trunk/; revision=2509
2000-10-18 00:37:54 +00:00
} else {
improve get_dns_name now that we have cheap emem allocated buffers and get rid of a few strcpy() a whole lot of arrays from the stack and make the function prototype slightly nicer. svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
pname="";
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
pname_len = 0;
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
}
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(pname, strlen(pname));
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
Move the pointer to the "column_info" structure in the "frame_data" structure to the "packet_info" structure; only stuff that's permanently stored with each frame should be in the "frame_data" structure, and the "column_info" structure is not guaranteed to hold the column values for that frame at all times - it was only in the "frame_data" structure so that it could be passed to dissectors, and, as all dissectors are now passed a pointer to a "packet_info" structure, it could just as well be put in the "packet_info" structure. That saves memory, by shrinking the "frame_data" structure (there's one of those per frame), and also lets us clean up the code a bit. svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
if (cinfo != NULL) {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
col_append_fstr(cinfo, COL_INFO, " %d %s %s",
pre_len,
Fix warning about strict-aliasing svn path=/trunk/; revision=8613
2003-10-05 21:57:36 +00:00
ip6_to_str(&suffix),
The name returned by "get_dns_name()" (and thus by "get_dns_name_type_class()") is null-terminated - and the length returned is *NOT* the length of the string, it's the length of the chunk of DNS data extracted by "get_dns_name()", and that chunk could just point to a later chunk as part of DNS compression. When running the name through "format_text()", just use "strlen()" to get the length, so you don't get a value that's too large *OR* too small (both are possible - "too large" if it's uncompressed and includes length informatioin, "too small" if it contains a pointer to a string longer than the pointer). When adding a string value to the protocol tree, add the *raw* name, not the formatted name - the Ethereal display code will format the string's value as necessary. Add formatting code for DNS names in replies. svn path=/trunk/; revision=14793
2005-06-27 07:50:11 +00:00
name_out);
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance A6 DNS Type svn path=/trunk/; revision=49714
2013-06-03 13:10:12 +00:00
proto_tree_add_item(rr_tree, hf_dns_a6_prefix_len,tvb, a6_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
a6_offset++;
if (suf_len) {
Enhance A6 DNS Type svn path=/trunk/; revision=49714
2013-06-03 13:10:12 +00:00
proto_tree_add_ipv6(rr_tree, hf_dns_a6_address_suffix,tvb, a6_offset, suf_octet_count, ip6_to_str(&suffix));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
a6_offset += suf_octet_count;
}
if (pre_len > 0) {
Enhance A6 DNS Type svn path=/trunk/; revision=49714
2013-06-03 13:10:12 +00:00
proto_tree_add_string(rr_tree, hf_dns_a6_prefix_name, tvb, a6_offset, pname_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", addr %d %s %s",
pre_len,
ip6_to_str(&suffix),
name_out);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
}
break;
Enhance DNAME DNS Type svn path=/trunk/; revision=49715
2013-06-03 13:10:22 +00:00
case T_DNAME: /* Non-terminal DNS name redirection (39) */
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *dname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int dname_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
dname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
&dname);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(dname, strlen(dname));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", dname %s", name_out);
Enhance DNAME DNS Type svn path=/trunk/; revision=49715
2013-06-03 13:10:22 +00:00
proto_tree_add_string(rr_tree, hf_dns_dname, tvb, cur_offset, dname_len, name_out);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
A6 and DNAME resource record support, and RFC 2673 bitstring label support, from Per Flock. svn path=/trunk/; revision=2473
2000-10-02 17:42:38 +00:00
}
break;
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
case T_LOC: /* Geographical Location (29) */
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
{
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
guint8 version;
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
proto_item *ti;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
version = tvb_get_guint8(tvb, cur_offset);
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
proto_tree_add_item(rr_tree, hf_dns_loc_version, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (version == 0) {
/* Version 0, the only version RFC 1876 discusses. */
cur_offset++;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_loc_size, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "(%g m)", rfc1867_size(tvb, cur_offset));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset++;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_loc_horizontal_precision, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "(%g)", rfc1867_size(tvb, cur_offset));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset++;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_loc_vertical_precision, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "(%g)", rfc1867_size(tvb, cur_offset));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset++;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_loc_latitude, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "(%s)", rfc1867_angle(tvb, cur_offset, "NS"));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_loc_longitude, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "(%s)", rfc1867_angle(tvb, cur_offset, "EW"));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_loc_altitude, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(ti, "(%g m)", ((gint32)tvb_get_ntohl(tvb, cur_offset) - 10000000)/100.0);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
proto_tree_add_item(rr_tree, hf_dns_loc_unknown_data, tvb, cur_offset, data_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Add code to dissect MX and LOC records ("sparc.com" has both). svn path=/trunk/; revision=694
1999-09-21 07:15:38 +00:00
}
break;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Enhance NSEC DNS Type svn path=/trunk/; revision=49717
2013-06-03 13:10:39 +00:00
case T_NSEC: /* NSEC (43) */
From David Fort: NSEC RRs aren't the same as NXT RRs - dissect them differently. Remove a redundant "break" statement. svn path=/trunk/; revision=9811
2004-01-23 19:16:52 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *next_domain_name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int next_domain_name_len;
From David Fort: NSEC RRs aren't the same as NXT RRs - dissect them differently. Remove a redundant "break" statement. svn path=/trunk/; revision=9811
2004-01-23 19:16:52 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
next_domain_name_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
&next_domain_name);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(next_domain_name, strlen(next_domain_name));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", next domain name %s", name_out);
Enhance NSEC DNS Type svn path=/trunk/; revision=49717
2013-06-03 13:10:39 +00:00
proto_tree_add_string(rr_tree, hf_dns_nsec_next_domain_name, tvb, cur_offset, next_domain_name_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += next_domain_name_len;
rr_len -= next_domain_name_len;
dissect_type_bitmap(rr_tree, tvb, cur_offset, rr_len);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
}
break;
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_NSEC3:
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len, initial_offset = cur_offset;
guint8 salt_len, hash_len;
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
proto_item *flags_item;
proto_tree *flags_tree;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset++, 1, ENC_BIG_ENDIAN);
flags_item = proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
flags_tree = proto_item_add_subtree(flags_item, ett_nsec3_flags);
proto_tree_add_item(flags_tree, hf_dns_nsec3_flag_optout, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset++;
proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
salt_len = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset++, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, ENC_NA);
cur_offset += salt_len;
hash_len = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_length, tvb, cur_offset++, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rr_tree, hf_dns_nsec3_hash_value, tvb, cur_offset, hash_len, ENC_NA);
cur_offset += hash_len;
rr_len = data_len - (cur_offset - initial_offset);
dissect_type_bitmap(rr_tree, tvb, cur_offset, rr_len);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
break;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_NSEC3PARAM:
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int salt_len;
if (cinfo != NULL) {
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree_add_item(rr_tree, hf_dns_nsec3_algo, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset ++;
proto_tree_add_item(rr_tree, hf_dns_nsec3_flags, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset ++;
proto_tree_add_item(rr_tree, hf_dns_nsec3_iterations, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
salt_len = tvb_get_guint8(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_length, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset ++;
proto_tree_add_item(rr_tree, hf_dns_nsec3_salt_value, tvb, cur_offset, salt_len, ENC_NA);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
From David Fort: NSEC RRs aren't the same as NXT RRs - dissect them differently. Remove a redundant "break" statement. svn path=/trunk/; revision=9811
2004-01-23 19:16:52 +00:00
}
break;
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
case T_TLSA: /* DNS-Based Authentication of Named Entities (52) */
{
int rr_len = data_len;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
proto_tree_add_item(rr_tree, hf_dns_tlsa_certificate_usage, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset ++;
rr_len --;
proto_tree_add_item(rr_tree, hf_dns_tlsa_selector, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset ++;
rr_len --;
proto_tree_add_item(rr_tree, hf_dns_tlsa_matching_type, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset ++;
rr_len --;
Fix warning found by fix-encoding-args svn path=/trunk/; revision=50839
2013-07-23 14:54:09 +00:00
proto_tree_add_item(rr_tree, hf_dns_tlsa_certificate_association_data, tvb, cur_offset, rr_len, ENC_NA);
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
}
break;
Enhance NXT DNS Type svn path=/trunk/; revision=49718
2013-06-03 13:10:53 +00:00
case T_NXT: /* Next name (30) */
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *next_domain_name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int next_domain_name_len;
Enhance NXT DNS Type svn path=/trunk/; revision=49718
2013-06-03 13:10:53 +00:00
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
next_domain_name_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
&next_domain_name);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(next_domain_name, strlen(next_domain_name));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", next domain name %s", name_out);
Enhance NXT DNS Type svn path=/trunk/; revision=49718
2013-06-03 13:10:53 +00:00
proto_tree_add_string(rr_tree, hf_dns_nxt_next_domain_name, tvb, cur_offset, next_domain_name_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += next_domain_name_len;
rr_len -= next_domain_name_len;
Enhance NXT DNS Type svn path=/trunk/; revision=49718
2013-06-03 13:10:53 +00:00
dissect_type_bitmap(rr_tree, tvb, cur_offset, rr_len);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add dissection of RFC 2065 resource records. svn path=/trunk/; revision=1128
1999-11-27 08:59:28 +00:00
}
break;
Enhance KX DNS Type (and fix a minor bug.. KX Preference is always = 0...) svn path=/trunk/; revision=49719
2013-06-03 13:11:02 +00:00
case T_KX: /* Key Exchange (36) */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *kx_name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int kx_name_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
kx_name_len = get_dns_name(tvb, cur_offset + 2, 0, dns_data_offset, &kx_name);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(kx_name, strlen(kx_name));
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
Enhance KX DNS Type (and fix a minor bug.. KX Preference is always = 0...) svn path=/trunk/; revision=49719
2013-06-03 13:11:02 +00:00
col_append_fstr(cinfo, COL_INFO, " %u %s", tvb_get_ntohs(tvb, cur_offset), name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", preference %u, kx %s",
Enhance KX DNS Type (and fix a minor bug.. KX Preference is always = 0...) svn path=/trunk/; revision=49719
2013-06-03 13:11:02 +00:00
tvb_get_ntohs(tvb, cur_offset), name_out);
proto_tree_add_item(rr_tree, hf_dns_kx_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_string(rr_tree, hf_dns_kx_key_exchange, tvb, cur_offset + 2, kx_name_len, name_out);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
}
break;
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
case T_CERT: /* Certificate (37) */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
proto_tree_add_item(rr_tree, hf_dns_cert_type, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
proto_tree_add_item(rr_tree, hf_dns_cert_key_tag, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
proto_tree_add_item(rr_tree, hf_dns_cert_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len != 0) {
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
proto_tree_add_item(rr_tree, hf_dns_cert_certificate, tvb, cur_offset, rr_len, ENC_NA);
Add some checks to make sure we're not running past the end of the RR we're dissecting. (Some RR's still don't do that check, as they don't maintain an "rr_len" variable, and as "get_dns_name()" doesn't do any length checking.) That obviates the need for having "compute_key_id()" check the length, as we won't even get to calling it if the RR is too short. Have it still do a check for sanity, but just abort if the check fails, and have it return -1 if the algorithm is unsupported. Don't bother processing T_CERT RRs if we're not building a protocol tree, don't fetch data from a T_CERT RR until we put it into the tree, and fix the bug that change found, namely that we were using the wrong variable in the "val_to_str()" call for the certificate type. svn path=/trunk/; revision=9250
2003-12-12 23:23:57 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
break;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_OPT:
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
{
int rropt_len = data_len;
guint16 optcode, optlen;
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
proto_item *rropt, *rroptlen;
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
proto_tree *rropt_tree;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
while (rropt_len > 0) {
if (rropt_len < 2) {
goto bad_rr;
}
optcode = tvb_get_ntohs(tvb, cur_offset);
rropt_len -= 2;
if (rropt_len < 2) {
goto bad_rr;
}
optlen = tvb_get_ntohs(tvb, cur_offset + 2);
rropt_len -= 2;
if (rropt_len < optlen) {
goto bad_rr;
}
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
rropt = proto_tree_add_item(rr_tree, hf_dns_rr_opt, tvb, cur_offset, 4 + optlen, ENC_NA);
proto_item_append_text(rropt, ": %s", val_to_str(optcode, edns0_opt_code_vals, "Unknown (%d)"));
rropt_tree = proto_item_add_subtree(rropt, ett_dns_opts);
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
rropt = proto_tree_add_item(rropt_tree, hf_dns_rr_opt_code, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
cur_offset += 2;
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
rroptlen = proto_tree_add_item(rropt_tree, hf_dns_rr_opt_len, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
cur_offset += 2;
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_data, tvb, cur_offset, optlen, ENC_NA);
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
switch(optcode) {
Add RFC6975 (Signaling Cryptographic Algorithm Understanding in DNS Security Extensions (DNSSEC)) support ( DAU, DHU and N3U OPT(ion)) svn path=/trunk/; revision=50840
2013-07-23 14:54:18 +00:00
case O_DAU: /* DNSSEC Algorithm Understood (RFC6975) */
while(optlen != 0 ) {
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_dau, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
rropt_len -= 1;
optlen -= 1;
}
break;
case O_DHU: /* DS Hash Understood (RFC6975) */
while(optlen != 0 ) {
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_dhu, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
rropt_len -= 1;
optlen -= 1;
}
break;
case O_N3U: /* N3SEC Hash Understood (RFC6975) */
while(optlen != 0 ) {
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_n3u, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
rropt_len -= 1;
optlen -= 1;
}
break;
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
case O_CLIENT_SUBNET_EXP:
expert_add_info_format_text(pinfo, rropt, &ei_dns_depr_opc,
"Deprecated opcode. Client subnet OPT assigned as %d.", O_CLIENT_SUBNET);
/* Intentional fall-through */
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
case O_CLIENT_SUBNET:{
guint16 family;
union {
guint32 addr;
guint8 bytes[16];
} ip_addr = {0};
family = tvb_get_ntohs(tvb, cur_offset);
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_client_family, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_client_netmask, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_client_scope, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
Avoid a stack-smash when decoding the new DNS option field if the length is malformed. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7730 svn path=/trunk/; revision=44915
2012-09-15 13:49:27 +00:00
if (optlen-4 > 16) {
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
expert_add_info(pinfo, rroptlen, &ei_dns_rr_opt_bad_length);
Avoid a stack-smash when decoding the new DNS option field if the length is malformed. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7730 svn path=/trunk/; revision=44915
2012-09-15 13:49:27 +00:00
/* Avoid stack-smashing which occurs otherwise with the
* following tvb_memcpy. */
optlen = 20;
}
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
tvb_memcpy(tvb, ip_addr.bytes, cur_offset, (optlen - 4));
switch(family) {
case AFNUM_INET:
proto_tree_add_ipv4(rropt_tree, hf_dns_rr_opt_client_addr4, tvb,
cur_offset, (optlen - 4), ip_addr.addr);
break;
case AFNUM_INET6:
proto_tree_add_ipv6(rropt_tree, hf_dns_rr_opt_client_addr6, tvb,
cur_offset, (optlen - 4), ip_addr.bytes);
break;
default:
proto_tree_add_item(rropt_tree, hf_dns_rr_opt_client_addr, tvb, cur_offset, (optlen - 4),
ENC_NA);
break;
}
cur_offset += (optlen - 4);
rropt_len -= optlen;
}
break;
default:
cur_offset += optlen;
rropt_len -= optlen;
break;
}
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
}
}
break;
add dissector for OPT pseudo-RR, in RFC2671 section 4. svn path=/trunk/; revision=1765
2000-03-30 01:33:10 +00:00
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
case T_DS: /* Delegation Signature (43) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
case T_DLV:
From David Fort: DNS DSS RR support. svn path=/trunk/; revision=9096
2003-11-26 23:23:37 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
From David Fort: DNS DSS RR support. svn path=/trunk/; revision=9096
2003-11-26 23:23:37 +00:00
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
proto_tree_add_item(rr_tree, hf_dns_ds_key_id, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
proto_tree_add_item(rr_tree, hf_dns_ds_algorithm, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
proto_tree_add_item(rr_tree, hf_dns_ds_digest_type, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
proto_tree_add_item(rr_tree, hf_dns_ds_digest, tvb, cur_offset, rr_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From David Fort: DNS DSS RR support. svn path=/trunk/; revision=9096
2003-11-26 23:23:37 +00:00
}
break;
Add some checks to make sure we're not running past the end of the RR we're dissecting. (Some RR's still don't do that check, as they don't maintain an "rr_len" variable, and as "get_dns_name()" doesn't do any length checking.) That obviates the need for having "compute_key_id()" check the length, as we won't even get to calling it if the RR is too short. Have it still do a check for sanity, but just abort if the check fails, and have it return -1 if the algorithm is unsupported. Don't bother processing T_CERT RRs if we're not building a protocol tree, don't fetch data from a T_CERT RR until we put it into the tree, and fix the bug that change found, namely that we were using the wrong variable in the "val_to_str()" call for the certificate type. svn path=/trunk/; revision=9250
2003-12-12 23:23:57 +00:00
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
case T_TKEY: /* Transaction Key (249) */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
{
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *tkey_algname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int tkey_algname_len;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
guint16 tkey_mode, tkey_keylen, tkey_otherlen;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree *key_tree;
proto_item *key_item;
Call the GSSAPI dissector when disecting GSSAPI transaction keys. The TKEY request works quite nicely but I'm not sure what to call for the response. Currently it just displays "Unknown header: (cls=2, cons=1, tag=1) which looks like it's some more ASN.1 data. svn path=/trunk/; revision=7002
2003-01-26 01:00:05 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
/* XXX Fix data length */
tkey_algname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &tkey_algname);
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_string(rr_tree, hf_dns_tkey_algo_name, tvb, cur_offset, tkey_algname_len, tkey_algname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += tkey_algname_len;
rr_len -= tkey_algname_len;
if (rr_len < 4) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_signature_inception, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
if (rr_len < 4) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_signature_expiration, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
if (rr_len < 2) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_mode, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tkey_mode = tvb_get_ntohs(tvb, cur_offset);
cur_offset += 2;
rr_len -= 2;
if (rr_len < 2) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_error, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_key_size, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tkey_keylen = tvb_get_ntohs(tvb, cur_offset);
cur_offset += 2;
rr_len -= 2;
if (tkey_keylen != 0) {
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
key_item = proto_tree_add_item(rr_tree, hf_dns_tkey_key_data, tvb, cur_offset, tkey_keylen, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
key_tree = proto_item_add_subtree(key_item, ett_t_key);
switch(tkey_mode) {
case TKEYMODE_GSSAPI: {
tvbuff_t *gssapi_tvb;
/*
* XXX - in at least one capture, this appears to
* be an NTLMSSP blob, with no ASN.1 in it, in
* a query.
*
* See RFC 3645 which might indicate what's going
* on here. (The key is an output_token from
* GSS_Init_sec_context.)
*
* How the heck do we know what method is being
* used, so we know how to decode the key? Do we
* have to look at the algorithm name, e.g.
* "gss.microsoft.com"? We currently do as the
* the SMB dissector does in some cases, and check
* whether the security blob begins with "NTLMSSP".
*/
gssapi_tvb = tvb_new_subset(
tvb, cur_offset, tkey_keylen, tkey_keylen);
if (tvb_strneql(gssapi_tvb, 0, "NTLMSSP", 7) == 0) {
call_dissector(ntlmssp_handle, gssapi_tvb, pinfo, key_tree);
} else {
call_dissector(gssapi_handle, gssapi_tvb, pinfo, key_tree);
}
break;
}
default:
/* No dissector for this key mode */
break;
}
cur_offset += tkey_keylen;
rr_len -= tkey_keylen;
}
if (rr_len < 2) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_other_size, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
tkey_otherlen = tvb_get_ntohs(tvb, cur_offset);;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
if (tkey_otherlen != 0) {
if (rr_len < tkey_otherlen) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tkey_other_data, tvb, cur_offset, tkey_otherlen, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
}
break;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
case T_TSIG: /* Transaction Signature (250) */
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
{
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
guint16 tsig_siglen, tsig_otherlen;
const guchar *tsig_algname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int tsig_algname_len;
int rr_len = data_len;
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_item *ti;
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
/* XXX Fix data length */
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
tsig_algname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &tsig_algname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_tree_add_string(rr_tree, hf_dns_tsig_algorithm_name, tvb, cur_offset, tsig_algname_len, tsig_algname);
cur_offset += tsig_algname_len;
rr_len -= tsig_algname_len;
if (rr_len < 6) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
ti = proto_tree_add_item(rr_tree, hf_dns_tsig_time_signed ,tvb, cur_offset, 6, ENC_NA);
if(tvb_get_ntohs(tvb, cur_offset)) /* Time High */
{
proto_item_append_text(ti, " (high bits set)");
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 6;
rr_len -= 6;
if (rr_len < 2) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_tsig_fudge, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
rr_len -= 2;
if (rr_len < 2) {
goto bad_rr;
}
tsig_siglen = tvb_get_ntohs(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_tsig_mac_size, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
rr_len -= 2;
if (tsig_siglen != 0) {
proto_item *mac_item;
proto_tree *mac_tree;
tvbuff_t *sub_tvb;
if (rr_len < tsig_siglen) {
goto bad_rr;
}
mac_item = proto_tree_add_item(rr_tree, hf_dns_tsig_mac, tvb, cur_offset, tsig_siglen, ENC_NA);
mac_tree = proto_item_add_subtree(mac_item, ett_dns_mac);
sub_tvb=tvb_new_subset(tvb, cur_offset, tsig_siglen, tsig_siglen);
if (!dissector_try_string(dns_tsig_dissector_table, tsig_algname, sub_tvb, pinfo, mac_tree)) {
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
expert_add_info_format_text(pinfo, mac_item, &ei_dns_tsig_alg,
"No dissector for algorithm:%s", tsig_algname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
cur_offset += tsig_siglen;
rr_len -= tsig_siglen;
}
if (rr_len < 2) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_tsig_original_id, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
rr_len -= 2;
if (rr_len < 2) {
goto bad_rr;
}
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
proto_tree_add_item(rr_tree, hf_dns_tsig_error, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
if (rr_len < 2) {
goto bad_rr;
}
tsig_otherlen = tvb_get_ntohs(tvb, cur_offset);
proto_tree_add_item(rr_tree, hf_dns_tsig_other_len, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset += 2;
rr_len -= 2;
if (tsig_otherlen != 0) {
if (rr_len < tsig_otherlen) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_tsig_other_data, tvb, cur_offset, tsig_otherlen, ENC_NA);
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
}
break;
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
case T_WINS: /* Microsoft's WINS (65281)*/
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
guint32 nservers;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
goto bad_rr;
}
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_wins_local_flag, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
goto bad_rr;
}
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_wins_lookup_timeout, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
goto bad_rr;
}
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_wins_cache_timeout, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
goto bad_rr;
}
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_wins_nb_wins_servers, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
nservers = tvb_get_ntohl(tvb, cur_offset);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
while (rr_len != 0 && nservers != 0) {
if (rr_len < 4) {
goto bad_rr;
}
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_wins_server, tvb, cur_offset, 4, ENC_NA);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 4;
rr_len -= 4;
nservers--;
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
}
break;
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
case T_WINS_R: /* Microsoft's WINS-R (65282)*/
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *dname;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int dname_len;
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
goto bad_rr;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_winsr_local_flag, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
cur_offset += 4;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
rr_len -= 4;
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
goto bad_rr;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_winsr_lookup_timeout, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
cur_offset += 4;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
rr_len -= 4;
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 4) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
goto bad_rr;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_item(rr_tree, hf_dns_winsr_cache_timeout, tvb, cur_offset, 4, ENC_BIG_ENDIAN);
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
cur_offset += 4;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
/* rr_len -= 4; */
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
dname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &dname);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(dname, strlen(dname));
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
proto_tree_add_string(rr_tree, hf_dns_winsr_name_result_domain, tvb, cur_offset, dname_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %s", name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr, ", name result domain %s", name_out);
Add support for Microsoft's WINS and WINS-R resource records. svn path=/trunk/; revision=2145
2000-07-21 01:29:04 +00:00
}
break;
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
case T_SRV: /* Service Location (33) */
added support for dissecting SRV RRs svn path=/trunk/; revision=3058
2001-02-20 16:25:52 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint16 priority = 0;
guint16 weight = 0;
guint16 port = 0;
Fixed some data types to remove some warnings in the solaris build. svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
const guchar *target;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int target_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
proto_tree_add_item(rr_tree, hf_dns_srv_priority, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
priority = tvb_get_ntohs(tvb, cur_offset);
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
cur_offset += 2;
proto_tree_add_item(rr_tree, hf_dns_srv_weight, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
weight = tvb_get_ntohs(tvb, cur_offset);
cur_offset += 2;
proto_tree_add_item(rr_tree, hf_dns_srv_port, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
port = tvb_get_ntohs(tvb, cur_offset);
cur_offset += 2;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
From Roy Marples (bug 2781 and bug 2796): Display FQDN binary encoded name as text Ensure that get_dns_name does not cross packet sub boundry From me: Preserve the usage of bootp.fqdn.name as a display filter svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
/* XXX Fix data length */
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
target_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &target);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
name_out = format_text(target, strlen(target));
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
proto_tree_add_string(rr_tree, hf_dns_srv_target, tvb, cur_offset, target_len, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %u %u %u %s", priority, weight, port, name_out);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
proto_item_append_text(trr,
", priority %u, weight %u, port %u, target %s",
priority, weight, port, name_out);
Enhance SRV DNS type svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
added support for dissecting SRV RRs svn path=/trunk/; revision=3058
2001-02-20 16:25:52 +00:00
}
break;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
case T_NAPTR: /* Naming Authority PoinTeR (35) */
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int offset = cur_offset;
guint16 order;
guint16 preference;
gchar *flags;
guint8 flags_len;
guint8 service_len;
guint8 regex_len;
From Ivan Sy: NAPTR RR (RFC 3403) replacement MUST be a fully qualified domain-name. svn path=/trunk/; revision=29250
2009-07-31 06:51:27 +00:00
const guchar *replacement;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int replacement_len;
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
/* Order */
proto_tree_add_item(rr_tree, hf_dns_naptr_order, tvb, offset, 2, ENC_BIG_ENDIAN);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
order = tvb_get_ntohs(tvb, offset);
offset += 2;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
/* Preference */
proto_tree_add_item(rr_tree, hf_dns_naptr_preference, tvb, offset, 2, ENC_BIG_ENDIAN);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
preference = tvb_get_ntohs(tvb, offset);
offset += 2;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
/* Flags */
proto_tree_add_item(rr_tree, hf_dns_naptr_flags_length, tvb, offset, 1, ENC_BIG_ENDIAN);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
flags_len = tvb_get_guint8(tvb, offset);
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
offset += 1;
proto_tree_add_item(rr_tree, hf_dns_naptr_flags, tvb, offset, flags_len, ENC_ASCII|ENC_NA);
Remove almost all of the casts I committed recently and in place of them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
flags = tvb_get_ephemeral_string(tvb, offset, flags_len);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
offset += flags_len;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
/* Service */
proto_tree_add_item(rr_tree, hf_dns_naptr_service_length, tvb, offset, 1, ENC_BIG_ENDIAN);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
service_len = tvb_get_guint8(tvb, offset);
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
offset += 1;
proto_tree_add_item(rr_tree, hf_dns_naptr_service, tvb, offset, service_len, ENC_ASCII|ENC_NA);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
offset += service_len;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
/* Regex */
proto_tree_add_item(rr_tree, hf_dns_naptr_regex_length, tvb, offset, 1, ENC_BIG_ENDIAN);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
regex_len = tvb_get_guint8(tvb, offset);
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
offset += 1;
proto_tree_add_item(rr_tree, hf_dns_naptr_regex, tvb, offset, regex_len, ENC_ASCII|ENC_NA);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
offset += regex_len;
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
/* Replacement */
From Ivan Sy: NAPTR RR (RFC 3403) replacement MUST be a fully qualified domain-name. svn path=/trunk/; revision=29250
2009-07-31 06:51:27 +00:00
replacement_len = get_dns_name(tvb, offset, 0, dns_data_offset, &replacement);
name_out = format_text(replacement, strlen(replacement));
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
proto_tree_add_item(rr_tree, hf_dns_naptr_replacement_length, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_string(rr_tree, hf_dns_naptr_replacement, tvb, offset, replacement_len, name_out);
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
col_append_fstr(cinfo, COL_INFO, " %u %u %s", order, preference, flags);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_item_append_text(trr, ", order %u, preference %u, flags %s",
order, preference, flags);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
From Paul Erkkila: parse NAPTR records in dns dissector (rfc 3403) svn path=/trunk/; revision=20250
2006-12-31 00:00:06 +00:00
}
break;
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
case T_SSHFP: /* Securely Publish SSH Key Fingerprints (44) */
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int rr_len = data_len;
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
proto_tree_add_item(rr_tree, hf_dns_sshfp_algorithm, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
proto_tree_add_item(rr_tree, hf_dns_sshfp_fingerprint_type, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
if (rr_len != 0) {
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Fix indent (remove tabs) svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
proto_tree_add_item(rr_tree, hf_dns_sshfp_fingerprint, tvb, cur_offset, rr_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
}
break;
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
case T_HIP: /* Host Identity Protocol (55) */
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
{
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
guint8 hit_len;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
guint16 pk_len;
int rr_len = data_len;
int rendezvous_len;
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
const guchar *rend_server_dns_name;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
if (rr_len < 1) {
goto bad_rr;
}
hit_len = tvb_get_guint8(tvb, cur_offset);
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
proto_tree_add_item(rr_tree, hf_dns_hip_hit_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
if (rr_len < 1) {
goto bad_rr;
}
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
proto_tree_add_item(rr_tree, hf_dns_hip_pk_algo, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 1;
rr_len -= 1;
if (rr_len < 1) {
goto bad_rr;
}
pk_len = tvb_get_ntohs(tvb, cur_offset);
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
proto_tree_add_item(rr_tree, hf_dns_hip_pk_length, tvb, cur_offset, 2, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
if (rr_len < 1) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_hip_hit, tvb, cur_offset, hit_len, ENC_NA);
cur_offset += hit_len;
rr_len -= hit_len;
if (rr_len < 1) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_hip_pk, tvb, cur_offset, pk_len, ENC_NA);
cur_offset += pk_len;
rr_len -= pk_len;
if (rr_len < 1) {
goto bad_rr;
}
while (rr_len > 1) {
rendezvous_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &rend_server_dns_name);
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
proto_tree_add_string(rr_tree, hf_dns_hip_rendezvous_server, tvb, cur_offset, rendezvous_len, rend_server_dns_name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += rendezvous_len;
rr_len -= rendezvous_len;
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
}
break;
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
case T_DHCID: /* DHCID (49) */
From Ivan Sy: Add support for Support for DHCID RR (RFC 4701). svn path=/trunk/; revision=29305
2009-08-05 18:17:18 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len < 1) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_dhcid_rdata, tvb, cur_offset, data_len, ENC_NA);
As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
From Ivan Sy: Add support for Support for DHCID RR (RFC 4701). svn path=/trunk/; revision=29305
2009-08-05 18:17:18 +00:00
}
break;
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
case T_APL: /* Lists of Address Prefixes (42) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
int rr_len = data_len;
guint16 afamily;
guint8 afdpart_len;
guint8 *addr_copy;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
while (rr_len > 1) {
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
afamily = tvb_get_ntohs(tvb, cur_offset);
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
proto_tree_add_item(rr_tree, hf_dns_apl_address_family, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
rr_len -= 2;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_apl_coded_prefix, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
rr_len -= 1;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len < 1) {
goto bad_rr;
}
afdpart_len = tvb_get_guint8(tvb, cur_offset) & DNS_APL_AFDLENGTH;
proto_tree_add_item(rr_tree, hf_dns_apl_negation, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(rr_tree, hf_dns_apl_afdlength, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset += 1;
rr_len -= 1;
if (rr_len < 1) {
goto bad_rr;
}
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
if (afamily == 1 && afdpart_len <= 4) { /* IPv4 */
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
addr_copy = (guint8 *)wmem_alloc0(wmem_file_scope(), 4);
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
tvb_memcpy(tvb, (guint8 *)addr_copy, cur_offset, afdpart_len);
proto_tree_add_ipv4(rr_tree, hf_dns_apl_afdpart_ipv4, tvb, cur_offset, afdpart_len, *addr_copy);
} else if (afamily == 2 && afdpart_len <= 16) { /* IPv6 */
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
addr_copy = (guint8 *)wmem_alloc0(wmem_file_scope(), 16);
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
tvb_memcpy(tvb, (guint8 *)addr_copy, cur_offset, afdpart_len);
proto_tree_add_ipv6(rr_tree, hf_dns_apl_afdpart_ipv6, tvb, cur_offset, afdpart_len, addr_copy);
} else { /* Other... */
proto_tree_add_item(rr_tree, hf_dns_apl_afdpart_data, tvb, cur_offset, afdpart_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
cur_offset += afdpart_len;
rr_len -= afdpart_len;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
case T_GPOS: /* Geographical POSition (27) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
guint8 long_len, lat_len, alt_len;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
if (data_len < 1) {
goto bad_rr;
}
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
proto_tree_add_item(rr_tree, hf_dns_gpos_longitude_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
long_len = tvb_get_guint8(tvb, cur_offset);
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
cur_offset += 1;
proto_tree_add_item(rr_tree, hf_dns_gpos_longitude, tvb, cur_offset, long_len, ENC_ASCII|ENC_NA);
cur_offset += long_len;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
proto_tree_add_item(rr_tree, hf_dns_gpos_latitude_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
lat_len = tvb_get_guint8(tvb, cur_offset);
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
cur_offset += 1;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
proto_tree_add_item(rr_tree, hf_dns_gpos_latitude, tvb, cur_offset, lat_len, ENC_ASCII|ENC_NA);
cur_offset += lat_len;
proto_tree_add_item(rr_tree, hf_dns_gpos_altitude_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
alt_len = tvb_get_guint8(tvb, cur_offset);
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
cur_offset += 1;
proto_tree_add_item(rr_tree, hf_dns_gpos_altitude, tvb, cur_offset, alt_len, ENC_ASCII|ENC_NA);
/*cur_offset += alt_len;*/
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
break;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance RP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
case T_RP: /* Responsible Person (17) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
int mbox_dname_len, txt_dname_len;
const guchar *mbox_dname, *txt_dname;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len < 1) {
goto bad_rr;
}
mbox_dname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &mbox_dname);
Enhance RP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
proto_tree_add_string(rr_tree, hf_dns_rp_mailbox, tvb, cur_offset, mbox_dname_len, mbox_dname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += mbox_dname_len;
Enhance RP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
txt_dname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &txt_dname);
Enhance RP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
proto_tree_add_string(rr_tree, hf_dns_rp_txt_rr, tvb, cur_offset, txt_dname_len, txt_dname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
case T_AFSDB: /* AFS data base location (18) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
const guchar *host_name;
int host_name_len;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
host_name_len = get_dns_name(tvb, cur_offset + 2, 0, dns_data_offset, &host_name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len < 1) {
goto bad_rr;
}
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
proto_tree_add_item(rr_tree, hf_dns_afsdb_subtype, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset =+ 2;
proto_tree_add_string(rr_tree, hf_dns_afsdb_hostname, tvb, cur_offset, host_name_len, host_name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
}
case T_RT: /* Route-Through (21) */
{
const guchar *host_name;
int host_name_len;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
host_name_len = get_dns_name(tvb, cur_offset + 2, 0, dns_data_offset, &host_name);
if (data_len < 1) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_rt_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
cur_offset =+ 2;
proto_tree_add_string(rr_tree, hf_dns_rt_intermediate_host, tvb, cur_offset, host_name_len, host_name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
case T_X25: /* X.25 address (19) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
guint8 x25_len;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len < 1) {
goto bad_rr;
}
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
proto_tree_add_item(rr_tree, hf_dns_x25_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
x25_len = tvb_get_guint8(tvb, cur_offset);
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
cur_offset += 1;
proto_tree_add_item(rr_tree, hf_dns_x25_psdn_address, tvb, cur_offset, x25_len, ENC_ASCII|ENC_NA);
/*cur_offset += x25_len;*/
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
case T_ISDN: /* ISDN address (20) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
guint8 isdn_address_len, isdn_sa_len;
int rr_len = data_len;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
if (rr_len < 1) {
goto bad_rr;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
proto_tree_add_item(rr_tree, hf_dns_isdn_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
isdn_address_len = tvb_get_guint8(tvb, cur_offset);
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
cur_offset += 1;
rr_len -= 1;
proto_tree_add_item(rr_tree, hf_dns_isdn_address, tvb, cur_offset, isdn_address_len, ENC_ASCII|ENC_NA);
cur_offset += isdn_address_len;
rr_len -= isdn_address_len;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (rr_len > 1) /* ISDN SA is optional */ {
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
proto_tree_add_item(rr_tree, hf_dns_isdn_sa_length, tvb, cur_offset, 1, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
isdn_sa_len = tvb_get_guint8(tvb, cur_offset);
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
proto_tree_add_item(rr_tree, hf_dns_isdn_sa, tvb, cur_offset, isdn_sa_len, ENC_ASCII|ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
case T_PX: /* Pointer to X.400/RFC822 mapping info (26)*/
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
int px_map822_len, px_mapx400_len;
const guchar *px_map822_dnsname, *px_mapx400_dnsname;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
if (data_len < 1) {
goto bad_rr;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
proto_tree_add_item(rr_tree, hf_dns_px_preference, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += 2;
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
px_map822_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &px_map822_dnsname);
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
proto_tree_add_string(rr_tree, hf_dns_px_map822, tvb, cur_offset, px_map822_len, px_map822_dnsname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += px_map822_len;
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
px_mapx400_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &px_mapx400_dnsname);
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
proto_tree_add_string(rr_tree, hf_dns_px_mapx400, tvb, cur_offset, px_mapx400_len, px_mapx400_dnsname);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
/*cur_offset += px_mapx400_len;*/
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance NSAP and NSAP PTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
case T_NSAP: /* for NSAP address, NSAP style A record (22) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len < 1) {
goto bad_rr;
}
proto_tree_add_item(rr_tree, hf_dns_nsap_rdata, tvb, cur_offset, data_len, ENC_NA);
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance NSAP and NSAP PTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
case T_NSAP_PTR: /* for domain name pointer, NSAP style (23) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
int nsap_ptr_owner_len;
const guchar *nsap_ptr_owner;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
if (data_len < 1) {
goto bad_rr;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Enhance NSAP and NSAP PTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
nsap_ptr_owner_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &nsap_ptr_owner);
Enhance NSAP and NSAP PTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
proto_tree_add_string(rr_tree, hf_dns_nsap_ptr_owner, tvb, cur_offset, nsap_ptr_owner_len, nsap_ptr_owner);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
case T_MD: /* Mail Destination (3) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
int hostname_len;
const guchar *hostname_str;
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
hostname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &hostname_str);
proto_tree_add_string(rr_tree, hf_dns_md, tvb, cur_offset, hostname_len, hostname_str);
}
break;
case T_MF: /* Mail Forwader (4) */
{
int hostname_len;
const guchar *hostname_str;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
hostname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &hostname_str);
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
proto_tree_add_string(rr_tree, hf_dns_mf, tvb, cur_offset, hostname_len, hostname_str);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
case T_MB: /* MailBox domain (7) */
{
int hostname_len;
const guchar *hostname_str;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
hostname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &hostname_str);
proto_tree_add_string(rr_tree, hf_dns_mb, tvb, cur_offset, hostname_len, hostname_str);
}
break;
case T_MG: /* Mail Group member (8) */
{
int hostname_len;
const guchar *hostname_str;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
hostname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &hostname_str);
proto_tree_add_string(rr_tree, hf_dns_mg, tvb, cur_offset, hostname_len, hostname_str);
}
break;
case T_MR: /* Mail Rename domain (9) */
{
int hostname_len;
const guchar *hostname_str;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
}
hostname_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &hostname_str);
proto_tree_add_string(rr_tree, hf_dns_mr, tvb, cur_offset, hostname_len, hostname_str);
}
break;
case T_MINFO: /* Mailbox or Mail list INFOrmation (14) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
int rmailbx_len, emailbx_len;
const guchar *rmailbx_str, *emailbx_str;
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (data_len < 1) {
goto bad_rr;
}
rmailbx_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &rmailbx_str);
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
proto_tree_add_string(rr_tree, hf_dns_minfo_r_mailbox, tvb, cur_offset, rmailbx_len, rmailbx_str);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
cur_offset += rmailbx_len;
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
emailbx_len = get_dns_name(tvb, cur_offset, 0, dns_data_offset, &emailbx_str);
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
proto_tree_add_string(rr_tree, hf_dns_minfo_e_mailbox, tvb, cur_offset, emailbx_len, emailbx_str);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
case T_CAA:
{
proto_item *caa_item;
proto_tree *caa_tree;
guint8 tag_len;
const char *tag;
gushort value_len;
const guchar *value;
int cur_hf = -1;
caa_item = proto_tree_add_item(rr_tree, hf_dns_caa_flags, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
caa_tree = proto_item_add_subtree(caa_item, ett_caa_flags);
proto_tree_add_item(caa_tree, hf_dns_caa_flag_issuer_critical, tvb, cur_offset, 1, ENC_BIG_ENDIAN);
cur_offset++;
tag_len = tvb_get_guint8(tvb, cur_offset);
tag = tvb_get_ephemeral_string(tvb, cur_offset + 1, tag_len);
value_len = data_len - (tag_len + 2);
value = tvb_get_ephemeral_string(tvb, cur_offset + 1 + tag_len, value_len);
value = format_text(value, value_len);
if (strncmp(tag, "issue", tag_len) == 0) {
cur_hf = hf_dns_caa_issue;
} else if (strncmp(tag, "issuewild", tag_len) == 0) {
cur_hf = hf_dns_caa_issuewild;
} else if (strncmp(tag, "iodef", tag_len) == 0) {
cur_hf = hf_dns_caa_iodef;
} else {
cur_hf = hf_dns_caa_unknown;
}
caa_item = proto_tree_add_string(rr_tree, cur_hf, tvb, cur_offset, 1 + tag_len + value_len, value);
caa_tree = proto_item_add_subtree(caa_item, ett_caa_data);
proto_tree_add_uint(caa_tree, hf_dns_caa_tag_length, tvb, cur_offset, 1, tag_len);
proto_tree_add_string(caa_tree, hf_dns_caa_tag, tvb, cur_offset + 1, tag_len, tag);
proto_tree_add_string(caa_tree, hf_dns_caa_value, tvb, cur_offset + 1 + tag_len, value_len, value);
}
break;
Enhance NULL type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51707
2013-09-03 06:34:52 +00:00
case T_NULL: /* Null (10) */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{
if (cinfo != NULL) {
col_append_fstr(cinfo, COL_INFO, " %s", name);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
}
Enhance NULL type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51707
2013-09-03 06:34:52 +00:00
proto_tree_add_item(rr_tree, hf_dns_null, tvb, cur_offset, data_len, ENC_NA);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
break;
Add #defines for more T_ types. In the detailed expansion of an RR, give a more detailed description of the RR type, as per Peter Hawkins' suggestion, but leave the record type in the summary line for the RR, along the lines of John McDermott's suggestion. Decode PTR and CNAME RRs. svn path=/trunk/; revision=222
1999-03-22 23:31:05 +00:00
/* TODO: parse more record types */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
default:
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
proto_tree_add_text(rr_tree, tvb, cur_offset, data_len, "Data");
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
break;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
data_offset += data_len;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Add some checks to make sure we're not running past the end of the RR we're dissecting. (Some RR's still don't do that check, as they don't maintain an "rr_len" variable, and as "get_dns_name()" doesn't do any length checking.) That obviates the need for having "compute_key_id()" check the length, as we won't even get to calling it if the RR is too short. Have it still do a check for sanity, but just abort if the check fails, and have it return -1 if the algorithm is unsupported. Don't bother processing T_CERT RRs if we're not building a protocol tree, don't fetch data from a T_CERT RR until we put it into the tree, and fix the bug that change found, namely that we were using the wrong variable in the "val_to_str()" call for the certificate type. svn path=/trunk/; revision=9250
2003-12-12 23:23:57 +00:00
return data_offset - data_start;
bad_rr:
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_item_append_text(trr, ", bad RR length %d, too short",
data_len);
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
Add some checks to make sure we're not running past the end of the RR we're dissecting. (Some RR's still don't do that check, as they don't maintain an "rr_len" variable, and as "get_dns_name()" doesn't do any length checking.) That obviates the need for having "compute_key_id()" check the length, as we won't even get to calling it if the RR is too short. Have it still do a check for sanity, but just abort if the check fails, and have it return -1 if the algorithm is unsupported. Don't bother processing T_CERT RRs if we're not building a protocol tree, don't fetch data from a T_CERT RR until we put it into the tree, and fix the bug that change found, namely that we were using the wrong variable in the "val_to_str()" call for the certificate type. svn path=/trunk/; revision=9250
2003-12-12 23:23:57 +00:00
data_offset += data_len;
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
return data_offset - data_start;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
static int
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
dissect_query_records(tvbuff_t *tvb, int cur_off, int dns_data_offset,
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
int count, column_info *cinfo, proto_tree *dns_tree, gboolean isupdate,
gboolean is_mdns)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int start_off, add_off;
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
proto_tree *qatree = NULL;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_item *ti = NULL;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
start_off = cur_off;
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
if (dns_tree) {
Make some funtions static. More char -> const char warning fixes svn path=/trunk/; revision=15146
2005-07-30 01:01:02 +00:00
const char *s = (isupdate ? "Zone" : "Queries");
Fix some "format not a string literal and no format arguments" warnings. svn path=/trunk/; revision=26646
2008-10-31 14:07:23 +00:00
ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, "%s", s);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
qatree = proto_item_add_subtree(ti, ett_dns_qry);
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
}
Fixed the infinite-loop problem in the DNS dissector, at least for the random packets I generated. I'm not convinced that all the problems are gone. We now: 1. Check that the bytes are indded in the frame before accessing them in dissect_dns_query() and dissect_dns_answer(). If not, we return 0, which means "0-byte increment". 2. Check the return value of the two functions above in dissect_query_records() and dissect_answer_records(), which have loops that call those two functions above. If a 0-byte increment is found, the loop is broken to avoid an infinite loop. svn path=/trunk/; revision=778
1999-10-07 02:26:45 +00:00
while (count-- > 0) {
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
add_off = dissect_dns_query(tvb, cur_off, dns_data_offset, cinfo, qatree,
is_mdns);
Fixed the infinite-loop problem in the DNS dissector, at least for the random packets I generated. I'm not convinced that all the problems are gone. We now: 1. Check that the bytes are indded in the frame before accessing them in dissect_dns_query() and dissect_dns_answer(). If not, we return 0, which means "0-byte increment". 2. Check the return value of the two functions above in dissect_query_records() and dissect_answer_records(), which have loops that call those two functions above. If a 0-byte increment is found, the loop is broken to avoid an infinite loop. svn path=/trunk/; revision=778
1999-10-07 02:26:45 +00:00
cur_off += add_off;
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (ti) {
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
proto_item_set_len(ti, cur_off - start_off);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
return cur_off - start_off;
}
static int
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
dissect_answer_records(tvbuff_t *tvb, int cur_off, int dns_data_offset,
Make some funtions static. More char -> const char warning fixes svn path=/trunk/; revision=15146
2005-07-30 01:01:02 +00:00
int count, column_info *cinfo, proto_tree *dns_tree, const char *name,
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
packet_info *pinfo, gboolean is_mdns)
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int start_off, add_off;
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
proto_tree *qatree = NULL;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
proto_item *ti = NULL;
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
start_off = cur_off;
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
if (dns_tree) {
Fix some "format not a string literal and no format arguments" warnings. svn path=/trunk/; revision=26646
2008-10-31 14:07:23 +00:00
ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, "%s", name);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
qatree = proto_item_add_subtree(ti, ett_dns_ans);
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
}
Fixed the infinite-loop problem in the DNS dissector, at least for the random packets I generated. I'm not convinced that all the problems are gone. We now: 1. Check that the bytes are indded in the frame before accessing them in dissect_dns_query() and dissect_dns_answer(). If not, we return 0, which means "0-byte increment". 2. Check the return value of the two functions above in dissect_query_records() and dissect_answer_records(), which have loops that call those two functions above. If a 0-byte increment is found, the loop is broken to avoid an infinite loop. svn path=/trunk/; revision=778
1999-10-07 02:26:45 +00:00
while (count-- > 0) {
Call the GSSAPI dissector when disecting GSSAPI transaction keys. The TKEY request works quite nicely but I'm not sure what to call for the response. Currently it just displays "Unknown header: (cls=2, cons=1, tag=1) which looks like it's some more ASN.1 data. svn path=/trunk/; revision=7002
2003-01-26 01:00:05 +00:00
add_off = dissect_dns_answer(
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, cur_off, dns_data_offset, cinfo, qatree, pinfo, is_mdns);
Fixed the infinite-loop problem in the DNS dissector, at least for the random packets I generated. I'm not convinced that all the problems are gone. We now: 1. Check that the bytes are indded in the frame before accessing them in dissect_dns_query() and dissect_dns_answer(). If not, we return 0, which means "0-byte increment". 2. Check the return value of the two functions above in dissect_query_records() and dissect_answer_records(), which have loops that call those two functions above. If a 0-byte increment is found, the loop is broken to avoid an infinite loop. svn path=/trunk/; revision=778
1999-10-07 02:26:45 +00:00
cur_off += add_off;
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (ti) {
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
proto_item_set_len(ti, cur_off - start_off);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
return cur_off - start_off;
}
Redo the DNS-over-TCP code to handle the DNS-over-TCP header being split across segment boundaries and to, for each DNS-over-TCP PDU, create a tvbuff containing the header and the body of the PDU, handing that to the DNS PDU dissector. svn path=/trunk/; revision=4776
2002-02-22 08:45:02 +00:00
static void
Make a "tcp_dissect_pdus()" with the standard loop for a TCP segment, extracting PDUs from it and possibly doing reassembly. Make the COPS, DNS, DSI, Gryphon, and SCCP dissectors use it. Add "set_actual_length()", "tcp_dissect_pdus()", "decode_boolean_bitfield()", "decode_numeric_bitfield()", and "decode_enumerated_bitfield()" to the list of routines available to dissectors on platforms where routines in the main program aren't available to dynamically-loaded code. Declare routines in "to_str.h" as "extern"; as I remember, that's necessary to allow the "decode_XXX_bitfield()" routines declared therein to be made available to plugins as per the above. Note that new exported routines should be added to the end of the table if that's the only change being made to the table. Create a new "plugin_api_decls.h" header file, used to declare both the "p_" variables and the "p_" structure members in the routine-exporting mechanism; this reduces the number of places you have to change to change the list of exported routines. svn path=/trunk/; revision=5394
2002-05-05 00:16:38 +00:00
dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
gboolean is_tcp, gboolean is_mdns, gboolean is_llmnr)
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
{
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
int offset = is_tcp ? 2 : 0;
int dns_data_offset;
proto_tree *dns_tree = NULL, *field_tree;
proto_item *ti, *tf;
guint16 id, flags, opcode, rcode, quest, ans, auth, add;
int cur_off;
gboolean isupdate;
conversation_t *conversation;
dns_conv_info_t *dns_info;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
dns_transaction_t *dns_trans;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
dns_data_offset = offset;
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Don't guard col_clear with col_check svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
col_clear(pinfo->cinfo, COL_INFO);
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
remove one array from the stack get rid of strcpy and strcat svn path=/trunk/; revision=16235
2005-10-16 00:27:50 +00:00
Add more packet bounds checking to DNS, and add some to NetBIOS-over-TCP as well. svn path=/trunk/; revision=779
1999-10-07 07:44:29 +00:00
/* To do: check for errs, etc. */
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
id = tvb_get_ntohs(tvb, offset + DNS_ID);
flags = tvb_get_ntohs(tvb, offset + DNS_FLAGS);
removed some MSVC warnings (level 3) svn path=/trunk/; revision=9561
2004-01-05 19:31:44 +00:00
opcode = (guint16) ((flags & F_OPCODE) >> OPCODE_SHIFT);
rcode = (guint16) (flags & F_RCODE);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
Remove check_col() and the occasional tree. This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors. svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s 0x%04x ",
Enhance DNS Dissector (use WS function...) svn path=/trunk/; revision=40886
2012-02-06 21:59:53 +00:00
val_to_str(opcode, opcode_vals, "Unknown operation (%u)"),
(flags&F_RESPONSE)?" response":"", id);
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
Remove check_col() and the occasional tree. This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors. svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
if (flags & F_RESPONSE) {
if (rcode != RCODE_NOERROR) {
col_append_str(pinfo-> cinfo,COL_INFO,
val_to_str(rcode, rcode_vals, "Unknown error (%u)"));
Get rid of the "(UDP)" in the DNS protocol string. If a DNS response got an error, include the error indication in the summary line. svn path=/trunk/; revision=1391
1999-12-29 10:36:13 +00:00
}
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
}
Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776) From Dario Lombardo svn path=/trunk/; revision=50169
2013-06-26 14:09:10 +00:00
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (opcode == OPCODE_UPDATE) {
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
isupdate = TRUE;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
} else {
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
isupdate = FALSE;
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
if (tree) {
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
if (is_llmnr) {
ti = proto_tree_add_protocol_format(tree, proto_dns, tvb, 0, -1,
"Link-local Multicast Name Resolution (%s)", (flags & F_RESPONSE) ? "response" : "query");
} else {
ti = proto_tree_add_protocol_format(tree, proto_dns, tvb, 0, -1,
"Domain Name System (%s)", (flags & F_RESPONSE) ? "response" : "query");
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
dns_tree = proto_item_add_subtree(ti, ett_dns);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
}
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
/*
* Do we have a conversation for this connection?
*/
As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
conversation = find_or_create_conversation(pinfo);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
/*
* Do we already have a state structure for this conv
*/
Get rid of Warnings. svn path=/trunk/; revision=39957
2011-11-20 12:43:04 +00:00
dns_info = (dns_conv_info_t *)conversation_get_proto_data(conversation, proto_dns);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
if (!dns_info) {
/* No. Attach that information to the conversation, and add
* it to the list of information structures.
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
*/
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
dns_info = wmem_new(wmem_file_scope(), dns_conv_info_t);
dns_info->pdus=wmem_tree_new(wmem_file_scope());
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
conversation_add_proto_data(conversation, proto_dns, dns_info);
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (!pinfo->fd->flags.visited) {
if (!(flags&F_RESPONSE)) {
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
/* This is a request */
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
dns_trans=wmem_new(wmem_file_scope(), dns_transaction_t);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
dns_trans->req_frame=pinfo->fd->num;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
dns_trans->rep_frame=0;
dns_trans->req_time=pinfo->fd->abs_ts;
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
wmem_tree_insert32(dns_info->pdus, id, (void *)dns_trans);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
} else {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
dns_trans=(dns_transaction_t *)wmem_tree_lookup32(dns_info->pdus, id);
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (dns_trans) {
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
dns_trans->rep_frame=pinfo->fd->num;
}
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
}
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
} else {
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
dns_trans=(dns_transaction_t *)wmem_tree_lookup32(dns_info->pdus, id);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
}
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (!dns_trans) {
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
/* create a "fake" pana_trans structure */
Convert DNS dissector to wmem, including first actual usage of wmem's red-black tree. svn path=/trunk/; revision=50041
2013-06-19 17:40:33 +00:00
dns_trans=wmem_new(wmem_packet_scope(), dns_transaction_t);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
dns_trans->req_frame=0;
dns_trans->rep_frame=0;
dns_trans->req_time=pinfo->fd->abs_ts;
}
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
/* print state tracking in the tree */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (!(flags&F_RESPONSE)) {
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
/* This is a request */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (dns_trans->rep_frame) {
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
proto_item *it;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
it=proto_tree_add_uint(dns_tree, hf_dns_response_in, tvb, 0, 0, dns_trans->rep_frame);
PROTO_ITEM_SET_GENERATED(it);
}
} else {
/* This is a reply */
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
if (dns_trans->req_frame) {
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
proto_item *it;
nstime_t ns;
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
it=proto_tree_add_uint(dns_tree, hf_dns_response_to, tvb, 0, 0, dns_trans->req_frame);
PROTO_ITEM_SET_GENERATED(it);
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
nstime_delta(&ns, &pinfo->fd->abs_ts, &dns_trans->req_time);
it=proto_tree_add_time(dns_tree, hf_dns_time, tvb, 0, 0, &ns);
PROTO_ITEM_SET_GENERATED(it);
For DNS-over-TCP, put the length indicator into the tree for the DNS request/response. svn path=/trunk/; revision=3633
2001-07-02 07:29:03 +00:00
}
Fixup whitespace. svn path=/trunk/; revision=27900
2009-03-30 19:39:01 +00:00
}
For DNS-over-TCP, put the length indicator into the tree for the DNS request/response. svn path=/trunk/; revision=3633
2001-07-02 07:29:03 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
if (is_tcp) {
/* Put the length indication into the tree. */
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00
proto_tree_add_item(dns_tree, hf_dns_length, tvb, offset - 2, 2, ENC_BIG_ENDIAN);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
}
Decode the word containing the opcode, flags, reply code, etc. in DNS and NBNS requests. Put the opcode in the COL_INFO field for DNS requests (it was already there for NBNS requests). Don't assume a DNS or NBNS request is neatly aligned on a 2-byte boundary (it might not be if, for example, the packet is an FDDI packet). svn path=/trunk/; revision=153
1999-01-04 09:13:46 +00:00
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
proto_tree_add_uint(dns_tree, hf_dns_transaction_id, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_ID, 2, id);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
Enhance DNS Dissector (use WS function...) svn path=/trunk/; revision=40886
2012-02-06 21:59:53 +00:00
tf = proto_tree_add_item(dns_tree, hf_dns_flags, tvb,
offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
proto_item_append_text(tf, " %s",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
val_to_str_const(opcode, opcode_vals, "Unknown operation"));
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
if (flags & F_RESPONSE) {
Enhance DNS Dissector (use WS function...) svn path=/trunk/; revision=40886
2012-02-06 21:59:53 +00:00
proto_item_append_text(tf, " response, %s",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
val_to_str_const(rcode, rcode_vals, "Unknown error"));
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
}
field_tree = proto_item_add_subtree(tf, ett_dns_flags);
proto_tree_add_item(field_tree, hf_dns_flags_response,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
proto_tree_add_item(field_tree, hf_dns_flags_opcode,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
if (is_llmnr) {
if (flags & F_RESPONSE) {
proto_tree_add_item(field_tree, hf_dns_flags_conflict_response,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
} else {
proto_tree_add_item(field_tree, hf_dns_flags_conflict_query,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
}
proto_tree_add_item(field_tree, hf_dns_flags_truncated,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
proto_tree_add_item(field_tree, hf_dns_flags_tentative,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
if (flags & F_RESPONSE) {
proto_tree_add_item(field_tree, hf_dns_flags_rcode,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
}
} else {
if (flags & F_RESPONSE) {
proto_tree_add_item(field_tree, hf_dns_flags_authoritative,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
}
proto_tree_add_item(field_tree, hf_dns_flags_truncated,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
proto_tree_add_item(field_tree, hf_dns_flags_recdesired,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
if (flags & F_RESPONSE) {
proto_tree_add_item(field_tree, hf_dns_flags_recavail,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
From Ivan Sy: Patch allows display of CD (Checking Disable) bit for DNS request and response. Section 3.2.2 of RFC 4035 revised section 6.1 of RFC 2535 for the CD Bit. svn path=/trunk/; revision=32453
2010-04-13 17:38:53 +00:00
}
proto_tree_add_item(field_tree, hf_dns_flags_z,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
From Ivan Sy: Patch allows display of CD (Checking Disable) bit for DNS request and response. Section 3.2.2 of RFC 4035 revised section 6.1 of RFC 2535 for the CD Bit. svn path=/trunk/; revision=32453
2010-04-13 17:38:53 +00:00
if (flags & F_RESPONSE) {
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
proto_tree_add_item(field_tree, hf_dns_flags_authenticated,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
} else if (flags & F_AUTHENTIC) {
Remove expert info for bit AD in DNS query See Section 5.7 (Setting the AD Bit on Queries) of RFC 6840 (Clarifications and Implementation Notes for DNS Security (DNSSEC)) The semantics of the Authentic Data (AD) bit in the query were previously undefined. Section 4.6 of [RFC4035] instructed resolvers to always clear the AD bit when composing queries. This document defines setting the AD bit in a query as a signal indicating that the requester understands and is interested in the value of the AD bit in the response. This allows a requester to indicate that it understands the AD bit without also requesting DNSSEC data via the DO bit. svn path=/trunk/; revision=48942
2013-04-20 09:49:12 +00:00
proto_tree_add_item(field_tree, hf_dns_flags_ad,
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
From Ivan Sy: Patch allows display of CD (Checking Disable) bit for DNS request and response. Section 3.2.2 of RFC 4035 revised section 6.1 of RFC 2535 for the CD Bit. svn path=/trunk/; revision=32453
2010-04-13 17:38:53 +00:00
}
proto_tree_add_item(field_tree, hf_dns_flags_checkdisable,
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
From Ivan Sy: Patch allows display of CD (Checking Disable) bit for DNS request and response. Section 3.2.2 of RFC 4035 revised section 6.1 of RFC 2535 for the CD Bit. svn path=/trunk/; revision=32453
2010-04-13 17:38:53 +00:00
if (flags & F_RESPONSE) {
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
proto_tree_add_item(field_tree, hf_dns_flags_rcode,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
tvb, offset + DNS_FLAGS, 2, ENC_BIG_ENDIAN);
As suggested in http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
2010-05-13 18:28:34 +00:00
}
dns request/response tracking did not work if tree==NULL we didnt set up the tracking structures this makes dns request/response trackign work when you dont have any color filters svn path=/trunk/; revision=22163
2007-06-22 13:23:50 +00:00
}
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
quest = tvb_get_ntohs(tvb, offset + DNS_QUEST);
if (tree) {
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
if (isupdate) {
proto_tree_add_uint(dns_tree, hf_dns_count_zones, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_QUEST, 2, quest);
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
} else {
proto_tree_add_uint(dns_tree, hf_dns_count_questions, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_QUEST, 2, quest);
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
}
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
}
ans = tvb_get_ntohs(tvb, offset + DNS_ANS);
if (tree) {
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
if (isupdate) {
proto_tree_add_uint(dns_tree, hf_dns_count_prerequisites, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_ANS, 2, ans);
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
} else {
proto_tree_add_uint(dns_tree, hf_dns_count_answers, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_ANS, 2, ans);
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
}
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
}
auth = tvb_get_ntohs(tvb, offset + DNS_AUTH);
if (tree) {
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
if (isupdate) {
proto_tree_add_uint(dns_tree, hf_dns_count_updates, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_AUTH, 2, auth);
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
} else {
proto_tree_add_uint(dns_tree, hf_dns_count_auth_rr, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_AUTH, 2, auth);
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
}
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
}
add = tvb_get_ntohs(tvb, offset + DNS_ADD);
if (tree) {
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
proto_tree_add_uint(dns_tree, hf_dns_count_add_rr, tvb,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
offset + DNS_ADD, 2, add);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
}
cur_off = offset + DNS_HDRLEN;
if (quest > 0) {
/* If this is a response, don't add information about the queries
to the summary, just add information about the answers. */
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
cur_off += dissect_query_records(tvb, cur_off, dns_data_offset, quest,
Remove check_col() and the occasional tree. This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors. svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
(!(flags & F_RESPONSE) ? pinfo->cinfo : NULL),
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
dns_tree, isupdate, is_mdns);
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
if (ans > 0) {
/* If this is a request, don't add information about the answers
to the summary, just add information about the queries. */
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
cur_off += dissect_answer_records(tvb, cur_off, dns_data_offset, ans,
Remove check_col() and the occasional tree. This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors. svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
((flags & F_RESPONSE) ? pinfo->cinfo : NULL),
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
dns_tree, (isupdate ?
"Prerequisites" : "Answers"),
pinfo, is_mdns);
Brian J. Murrell's patch to put information about the queries and answers into the COL_INFO column in the summary pane. svn path=/trunk/; revision=988
1999-11-07 21:00:40 +00:00
}
Removed trailing whitespaces from .h and .c files using the winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Fix the handling of DNS-over-TCP. Rename the "cap_len" argument to "dissect_dns_common()" to "msg_len", as it's just the length of the DNS message being dissected. svn path=/trunk/; revision=3941
2001-09-17 00:36:04 +00:00
/* Don't add information about the authoritative name servers, or the
additional records, to the summary. */
if (auth > 0) {
cur_off += dissect_answer_records(tvb, cur_off, dns_data_offset, auth,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
NULL, dns_tree,
(isupdate ? "Updates" :
"Authoritative nameservers"),
pinfo, is_mdns);
Fix the handling of DNS-over-TCP. Rename the "cap_len" argument to "dissect_dns_common()" to "msg_len", as it's just the length of the DNS message being dissected. svn path=/trunk/; revision=3941
2001-09-17 00:36:04 +00:00
}
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
Fix the handling of DNS-over-TCP. Rename the "cap_len" argument to "dissect_dns_common()" to "msg_len", as it's just the length of the DNS message being dissected. svn path=/trunk/; revision=3941
2001-09-17 00:36:04 +00:00
if (add > 0) {
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40887
2012-02-06 22:01:04 +00:00
dissect_answer_records(tvb, cur_off, dns_data_offset, add,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
NULL, dns_tree, "Additional records",
pinfo, is_mdns);
Initial revision svn path=/trunk/; revision=2
1998-09-16 02:39:15 +00:00
}
}
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
static void
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
dissect_dns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS");
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
dissect_dns_common(tvb, pinfo, tree, FALSE, FALSE, FALSE);
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
}
Add initial support for DNS/SCTP. svn path=/trunk/; revision=30035
2009-09-21 12:00:03 +00:00
static void
dissect_dns_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS");
dissect_dns_common(tvb, pinfo, tree, FALSE, FALSE, FALSE);
}
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
static void
dissect_mdns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDNS");
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
dissect_dns_common(tvb, pinfo, tree, FALSE, TRUE, FALSE);
Make a "tcp_dissect_pdus()" with the standard loop for a TCP segment, extracting PDUs from it and possibly doing reassembly. Make the COPS, DNS, DSI, Gryphon, and SCCP dissectors use it. Add "set_actual_length()", "tcp_dissect_pdus()", "decode_boolean_bitfield()", "decode_numeric_bitfield()", and "decode_enumerated_bitfield()" to the list of routines available to dissectors on platforms where routines in the main program aren't available to dynamically-loaded code. Declare routines in "to_str.h" as "extern"; as I remember, that's necessary to allow the "decode_XXX_bitfield()" routines declared therein to be made available to plugins as per the above. Note that new exported routines should be added to the end of the table if that's the only change being made to the table. Create a new "plugin_api_decls.h" header file, used to declare both the "p_" variables and the "p_" structure members in the routine-exporting mechanism; this reduces the number of places you have to change to change the list of exported routines. svn path=/trunk/; revision=5394
2002-05-05 00:16:38 +00:00
}
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
static void
dissect_llmnr_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLMNR");
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
dissect_dns_common(tvb, pinfo, tree, FALSE, FALSE, TRUE);
}
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
Make a "tcp_dissect_pdus()" with the standard loop for a TCP segment, extracting PDUs from it and possibly doing reassembly. Make the COPS, DNS, DSI, Gryphon, and SCCP dissectors use it. Add "set_actual_length()", "tcp_dissect_pdus()", "decode_boolean_bitfield()", "decode_numeric_bitfield()", and "decode_enumerated_bitfield()" to the list of routines available to dissectors on platforms where routines in the main program aren't available to dynamically-loaded code. Declare routines in "to_str.h" as "extern"; as I remember, that's necessary to allow the "decode_XXX_bitfield()" routines declared therein to be made available to plugins as per the above. Note that new exported routines should be added to the end of the table if that's the only change being made to the table. Create a new "plugin_api_decls.h" header file, used to declare both the "p_" variables and the "p_" structure members in the routine-exporting mechanism; this reduces the number of places you have to change to change the list of exported routines. svn path=/trunk/; revision=5394
2002-05-05 00:16:38 +00:00
static guint
change the signature for the get_pdu_len() function pointer passed to tcp_dissect_pdus() to also include a packet_info pointer. there are many reasons why some protocols actually need to be able to access the pinfo structure while determining the pdu size svn path=/trunk/; revision=19751
2006-10-31 09:29:07 +00:00
get_dns_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
Make a "tcp_dissect_pdus()" with the standard loop for a TCP segment, extracting PDUs from it and possibly doing reassembly. Make the COPS, DNS, DSI, Gryphon, and SCCP dissectors use it. Add "set_actual_length()", "tcp_dissect_pdus()", "decode_boolean_bitfield()", "decode_numeric_bitfield()", and "decode_enumerated_bitfield()" to the list of routines available to dissectors on platforms where routines in the main program aren't available to dynamically-loaded code. Declare routines in "to_str.h" as "extern"; as I remember, that's necessary to allow the "decode_XXX_bitfield()" routines declared therein to be made available to plugins as per the above. Note that new exported routines should be added to the end of the table if that's the only change being made to the table. Create a new "plugin_api_decls.h" header file, used to declare both the "p_" variables and the "p_" structure members in the routine-exporting mechanism; this reduces the number of places you have to change to change the list of exported routines. svn path=/trunk/; revision=5394
2002-05-05 00:16:38 +00:00
{
guint16 plen;
/*
* Get the length of the DNS packet.
*/
plen = tvb_get_ntohs(tvb, offset);
/*
* That length doesn't include the length field itself; add that in.
*/
return plen + 2;
}
static void
dissect_dns_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS");
From Brad Hards: Support for mDNS/LLMNR "cache flush" bit Label mDNS and DNS differently in the Protocol column Clean up summary line for PTR records svn path=/trunk/; revision=6709
2002-12-01 20:50:52 +00:00
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
dissect_dns_common(tvb, pinfo, tree, TRUE, FALSE, FALSE);
Tvbuffify the DNS, NBNS, NBDS, and NBSS dissectors. Add a "tvb_memeql()" routine, for doing "memcmp()"-style equality comparisons. svn path=/trunk/; revision=3631
2001-07-02 07:11:40 +00:00
}
static void
dissect_dns_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
{
Make a "tcp_dissect_pdus()" with the standard loop for a TCP segment, extracting PDUs from it and possibly doing reassembly. Make the COPS, DNS, DSI, Gryphon, and SCCP dissectors use it. Add "set_actual_length()", "tcp_dissect_pdus()", "decode_boolean_bitfield()", "decode_numeric_bitfield()", and "decode_enumerated_bitfield()" to the list of routines available to dissectors on platforms where routines in the main program aren't available to dynamically-loaded code. Declare routines in "to_str.h" as "extern"; as I remember, that's necessary to allow the "decode_XXX_bitfield()" routines declared therein to be made available to plugins as per the above. Note that new exported routines should be added to the end of the table if that's the only change being made to the table. Create a new "plugin_api_decls.h" header file, used to declare both the "p_" variables and the "p_" structure members in the routine-exporting mechanism; this reduces the number of places you have to change to change the list of exported routines. svn path=/trunk/; revision=5394
2002-05-05 00:16:38 +00:00
tcp_dissect_pdus(tvb, pinfo, tree, dns_desegment, 2, get_dns_pdu_len,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
dissect_dns_tcp_pdu);
DNS updates from Brian Wellington. svn path=/trunk/; revision=2486
2000-10-11 04:12:06 +00:00
}
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
void
proto_reg_handoff_dns(void)
{
dissector_handle_t dns_sctp_handle;
dissector_handle_t mdns_udp_handle;
dissector_handle_t llmnr_udp_handle;
static range_t *dns_tcp_port_range;
static range_t *dns_udp_port_range;
static gboolean Initialized = FALSE;
if (!Initialized) {
dns_udp_handle = create_dissector_handle(dissect_dns_udp, proto_dns);
dns_tcp_handle = create_dissector_handle(dissect_dns_tcp, proto_dns);
Initialized = TRUE;
} else {
Use dissector_delete_uint_range/dissector_add_uint_range svn path=/trunk/; revision=51567
2013-08-28 19:10:33 +00:00
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);
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
g_free(dns_tcp_port_range);
g_free(dns_udp_port_range);
}
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
dns_tcp_port_range = range_copy(global_dns_tcp_port_range);
dns_udp_port_range = range_copy(global_dns_udp_port_range);
Use dissector_delete_uint_range/dissector_add_uint_range svn path=/trunk/; revision=51567
2013-08-28 19:10:33 +00:00
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);
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
dns_sctp_handle = create_dissector_handle(dissect_dns_sctp, proto_dns);
mdns_udp_handle = create_dissector_handle(dissect_mdns_udp, proto_dns);
llmnr_udp_handle = create_dissector_handle(dissect_llmnr_udp, proto_dns);
dissector_add_uint("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
dissector_add_uint("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
dissector_add_uint("udp.port", UDP_PORT_LLMNR, llmnr_udp_handle);
dissector_add_uint("sctp.port", SCTP_PORT_DNS, dns_sctp_handle);
#if 0
dissector_add_uint("sctp.ppi", DNS_PAYLOAD_PROTOCOL_ID, dns_sctp_handle);
#endif
gssapi_handle = find_dissector("gssapi");
ntlmssp_handle = find_dissector("ntlmssp");
}
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
void
proto_register_dns(void)
{
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
static hf_register_info hf[] = {
For DNS-over-TCP, put the length indicator into the tree for the DNS request/response. svn path=/trunk/; revision=3633
2001-07-02 07:29:03 +00:00
{ &hf_dns_length,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Length", "dns.length",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Length of DNS-over-TCP request or response", HFILL }},
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
{ &hf_dns_flags,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Flags", "dns.flags",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_response,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Response", "dns.flags.response",
FT_BOOLEAN, 16, TFS(&tfs_flags_response), F_RESPONSE,
"Is the message a response?", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_opcode,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Opcode", "dns.flags.opcode",
FT_UINT16, BASE_DEC, VALS(opcode_vals), F_OPCODE,
"Operation code", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_authoritative,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Authoritative", "dns.flags.authoritative",
FT_BOOLEAN, 16, TFS(&tfs_flags_authoritative), F_AUTHORITATIVE,
"Is the server is an authority for the domain?", HFILL }},
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
{ &hf_dns_flags_conflict_query,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Conflict", "dns.flags.conflict",
FT_BOOLEAN, 16, TFS(&tfs_flags_conflict_query), F_CONFLICT,
"Did we receive multiple responses to a query?", HFILL }},
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
{ &hf_dns_flags_conflict_response,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Conflict", "dns.flags.conflict",
FT_BOOLEAN, 16, TFS(&tfs_flags_conflict_response), F_CONFLICT,
"Is the name considered unique?", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_truncated,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Truncated", "dns.flags.truncated",
FT_BOOLEAN, 16, TFS(&tfs_flags_truncated), F_TRUNCATED,
"Is the message truncated?", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_recdesired,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Recursion desired", "dns.flags.recdesired",
FT_BOOLEAN, 16, TFS(&tfs_flags_recdesired), F_RECDESIRED,
"Do query recursively?", HFILL }},
Added support for LLMNR. svn path=/trunk/; revision=27425
2009-02-11 13:25:00 +00:00
{ &hf_dns_flags_tentative,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Tentative", "dns.flags.tentative",
FT_BOOLEAN, 16, TFS(&tfs_flags_tentative), F_TENTATIVE,
"Is the responder authoritative for the name, but not yet verified the uniqueness?", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_recavail,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Recursion available", "dns.flags.recavail",
FT_BOOLEAN, 16, TFS(&tfs_flags_recavail), F_RECAVAIL,
"Can the server do recursive queries?", HFILL }},
From Yaniv Kaul: show MBZ flags as either OK if 0 or incorrect if not 0. svn path=/trunk/; revision=7645
2003-05-07 03:00:32 +00:00
{ &hf_dns_flags_z,
{ "Z", "dns.flags.z",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
FT_BOOLEAN, 16, TFS(&tfs_flags_z), F_Z,
"Z flag", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_authenticated,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Answer authenticated", "dns.flags.authenticated",
FT_BOOLEAN, 16, TFS(&tfs_flags_authenticated), F_AUTHENTIC,
"Was the reply data authenticated by the server?", HFILL }},
Fix for bug 7555: Add an expert item on the AD bit in a DNS query. Also add some type values. svn path=/trunk/; revision=44287
2012-08-06 21:45:43 +00:00
{ &hf_dns_flags_ad,
{ "AD bit", "dns.flags.authenticated",
FT_BOOLEAN, 16, TFS(&tfs_set_notset), F_AUTHENTIC,
NULL, HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_checkdisable,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Non-authenticated data", "dns.flags.checkdisable",
FT_BOOLEAN, 16, TFS(&tfs_flags_checkdisable), F_CHECKDISABLE,
"Is non-authenticated data acceptable?", HFILL }},
Use registered fields for the subfields of the Flags field in DNS and NBNS. svn path=/trunk/; revision=5475
2002-05-15 07:24:20 +00:00
{ &hf_dns_flags_rcode,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Reply code", "dns.flags.rcode",
FT_UINT16, BASE_DEC, VALS(rcode_vals), F_RCODE,
NULL, HFILL }},
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
{ &hf_dns_transaction_id,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Transaction ID", "dns.id",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Identification of transaction", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_qry_type,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Type", "dns.qry.type",
FT_UINT16, BASE_HEX, VALS(dns_types), 0x0,
"Query Type", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_qry_class,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Class", "dns.qry.class",
FT_UINT16, BASE_HEX, VALS(dns_classes), 0x0,
"Query Class", HFILL }},
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
{ &hf_dns_qry_class_mdns,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Class", "dns.qry.class",
FT_UINT16, BASE_HEX, VALS(dns_classes), 0x7FFF,
"Query Class", HFILL }},
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
{ &hf_dns_qry_qu,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "\"QU\" question", "dns.qry.qu",
FT_BOOLEAN, 16, NULL, C_QU,
"QU flag", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_qry_name,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Name", "dns.qry.name",
FT_STRING, BASE_NONE, NULL, 0x0,
"Query Name", HFILL }},
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776 Two new DNS tree items: dns.count.labels and dns.qry.name.len. svn path=/trunk/; revision=49856
2013-06-09 13:32:03 +00:00
{ &hf_dns_qry_name_len,
{ "Name Length", "dns.qry.name.len",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Query Name Len", HFILL }},
{ &hf_dns_count_labels,
{ "Label Count", "dns.count.labels",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Query Label Count", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_rr_type,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Type", "dns.resp.type",
FT_UINT16, BASE_HEX, VALS(dns_types), 0x0,
"Response Type", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_rr_class,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Class", "dns.resp.class",
FT_UINT16, BASE_HEX, VALS(dns_classes), 0x0,
"Response Class", HFILL }},
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
{ &hf_dns_rr_class_mdns,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Class", "dns.resp.class",
FT_UINT16, BASE_HEX, VALS(dns_classes), 0x7FFF,
"Response Class", HFILL }},
mDNS treats the class field as a flag bit and 15 bits of class; display it as such. svn path=/trunk/; revision=19879
2006-11-12 22:12:39 +00:00
{ &hf_dns_rr_cache_flush,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Cache flush", "dns.resp.cache_flush",
FT_BOOLEAN, 16, NULL, C_FLUSH,
"Cache flush flag", HFILL }},
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
{ &hf_dns_srv_service,
{ "Service", "dns.srv.service",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
"Desired service", HFILL }},
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
{ &hf_dns_srv_proto,
{ "Protocol", "dns.srv.proto",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
"Desired protocol", HFILL }},
When showing a DNS query response containing a SRV record, display items in the tree of the service record broken out. For example, "_ldap._tcp.domain.com" shows: Service: ldap Protocol: tcp Name: domain.com svn path=/trunk/; revision=35401
2011-01-06 17:15:50 +00:00
{ &hf_dns_srv_name,
{ "Name", "dns.srv.name",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
FT_STRING, BASE_NONE, NULL, 0x0,
"Domain this resource record refers to", HFILL }},
- Make dns srv elemnts filterable (were: text only) - Don't suppress first character in srv service and protocol as some services don't use _ as first character svn path=/trunk/; revision=43774
2012-07-17 21:10:02 +00:00
{ &hf_dns_srv_priority,
{ "Priority", "dns.srv.priority",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_srv_weight,
{ "Weight", "dns.srv.weight",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_srv_port,
{ "Port", "dns.srv.port",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_srv_target,
{ "Target", "dns.srv.target",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance NAPTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
{ &hf_dns_naptr_order,
{ "Order", "dns.naptr.order",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_preference,
{ "Preference", "dns.naptr.preference",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_flags_length,
{ "Flags Length", "dns.naptr.flags_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_flags,
{ "Flags", "dns.naptr.flags",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_service_length,
{ "Service Length", "dns.naptr.service_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_service,
{ "Service", "dns.naptr.service",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_regex_length,
{ "Regex Length", "dns.naptr.regex_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_regex,
{ "Regex", "dns.naptr.regex",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_replacement_length,
{ "rReplacement Length", "dns.naptr.replacement_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_naptr_replacement,
{ "Replacement", "dns.naptr.replacement",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_rr_name,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Name", "dns.resp.name",
FT_STRING, BASE_NONE, NULL, 0x0,
"Response Name", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_rr_ttl,
{ "Time to live", "dns.resp.ttl",
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
FT_UINT32, BASE_DEC, NULL, 0x0,
"Response TTL", HFILL }},
From Luis Ontanon: add more filterable fields to DNS, PGM, GTP, and RADIUS. svn path=/trunk/; revision=12835
2004-12-26 00:22:16 +00:00
{ &hf_dns_rr_len,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Data length", "dns.resp.len",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Response Length", HFILL }},
From Alex Kirk via bug 4366: Add DNS response addresses to tshark fields list. svn path=/trunk/; revision=31394
2009-12-31 15:36:40 +00:00
{ &hf_dns_rr_addr,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Addr", "dns.resp.addr",
FT_IPv4, BASE_NONE, NULL, 0x0,
"Response Address", HFILL }},
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
{ &hf_dns_md,
{ "Mail Destination", "dns.md",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_mf,
{ "Mail Forwarder", "dns.mf",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_mb,
{ "MailBox Domaine", "dns.mb",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_mg,
{ "Mail Group member", "dns.mg",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_mr,
{ "Mail Rename domaine", "dns.mr",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance NULL type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51707
2013-09-03 06:34:52 +00:00
{ &hf_dns_null,
{ "Null (data)", "dns.null",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance AAAA DNS Type svn path=/trunk/; revision=49713
2013-06-03 13:10:02 +00:00
{ &hf_dns_aaaa,
{ "AAAA Address", "dns.aaaa",
FT_IPv6, BASE_NONE, NULL, 0x0,
"AAAA Response Address", HFILL }},
Make the Primary name element filterable in response records. Same for Nameserver names. svn path=/trunk/; revision=35058
2010-11-28 21:45:15 +00:00
{ &hf_dns_rr_primaryname,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Primaryname", "dns.resp.primaryname",
FT_STRING, BASE_NONE, NULL, 0x0,
"Response Primary Name", HFILL }},
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything. svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +00:00
{ &hf_dns_rr_udp_payload_size,
{ "UDP payload size", "dns.resp.udp_payload_size",
FT_UINT16, BASE_HEX, NULL, 0x7FFF,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
{ &hf_dns_soa_mname,
{ "Primary name server", "dns.soa.mname",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_soa_rname,
{ "Responsible authority's mailbox", "dns.soa.rname",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_soa_serial_number,
{ "Serial Number", "dns.soa.serial_number",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_soa_refresh_interval,
{ "Refresh Interval", "dns.soa.refresh_interval",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_soa_retry_interval,
{ "Retry Interval", "dns.soa.retry_interval",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_soa_expire_limit,
{ "Expire limit", "dns.soa.expire_limit",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_soa_minimum_ttl,
{ "Minimum TTL", "dns.soa.mininum_ttl",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make PTR Type filterable svn path=/trunk/; revision=44848
2012-09-10 15:52:37 +00:00
{ &hf_dns_ptr_domain_name,
{ "Domain Name", "dns.ptr.domain_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make SOA Type filterable svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Make WKS Type filterable svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
{ &hf_dns_wks_address,
{ "Address", "dns.wks.address",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_wks_protocol,
{ "Protocol", "dns.wks.protocol",
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &ipproto_val_ext, 0x0,
NULL, HFILL }},
{ &hf_dns_wks_bits,
{ "Bits", "dns.wks.bits",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make HINFO filtereable svn path=/trunk/; revision=44941
2012-09-17 15:16:34 +00:00
{ &hf_dns_hinfo_cpu_length,
{ "CPU Length", "dns.hinfo.cpu_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_hinfo_cpu,
{ "CPU", "dns.hinfo.cpu",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_hinfo_os_length,
{ "OS Length", "dns.hinfo.os_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_hinfo_os,
{ "OS", "dns.hinfo.os",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO) Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
{ & hf_dns_minfo_r_mailbox,
{ "Responsible Mailbox", "dns.minfo.r",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ & hf_dns_minfo_e_mailbox,
{ "Error Mailbox", "dns.minfo.e",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make MX filtereable svn path=/trunk/; revision=44942
2012-09-17 15:17:48 +00:00
{ &hf_dns_mx_preference,
{ "Preference", "dns.mx.preference",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_mx_mail_exchange,
{ "Mail Exchange", "dns.mx.mail_exchange",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make TXT, SPF type filterable svn path=/trunk/; revision=44943
2012-09-17 15:18:32 +00:00
{ &hf_dns_txt_length,
{ "TXT Length", "dns.txt.length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_txt,
{ "TXT", "dns.txt",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_spf_length,
{ "SPF Length", "dns.spf.length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_spf,
{ "SPF", "dns.spf",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make RRSIG type filterable svn path=/trunk/; revision=44944
2012-09-17 15:18:54 +00:00
{ &hf_dns_rrsig_type_covered,
{ "Type Covered", "dns.rrsig.type_covered",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Identifies the type of the RRset that is covered by this RRSIG record", HFILL }},
{ &hf_dns_rrsig_algorithm,
{ "Algorithm", "dns.rrsig.algorithm",
FT_UINT8, BASE_DEC, VALS(dnssec_algo_vals), 0x0,
"Identifies the cryptographic algorithm used to create the signature", HFILL }},
{ &hf_dns_rrsig_labels,
{ "Labels", "dns.rrsig.labels",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Specifies the number of labels in the original RRSIG RR owner name", HFILL }},
{ &hf_dns_rrsig_original_ttl,
{ "Original TTL", "dns.rrsig.original_ttl",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Specifies the TTL of the covered RRset as it appears in the authoritative zone", HFILL }},
{ &hf_dns_rrsig_signature_expiration,
{ "Signature Expiration", "dns.rrsig.signature_expiration",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
"Specify a validity period for the signature", HFILL }},
{ &hf_dns_rrsig_signature_inception,
{ "Signature Inception", "dns.rrsig.signature_inception",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
"Specify a validity period for the signature", HFILL }},
{ &hf_dns_rrsig_key_tag,
{ "Key Tag", "dns.rrsig.key_tag",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Contains the key tag value of the DNSKEY RR that validates this signature", HFILL }},
{ &hf_dns_rrsig_signers_name,
{ "Signer's name", "dns.rrsig.signers_name",
FT_STRING, BASE_NONE, NULL, 0x0,
"Identifies the owner name of the DNSKEY RR that a validator is supposed to use to validate this signature", HFILL }},
{ &hf_dns_rrsig_signature,
{ "Signature", "dns.rrsig.signature",
FT_BYTES, BASE_NONE, NULL, 0x0,
"Contains the cryptographic signature that covers the RRSIG RDATA", HFILL }},
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Enhance DNS : make DNSKEY type filterable svn path=/trunk/; revision=44945
2012-09-17 15:19:18 +00:00
{ &hf_dns_dnskey_flags,
{ "Flags", "dns.dnskey.flags",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_dnskey_flags_zone_key,
{ "Zone Key", "dns.dnskey.flags.zone_key",
FT_BOOLEAN, 16, TFS(&dns_dnskey_zone_key_tfs), DNSKEY_FLAGS_ZK,
NULL, HFILL }},
{ &hf_dns_dnskey_flags_key_revoked,
{ "Key Revoked", "dns.dnskey.flags.key_revoked",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), DNSKEY_FLAGS_KR,
NULL, HFILL }},
{ &hf_dns_dnskey_flags_secure_entry_point,
{ "Key Signing Key", "dns.dnskey.flags.secure_entry_point",
FT_BOOLEAN, 16, TFS(&tfs_yes_no), DNSKEY_FLAGS_SEP,
NULL, HFILL }},
{ &hf_dns_dnskey_flags_reserved,
{ "Key Signing Key", "dns.dnskey.flags.reserved",
FT_UINT16, BASE_HEX, NULL, DNSKEY_FLAGS_RSV,
"Must be zero", HFILL }},
{ &hf_dns_dnskey_protocol,
{ "Protocol", "dns.dnskey.protocol",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Must be 3", HFILL }},
{ &hf_dns_dnskey_algorithm,
{ "Algorithm", "dns.dnskey.algorithm",
FT_UINT8, BASE_DEC, VALS(dnssec_algo_vals), 0x0,
"Identifies the public key's cryptographic algorithm and determines the format of the Public Key field", HFILL }},
{ &hf_dns_dnskey_key_id,
{ "Key id", "dns.dnskey.key_id",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_dnskey_public_key,
{ "Public Key", "dns.dnskey.public_key",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags,
{ "Flags", "dns.key.flags",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_authentication,
{ "Key allowed for authentication", "dns.key.flags.authentication",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_not_allowed_allowed), 0x8000,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_confidentiality,
{ "Key allowed for confidentiality", "dns.key.flags.confidentiality",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_not_allowed_allowed), 0x4000,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_key_required,
{ "Key required", "dns.key.flags.required",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_required_experimental), 0x2000,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_associated_user,
{ "Key is associated with a user", "dns.key.flags.associated_user",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0400,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_associated_named_entity,
{ "Key is associated with the named entity", "dns.key.flags.associated_named_entity",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0200,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_ipsec,
{ "Key use with IPSEC", "dns.key.flags.ipsec",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_valid_invalid), 0x0080,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_mime,
{ "Key use with MIME security multiparts", "dns.key.flags.mime",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_BOOLEAN, 16, TFS(&tfs_valid_invalid), 0x0040,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_flags_signatory,
{ "Signatory", "dns.key.flags.signatory",
replaced decode_boolean_bitfield calls with itemized filters svn path=/trunk/; revision=45152
2012-09-26 18:10:29 +00:00
FT_UINT16, BASE_DEC, NULL, 0x000F,
NULL, HFILL }},
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
{ &hf_dns_key_protocol,
{ "Protocol", "dns.key.protocol",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_key_algorithm,
{ "Algorithm", "dns.key.algorithm",
FT_UINT8, BASE_DEC, VALS(dnssec_algo_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_key_key_id,
{ "Key ID", "dns.key.key_id",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_key_public_key,
{ "Public Key", "dns.key.public_key",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance PX type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
{ &hf_dns_px_preference,
{ "Preference", "dns.px.preference",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_px_map822,
{ "MAP822", "dns.px.map822",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_px_mapx400,
{ "MAPX400", "dns.px.map400",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
{ &hf_dns_tkey_algo_name,
{ "Algorithm name", "dns.tkey.algo_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_tkey_signature_expiration,
{ "Signature Expiration", "dns.tkey.signature_expiration",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
"Specify a validity period for the signature", HFILL }},
{ &hf_dns_tkey_signature_inception,
{ "Signature Inception", "dns.tkey.signature_inception",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
"Specify a validity period for the signature", HFILL }},
{ &hf_dns_tkey_mode,
{ "Mode", "dns.tkey.mode",
FT_UINT16, BASE_DEC, VALS(tkey_mode_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_tkey_error,
{ "Error", "dns.tkey.error",
FT_UINT16, BASE_DEC, VALS(rcode_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_tkey_key_size,
{ "Key Size", "dns.tkey.key_size",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_tkey_key_data,
{ "Key Data", "dns.tkey.key_data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_tkey_other_size,
{ "Other Size", "dns.tkey.other_size",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_tkey_other_data,
{ "Other Data", "dns.tkey.other_data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance IPSECKEY DNS Type svn path=/trunk/; revision=49712
2013-06-03 13:09:53 +00:00
{ &hf_dns_ipseckey_gateway_precedence,
{ "Gateway Precedence", "dns.ipseckey.gateway_precedence",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_ipseckey_gateway_algorithm,
{ "Gateway Algorithm", "dns.ipseckey.gateway_algorithm",
FT_UINT8, BASE_DEC, VALS(gw_algo_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_ipseckey_gateway_type,
{ "Gateway Type", "dns.ipseckey.gateway_type",
FT_UINT8, BASE_DEC, VALS(gw_type_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_ipseckey_gateway_ipv4,
{ "IPv4 Gateway", "dns.ipseckey.gateway_ipv4",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_ipseckey_gateway_ipv6,
{ "IPv6 Gateway", "dns.ipseckey.gateway_ipv6",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_ipseckey_gateway_dns,
{ "DNS Gateway", "dns.ipseckey.gateway_dns",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_ipseckey_public_key,
{ "Public Key", "dns.ipseckey.public_key",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance A6 DNS Type svn path=/trunk/; revision=49714
2013-06-03 13:10:12 +00:00
{ &hf_dns_a6_prefix_len,
{ "Prefix len", "dns.a6.prefix_len",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_a6_address_suffix,
{ "Address Suffix", "dns.a6.address_suffix",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_a6_prefix_name,
{ "Prefix name", "dns.a6.prefix_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance DNAME DNS Type svn path=/trunk/; revision=49715
2013-06-03 13:10:22 +00:00
{ &hf_dns_dname,
{ "Dname", "dns.dname",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance LOC DNS Type svn path=/trunk/; revision=49716
2013-06-03 13:10:31 +00:00
{ &hf_dns_loc_version,
{ "Version", "dns.loc.version",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_size,
{ "Size", "dns.loc.size",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_horizontal_precision,
{ "Horizontal Precision", "dns.loc.horizontal_precision",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_vertical_precision,
{ "Vertial Precision", "dns.loc.vertial_precision",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_latitude,
{ "Latitude", "dns.loc.latitude",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_longitude,
{ "Longitude", "dns.loc.longitude",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_altitude,
{ "Altitude", "dns.loc.altitude",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_loc_unknown_data,
{ "Unknown data", "dns.loc.unknown_data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance DNAME DNS Type svn path=/trunk/; revision=49715
2013-06-03 13:10:22 +00:00
Enhance NXT DNS Type svn path=/trunk/; revision=49718
2013-06-03 13:10:53 +00:00
{ &hf_dns_nxt_next_domain_name,
{ "Next Domain Name", "dns.nxt.next_domain_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance KX DNS Type (and fix a minor bug.. KX Preference is always = 0...) svn path=/trunk/; revision=49719
2013-06-03 13:11:02 +00:00
{ &hf_dns_kx_preference,
{ "Preference", "dns.kx.preference",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_kx_key_exchange,
{ "Key Exchange", "dns.kx.key_exchange",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance CERT DNS Type svn path=/trunk/; revision=49720
2013-06-03 13:11:12 +00:00
{ &hf_dns_cert_type,
{ "Type", "dns.cert.type",
FT_UINT16, BASE_DEC, VALS(dns_cert_type_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_cert_key_tag,
{ "Key Tag", "dns.cert.key_tag",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_cert_algorithm,
{ "Algorithm", "dns.cert.algorithm",
FT_UINT8, BASE_DEC, VALS(dnssec_algo_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_cert_certificate,
{ "Certificate (or CRL)", "dns.cert.certificate",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Enhance NSEC DNS Type svn path=/trunk/; revision=49717
2013-06-03 13:10:39 +00:00
{ &hf_dns_nsec_next_domain_name,
{ "Next Domain Name", "dns.nsec.next_domain_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Make the Primary name element filterable in response records. Same for Nameserver names. svn path=/trunk/; revision=35058
2010-11-28 21:45:15 +00:00
{ &hf_dns_rr_ns,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Name Server", "dns.resp.ns",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
{ &hf_dns_rr_opt,
{ "Option", "dns.rr.opt",
FT_NONE, BASE_NONE,
NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_code,
{ "Option Code", "dns.rr.opt.code",
FT_UINT16, BASE_DEC,
VALS(edns0_opt_code_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_len,
{ "Option Length", "dns.rr.opt.len",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_data,
{ "Option Data", "dns.rr.opt.data",
FT_BYTES, BASE_NONE, NULL, 0x0,
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
NULL, HFILL }},
Add RFC6975 (Signaling Cryptographic Algorithm Understanding in DNS Security Extensions (DNSSEC)) support ( DAU, DHU and N3U OPT(ion)) svn path=/trunk/; revision=50840
2013-07-23 14:54:18 +00:00
{ &hf_dns_rr_opt_dau,
{ "DAU", "dns.rr.opt.dau",
FT_UINT8, BASE_DEC, VALS(dnssec_algo_vals), 0x0,
"DNSSEC Algorithm Understood", HFILL }},
{ &hf_dns_rr_opt_dhu,
{ "DHU", "dns.rr.opt.dhu",
FT_UINT8, BASE_DEC, VALS(dns_ds_digest_vals), 0x0,
"DS Hash Understood", HFILL }},
{ &hf_dns_rr_opt_n3u,
{ "N3U", "dns.rr.opt.n3u",
FT_UINT8, BASE_DEC, VALS(hash_algorithms), 0x0,
"NSEC3 Hash Understood", HFILL }},
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
{ &hf_dns_rr_opt_client_family,
{ "Family", "dns.rr.opt.client.family",
FT_UINT16, BASE_DEC,
VALS(afamily_vals), 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_client_netmask,
{ "Source Netmask", "dns.rr.opt.client.netmask",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_client_scope,
{ "Scope Netmask", "dns.rr.opt.client.scope",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_client_addr,
{ "Client Subnet", "dns.rr.opt.client.addr",
Display hf_dns_rr_opt_client_addr as FT_BYTES svn path=/trunk/; revision=44704
2012-08-30 19:13:38 +00:00
FT_BYTES, BASE_NONE, NULL, 0x0,
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552 Add support for EDNS0 option from draft-vandergaast-edns-client-subnet-01 From me * use/prefer proto_tree_add_item * use switch() for optcode (may be there is other optcode later...) svn path=/trunk/; revision=44702
2012-08-30 17:03:50 +00:00
NULL, HFILL }},
{ &hf_dns_rr_opt_client_addr4,
{ "Client Subnet", "dns.rr.opt.client.addr4",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_rr_opt_client_addr6,
{ "Client Subnet", "dns.rr.opt.client.addr6",
FT_IPv6, BASE_NONE, NULL, 0x0,
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
NULL, HFILL }},
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
{ &hf_dns_count_questions,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Questions", "dns.count.queries",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of queries in packet", HFILL }},
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
{ &hf_dns_count_zones,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Zones", "dns.count.zones",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of zones in packet", HFILL }},
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
{ &hf_dns_count_answers,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Answer RRs", "dns.count.answers",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of answers in packet", HFILL }},
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
{ &hf_dns_count_prerequisites,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Prerequisites", "dns.count.prerequisites",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of prerequisites in packet", HFILL }},
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
{ &hf_dns_count_auth_rr,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Authority RRs", "dns.count.auth_rr",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of authoritative records in packet", HFILL }},
For dynamic DNS updates, give the counts in the message the appropriate names. For RRs with a data length of 0 - as can appear in dynamic DNS updates - don't attempt to display the data. svn path=/trunk/; revision=12511
2004-11-12 09:46:31 +00:00
{ &hf_dns_count_updates,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Updates", "dns.count.updates",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of updates records in packet", HFILL }},
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_algo,
{ "Hash algorithm", "dns.nsec3.algo",
FT_UINT8, BASE_DEC, VALS(hash_algorithms), 0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_flags,
{ "NSEC3 flags", "dns.nsec3.flags",
FT_UINT8, BASE_DEC, NULL, 0,
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_flag_optout,
{ "NSEC3 Opt-out flag", "dns.nsec3.flags.opt_out",
FT_BOOLEAN, 8, TFS(&tfs_flags_nsec3_optout), NSEC3_FLAG_OPTOUT,
(Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL. svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_iterations,
{ "NSEC3 iterations", "dns.nsec3.iterations",
FT_UINT16, BASE_DEC, NULL, 0,
"Number of hashing iterations", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_salt_length,
{ "Salt length", "dns.nsec3.salt_length",
FT_UINT8, BASE_DEC, NULL, 0,
"Length of salt in bytes", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_salt_value,
{ "Salt value", "dns.nsec3.salt_value",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_hash_length,
{ "Hash length", "dns.nsec3.hash_length",
FT_UINT8, BASE_DEC, NULL, 0,
"Length in bytes of next hashed owner", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
{ &hf_dns_nsec3_hash_value,
{ "Next hashed owner", "dns.nsec3.hash_value",
From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709 Enhance DNS Dissector Add new DNS type : TLSA/DANE (52) RFC6698 The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
{ &hf_dns_tlsa_certificate_usage,
{ "Certificate Usage", "dns.tlsa.certificate_usage",
FT_UINT8, BASE_DEC, VALS(tlsa_certificate_usage_vals), 0,
"Specifies the provided association that will be used to match the certificate presented in the TLS handshake", HFILL }},
{ &hf_dns_tlsa_selector,
{ "Selector", "dns.tlsa.selector",
FT_UINT8, BASE_DEC, VALS(tlsa_selector_vals), 0,
"Specifies which part of the TLS certificate presented by the server will be matched against the association data", HFILL }},
{ &hf_dns_tlsa_matching_type,
{ "Matching Type", "dns.tlsa.matching_type",
FT_UINT8, BASE_DEC, VALS(tlsa_matching_type_vals), 0,
"Specifies how the certificate association is presented", HFILL }},
{ &hf_dns_tlsa_certificate_association_data,
{ "Certificate Association Data", "dns.tlsa.certificate_association_data",
FT_BYTES, BASE_NONE, NULL, 0,
"The data refers to the certificate in the association", HFILL }},
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
{ &hf_dns_tsig_algorithm_name,
{ "Algorithm Name", "dns.tsig.algorithm_name",
FT_STRING, BASE_NONE, NULL, 0x0,
"Name of algorithm used for the MAC", HFILL }},
{ &hf_dns_tsig_time_signed,
{ "Time Signed", "dns.tsig.time_signed",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
NULL, HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_original_id,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Original Id", "dns.tsig.original_id",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_error,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Error", "dns.tsig.error",
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
FT_UINT16, BASE_DEC, VALS(rcode_vals), 0x0,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
"Expanded RCODE for TSIG", HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_fudge,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Fudge", "dns.tsig.fudge",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of bytes for the MAC", HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_mac_size,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "MAC Size", "dns.tsig.mac_size",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of bytes for the MAC", HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_other_len,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Other Len", "dns.tsig.other_len",
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of bytes for Other Data", HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_mac,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "MAC", "dns.tsig.mac",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
{ &hf_dns_tsig_other_data,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Other Data", "dns.tsig.other_data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
{ &hf_dns_response_in,
{ "Response In", "dns.response_in",
From Kovarththanan Rajaratnam: More FT_XXX cleanup. svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
"The response to this DNS query is in this frame", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
{ &hf_dns_response_to,
{ "Request In", "dns.response_to",
From Kovarththanan Rajaratnam: More FT_XXX cleanup. svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
"This is a response to the DNS query in this frame", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
testdrive the request/response README and implement request/response matching for DNS svn path=/trunk/; revision=19003
2006-08-23 09:48:16 +00:00
{ &hf_dns_time,
{ "Time", "dns.time",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"The time between the Query and the Response", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
{ &hf_dns_count_add_rr,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Additional RRs", "dns.count.add_rr",
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
FT_UINT16, BASE_DEC, NULL, 0x0,
"Number of additional records in packet", HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance SSHFP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
{ &hf_dns_sshfp_algorithm,
{ "Algorithm", "dns.sshfp.algorithm",
FT_UINT8, BASE_DEC, VALS(sshfp_algo_vals), 0,
NULL, HFILL }},
{ &hf_dns_sshfp_fingerprint_type,
{ "Fingerprint type", "dns.sshfp.fingerprint.type",
FT_UINT8, BASE_DEC, VALS(sshfp_fingertype_vals), 0,
NULL, HFILL }},
From Ivan Sy: Add support for SSHFP RR (RFC 4255). svn path=/trunk/; revision=29252
2009-07-31 07:05:43 +00:00
{ &hf_dns_sshfp_fingerprint,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Fingerprint", "dns.sshfp.fingerprint",
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
{ &hf_dns_hip_hit_length,
{ "HIT length", "dns.hip.hit.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_hip_pk_algo,
{ "HIT length", "dns.hip.hit.pk.algo",
FT_UINT8, BASE_DEC, VALS(hip_algo_vals), 0,
NULL, HFILL }},
{ &hf_dns_hip_pk_length,
{ "PK length", "dns.hip.pk.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
{ &hf_dns_hip_hit,
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
{ "Host Identity Tag", "dns.hip.hit",
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
{ &hf_dns_hip_pk,
{ "HIP Public Key", "dns.hip.pk",
From Ivan Sy: Add support for Support for DHCID RR (RFC 4701). svn path=/trunk/; revision=29305
2009-08-05 18:17:18 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
Enhance HIP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
NULL, HFILL }},
{ &hf_dns_hip_rendezvous_server,
{ "Rendezvous Server", "dns.hip.rendezvous_server",
FT_STRING, BASE_NONE, NULL, 0,
From Ivan Sy: Add support for Support for DHCID RR (RFC 4701). svn path=/trunk/; revision=29305
2009-08-05 18:17:18 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Ivan Sy: Add support for Support for DHCID RR (RFC 4701). svn path=/trunk/; revision=29305
2009-08-05 18:17:18 +00:00
{ &hf_dns_dhcid_rdata,
{ "DHCID Data", "dns.dhcid.rdata",
From Ivan Sy: Support for Host Identity Protocol (HIP) Domain Name System (DNS) Extension. svn path=/trunk/; revision=29277
2009-08-03 18:23:04 +00:00
FT_BYTES, BASE_NONE, NULL, 0,
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance DNS Dissector Make DS ( Delegation Signature 43 ) filterable (Update RFC reference...) svn path=/trunk/; revision=50838
2013-07-23 14:53:59 +00:00
{ &hf_dns_ds_key_id,
{ "Key id", "dns.ds.key_id",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
{ &hf_dns_ds_algorithm,
{ "Algorithm", "dns.ds.algorithm",
FT_UINT8, BASE_DEC, VALS(dnssec_algo_vals), 0,
NULL, HFILL }},
{ &hf_dns_ds_digest_type,
{ "Digest Type", "dns.ds.digest_type",
FT_UINT8, BASE_DEC, VALS(dns_ds_digest_vals), 0,
NULL, HFILL }},
{ &hf_dns_ds_digest,
{ "Digest", "dns.ds.digest",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
{ &hf_dns_apl_address_family,
{ "Address Family", "dns.apl.address_family",
FT_UINT16, BASE_DEC, VALS(afamily_vals), 0,
NULL, HFILL }},
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
{ &hf_dns_apl_coded_prefix,
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
{ "Prefix Length", "dns.apl.coded_prefix",
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
FT_UINT8, BASE_DEC, NULL, 0,
Replace blurbs that match the name (case insensitive) with NULL. svn path=/trunk/; revision=34227
2010-09-23 21:46:31 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
{ &hf_dns_apl_negation,
{ "Negation Flag", "dns.apl.negation",
FT_BOOLEAN, 8, TFS(&tfs_dns_apl_negation), DNS_APL_NEGATION,
(Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL. svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
{ &hf_dns_apl_afdlength,
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
{ "Address Length","dns.apl.afdlength",
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
FT_UINT8, BASE_DEC, NULL, DNS_APL_AFDLENGTH,
Enhance APL (and DHCID) type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
"in octets", HFILL }},
{ &hf_dns_apl_afdpart_ipv4,
{ "Address","dns.apl.afdpart.ipv4",
FT_IPv4, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_apl_afdpart_ipv6,
{ "Address","dns.apl.afdpart.ipv6",
FT_IPv6, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_apl_afdpart_data,
{ "Address","dns.apl.afdpart.data",
FT_BYTES, BASE_NONE, NULL, 0,
(Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL. svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance GPOS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
{ &hf_dns_gpos_longitude_length,
{ "Longitude length","dns.gpos.longitude_length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_gpos_longitude,
{ "Longitude","dns.gpos.longitude",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_gpos_latitude_length,
{ "Latitude length","dns.gpos.latitude_length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_gpos_latitude,
{ "Latitude","dns.gpos.latitude",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_gpos_altitude_length,
{ "Altitude length","dns.gpos.altitude_length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_gpos_altitude,
{ "Altitude","dns.gpos.altitude",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
Enhance RP type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
{ &hf_dns_rp_mailbox,
{ "Mailbox","dns.rp.mailbox",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_rp_txt_rr,
{ "TXT RR","dns.rp.txt_rr",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
{ &hf_dns_afsdb_subtype,
{ "Subtype","dns.afsdb.subtype",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_afsdb_hostname,
{ "Hostname","dns.afsdb.hostname",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
Enhance X25 and ISDN type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
{ &hf_dns_x25_length,
{ "Length","dns.x25.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_x25_psdn_address,
{ "PSDN-Address","dns.x25.psdn_address",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_isdn_length,
{ "Length","dns.idsn.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_isdn_address,
{ "ISDN Address","dns.idsn.address",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_dns_isdn_sa_length,
{ "Length","dns.idsn.sa.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_isdn_sa,
{ "Sub Address","dns.idsn.sa.address",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
Enhance AFSDB and RT type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
{ &hf_dns_rt_preference,
{ "Preference","dns.rt.subtype",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_rt_intermediate_host,
{ "Intermediate Hostname","dns.rt.intermediate_host",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
From Ivan Sy: NSEC3PARAM RR (RFC 5155), APL RR (RFC 3123), PX RR (RFC 2163), GPOS RR (RFC 1712), NSAP RR (RFC 1706), NSAP-PTR RR (RFC 1348), AFSDB, RP, X25, ISDN, RT, RR (RFC 1183). Also cleanup of protocol tree dependancies. svn path=/trunk/; revision=29506
2009-08-22 17:28:54 +00:00
{ &hf_dns_nsap_rdata,
{ "NSAP Data", "dns.nsap.rdata",
FT_BYTES, BASE_NONE, NULL, 0,
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
NULL, HFILL }},
Minor: reformatting, unneeded #includes, whitespace cleanup; Also: use val_to_str_const(0 instead of val_to_str() in a few cases. svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +00:00
Enhance NSAP and NSAP PTR type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
{ &hf_dns_nsap_ptr_owner,
{ "Owner", "dns.nsap_ptr.owner",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
{ &hf_dns_caa_flags,
{ "CAA Flags", "dns.caa.flags",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_caa_flag_issuer_critical,
{ "Issuer Critical", "dns.caa.flags.issuer_critical",
FT_BOOLEAN, 8, TFS(&tfs_critical_not_critical), CAA_FLAG_ISSUER_CRITICAL,
"Other CAs must not issue certificates", HFILL }},
{ &hf_dns_caa_issue,
{ "Issue", "dns.caa.issue",
FT_STRING, BASE_NONE, NULL, 0x0,
"CA which is allowed to issue certificates", HFILL }},
{ &hf_dns_caa_issuewild,
{ "Issue Wildcard", "dns.caa.issuewild",
FT_STRING, BASE_NONE, NULL, 0x0,
"CA which is allowed to issue wildcard certificates", HFILL }},
{ &hf_dns_caa_iodef,
{ "Report URL", "dns.caa.iodef",
FT_STRING, BASE_NONE, NULL, 0x0,
"URL or email address for certificate issue requests and violation reports", HFILL }},
{ &hf_dns_caa_unknown,
{ "Unkown tag", "dns.caa.unknown",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_caa_tag_length,
{ "Tag length", "dns.caa.tag_length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_dns_caa_tag,
{ "Tag", "dns.caa.tag",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_caa_value,
{ "Value", "dns.caa.value",
FT_STRING, BASE_NONE, NULL, 0x0,
Enhance WINS and WINS-R DNS type Convert proto_tree_add_text calls to proto_tree_add_item svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
NULL, HFILL }},
{ &hf_dns_wins_local_flag,
{ "Local Flag", "dns.wins.local_flag",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x1,
NULL, HFILL }},
{ &hf_dns_wins_lookup_timeout,
{ "Lookup timeout", "dns.wins.lookup_timeout",
FT_UINT32, BASE_DEC, NULL, 0x0,
"In seconds", HFILL }},
{ &hf_dns_wins_cache_timeout,
{ "Cache timeout", "dns.wins.cache_timeout",
FT_UINT32, BASE_DEC, NULL, 0x0,
"In seconds", HFILL }},
{ &hf_dns_wins_nb_wins_servers,
{ "Number of WINS servers", "dns.wins.nb_wins_servers",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_wins_server,
{ "WINS Server Address", "dns.wins.wins_server",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_dns_winsr_local_flag,
{ "Local Flag", "dns.winsr.local_flag",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x1,
NULL, HFILL }},
{ &hf_dns_winsr_lookup_timeout,
{ "Lookup timeout", "dns.winsr.lookup_timeout",
FT_UINT32, BASE_DEC, NULL, 0x0,
"In seconds", HFILL }},
{ &hf_dns_winsr_cache_timeout,
{ "Cache timeout", "dns.winsr.cache_timeout",
FT_UINT32, BASE_DEC, NULL, 0x0,
"In seconds", HFILL }},
{ &hf_dns_winsr_name_result_domain,
{ "Name Result Domain", "dns.winsr.name_result_domain",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
};
Batch of filterable expert_infos. svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
static ei_register_info ei[] = {
{ &ei_dns_rr_opt_bad_length, { "dns.rr.opt.bad_length", PI_MALFORMED, PI_ERROR, "Length too long for any type of IP address.", EXPFILL }},
Client subnet optcode value now IANA assigned. Warn if experimental placeholder value is still used. Bug 7552 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7552) svn path=/trunk/; revision=50503
2013-07-11 11:59:30 +00:00
{ &ei_dns_depr_opc, { "dns.depr.opc", PI_PROTOCOL, PI_WARN, "Deprecated opcode", EXPFILL }},
Enhance TSIG and TKIP DNS type Update rrcode list Convert proto_tree_add_text calls to proto_tree_add_item Use expert info when no found dissector for TSIG algo Enhance TKEY (BETA) svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
{ &ei_ttl_negative, { "dns.ttl.negative", PI_PROTOCOL, PI_WARN, "TTL can't be negative", EXPFILL }},
{ &ei_dns_tsig_alg, { "dns.tsig.noalg", PI_UNDECODED, PI_WARN, "No dissector for algorithm", EXPFILL }},
Batch of filterable expert_infos. svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
};
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint *ett[] = {
&ett_dns,
&ett_dns_qd,
&ett_dns_rr,
&ett_dns_qry,
&ett_dns_ans,
&ett_dns_flags,
From David Drysdale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7551 Add dissection of sub-options in DNS OPT RRs (RFC 2671) From me * use/prefer proto_tree_add_item * Remove dns_optcode_description function (Use value_string...) svn path=/trunk/; revision=44383
2012-08-09 15:15:24 +00:00
&ett_dns_opts,
From Richard Brodie: DNSSEC RFC 5155 support patch svn path=/trunk/; revision=27048
2008-12-18 19:01:08 +00:00
&ett_nsec3_flags,
Enhance KEY Type svn path=/trunk/; revision=49711
2013-06-03 13:09:43 +00:00
&ett_key_flags,
Call the GSSAPI dissector when disecting GSSAPI transaction keys. The TKEY request works quite nicely but I'm not sure what to call for the response. Currently it just displays "Unknown header: (cls=2, cons=1, tag=1) which looks like it's some more ASN.1 data. svn path=/trunk/; revision=7002
2003-01-26 01:00:05 +00:00
&ett_t_key,
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
&ett_dns_mac,
From Oliver Gasser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8863 Add CAA support to DNS dissector Add informationa about Certificate Authority Authorization (CAA) data to the DNS dissector. See the RFC [1] for more information. Suggestions and improvements are welcome. [1] http://tools.ietf.org/html/rfc6844 svn path=/trunk/; revision=50370
2013-07-03 16:46:29 +00:00
&ett_caa_flags,
&ett_caa_data,
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
};
From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9061 Added expert info to DNS dissector for negative TTL values According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful. svn path=/trunk/; revision=51452
2013-08-21 17:04:51 +00:00
Add support for desegmentation of DNS messages. Make the default for NBSS and ONC RPC-over-TCP desegmentation "on", rather than "off"; the default for desegmentation in general is "off", so this won't change the default behavior, but it lets you turn desegmentation on by flipping only one switch (and turn it off for particular protocols if you desire). svn path=/trunk/; revision=3943
2001-09-17 02:07:00 +00:00
module_t *dns_module;
Batch of filterable expert_infos. svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
expert_module_t* expert_dns;
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
Have "proto_register_protocol()" build a list of data structures for protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
proto_dns = proto_register_protocol("Domain Name Service", "DNS", "dns");
Add display filters. svn path=/trunk/; revision=857
1999-10-16 15:08:11 +00:00
proto_register_field_array(proto_dns, hf, array_length(hf));
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
proto_register_subtree_array(ett, array_length(ett));
Batch of filterable expert_infos. svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
expert_dns = expert_register_protocol(proto_dns);
expert_register_field_array(expert_dns, ei, array_length(ei));
Add support for desegmentation of DNS messages. Make the default for NBSS and ONC RPC-over-TCP desegmentation "on", rather than "off"; the default for desegmentation in general is "off", so this won't change the default behavior, but it lets you turn desegmentation on by flipping only one switch (and turn it off for particular protocols if you desire). svn path=/trunk/; revision=3943
2001-09-17 02:07:00 +00:00
From Johan Wåhl: Make DNS ports configurable. svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
/* 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 ")",
&global_dns_udp_port_range, MAX_UDP_PORT);
Add support for desegmentation of DNS messages. Make the default for NBSS and ONC RPC-over-TCP desegmentation "on", rather than "off"; the default for desegmentation in general is "off", so this won't change the default behavior, but it lets you turn desegmentation on by flipping only one switch (and turn it off for particular protocols if you desire). svn path=/trunk/; revision=3943
2001-09-17 02:07:00 +00:00
prefs_register_bool_preference(dns_module, "desegment_dns_messages",
Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions. I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences. Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect. If you encounter any mistakes I've made here, please let me know... svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
"Reassemble DNS messages spanning multiple TCP segments",
"Whether the DNS dissector should reassemble messages spanning multiple TCP segments."
" To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
Add support for desegmentation of DNS messages. Make the default for NBSS and ONC RPC-over-TCP desegmentation "on", rather than "off"; the default for desegmentation in general is "off", so this won't change the default behavior, but it lets you turn desegmentation on by flipping only one switch (and turn it off for particular protocols if you desire). svn path=/trunk/; revision=3943
2001-09-17 02:07:00 +00:00
&dns_desegment);
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
Add a preference for whether to use names found in DNS packets for address resolution. svn path=/trunk/; revision=51584
2013-08-30 01:29:46 +00:00
prefs_register_bool_preference(dns_module, "use_for_addr_resolution",
"Use DNS packet data for address resolution",
"Whether address/name pairs found in dissected DNS packets should be used by Wireshark for name resolution.",
&dns_use_for_addr_resolution);
remove some proto_tree_add_text and replace with proto_tree_add_item() for the TSIG dissection in dns. create a new dissector table where MAC algorithms for dns/tsig can be registered. register gssapi for the algorithm "gss.microsoft.com" since this is what w2k uses when performing dns updates. svn path=/trunk/; revision=16895
2005-12-25 12:03:18 +00:00
dns_tsig_dissector_table = register_dissector_table("dns.tsig.mac", "DNS TSIG MAC Dissectors", FT_STRING, BASE_NONE);
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
}
Add modelines for DNS dissector svn path=/trunk/; revision=44767
2012-09-04 08:19:08 +00:00
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* ex: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/