diff options
author | Stephen Fisher <steve@stephen-fisher.com> | 2011-01-05 00:48:40 +0000 |
---|---|---|
committer | Stephen Fisher <steve@stephen-fisher.com> | 2011-01-05 00:48:40 +0000 |
commit | bc2bd6dcc5e74c1d670a05e84c6ffa7cb553257e (patch) | |
tree | 2272bb3802a502ea6c42ac0e9e7411a72712defd /epan | |
parent | 25485e9b3ec45b69085ca84286949abd2d5b19ae (diff) |
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
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-dns.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index dcc6525053..8cabef8944 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -437,10 +437,6 @@ http://www.microsoft.com/windows2000/library/resources/reskit/samplechapters/cnc static const value_string dns_types[] = { { 0, "Unused" }, -/* Sort most common for speed */ - { T_NAPTR, "NAPTR" }, /* RFC 3403 */ - { T_SRV, "SRV" }, /* RFC 2052 */ - { T_A, "A" }, { T_NS, "NS" }, { T_MD, "MD" }, @@ -473,7 +469,9 @@ static const value_string dns_types[] = { { 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 2538 */ { T_A6, "A6" }, /* RFC 2874 */ @@ -529,11 +527,7 @@ dns_type_description (guint type) { static const char *type_names[] = { "unused", -/* Sort most common for speed */ - "Naming authority pointer", /* RFC 2168 */ - "Service location", /* RFC 2052 */ - - "Host address", + "Host address", "Authoritative name server", "Mail destination", "Mail forwarder", @@ -565,7 +559,9 @@ dns_type_description (guint type) "Next", /* RFC 2535 */ "EID", "NIMLOC", + "Service location", /* RFC 2052 */ "ATMA", + "Naming authority pointer", /* RFC 2168 */ "Key Exchange", /* RFC 2230 */ "Certificate", /* RFC 2538 */ "IPv6 address with indirection", /* RFC 2874 */ |