Use more the ND_TTEST_1() macro

[tcpdump] / print-sll.c

diff --git a/print-sll.c b/print-sll.c
index e3e6ec96e28865b13205d7af2e2e042d989a97eb..0f0a2e7f534e86e79087ded03583dcf72ccd85e2 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -19,19 +19,19 @@
  * 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"
 
-#include "ether.h"
-
 /*
  * For captures on Linux cooked sockets, we construct a fake header
  * that includes:
@@ -130,24 +130,24 @@ static const struct tok sll_pkttype_values[] = {
 };
 
 static inline void
-sll_print(netdissect_options *ndo, register const struct sll_header *sllp, u_int length)
+sll_print(netdissect_options *ndo, const struct sll_header *sllp, u_int length)
 {
        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) {
+               if (ether_type <= MAX_ETHERNET_LENGTH_VAL) {
                        /*
                         * Not an Ethernet type; what type is it?
                         */
@@ -195,7 +195,7 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
-       register const struct sll_header *sllp;
+       const struct sll_header *sllp;
        u_short ether_type;
        int llc_hdrlen;
        u_int hdrlen;
@@ -223,14 +223,14 @@ 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:
        /*
         * Is it (gag) an 802.3 encapsulation, or some non-Ethernet
         * packet type?
         */
-       if (ether_type <= ETHERMTU) {
+       if (ether_type <= MAX_ETHERNET_LENGTH_VAL) {
                /*
                 * Yes - what type is it?
                 */
@@ -277,13 +277,13 @@ 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);
-               if (ether_type <= ETHERMTU)
+               ether_type = EXTRACT_BE_U_2(p + 2);
+               if (ether_type <= MAX_ETHERNET_LENGTH_VAL)
                        ether_type = LINUX_SLL_P_802_2;
                if (!ndo->ndo_qflag) {
                        ND_PRINT((ndo, "ethertype %s, ",
@@ -295,7 +295,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);