From Wesley Griffin <[email protected]>: update the list of

DNS RR typecodes.

diff --git a/CREDITS b/CREDITS
index 5ba62bc9843bb4b5bb858795bf31e7ea9401689f..c72d8f0a5a933926781224dc51fa3868bcc5404f 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -131,6 +131,7 @@ Additional people who have contributed patches:
        Timo Koskiahde
        Tony Li                         <[email protected]>
        Uns Lider                       <[email protected]>
+       Wesley Griffin                  <[email protected]>
        Wilbert de Graaf                <[email protected]>
        Yen Yen Lim
        Yoshifumi Nishida

diff --git a/nameser.h b/nameser.h
index 7a9e6113595dc1c96c934614176d504495dd5d59..55616e415e86326255317f7b7d303eb00a68749f 100644 (file)
--- a/nameser.h
+++ b/nameser.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.14 2003-11-05 06:02:59 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.14.4.1 2006-04-07 08:48:09 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1983, 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -163,10 +163,21 @@
 #define T_SRV          33              /* Server selection */
 #define T_ATMA         34              /* ATM Address */
 #define T_NAPTR                35              /* Naming Authority PoinTeR */
+#define T_KX           36              /* Key Exchanger */
+#define T_CERT         37              /* Certificates in the DNS */
 #define T_A6           38              /* IP6 address */
 #define T_DNAME                39              /* non-terminal redirection */
+#define T_SINK         40              /* unknown */
 #define T_OPT          41              /* EDNS0 option (meta-RR) */
+#define T_APL          42              /* lists of address prefixes */
+#define T_DS           43              /* Delegation Signer */
+#define T_SSHFP                44              /* SSH Fingerprint */
+#define T_IPSECKEY     45              /* IPsec keying material */
+#define T_RRSIG                46              /* new security signature */
+#define T_NSEC         47              /* provable insecure information */
+#define T_DNSKEY       48              /* new security key */
        /* non standard */
+#define T_SPF          99              /* sender policy framework */
 #define T_UINFO                100             /* user (finger) information */
 #define T_UID          101             /* user ID */
 #define T_GID          102             /* group ID */

diff --git a/print-domain.c b/print-domain.c
index a50e591830ffad7e6247fd41f3d476b42e0ef850..56e3fbabdb6cdaddbaf6474c4b71e16c7ad30e95 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.89.2.1 2005-04-20 20:59:00 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.89.2.2 2006-04-07 08:48:09 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -278,9 +278,20 @@ struct tok ns_type2str[] = {
        { T_SRV,        "SRV" },                /* RFC 2782 */
        { T_ATMA,       "ATMA" },               /* ATM Forum */
        { T_NAPTR,      "NAPTR" },              /* RFC 2168, RFC 2915 */
+       { T_KX,         "KX" },                 /* RFC 2230 */
+       { T_CERT,       "CERT" },               /* RFC 2538 */
        { T_A6,         "A6" },                 /* RFC 2874 */
        { T_DNAME,      "DNAME" },              /* RFC 2672 */
+       { T_SINK,       "SINK" },
        { T_OPT,        "OPT" },                /* RFC 2671 */
+       { T_APL,        "APL" },                /* RFC 3123 */
+       { T_DS,         "DS" },                 /* RFC 4034 */
+       { 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_SPF,        "SPF" },                /* RFC-schlitt-spf-classic-02.txt */
        { T_UINFO,      "UINFO" },
        { T_UID,        "UID" },
        { T_GID,        "GID" },