We no longer use "packetp" for anything, so eliminate it. (If any

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index b0cafe12943310754157b84ffe840091eb0ae6be..cdbb3734bcd02428a9251a29dbba0e8158785319 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -21,103 +21,110 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.28 1999-11-21 09:36:58 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.45 2002-12-18 08:53:22 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 <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include <tcpdump-stdinc.h>

 
 #include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 
 
 #include <pcap.h>
 #include <stdio.h>
 #include <string.h>
 

-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-

 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"
 

+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
+#endif
+

 #ifndef AF_NS
 #define AF_NS          6               /* XEROX NS protocols */
 #endif
 
 /*
 #ifndef AF_NS
 #define AF_NS          6               /* XEROX NS protocols */
 #endif
 
 /*

- * The DLT_NULL packet header is 4 bytes long. It contains a network
- * order 32 bit integer that specifies the family, e.g. AF_INET
+ * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
+ * 32-bit integer that specifies the family, e.g. AF_INET.
+ *
+ * Note here that "host" refers to the host on which the packets were
+ * captured; that isn't necessarily *this* host.
+ *
+ * The OpenBSD DLT_LOOP packet header is the same, except that the integer
+ * is in network byte order.

  */
 #define        NULL_HDRLEN 4
 
 static void
  */
 #define        NULL_HDRLEN 4
 
 static void

-null_print(const u_char *p, const struct ip *ip, u_int length)
+null_print(u_int family, u_int length)

 {
 {

-       u_int family;
+       if (nflag)
+               printf("AF %u ", family);
+       else {
+               switch (family) {

 
 

-       memcpy((char *)&family, (char *)p, sizeof(family));
-
-       if (nflag) {
-               /* XXX just dump the header */
-               return;
-       }
-       switch (family) {
-
-       case AF_INET:
-               printf("ip: ");
-               break;
+               case AF_INET:
+                       printf("ip ");
+                       break;

 
 #ifdef INET6
 
 #ifdef INET6

-       case AF_INET6:
-               printf("ip6: ");
-               break;
+               case AF_INET6:
+                       printf("ip6 ");
+                       break;

 #endif
 
 #endif
 

-       case AF_NS:
-               printf("ns: ");
-               break;
+               case AF_NS:
+                       printf("ns ");
+                       break;

 
 

-       default:
-               printf("AF %d: ", family);
-               break;
+               default:
+                       printf("AF %u ", family);
+                       break;
+               }

        }
        }

+       printf("%d: ", length);

 }
 
 }
 

+/*
+ * Byte-swap a 32-bit number.
+ * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
+ * big-endian platforms.)
+ */
+#define        SWAPLONG(y) \
+((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
+

 void
 void

-null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+null_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int length = h->len;
        u_int caplen = h->caplen;
        const struct ip *ip;
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
        const struct ip *ip;

+       u_int family;

 
 

+       ++infodelay;

        ts_print(&h->ts);
 
        ts_print(&h->ts);
 

+       memcpy((char *)&family, (char *)p, sizeof(family));
+

        /*
        /*

-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
+        * This isn't necessarily in our host byte order; if this is
+        * a DLT_LOOP capture, it's in network byte order, and if
+        * this is a DLT_NULL capture from a machine with the opposite
+        * byte-order, it's in the opposite byte order from ours.
+        *
+        * If the upper 16 bits aren't all zero, assume it's byte-swapped.
+        */
+       if ((family & 0xFFFF0000) != 0)
+               family = SWAPLONG(family);
+
+       /*
+        * Some printers want to check that they're not walking off the
+        * end of the packet.
+        * Rather than pass it all the way down, we set this global.

         */
         */

-       packetp = p;

        snapend = p + caplen;
 
        length -= NULL_HDRLEN;
        snapend = p + caplen;
 
        length -= NULL_HDRLEN;


@@ -125,24 +132,27 @@ null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        ip = (struct ip *)(p + NULL_HDRLEN);
 
        if (eflag)
        ip = (struct ip *)(p + NULL_HDRLEN);
 
        if (eflag)

-               null_print(p, ip, length);
+               null_print(family, length);

 
 

-       switch (ip->ip_v) {
-       case 4 :
-               ip_print((const void *)ip, length);
+       switch (IP_V(ip)) {
+       case 4:
+               ip_print((const u_char *)ip, length);

                break;
 #ifdef INET6
        case 6:
                break;
 #ifdef INET6
        case 6:

-               ipv6_print((const void *)ip, length);
+               ip6_print((const u_char *)ip, length);

                break;
 #endif /* INET6 */
                break;
 #endif /* INET6 */

-       default :
-               printf("ip v%d", ip->ip_v);
+       default:
+               printf("ip v%d", IP_V(ip));

                break;
        }
 
        if (xflag)
                default_print((const u_char *)ip, caplen - NULL_HDRLEN);
        putchar('\n');
                break;
        }
 
        if (xflag)
                default_print((const u_char *)ip, caplen - NULL_HDRLEN);
        putchar('\n');

+       --infodelay;
+       if (infoprint)
+               info(0);

 }
 
 }