Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / nameser.h

diff --git a/nameser.h b/nameser.h
index 21f50e6cd613c437a12708612686c1b9e5046216..f441f3ea6f568406ae99f9dfabc998469916bdce 100644 (file)
--- a/nameser.h
+++ b/nameser.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.6 2001-01-28 07:47:56 itojun Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/nameser.h,v 1.16 2006-11-10 03:18:21 guy Exp $ (LBL) */

 /*
  * Copyright (c) 1983, 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
 /*
  * Copyright (c) 1983, 1989, 1993
  *     The Regents of the University of California.  All rights reserved.


@@ -34,14 +34,14 @@
  *      @(#)nameser.h  8.2 (Berkeley) 2/16/94
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
  *      @(#)nameser.h  8.2 (Berkeley) 2/16/94
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.

- * 
+ *

  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.

- * 
+ *

  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT


@@ -76,6 +76,15 @@
  */
 #define NAMESERVER_PORT        53
 
  */
 #define NAMESERVER_PORT        53
 

+/*
+ * Port for multicast DNS; see
+ *
+ *     http://files.multicastdns.org/draft-cheshire-dnsext-multicastdns.txt
+ *
+ * for the current mDNS spec.
+ */
+#define MULTICASTDNS_PORT      5353
+

 /*
  * Currently defined opcodes
  */
 /*
  * Currently defined opcodes
  */


@@ -95,6 +104,23 @@
 #define ZONEINIT       0xe             /* initial zone transfer */
 #define ZONEREF                0xf             /* incremental zone referesh */
 
 #define ZONEINIT       0xe             /* initial zone transfer */
 #define ZONEREF                0xf             /* incremental zone referesh */
 

+/*
+ * Undefine various #defines from various System V-flavored OSes (Solaris,
+ * SINIX, HP-UX) so the compiler doesn't whine that we redefine them.
+ */
+#ifdef T_NULL
+#undef T_NULL
+#endif
+#ifdef T_OPT
+#undef T_OPT
+#endif
+#ifdef T_UNSPEC
+#undef T_UNSPEC
+#endif
+#ifdef NOERROR
+#undef NOERROR
+#endif
+

 /*
  * Currently defined response codes
  */
 /*
  * Currently defined response codes
  */


@@ -145,16 +171,30 @@
 #define T_SRV          33              /* Server selection */
 #define T_ATMA         34              /* ATM Address */
 #define T_NAPTR                35              /* Naming Authority PoinTeR */
 #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_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_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 */
        /* 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 */
 #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_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_TKEY         249             /* Transaction Key [RFC2930] */
+#define T_TSIG         250             /* Transaction Signature [RFC2845] */
+#define T_IXFR         251             /* incremental transfer [RFC1995] */

 #define T_AXFR         252             /* transfer zone of authority */
 #define T_MAILB                253             /* transfer mailbox records */
 #define T_MAILA                254             /* transfer mail agent records */
 #define T_AXFR         252             /* transfer zone of authority */
 #define T_MAILB                253             /* transfer mailbox records */
 #define T_MAILA                254             /* transfer mail agent records */


@@ -169,6 +209,8 @@
 #define C_HS           4               /* for Hesiod name server (MIT) (XXX) */
        /* Query class values which do not appear in resource records */
 #define C_ANY          255             /* wildcard match */
 #define C_HS           4               /* for Hesiod name server (MIT) (XXX) */
        /* Query class values which do not appear in resource records */
 #define C_ANY          255             /* wildcard match */

+#define C_QU           0x8000          /* mDNS QU flag in queries */
+#define C_CACHE_FLUSH  0x8000          /* mDNS cache flush flag in replies */

 
 /*
  * Status return codes for T_UNSPEC conversion routines
 
 /*
  * Status return codes for T_UNSPEC conversion routines


@@ -211,7 +253,7 @@ typedef struct {
  */
 #define INDIR_MASK     0xc0    /* 11.... */
 #define EDNS0_MASK     0x40    /* 01.... */
  */
 #define INDIR_MASK     0xc0    /* 11.... */
 #define EDNS0_MASK     0x40    /* 01.... */

-#  define EDNS0_ELT_BITLABEL 0x01 
+#  define EDNS0_ELT_BITLABEL 0x01

 
 /*
  * Structure for passing resource records around.
 
 /*
  * Structure for passing resource records around.