When discussing the "gateway" keyword, don't say that the host must be

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 7a2de818c1a3f8ee6b634669abdd4cb5e5cba296..f3afd3080de18ff27fcc5a77c1d6aa3a627a785c 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -22,13 +22,15 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.10 2000-12-18 05:41:58 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.13 2001-06-08 04:48:23 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -45,9 +47,6 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "ether.h"
 
-const u_char *packetp;
-const u_char *snapend;
-
 #define RFC1483LLC_LEN 8 
 
 static unsigned char rfcllc[] = {
@@ -136,7 +135,7 @@ cip_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                    &extracted_ethertype)==0) {
                        /* ether_type not known, print raw packet */
                        if (!eflag)
-                               cip_print((u_char *)bp, length);
+                               cip_print((u_char *)bp, length + RFC1483LLC_LEN);
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));