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 b2b6d16b1c6779af4c0ea44181dbd7bfc4c1b6fb..f3afd3080de18ff27fcc5a77c1d6aa3a627a785c 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -22,37 +22,30 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.4 2000-04-28 11:34:12 itojun 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>
 #include <sys/socket.h>
 
-#include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
-
-const u_char *packetp;
-const u_char *snapend;
+#include "ethertype.h"
+#include "ether.h"
 
 #define RFC1483LLC_LEN 8 
 
@@ -138,10 +131,11 @@ cip_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        extracted_ethertype = 0;
        if (ether_type < ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(p, length, caplen, NULL, NULL)==0) {
+               if (llc_print(p, length, caplen, NULL, NULL,
+                   &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)));
@@ -149,7 +143,8 @@ cip_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                        if (!xflag && !qflag)
                                default_print(p, caplen);
                }
-       } else if (ether_encap_print(ether_type, p, length, caplen) == 0) {
+       } else if (ether_encap_print(ether_type, p, length, caplen,
+           &extracted_ethertype) == 0) {
                /* ether_type not known, print raw packet */
                if (!eflag)
                        cip_print((u_char *)bp, length + RFC1483LLC_LEN);