X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9d046ee0503d4c8cbfcb200c88986de876f6cae7..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-sll.c

diff --git a/print-sll.c b/print-sll.c
index 50335879..19d2973e 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -31,6 +31,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -162,7 +163,7 @@ sll_print(netdissect_options *ndo, const struct sll_header *sllp, u_int length)
 	 * For now, we just assume 6 means Ethernet.
 	 * XXX - print others as strings of hex?
 	 */
-	if (GET_BE_U_2(sllp->sll_halen) == 6)
+	if (GET_BE_U_2(sllp->sll_halen) == MAC_ADDR_LEN)
 		ND_PRINT("%s ", GET_ETHERADDR_STRING(sllp->sll_addr));
 
 	if (!ndo->ndo_qflag) {
@@ -211,7 +212,7 @@ sll_print(netdissect_options *ndo, const struct sll_header *sllp, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int caplen = h->caplen;
@@ -222,16 +223,8 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	int llc_hdrlen;
 	u_int hdrlen;
 
-	ndo->ndo_protocol = "sll_if";
-	if (caplen < SLL_HDR_LEN) {
-		/*
-		 * XXX - this "can't happen" because "pcap-linux.c" always
-		 * adds this many bytes of header to every packet in a
-		 * cooked socket capture.
-		 */
-		nd_print_trunc(ndo);
-		return (caplen);
-	}
+	ndo->ndo_protocol = "sll";
+	ND_TCHECK_LEN(p, SLL_HDR_LEN);
 
 	sllp = (const struct sll_header *)p;
 
@@ -254,7 +247,9 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		 * This is an packet with a radiotap header;
 		 * just dissect the payload as such.
 		 */
-		return (SLL_HDR_LEN + ieee802_11_radio_print(ndo, p, length, caplen));
+		ndo->ndo_ll_hdr_len += SLL_HDR_LEN;
+		ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, length, caplen);
+		return;
 	}
 	ether_type = GET_BE_U_2(sllp->sll_protocol);
 
@@ -304,7 +299,8 @@ recurse:
 		if (caplen < 4) {
 			ndo->ndo_protocol = "vlan";
 			nd_print_trunc(ndo);
-			return (hdrlen + caplen);
+			ndo->ndo_ll_hdr_len += hdrlen + caplen;
+			return;
 		}
 	        if (ndo->ndo_eflag) {
 			uint16_t tag = GET_BE_U_2(p);
@@ -334,7 +330,7 @@ recurse:
 		}
 	}
 
-	return (hdrlen);
+	ndo->ndo_ll_hdr_len += hdrlen;
 }
 
 static void
@@ -343,15 +339,14 @@ sll2_print(netdissect_options *ndo, const struct sll2_header *sllp, u_int length
 	u_short ether_type;
 
 	ndo->ndo_protocol = "sll2";
-        ND_PRINT("%3s ",
-		 tok2str(sll_pkttype_values,"?",GET_U_1(sllp->sll2_pkttype)));
+	ND_PRINT("ifindex %u ", GET_BE_U_4(sllp->sll2_if_index));
 
 	/*
 	 * XXX - check the link-layer address type value?
 	 * For now, we just assume 6 means Ethernet.
 	 * XXX - print others as strings of hex?
 	 */
-	if (GET_U_1(sllp->sll2_halen) == 6)
+	if (GET_U_1(sllp->sll2_halen) == MAC_ADDR_LEN)
 		ND_PRINT("%s ", GET_ETHERADDR_STRING(sllp->sll2_addr));
 
 	if (!ndo->ndo_qflag) {
@@ -400,7 +395,7 @@ sll2_print(netdissect_options *ndo, const struct sll2_header *sllp, u_int length
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int caplen = h->caplen;
@@ -415,26 +410,20 @@ sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	char ifname[IF_NAMESIZE];
 #endif
 
-	ndo->ndo_protocol = "sll2_if";
-	if (caplen < SLL2_HDR_LEN) {
-		/*
-		 * XXX - this "can't happen" because "pcap-linux.c" always
-		 * adds this many bytes of header to every packet in a
-		 * cooked socket capture.
-		 */
-		nd_print_trunc(ndo);
-		return (caplen);
-	}
+	ndo->ndo_protocol = "sll2";
+	ND_TCHECK_LEN(p, SLL2_HDR_LEN);
 
 	sllp = (const struct sll2_header *)p;
 #ifdef HAVE_NET_IF_H
 	if_index = GET_BE_U_4(sllp->sll2_if_index);
-	if (if_indextoname(if_index, ifname))
-		ND_PRINT("ifindex %u (%s) ", if_index, ifname);
-	else
-		ND_PRINT("ifindex %u ", if_index);
+	if (!if_indextoname(if_index, ifname))
+		strncpy(ifname, "?", 2);
+	ND_PRINT("%-5s ", ifname);
 #endif
 
+	ND_PRINT("%-3s ",
+		 tok2str(sll_pkttype_values, "?", GET_U_1(sllp->sll2_pkttype)));
+
 	if (ndo->ndo_eflag)
 		sll2_print(ndo, sllp, length);
 
@@ -454,7 +443,9 @@ sll2_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		 * This is an packet with a radiotap header;
 		 * just dissect the payload as such.
 		 */
-		return (SLL_HDR_LEN + ieee802_11_radio_print(ndo, p, length, caplen));
+		ndo->ndo_ll_hdr_len += SLL2_HDR_LEN;
+		ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, length, caplen);
+		return;
 	}
 	ether_type = GET_BE_U_2(sllp->sll2_protocol);
 
@@ -504,7 +495,8 @@ recurse:
 		if (caplen < 4) {
 			ndo->ndo_protocol = "vlan";
 			nd_print_trunc(ndo);
-			return (hdrlen + caplen);
+			ndo->ndo_ll_hdr_len += hdrlen + caplen;
+			return;
 		}
 	        if (ndo->ndo_eflag) {
 			uint16_t tag = GET_BE_U_2(p);
@@ -528,11 +520,11 @@ recurse:
 		if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {
 			/* ether_type not known, print raw packet */
 			if (!ndo->ndo_eflag)
-				sll2_print(ndo, sllp, length + SLL_HDR_LEN);
+				sll2_print(ndo, sllp, length + SLL2_HDR_LEN);
 			if (!ndo->ndo_suppress_default_print)
 				ND_DEFAULTPRINT(p, caplen);
 		}
 	}
 
-	return (hdrlen);
+	ndo->ndo_ll_hdr_len += hdrlen;
 }