move T_xx and C_xx fallback definitions into nameser.h.

diff --git a/nameser.h b/nameser.h
index 9a72a2e9a5fac6ee64783300932c963901846ab3..21f50e6cd613c437a12708612686c1b9e5046216 100644 (file)
--- a/nameser.h
+++ b/nameser.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.5 2000-12-28 20:30:41 itojun Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.6 2001-01-28 07:47:56 itojun Exp $ (LBL) */
 /*
  * Copyright (c) 1983, 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -128,13 +128,32 @@
 #define T_TXT          16              /* text strings */
 #define        T_RP            17              /* responsible person */
 #define        T_AFSDB         18              /* AFS cell database */
+#define T_X25          19              /* X_25 calling address */
+#define T_ISDN         20              /* ISDN calling address */
+#define T_RT           21              /* router */
 #define        T_NSAP          22              /* NSAP address */
 #define        T_NSAP_PTR      23              /* reverse lookup for NSAP */
+#define T_SIG          24              /* security signature */
+#define T_KEY          25              /* security key */
+#define T_PX           26              /* X.400 mail mapping */
+#define T_GPOS         27              /* geographical position (withdrawn) */
+#define T_AAAA         28              /* IP6 Address */
+#define T_LOC          29              /* Location Information */
+#define T_NXT          30              /* Next Valid Name in Zone */
+#define T_EID          31              /* Endpoint identifier */
+#define T_NIMLOC       32              /* Nimrod locator */
+#define T_SRV          33              /* Server selection */
+#define T_ATMA         34              /* ATM Address */
+#define T_NAPTR                35              /* Naming Authority PoinTeR */
+#define T_A6           38              /* IP6 address */
+#define T_DNAME                39              /* non-terminal redirection */
+#define T_OPT          41              /* EDNS0 option (meta-RR) */
        /* non standard */
 #define T_UINFO                100             /* user (finger) information */
 #define T_UID          101             /* user ID */
 #define T_GID          102             /* group ID */
 #define T_UNSPEC       103             /* Unspecified format (binary data) */
+#define T_UNSPECA      104             /* "unspecified ascii". Ugly MIT hack */
        /* Query type values which do not appear in resource records */
 #define T_AXFR         252             /* transfer zone of authority */
 #define T_MAILB                253             /* transfer mailbox records */

diff --git a/print-domain.c b/print-domain.c
index 7934e487c058eeda3fda0bd64b0d4649bebb5a3d..70d06b42d37481f70cd76532c72deb94d9125d07 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.65 2001-01-12 15:06:06 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.66 2001-01-28 07:47:56 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -48,92 +48,6 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"                    /* must come after interface.h */
 
-/* Compatibility */
-#ifndef T_TXT
-#define T_TXT          16              /* text strings */
-#endif
-#ifndef T_RP
-#define T_RP           17              /* responsible person */
-#endif
-#ifndef T_AFSDB
-#define T_AFSDB                18              /* AFS cell database */
-#endif
-#ifndef T_X25
-#define T_X25          19              /* X_25 calling address */
-#endif
-#ifndef T_ISDN
-#define T_ISDN         20              /* ISDN calling address */
-#endif
-#ifndef T_RT
-#define T_RT           21              /* router */
-#endif
-#ifndef T_NSAP
-#define T_NSAP         22              /* NSAP address */
-#endif
-#ifndef T_NSAP_PTR
-#define T_NSAP_PTR     23              /* reverse NSAP lookup (deprecated) */
-#endif
-#ifndef T_SIG
-#define T_SIG          24              /* security signature */
-#endif
-#ifndef T_KEY
-#define T_KEY          25              /* security key */
-#endif
-#ifndef T_PX
-#define T_PX           26              /* X.400 mail mapping */
-#endif
-#ifndef T_GPOS
-#define T_GPOS         27              /* geographical position (withdrawn) */
-#endif
-#ifndef T_AAAA
-#define T_AAAA         28              /* IP6 Address */
-#endif
-#ifndef T_LOC
-#define T_LOC          29              /* Location Information */
-#endif
-#ifndef T_NXT
-#define T_NXT          30              /* Next Valid Name in Zone */
-#endif
-#ifndef T_EID
-#define T_EID          31              /* Endpoint identifier */
-#endif
-#ifndef T_NIMLOC
-#define T_NIMLOC       32              /* Nimrod locator */
-#endif
-#ifndef T_SRV
-#define T_SRV          33              /* Server selection */
-#endif
-#ifndef T_ATMA
-#define T_ATMA         34              /* ATM Address */
-#endif
-#ifndef T_NAPTR
-#define T_NAPTR                35              /* Naming Authority PoinTeR */
-#endif
-#ifndef T_A6
-#define T_A6           38              /* IP6 address */
-#endif
-#ifndef T_DNAME
-#define T_DNAME                39              /* non-terminal redirection */
-#endif
-
-#ifndef T_OPT
-#define T_OPT          41              /* EDNS0 option (meta-RR) */
-#endif
-
-#ifndef T_UNSPEC
-#define T_UNSPEC       103             /* Unspecified format (binary data) */
-#endif
-#ifndef T_UNSPECA
-#define T_UNSPECA      104             /* "unspecified ascii". Ugly MIT hack */
-#endif
-
-#ifndef C_CHAOS
-#define C_CHAOS                3               /* for chaos net (MIT) */
-#endif
-#ifndef C_HS
-#define C_HS           4               /* for Hesiod name server (MIT) (XXX) */
-#endif
-
 static char *ns_ops[] = {
        "", " inv_q", " stat", " op3", " notify", " op5", " op6", " op7",
        " op8", " updataA", " updateD", " updateDA",