Compile with '-Wmissing-variable-declarations' if it's available

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index d20047da1ac6127d60b07c72d93a40a8c3adc05f..205cc8a7d7c99c0570d99e570981b763530df1a7 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -204,26 +204,48 @@ recurse:
        p += 2;
        hdrlen += 2;
 
+       /*
+        * Process 802.1AE MACsec headers.
+        */
+       printed_length = 0;
        if (length_type == ETHERTYPE_MACSEC) {
                /*
                 * MACsec, aka IEEE 802.1AE-2006
                 * Print the header, and try to print the payload if it's not encrypted
                 */
-               int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen, &length_type);
+               if (ndo->ndo_eflag) {
+                       ether_type_print(ndo, length_type);
+                       ND_PRINT(", length %u: ", orig_length);
+                       printed_length = 1;
+               }
+
+               int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen,
+                   &src, &dst);
 
                if (ret == 0) {
-                       /* Payload is encrypted; just quit. */
-                       return (hdrlen + caplen);
+                       /* Payload is encrypted; print it as raw data. */
+                       if (!ndo->ndo_suppress_default_print)
+                               ND_DEFAULTPRINT(p, caplen);
+                       return (hdrlen);
                } else if (ret > 0) {
                        /* Problem printing the header; just quit. */
                        return (ret);
+               } else {
+                       /*
+                        * Keep processing type/length fields.
+                        */
+                       length_type = GET_BE_U_2(p);
+
+                       length -= 2;
+                       caplen -= 2;
+                       p += 2;
+                       hdrlen += 2;
                }
        }
 
        /*
         * Process VLAN tag types.
         */
-       printed_length = 0;
        while (length_type == ETHERTYPE_8021Q  ||
                length_type == ETHERTYPE_8021Q9100 ||
                length_type == ETHERTYPE_8021Q9200 ||
@@ -361,7 +383,6 @@ recurse:
                                ND_PRINT(", ");
                }
                if (ethertype_print(ndo, length_type, p, length, caplen, &src, &dst) == 0) {
-raw:
                        /* type not known, print raw packet */
                        if (!ndo->ndo_eflag) {
                                /*