X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b9ac23ce92ca22483d56ee3192c54aa8f782f9ac..3cd171317f54bc968808d49e3ca87b6c49ccdcdd:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 1ef7e47b..573fdba8 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.48 1999-11-21 09:36:51 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.51 2000-07-01 03:39:02 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,10 +31,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
@@ -198,30 +196,34 @@ ether_encap_print(u_short ethertype, const u_char *p,
 		aarp_print(p, length);
 		return (1);
 
+	case ETHERTYPE_IPX:
+		ipx_print(p, length);
+		return (1);
+
 	case ETHERTYPE_8021Q:
 		printf("802.1Q vlan#%d P%d%s",
-		       ntohs(*(unsigned short*)p)&0xFFF,
-		       ntohs(*(unsigned short*)p)>>13,
-		       (ntohs(*(unsigned short*)p)&0x1000) ? " CFI" : "");
-		ethertype = ntohs(*(unsigned short*)(p+2));
+		       ntohs(*(u_int16_t *)p) & 0xfff,
+		       ntohs(*(u_int16_t *)p) >> 13,
+		       (ntohs(*(u_int16_t *)p) & 0x1000) ? " CFI" : "");
+		ethertype = ntohs(*(u_int16_t *)(p + 2));
 		p += 4;
 		length -= 4;
 		caplen -= 4;
-		if (ethertype > ETHERMTU) 
+		if (ethertype > ETHERMTU)
 			goto recurse;
 
 		extracted_ethertype = 0;
 
-		if (llc_print(p, length, caplen, p-18, p-12) == 0) {
+		if (llc_print(p, length, caplen, p - 18, p - 12) == 0) {
 			/* ether_type not known, print raw packet */
 			if (!eflag)
-				ether_print(p-18, length+4);
+				ether_print(p - 18, length + 4);
 			if (extracted_ethertype) {
 				printf("(LLC %s) ",
 			       etherproto_string(htons(extracted_ethertype)));
 			}
 			if (!xflag && !qflag)
-				default_print(p-18, caplen+4);
+				default_print(p - 18, caplen + 4);
 		}
 		return (1);