Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index dc6e78cb9d21ca97aacd7ccc71378ff9e07c1ce6..8727bff59d3dcdb7ebd881aba69a359b63af2724 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -46,6 +46,9 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },
     { ETHERTYPE_IPV6,          "IPv6" },
     { ETHERTYPE_8021Q,         "802.1Q" },
+    { ETHERTYPE_8021Q9100,     "802.1Q-9100" },
+    { ETHERTYPE_8021QinQ,      "802.1Q-QinQ" },
+    { ETHERTYPE_8021Q9200,     "802.1Q-9200" },
     { ETHERTYPE_VMAN,          "VMAN" },
     { ETHERTYPE_PUP,            "PUP" },
     { ETHERTYPE_ARP,            "ARP"},
@@ -93,26 +96,26 @@ ether_hdr_print(netdissect_options *ndo,
 
        ep = (const struct ether_header *)bp;
 
-       (void)printf("%s > %s",
+       (void)ND_PRINT((ndo, "%s > %s",
                     etheraddr_string(ESRC(ep)),
-                    etheraddr_string(EDST(ep)));
+                    etheraddr_string(EDST(ep))));
 
        ether_type = EXTRACT_16BITS(&ep->ether_type);
        if (!ndo->ndo_qflag) {
                if (ether_type <= ETHERMTU)
-                         (void)printf(", 802.3");
+                         (void)ND_PRINT((ndo, ", 802.3"));
                 else 
-                         (void)printf(", ethertype %s (0x%04x)",
+                         (void)ND_PRINT((ndo, ", ethertype %s (0x%04x)",
                                       tok2str(ethertype_values,"Unknown", ether_type),
-                                       ether_type);
+                                       ether_type));
         } else {
                 if (ether_type <= ETHERMTU)
-                          (void)printf(", 802.3");
+                          (void)ND_PRINT((ndo, ", 802.3"));
                 else 
-                          (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type));
+                          (void)ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
         }
 
-       (void)printf(", length %u: ", length);
+       (void)ND_PRINT((ndo, ", length %u: ", length));
 }
 
 /*
@@ -132,7 +135,7 @@ ether_print(netdissect_options *ndo,
        u_short extracted_ether_type;
 
        if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) {
-               printf("[|ether]");
+               ND_PRINT((ndo, "[|ether]"));
                return;
        }
 
@@ -168,27 +171,30 @@ recurse:
                        if (!ndo->ndo_suppress_default_print)
                                ndo->ndo_default_print(ndo, p, caplen);
                }
-       } else if (ether_type == ETHERTYPE_8021Q) {
+       } else if (ether_type == ETHERTYPE_8021Q  ||
+                ether_type == ETHERTYPE_8021Q9100 ||
+                ether_type == ETHERTYPE_8021Q9200 ||
+                ether_type == ETHERTYPE_8021QinQ) {
                /*
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */
                if (caplen < 4 || length < 4) {
-                       printf("[|vlan]");
+                       ND_PRINT((ndo, "[|vlan]"));
                        return;
                }
                if (ndo->ndo_eflag) {
                        u_int16_t tag = EXTRACT_16BITS(p);
 
-                       printf("vlan %u, p %u%s, ",
+                       ND_PRINT((ndo, "vlan %u, p %u%s, ",
                            tag & 0xfff,
                            tag >> 13,
-                           (tag & 0x1000) ? ", CFI" : "");
+                           (tag & 0x1000) ? ", CFI" : ""));
                }
 
                ether_type = EXTRACT_16BITS(p + 2);
                if (ndo->ndo_eflag && ether_type > ETHERMTU)
-                       printf("ethertype %s, ", tok2str(ethertype_values,"0x%04x", ether_type));
+                       ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", ether_type)));
                p += 4;
                length -= 4;
                caplen -= 4;
@@ -266,7 +272,7 @@ ethertype_print(netdissect_options *ndo,
 
 #ifdef INET6
        case ETHERTYPE_IPV6:
-               ip6_print(/*ndo,*/ p, length);
+               ip6_print(ndo, p, length);
                return (1);
 #endif /*INET6*/
 
@@ -290,7 +296,7 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_IPX:
-               printf("(NOV-ETHII) ");
+               ND_PRINT((ndo, "(NOV-ETHII) "));
                ipx_print(/*ndo,*/p, length);
                return (1);