X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/77b2a4405561467f66a3dfb0f8ce2b0eaa5ebaf9..ad6df73f5a6c46a409c7629f5588b1b81dff6357:/print-lane.c

diff --git a/print-lane.c b/print-lane.c
index cdab8dc5..2836f788 100644
--- a/print-lane.c
+++ b/print-lane.c
@@ -22,7 +22,11 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.1 1999-11-21 03:52:11 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.12 2001-07-05 18:54:15 guy Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -30,28 +34,17 @@ static const char rcsid[] =
 #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 <netinet/tcpip.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
+#include "ether.h"
 #include "lane.h"
 
-static const u_char *packetp;
-static const u_char *snapend;
-
 static inline void
 lane_print(register const u_char *bp, int length)
 {
@@ -88,6 +81,7 @@ lane_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 	u_short ether_type;
 	u_short extracted_ethertype;
 
+	++infodelay;
 	ts_print(&h->ts);
 
 	if (caplen < sizeof(struct lecdatahdr_8023)) {
@@ -119,10 +113,11 @@ lane_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, ep->h_source,ep->h_dest)==0) {
+		if (llc_print(p, length, caplen, ep->h_source, ep->h_dest,
+		    &extracted_ethertype) == 0) {
 			/* ether_type not known, print raw packet */
 			if (!eflag)
-				lane_print((u_char *)ep, length);
+				lane_print((u_char *)ep, length + sizeof(*ep));
 			if (extracted_ethertype) {
 				printf("(LLC %s) ",
 			       etherproto_string(htons(extracted_ethertype)));
@@ -130,7 +125,8 @@ lane_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)
 			lane_print((u_char *)ep, length + sizeof(*ep));
@@ -141,4 +137,7 @@ lane_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 		default_print(p, caplen);
  out:
 	putchar('\n');
+	--infodelay;
+	if (infoprint)
+		info(0);
 }