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

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index d60d981b052936a0f861d5fd151f2301e45a4ca0..e1cd59e198231fa64c9bdf3199fa34106b6d14dc 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,28 +1,36 @@
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-#include <pcap.h>
+#include "interface.h"
 
-#include "netdissect.h"
-#include "addrtoname.h"
-#include "ipnet.h"
+typedef struct ipnet_hdr {
+       uint8_t         iph_version;
+       uint8_t         iph_family;
+       uint16_t        iph_htype;
+       uint32_t        iph_pktlen;
+       uint32_t        iph_ifindex;
+       uint32_t        iph_grifindex;
+       uint32_t        iph_zsrc;
+       uint32_t        iph_zdst;
+} ipnet_hdr_t;
 
-#ifdef DLT_IPNET
+#define        IPH_AF_INET     2               /* Matches Solaris's AF_INET */
+#define        IPH_AF_INET6    26              /* Matches Solaris's AF_INET6 */
 
-int ipnet_encap_print(netdissect_options *,u_short, const u_char *, u_int, u_int);
+#ifdef DLT_IPNET
 
-const struct tok ipnet_values[] = {
+static const struct tok ipnet_values[] = {
        { IPH_AF_INET,          "IPv4" },
        { IPH_AF_INET6,         "IPv6" },
        { 0,                    NULL }
 };
 
 static inline void
-ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
+ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
@@ -44,8 +52,8 @@ ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
        ND_PRINT((ndo, ", length %u: ", length));
 }
 
-void
-ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
+static void
+ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        ipnet_hdr_t *hdr;
 
@@ -62,14 +70,27 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
        hdr = (ipnet_hdr_t *)p;
        p += sizeof(ipnet_hdr_t);
 
-       if (ipnet_encap_print(ndo, hdr->iph_family, p, length, caplen) == 0) {
+       switch (hdr->iph_family) {
+
+       case IPH_AF_INET:
+               ip_print(ndo, p, length);
+               break;
+
+#ifdef INET6
+       case IPH_AF_INET6:
+               ip6_print(ndo, p, length);
+               break;
+#endif /*INET6*/
+
+       default:
                if (!ndo->ndo_eflag)
                        ipnet_hdr_print(ndo, (u_char *)hdr,
                                        length + sizeof(ipnet_hdr_t));
 
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
-       } 
+                       ND_DEFAULTPRINT(p, caplen);
+               break;
+       }
 }
 
 /*
@@ -79,49 +100,14 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
  * is the number of bytes actually captured.
  */
 u_int
-ipnet_if_print(struct netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
+ipnet_if_print(netdissect_options *ndo,
+               const struct pcap_pkthdr *h, const u_char *p)
 {
        ipnet_print(ndo, p, h->len, h->caplen);
 
        return (sizeof(ipnet_hdr_t));
 }
 
-/*
- * Prints the packet encapsulated in an Ethernet data segment
- * (or an equivalent encapsulation), given the Ethernet type code.
- *
- * Returns non-zero if it can do so, zero if the ethertype is unknown.
- *
- * The Ethernet type code is passed through a pointer; if it was
- * ETHERTYPE_8021Q, it gets updated to be the Ethernet type of
- * the 802.1Q payload, for the benefit of lower layers that might
- * want to know what it is.
- */
-
-int
-ipnet_encap_print(struct netdissect_options *ndo, u_short family, const u_char *p,
-    u_int length, u_int caplen)
-{
- recurse:
-
-       switch (family) {
-
-       case IPH_AF_INET:
-               ip_print(ndo, p, length);
-               return (1);
-
-#ifdef INET6
-       case IPH_AF_INET6:
-               ip6_print(p, length);
-               return (1);
-#endif /*INET6*/
-
-       default:
-               return(0);
-       }
-}
-
-
 /*
  * Local Variables:
  * c-style: whitesmith