Eliminate a GCC warning about a "char" array subscript - and, by doing

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 3f3b3a599f4d8c610c1192b42765d53a4b7de159..2826c7bbd252f0377fd892b4123017f5192a5965 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,18 +20,14 @@
  */
 #ifndef lint
 static const char rcsid[] =
  */
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.69 2002-06-01 23:50:31 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.76 2002-12-19 09:39:12 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 <netinet/in.h>
+#include <tcpdump-stdinc.h>

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


@@ -42,7 +38,6 @@ static const char rcsid[] =
 
 #include "ether.h"
 
 
 #include "ether.h"
 

-const u_char *packetp;

 const u_char *snapend;
 
 static inline void
 const u_char *snapend;
 
 static inline void


@@ -79,14 +74,6 @@ ether_print(const u_char *p, u_int length, u_int caplen)
        if (eflag)
                ether_hdr_print(p, length);
 
        if (eflag)
                ether_hdr_print(p, length);
 

-       /*
-        * Some printers want to get back at the ethernet 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.
-        */
-       packetp = p;
-       snapend = p + caplen;
-

        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;
        ep = (struct ether_header *)p;
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;
        ep = (struct ether_header *)p;


@@ -123,34 +110,17 @@ ether_print(const u_char *p, u_int length, u_int caplen)
 }
 
 /*
 }
 
 /*

- * This is the top level routine of the printer.  'p' is the points
- * to the ether header of the packet, 'h->tv' is the timestamp,
+ * This is the top level routine of the printer.  'p' points
+ * to the ether header of the packet, 'h->ts' is the timestamp,

  * 'h->length' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->length' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-void
-ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+ether_if_print(const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       u_int caplen = h->caplen;
-       u_int length = h->len;
-
-       ++infodelay;
-       ts_print(&h->ts);
-
-       ether_print(p, length, caplen);
+       ether_print(p, h->len, h->caplen);

 
 

-       /*
-        * If "-x" was specified, print stuff past the Ethernet header,
-        * if there's anything to print.
-        */
-       if (xflag && caplen > ETHER_HDRLEN)
-               default_print(p + ETHER_HDRLEN, caplen - ETHER_HDRLEN);
-
-       putchar('\n');
-
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (ETHER_HDRLEN);

 }
 
 /*
 }
 
 /*


@@ -239,8 +209,8 @@ ether_encap_print(u_short ethertype, const u_char *p,
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
                pppoe_print(p, length);
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
                pppoe_print(p, length);

-               return (1);
- 
+               return (1);
+

        case ETHERTYPE_PPP:
                printf("ppp");
                if (length) {
        case ETHERTYPE_PPP:
                printf("ppp");
                if (length) {


@@ -249,6 +219,10 @@ ether_encap_print(u_short ethertype, const u_char *p,
                }
                return (1);
 
                }
                return (1);
 

+        case ETHERTYPE_LOOPBACK:
+                printf("loopback");
+                return (1);
+

        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
                mpls_print(p, length);
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
                mpls_print(p, length);