X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bd00116d80c18b782f4cb15dfc90cd5bf993d4f5..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-sll.c?ds=sidebyside

diff --git a/print-sll.c b/print-sll.c
index 91694693..58a1649e 100644
--- a/print-sll.c
+++ b/print-sll.c
@@ -19,13 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Linux cooked sockets capture printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "extract.h"
@@ -134,18 +136,18 @@ sll_print(netdissect_options *ndo, register const struct sll_header *sllp, u_int
 {
 	u_short ether_type;
 
-        ND_PRINT((ndo, "%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_16BITS(&sllp->sll_pkttype))));
+        ND_PRINT((ndo, "%3s ",tok2str(sll_pkttype_values,"?",EXTRACT_BE_U_2(&sllp->sll_pkttype))));
 
 	/*
 	 * XXX - check the link-layer address type value?
 	 * For now, we just assume 6 means Ethernet.
 	 * XXX - print others as strings of hex?
 	 */
-	if (EXTRACT_16BITS(&sllp->sll_halen) == 6)
+	if (EXTRACT_BE_U_2(&sllp->sll_halen) == 6)
 		ND_PRINT((ndo, "%s ", etheraddr_string(ndo, sllp->sll_addr)));
 
 	if (!ndo->ndo_qflag) {
-		ether_type = EXTRACT_16BITS(&sllp->sll_protocol);
+		ether_type = EXTRACT_BE_U_2(&sllp->sll_protocol);
 
 		if (ether_type <= ETHERMTU) {
 			/*
@@ -223,7 +225,7 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	p += SLL_HDR_LEN;
 	hdrlen = SLL_HDR_LEN;
 
-	ether_type = EXTRACT_16BITS(&sllp->sll_protocol);
+	ether_type = EXTRACT_BE_U_2(&sllp->sll_protocol);
 
 recurse:
 	/*
@@ -258,7 +260,7 @@ recurse:
 			/*FALLTHROUGH*/
 
 		unknown:
-			/* ether_type not known, print raw packet */
+			/* packet type not known, print raw packet */
 			if (!ndo->ndo_suppress_default_print)
 				ND_DEFAULTPRINT(p, caplen);
 			break;
@@ -277,12 +279,12 @@ recurse:
 			return (hdrlen + length);
 		}
 	        if (ndo->ndo_eflag) {
-	        	uint16_t tag = EXTRACT_16BITS(p);
+	        	uint16_t tag = EXTRACT_BE_U_2(p);
 
 			ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
 		}
 
-		ether_type = EXTRACT_16BITS(p + 2);
+		ether_type = EXTRACT_BE_U_2(p + 2);
 		if (ether_type <= ETHERMTU)
 			ether_type = LINUX_SLL_P_802_2;
 		if (!ndo->ndo_qflag) {
@@ -295,7 +297,7 @@ recurse:
 		hdrlen += 4;
 		goto recurse;
 	} else {
-		if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
+		if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {
 			/* ether_type not known, print raw packet */
 			if (!ndo->ndo_eflag)
 				sll_print(ndo, sllp, length + SLL_HDR_LEN);