Fixup the previous commit for GCC. [skip ci]

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 56b497844b7ce3251d74d23a8bffde44b745f855..eddcc1d7546fcd1113acfc3f2044af20739696d5 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,75 +1,97 @@
+/* \summary: Solaris DLT_IPNET printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 

-#include <stdio.h>
-#include <pcap.h>
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"

 
 

-#include "interface.h"
-#include "addrtoname.h"
-#include "ipnet.h"

 
 

-#ifdef DLT_IPNET
+typedef struct ipnet_hdr {
+       nd_uint8_t      iph_version;
+       nd_uint8_t      iph_family;
+       nd_uint16_t     iph_htype;
+       nd_uint32_t     iph_pktlen;
+       nd_uint32_t     iph_ifindex;
+       nd_uint32_t     iph_grifindex;
+       nd_uint32_t     iph_zsrc;
+       nd_uint32_t     iph_zdst;
+} ipnet_hdr_t;

 
 

-int ipnet_encap_print(u_short, const u_char *, u_int, u_int);
+#define        IPH_AF_INET     2               /* Matches Solaris's AF_INET */
+#define        IPH_AF_INET6    26              /* Matches Solaris's AF_INET6 */

 
 

-const struct tok ipnet_values[] = {
+#ifdef DLT_IPNET
+
+static const struct tok ipnet_values[] = {

        { IPH_AF_INET,          "IPv4" },
        { IPH_AF_INET6,         "IPv6" },
        { 0,                    NULL }
 };
 
        { IPH_AF_INET,          "IPv4" },
        { IPH_AF_INET6,         "IPv6" },
        { 0,                    NULL }
 };
 

-static inline void
-ipnet_hdr_print(register const u_char *bp, u_int length)
+static void
+ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 
 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 

-       (void)printf("%d > %d", hdr->iph_zsrc, hdr->iph_zdst);
+       ND_PRINT("%u > %u", GET_BE_U_4(hdr->iph_zsrc),
+                 GET_BE_U_4(hdr->iph_zdst));

 
 

-       if (!qflag) {
-               (void)printf(", family %s (%d)",
-                            tok2str(ipnet_values, "Unknown",
-                                    hdr->iph_family),
-                             hdr->iph_family);
+       if (!ndo->ndo_qflag) {
+               ND_PRINT(", family %s (%u)",
+                          tok2str(ipnet_values, "Unknown",
+                                  GET_U_1(hdr->iph_family)),
+                          GET_U_1(hdr->iph_family));

         } else {
         } else {

-               (void)printf(", %s",
-                            tok2str(ipnet_values,
-                                    "Unknown Ethertype (0x%04x)",
-                                    hdr->iph_family));
+               ND_PRINT(", %s",
+                          tok2str(ipnet_values,
+                                  "Unknown Ethertype (0x%04x)",
+                                 GET_U_1(hdr->iph_family)));

         }
 
         }
 

-       (void)printf(", length %u: ", length);
+       ND_PRINT(", length %u: ", length);

 }
 
 }
 

-void
-ipnet_print(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;
+       const ipnet_hdr_t *hdr;

 
 

-       if (caplen < sizeof(ipnet_hdr_t)) {
-               printf("[|ipnet]");
-               return;
-       }
+       ND_TCHECK_LEN(p, sizeof(ipnet_hdr_t));
+       ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);

 
 

-       if (eflag)
-               ipnet_hdr_print(p, length);
+       if (ndo->ndo_eflag)
+               ipnet_hdr_print(ndo, p, length);

 
        length -= sizeof(ipnet_hdr_t);
        caplen -= sizeof(ipnet_hdr_t);
 
        length -= sizeof(ipnet_hdr_t);
        caplen -= sizeof(ipnet_hdr_t);

-       hdr = (ipnet_hdr_t *)p;
+       hdr = (const ipnet_hdr_t *)p;

        p += sizeof(ipnet_hdr_t);
 
        p += sizeof(ipnet_hdr_t);
 

-       if (ipnet_encap_print(hdr->iph_family, p, length, caplen) == 0) {
-               if (!eflag)
-                       ipnet_hdr_print((u_char *)hdr,
+       switch (GET_U_1(hdr->iph_family)) {
+
+       case IPH_AF_INET:
+               ip_print(ndo, p, length);
+               break;
+
+       case IPH_AF_INET6:
+               ip6_print(ndo, p, length);
+               break;
+
+       default:
+               if (!ndo->ndo_eflag)
+                       ipnet_hdr_print(ndo, (const u_char *)hdr,

                                        length + sizeof(ipnet_hdr_t));
 
                                        length + sizeof(ipnet_hdr_t));
 

-               if (!suppress_default_print)
-                       default_print(p, caplen);
-       } 
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
+               break;
+       }

 }
 
 /*
 }
 
 /*


@@ -78,55 +100,11 @@ ipnet_print(const u_char *p, u_int length, u_int caplen)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
-ipnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
-{
-       ipnet_print(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(u_short family, const u_char *p,
-    u_int length, u_int caplen)
+void
+ipnet_if_print(netdissect_options *ndo,
+               const struct pcap_pkthdr *h, const u_char *p)

 {
 {

- recurse:
-
-       switch (family) {
-
-       case IPH_AF_INET:
-               ip_print(gndo, p, length);
-               return (1);
-
-#ifdef INET6
-       case IPH_AF_INET6:
-               ip6_print(p, length);
-               return (1);
-#endif /*INET6*/
-
-       default:
-               return(0);
-       }
+       ndo->ndo_protocol = "ipnet";
+       ipnet_print(ndo, p, h->len, h->caplen);

 }
 }

-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-

 #endif /* DLT_IPNET */
 #endif /* DLT_IPNET */