Use more the ND_TTEST_1() macro

[tcpdump] / print-sll.c

diff --git a/print-sll.c b/print-sll.c
index 0ca36f53e46b1badfee1c95548b32a9023a72d05..0f0a2e7f534e86e79087ded03583dcf72ccd85e2 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -19,20 +19,19 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \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:
@@ -131,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?
                         */
@@ -196,9 +195,10 @@ 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;
-       u_short extracted_ethertype;
+       int llc_hdrlen;
+       u_int hdrlen;
 
        if (caplen < SLL_HDR_LEN) {
                /*
@@ -221,15 +221,16 @@ sll_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
        length -= SLL_HDR_LEN;
        caplen -= SLL_HDR_LEN;
        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?
                 */
@@ -247,23 +248,17 @@ recurse:
                         * 802.2.
                         * Try to print the LLC-layer header & higher layers.
                         */
-                       if (llc_print(ndo, p, length, caplen, NULL, NULL,
-                           &extracted_ethertype) == 0)
+                       llc_hdrlen = llc_print(ndo, p, length, caplen, NULL, NULL);
+                       if (llc_hdrlen < 0)
                                goto unknown;   /* unknown LLC type */
+                       hdrlen += llc_hdrlen;
                        break;
 
                default:
-                       extracted_ethertype = 0;
                        /*FALLTHROUGH*/
 
                unknown:
-                       /* ether_type not known, print raw packet */
-                       if (!ndo->ndo_eflag)
-                               sll_print(ndo, sllp, length + SLL_HDR_LEN);
-                       if (extracted_ethertype) {
-                               ND_PRINT((ndo, "(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype))));
-                       }
+                       /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
                                ND_DEFAULTPRINT(p, caplen);
                        break;
@@ -273,21 +268,22 @@ recurse:
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */
-               if (caplen < 4 || length < 4) {
+               if (caplen < 4) {
+                       ND_PRINT((ndo, "[|vlan]"));
+                       return (hdrlen + caplen);
+               }
+               if (length < 4) {
                        ND_PRINT((ndo, "[|vlan]"));
-                       return (SLL_HDR_LEN);
+                       return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {
-                       uint16_t tag = EXTRACT_16BITS(p);
+                       uint16_t tag = EXTRACT_BE_U_2(p);
 
-                       ND_PRINT((ndo, "vlan %u, p %u%s, ",
-                           tag & 0xfff,
-                           tag >> 13,
-                           (tag & 0x1000) ? ", CFI" : ""));
+                       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, ",
@@ -296,9 +292,10 @@ recurse:
                p += 4;
                length -= 4;
                caplen -= 4;
+               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);
@@ -307,5 +304,5 @@ recurse:
                }
        }
 
-       return (SLL_HDR_LEN);
+       return (hdrlen);
 }