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

[tcpdump] / print-lwres.c

diff --git a/print-lwres.c b/print-lwres.c
index dbb7536ff8f476c82249bf0d72b629afe7e2ad16..aad4eee3843bbb37ac48d391968a4a9a7399de9e 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -28,18 +28,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.5 2001-06-26 06:19:05 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lwres.c,v 1.13 2004-03-24 01:54:29 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #include "nameser.h"
 
 
 #include "nameser.h"
 


@@ -199,7 +196,7 @@ static int
 lwres_printname(size_t l, const char *p0)
 {
        const char *p;
 lwres_printname(size_t l, const char *p0)
 {
        const char *p;

-       int i;
+       size_t i;

 
        p = p0;
        /* + 1 for terminating \0 */
 
        p = p0;
        /* + 1 for terminating \0 */


@@ -265,25 +262,28 @@ lwres_printaddr(lwres_addr_t *ap)
        int i;
 
        TCHECK(ap->length);
        int i;
 
        TCHECK(ap->length);

-       l = ntohs(ap->length);
+       l = EXTRACT_16BITS(&ap->length);

        /* XXX ap points to packed struct */
        p = (const char *)&ap->length + sizeof(ap->length);
        /* XXX ap points to packed struct */
        p = (const char *)&ap->length + sizeof(ap->length);

-       if (p + l > (const char *)snapend)
-               goto trunc;
+       TCHECK2(*p, l);

 
 

-       switch (ntohl(ap->family)) {
+       switch (EXTRACT_32BITS(&ap->family)) {

        case 1: /* IPv4 */
        case 1: /* IPv4 */

+               if (l < 4)
+                       return -1;

                printf(" %s", ipaddr_string(p));
                p += sizeof(struct in_addr);
                break;
 #ifdef INET6
        case 2: /* IPv6 */
                printf(" %s", ipaddr_string(p));
                p += sizeof(struct in_addr);
                break;
 #ifdef INET6
        case 2: /* IPv6 */

+               if (l < 16)
+                       return -1;

                printf(" %s", ip6addr_string(p));
                p += sizeof(struct in6_addr);
                break;
 #endif
        default:
                printf(" %s", ip6addr_string(p));
                p += sizeof(struct in6_addr);
                break;
 #endif
        default:

-               printf(" %lu/", (unsigned long)ntohl(ap->family));
+               printf(" %u/", EXTRACT_32BITS(&ap->family));

                for (i = 0; i < l; i++)
                        printf("%02x", *p++);
        }
                for (i = 0; i < l; i++)
                        printf("%02x", *p++);
        }


@@ -308,35 +308,35 @@ lwres_print(register const u_char *bp, u_int length)
        TCHECK(np->authlength);
 
        printf(" lwres");
        TCHECK(np->authlength);
 
        printf(" lwres");

-       v = ntohs(np->version);
+       v = EXTRACT_16BITS(&np->version);

        if (vflag || v != LWRES_LWPACKETVERSION_0)
                printf(" v%u", v);
        if (v != LWRES_LWPACKETVERSION_0) {
        if (vflag || v != LWRES_LWPACKETVERSION_0)
                printf(" v%u", v);
        if (v != LWRES_LWPACKETVERSION_0) {

-               s = (const char *)np + ntohl(np->length);
+               s = (const char *)np + EXTRACT_32BITS(&np->length);

                goto tail;
        }
 
                goto tail;
        }
 

-       response = ntohs(np->pktflags) & LWRES_LWPACKETFLAG_RESPONSE;
+       response = EXTRACT_16BITS(&np->pktflags) & LWRES_LWPACKETFLAG_RESPONSE;

 
        /* opcode and pktflags */
 
        /* opcode and pktflags */

-       v = (u_int32_t)ntohl(np->opcode);
+       v = EXTRACT_32BITS(&np->opcode);

        s = tok2str(opcode, "#0x%x", v);
        printf(" %s%s", s, response ? "" : "?");
 
        /* pktflags */
        s = tok2str(opcode, "#0x%x", v);
        printf(" %s%s", s, response ? "" : "?");
 
        /* pktflags */

-       v = ntohs(np->pktflags);
+       v = EXTRACT_16BITS(&np->pktflags);

        if (v & ~LWRES_LWPACKETFLAG_RESPONSE)
                printf("[0x%x]", v);
 
        if (vflag > 1) {
                printf(" (");   /*)*/
        if (v & ~LWRES_LWPACKETFLAG_RESPONSE)
                printf("[0x%x]", v);
 
        if (vflag > 1) {
                printf(" (");   /*)*/

-               printf("serial:0x%lx", (unsigned long)ntohl(np->serial));
-               printf(" result:0x%lx", (unsigned long)ntohl(np->result));
-               printf(" recvlen:%lu", (unsigned long)ntohl(np->recvlength));
+               printf("serial:0x%x", EXTRACT_32BITS(&np->serial));
+               printf(" result:0x%x", EXTRACT_32BITS(&np->result));
+               printf(" recvlen:%u", EXTRACT_32BITS(&np->recvlength));

                /* BIND910: not used */
                if (vflag > 2) {
                /* BIND910: not used */
                if (vflag > 2) {

-                       printf(" authtype:0x%x", ntohs(np->authtype));
-                       printf(" authlen:%u", ntohs(np->authlength));
+                       printf(" authtype:0x%x", EXTRACT_16BITS(&np->authtype));
+                       printf(" authlen:%u", EXTRACT_16BITS(&np->authlength));

                }
                /*(*/
                printf(")");
                }
                /*(*/
                printf(")");


@@ -356,7 +356,7 @@ lwres_print(register const u_char *bp, u_int length)
                gnba = NULL;
                grbn = NULL;
 
                gnba = NULL;
                grbn = NULL;
 

-               switch (ntohl(np->opcode)) {
+               switch (EXTRACT_32BITS(&np->opcode)) {

                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:
                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:


@@ -365,15 +365,15 @@ lwres_print(register const u_char *bp, u_int length)
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->namelen +
                            sizeof(gabn->namelen);
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->namelen +
                            sizeof(gabn->namelen);

-                       l = ntohs(gabn->namelen);
+                       l = EXTRACT_16BITS(&gabn->namelen);

 
                        /* BIND910: not used */
                        if (vflag > 2) {
 
                        /* BIND910: not used */
                        if (vflag > 2) {

-                               printf(" flags:0x%lx",
-                                   (unsigned long)ntohl(gabn->flags));
+                               printf(" flags:0x%x",
+                                   EXTRACT_32BITS(&gabn->flags));

                        }
 
                        }
 

-                       v = (u_int32_t)ntohl(gabn->addrtypes);
+                       v = EXTRACT_32BITS(&gabn->addrtypes);

                        switch (v & (LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6)) {
                        case LWRES_ADDRTYPE_V4:
                                printf(" IPv4");
                        switch (v & (LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6)) {
                        case LWRES_ADDRTYPE_V4:
                                printf(" IPv4");


@@ -399,8 +399,8 @@ lwres_print(register const u_char *bp, u_int length)
 
                        /* BIND910: not used */
                        if (vflag > 2) {
 
                        /* BIND910: not used */
                        if (vflag > 2) {

-                               printf(" flags:0x%lx",
-                                   (unsigned long)ntohl(gnba->flags));
+                               printf(" flags:0x%x",
+                                   EXTRACT_32BITS(&gnba->flags));

                        }
 
                        s = (const char *)&gnba->addr;
                        }
 
                        s = (const char *)&gnba->addr;


@@ -417,20 +417,21 @@ lwres_print(register const u_char *bp, u_int length)
 
                        /* BIND910: not used */
                        if (vflag > 2) {
 
                        /* BIND910: not used */
                        if (vflag > 2) {

-                               printf(" flags:0x%lx",
-                                   (unsigned long)ntohl(grbn->flags));
+                               printf(" flags:0x%x",
+                                   EXTRACT_32BITS(&grbn->flags));

                        }
 
                        printf(" %s", tok2str(ns_type2str, "Type%d",
                        }
 
                        printf(" %s", tok2str(ns_type2str, "Type%d",

-                           ntohs(grbn->rdtype)));
-                       if (ntohs(grbn->rdclass) != C_IN);
+                           EXTRACT_16BITS(&grbn->rdtype)));
+                       if (EXTRACT_16BITS(&grbn->rdclass) != C_IN) {

                                printf(" %s", tok2str(ns_class2str, "Class%d",
                                printf(" %s", tok2str(ns_class2str, "Class%d",

-                                   ntohs(grbn->rdclass)));
+                                   EXTRACT_16BITS(&grbn->rdclass)));
+                       }

 
                        /* XXX grbn points to packed struct */
                        s = (const char *)&grbn->namelen +
                            sizeof(grbn->namelen);
 
                        /* XXX grbn points to packed struct */
                        s = (const char *)&grbn->namelen +
                            sizeof(grbn->namelen);

-                       l = ntohs(gabn->namelen);
+                       l = EXTRACT_16BITS(&grbn->namelen);

 
                        advance = lwres_printname(l, s);
                        if (advance < 0)
 
                        advance = lwres_printname(l, s);
                        if (advance < 0)


@@ -449,13 +450,13 @@ lwres_print(register const u_char *bp, u_int length)
                lwres_gnbaresponse_t *gnba;
                lwres_grbnresponse_t *grbn;
                u_int32_t l, na;
                lwres_gnbaresponse_t *gnba;
                lwres_grbnresponse_t *grbn;
                u_int32_t l, na;

-               int i;
+               u_int32_t i;

 
                gabn = NULL;
                gnba = NULL;
                grbn = NULL;
 
 
                gabn = NULL;
                gnba = NULL;
                grbn = NULL;
 

-               switch (ntohl(np->opcode)) {
+               switch (EXTRACT_32BITS(&np->opcode)) {

                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:
                case LWRES_OPCODE_NOOP:
                        break;
                case LWRES_OPCODE_GETADDRSBYNAME:


@@ -464,16 +465,16 @@ lwres_print(register const u_char *bp, u_int length)
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->realnamelen +
                            sizeof(gabn->realnamelen);
                        /* XXX gabn points to packed struct */
                        s = (const char *)&gabn->realnamelen +
                            sizeof(gabn->realnamelen);

-                       l = ntohs(gabn->realnamelen);
+                       l = EXTRACT_16BITS(&gabn->realnamelen);

 
                        /* BIND910: not used */
                        if (vflag > 2) {
 
                        /* BIND910: not used */
                        if (vflag > 2) {

-                               printf(" flags:0x%lx",
-                                   (unsigned long)ntohl(gabn->flags));
+                               printf(" flags:0x%x",
+                                   EXTRACT_32BITS(&gabn->flags));

                        }
 
                        }
 

-                       printf(" %u/%u", ntohs(gabn->naliases),
-                           ntohs(gabn->naddrs));
+                       printf(" %u/%u", EXTRACT_16BITS(&gabn->naliases),
+                           EXTRACT_16BITS(&gabn->naddrs));

 
                        advance = lwres_printname(l, s);
                        if (advance < 0)
 
                        advance = lwres_printname(l, s);
                        if (advance < 0)


@@ -481,7 +482,7 @@ lwres_print(register const u_char *bp, u_int length)
                        s += advance;
 
                        /* aliases */
                        s += advance;
 
                        /* aliases */

-                       na = ntohs(gabn->naliases);
+                       na = EXTRACT_16BITS(&gabn->naliases);

                        for (i = 0; i < na; i++) {
                                advance = lwres_printnamelen(s);
                                if (advance < 0)
                        for (i = 0; i < na; i++) {
                                advance = lwres_printnamelen(s);
                                if (advance < 0)


@@ -490,7 +491,7 @@ lwres_print(register const u_char *bp, u_int length)
                        }
 
                        /* addrs */
                        }
 
                        /* addrs */

-                       na = ntohs(gabn->naddrs);
+                       na = EXTRACT_16BITS(&gabn->naddrs);

                        for (i = 0; i < na; i++) {
                                advance = lwres_printaddr((lwres_addr_t *)s);
                                if (advance < 0)
                        for (i = 0; i < na; i++) {
                                advance = lwres_printaddr((lwres_addr_t *)s);
                                if (advance < 0)


@@ -504,15 +505,15 @@ lwres_print(register const u_char *bp, u_int length)
                        /* XXX gnba points to packed struct */
                        s = (const char *)&gnba->realnamelen +
                            sizeof(gnba->realnamelen);
                        /* XXX gnba points to packed struct */
                        s = (const char *)&gnba->realnamelen +
                            sizeof(gnba->realnamelen);

-                       l = ntohs(gnba->realnamelen);
+                       l = EXTRACT_16BITS(&gnba->realnamelen);

 
                        /* BIND910: not used */
                        if (vflag > 2) {
 
                        /* BIND910: not used */
                        if (vflag > 2) {

-                               printf(" flags:0x%lx",
-                                   (unsigned long)ntohl(gnba->flags));
+                               printf(" flags:0x%x",
+                                   EXTRACT_32BITS(&gnba->flags));

                        }
 
                        }
 

-                       printf(" %u", ntohs(gnba->naliases));
+                       printf(" %u", EXTRACT_16BITS(&gnba->naliases));

 
                        advance = lwres_printname(l, s);
                        if (advance < 0)
 
                        advance = lwres_printname(l, s);
                        if (advance < 0)


@@ -520,7 +521,7 @@ lwres_print(register const u_char *bp, u_int length)
                        s += advance;
 
                        /* aliases */
                        s += advance;
 
                        /* aliases */

-                       na = ntohs(gnba->naliases);
+                       na = EXTRACT_16BITS(&gnba->naliases);

                        for (i = 0; i < na; i++) {
                                advance = lwres_printnamelen(s);
                                if (advance < 0)
                        for (i = 0; i < na; i++) {
                                advance = lwres_printnamelen(s);
                                if (advance < 0)


@@ -535,19 +536,20 @@ lwres_print(register const u_char *bp, u_int length)
 
                        /* BIND910: not used */
                        if (vflag > 2) {
 
                        /* BIND910: not used */
                        if (vflag > 2) {

-                               printf(" flags:0x%lx",
-                                   (unsigned long)ntohl(grbn->flags));
+                               printf(" flags:0x%x",
+                                   EXTRACT_32BITS(&grbn->flags));

                        }
 
                        printf(" %s", tok2str(ns_type2str, "Type%d",
                        }
 
                        printf(" %s", tok2str(ns_type2str, "Type%d",

-                           ntohs(grbn->rdtype)));
-                       if (ntohs(grbn->rdclass) != C_IN);
+                           EXTRACT_16BITS(&grbn->rdtype)));
+                       if (EXTRACT_16BITS(&grbn->rdclass) != C_IN) {

                                printf(" %s", tok2str(ns_class2str, "Class%d",
                                printf(" %s", tok2str(ns_class2str, "Class%d",

-                                   ntohs(grbn->rdclass)));
+                                   EXTRACT_16BITS(&grbn->rdclass)));
+                       }

                        printf(" TTL ");
                        printf(" TTL ");

-                       relts_print(ntohl(grbn->ttl));
-                       printf(" %u/%u", ntohs(grbn->nrdatas),
-                           ntohs(grbn->nsigs));
+                       relts_print(EXTRACT_32BITS(&grbn->ttl));
+                       printf(" %u/%u", EXTRACT_16BITS(&grbn->nrdatas),
+                           EXTRACT_16BITS(&grbn->nsigs));

 
                        /* XXX grbn points to packed struct */
                        s = (const char *)&grbn->nsigs+ sizeof(grbn->nsigs);
 
                        /* XXX grbn points to packed struct */
                        s = (const char *)&grbn->nsigs+ sizeof(grbn->nsigs);


@@ -558,7 +560,7 @@ lwres_print(register const u_char *bp, u_int length)
                        s += advance;
 
                        /* rdatas */
                        s += advance;
 
                        /* rdatas */

-                       na = ntohs(grbn->nrdatas);
+                       na = EXTRACT_16BITS(&grbn->nrdatas);

                        for (i = 0; i < na; i++) {
                                /* XXX should decode resource data */
                                advance = lwres_printbinlen(s);
                        for (i = 0; i < na; i++) {
                                /* XXX should decode resource data */
                                advance = lwres_printbinlen(s);


@@ -568,7 +570,7 @@ lwres_print(register const u_char *bp, u_int length)
                        }
 
                        /* sigs */
                        }
 
                        /* sigs */

-                       na = ntohs(grbn->nsigs);
+                       na = EXTRACT_16BITS(&grbn->nsigs);

                        for (i = 0; i < na; i++) {
                                /* XXX how should we print it? */
                                advance = lwres_printbinlen(s);
                        for (i = 0; i < na; i++) {
                                /* XXX how should we print it? */
                                advance = lwres_printbinlen(s);


@@ -585,11 +587,11 @@ lwres_print(register const u_char *bp, u_int length)
 
   tail:
        /* length mismatch */
 
   tail:
        /* length mismatch */

-       if (ntohl(np->length) != length) {
-               printf(" [len: %lu != %u]", (unsigned long)ntohl(np->length),
+       if (EXTRACT_32BITS(&np->length) != length) {
+               printf(" [len: %u != %u]", EXTRACT_32BITS(&np->length),

                    length);
        }
                    length);
        }

-       if (!unsupported && s < (const char *)np + ntohl(np->length))
+       if (!unsupported && s < (const char *)np + EXTRACT_32BITS(&np->length))

                printf("[extra]");
        return;
 
                printf("[extra]");
        return;