For Babel, recognise both UDP/6696 and UDP/6697.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index e086d1660c090c8b2dd160051e0d996067ec3903..8727bff59d3dcdb7ebd881aba69a359b63af2724 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -23,6 +23,7 @@ static const char rcsid[] _U_ =
     "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.106 2008-02-06 10:47:53 guy Exp $ (LBL)";
 #endif
 
     "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.106 2008-02-06 10:47:53 guy Exp $ (LBL)";
 #endif
 

+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif


@@ -45,6 +46,9 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },
     { ETHERTYPE_IPV6,          "IPv6" },
     { ETHERTYPE_8021Q,         "802.1Q" },
     { 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"},
     { ETHERTYPE_VMAN,          "VMAN" },
     { ETHERTYPE_PUP,            "PUP" },
     { ETHERTYPE_ARP,            "ARP"},


@@ -84,33 +88,34 @@ const struct tok ethertype_values[] = {
 };
 
 static inline void
 };
 
 static inline void

-ether_hdr_print(register const u_char *bp, u_int length)
+ether_hdr_print(netdissect_options *ndo,
+                const u_char *bp, u_int length)

 {
        register const struct ether_header *ep;
        u_int16_t ether_type;
 
        ep = (const struct ether_header *)bp;
 
 {
        register const struct ether_header *ep;
        u_int16_t ether_type;
 
        ep = (const struct ether_header *)bp;
 

-       (void)printf("%s > %s",
+       (void)ND_PRINT((ndo, "%s > %s",

                     etheraddr_string(ESRC(ep)),
                     etheraddr_string(ESRC(ep)),

-                    etheraddr_string(EDST(ep)));
+                    etheraddr_string(EDST(ep))));

 
        ether_type = EXTRACT_16BITS(&ep->ether_type);
 
        ether_type = EXTRACT_16BITS(&ep->ether_type);

-       if (!qflag) {
+       if (!ndo->ndo_qflag) {

                if (ether_type <= ETHERMTU)
                if (ether_type <= ETHERMTU)

-                         (void)printf(", 802.3");
+                         (void)ND_PRINT((ndo, ", 802.3"));

                 else 
                 else 

-                         (void)printf(", ethertype %s (0x%04x)",
+                         (void)ND_PRINT((ndo, ", ethertype %s (0x%04x)",

                                       tok2str(ethertype_values,"Unknown", ether_type),
                                       tok2str(ethertype_values,"Unknown", ether_type),

-                                       ether_type);
+                                       ether_type));

         } else {
                 if (ether_type <= ETHERMTU)
         } else {
                 if (ether_type <= ETHERMTU)

-                          (void)printf(", 802.3");
+                          (void)ND_PRINT((ndo, ", 802.3"));

                 else 
                 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));

 }
 
 /*
 }
 
 /*


@@ -120,8 +125,9 @@ ether_hdr_print(register const u_char *bp, u_int length)
  * frame's protocol, and an argument to pass to that function.
  */
 void
  * frame's protocol, and an argument to pass to that function.
  */
 void

-ether_print(const u_char *p, u_int length, u_int caplen,
-    void (*print_encap_header)(const u_char *), const u_char *encap_header_arg)
+ether_print(netdissect_options *ndo,
+            const u_char *p, u_int length, u_int caplen,
+            void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)

 {
        struct ether_header *ep;
        u_int orig_length;
 {
        struct ether_header *ep;
        u_int orig_length;


@@ -129,14 +135,14 @@ ether_print(const u_char *p, u_int length, u_int caplen,
        u_short extracted_ether_type;
 
        if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) {
        u_short extracted_ether_type;
 
        if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) {

-               printf("[|ether]");
+               ND_PRINT((ndo, "[|ether]"));

                return;
        }
 
                return;
        }
 

-       if (eflag) {
+       if (ndo->ndo_eflag) {

                if (print_encap_header != NULL)
                if (print_encap_header != NULL)

-                       (*print_encap_header)(encap_header_arg);
-               ether_hdr_print(p, length);
+                       (*print_encap_header)(ndo, encap_header_arg);
+               ether_hdr_print(ndo, p, length);

        }
        orig_length = length;
 
        }
        orig_length = length;
 


@@ -156,36 +162,39 @@ recurse:
                if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */
                if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */

-                       if (!eflag) {
+                       if (!ndo->ndo_eflag) {

                                if (print_encap_header != NULL)
                                if (print_encap_header != NULL)

-                                       (*print_encap_header)(encap_header_arg);
-                               ether_hdr_print((u_char *)ep, orig_length);
+                                       (*print_encap_header)(ndo, encap_header_arg);
+                               ether_hdr_print(ndo, (u_char *)ep, orig_length);

                        }
 
                        }
 

-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+                       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) {
                /*
                 * 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;
                }
                        return;
                }

-               if (eflag) {
+               if (ndo->ndo_eflag) {

                        u_int16_t tag = EXTRACT_16BITS(p);
 
                        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 & 0xfff,
                            tag >> 13,

-                           (tag & 0x1000) ? ", CFI" : "");
+                           (tag & 0x1000) ? ", CFI" : ""));

                }
 
                ether_type = EXTRACT_16BITS(p + 2);
                }
 
                ether_type = EXTRACT_16BITS(p + 2);

-               if (eflag && ether_type > ETHERMTU)
-                       printf("ethertype %s, ", tok2str(ethertype_values,"0x%04x", ether_type));
+               if (ndo->ndo_eflag && ether_type > ETHERMTU)
+                       ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", ether_type)));

                p += 4;
                length -= 4;
                caplen -= 4;
                p += 4;
                length -= 4;
                caplen -= 4;


@@ -204,26 +213,26 @@ recurse:
                if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */
                if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */

-                       if (!eflag) {
+                       if (!ndo->ndo_eflag) {

                                if (print_encap_header != NULL)
                                if (print_encap_header != NULL)

-                                       (*print_encap_header)(encap_header_arg);
-                               ether_hdr_print((u_char *)ep, orig_length);
+                                       (*print_encap_header)(ndo, encap_header_arg);
+                               ether_hdr_print(ndo, (u_char *)ep, orig_length);

                        }
 
                        }
 

-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+                       if (!ndo->ndo_suppress_default_print)
+                               ndo->ndo_default_print(ndo, p, caplen);

                }
        } else {
                }
        } else {

-               if (ethertype_print(ether_type, p, length, caplen) == 0) {
+               if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {

                        /* ether_type not known, print raw packet */
                        /* ether_type not known, print raw packet */

-                       if (!eflag) {
+                       if (!ndo->ndo_eflag) {

                                if (print_encap_header != NULL)
                                if (print_encap_header != NULL)

-                                       (*print_encap_header)(encap_header_arg);
-                               ether_hdr_print((u_char *)ep, orig_length);
+                                       (*print_encap_header)(ndo, encap_header_arg);
+                               ether_hdr_print(ndo, (u_char *)ep, orig_length);

                        }
 
                        }
 

-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+                       if (!ndo->ndo_suppress_default_print)
+                               ndo->ndo_default_print(ndo, p, caplen);

                }
        }
 }
                }
        }
 }


@@ -235,9 +244,10 @@ recurse:
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-ether_if_print(const struct pcap_pkthdr *h, const u_char *p)
+ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
+               const u_char *p)

 {
 {

-       ether_print(p, h->len, h->caplen, NULL, NULL);
+       ether_print(ndo, p, h->len, h->caplen, NULL, NULL);

 
        return (ETHER_HDRLEN);
 }
 
        return (ETHER_HDRLEN);
 }


@@ -250,85 +260,87 @@ ether_if_print(const struct pcap_pkthdr *h, const u_char *p)
  */
 
 int
  */
 
 int

-ethertype_print(u_short ether_type, const u_char *p, u_int length, u_int caplen)
+ethertype_print(netdissect_options *ndo,
+                u_short ether_type, const u_char *p,
+                u_int length, u_int caplen)

 {
        switch (ether_type) {
 
        case ETHERTYPE_IP:
 {
        switch (ether_type) {
 
        case ETHERTYPE_IP:

-               ip_print(gndo, p, length);
+               ip_print(ndo, p, length);

                return (1);
 
 #ifdef INET6
        case ETHERTYPE_IPV6:
                return (1);
 
 #ifdef INET6
        case ETHERTYPE_IPV6:

-               ip6_print(p, length);
+               ip6_print(ndo, p, length);

                return (1);
 #endif /*INET6*/
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
                return (1);
 #endif /*INET6*/
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:

-               arp_print(gndo, p, length, caplen);
+               arp_print(ndo, p, length, caplen);

                return (1);
 
        case ETHERTYPE_DN:
                return (1);
 
        case ETHERTYPE_DN:

-               decnet_print(p, length, caplen);
+               decnet_print(/*ndo,*/p, length, caplen);

                return (1);
 
        case ETHERTYPE_ATALK:
                return (1);
 
        case ETHERTYPE_ATALK:

-               if (vflag)
+               if (ndo->ndo_vflag)

                        fputs("et1 ", stdout);
                        fputs("et1 ", stdout);

-               atalk_print(p, length);
+               atalk_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_AARP:
                return (1);
 
        case ETHERTYPE_AARP:

-               aarp_print(p, length);
+               aarp_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_IPX:
                return (1);
 
        case ETHERTYPE_IPX:

-               printf("(NOV-ETHII) ");
-               ipx_print(p, length);
+               ND_PRINT((ndo, "(NOV-ETHII) "));
+               ipx_print(/*ndo,*/p, length);

                return (1);
 
         case ETHERTYPE_ISO:
                return (1);
 
         case ETHERTYPE_ISO:

-                isoclns_print(p+1, length-1, length-1);
+                isoclns_print(/*ndo,*/p+1, length-1, length-1);

                 return(1);
 
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:
                 return(1);
 
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:

-               pppoe_print(p, length);
+               pppoe_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_EAPOL:
                return (1);
 
        case ETHERTYPE_EAPOL:

-               eap_print(gndo, p, length);
+               eap_print(ndo, p, length);

                return (1);
 
        case ETHERTYPE_RRCP:
                return (1);
 
        case ETHERTYPE_RRCP:

-               rrcp_print(gndo, p - 14 , length + 14);
+               rrcp_print(ndo, p - 14 , length + 14);

                return (1);
 
        case ETHERTYPE_PPP:
                if (length) {
                        printf(": ");
                return (1);
 
        case ETHERTYPE_PPP:
                if (length) {
                        printf(": ");

-                       ppp_print(p, length);
+                       ppp_print(/*ndo,*/p, length);

                }
                return (1);
 
        case ETHERTYPE_MPCP:
                }
                return (1);
 
        case ETHERTYPE_MPCP:

-               mpcp_print(p, length);
+               mpcp_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_SLOW:
                return (1);
 
        case ETHERTYPE_SLOW:

-               slow_print(p, length);
+               slow_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_CFM:
        case ETHERTYPE_CFM_OLD:
                return (1);
 
        case ETHERTYPE_CFM:
        case ETHERTYPE_CFM_OLD:

-               cfm_print(p, length);
+               cfm_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_LLDP:
                return (1);
 
        case ETHERTYPE_LLDP:

-               lldp_print(p, length);
+               lldp_print(/*ndo,*/p, length);

                return (1);
 
         case ETHERTYPE_LOOPBACK:
                return (1);
 
         case ETHERTYPE_LOOPBACK:


@@ -336,7 +348,7 @@ ethertype_print(u_short ether_type, const u_char *p, u_int length, u_int caplen)
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:

-               mpls_print(p, length);
+               mpls_print(/*ndo,*/p, length);

                return (1);
 
        case ETHERTYPE_LAT:
                return (1);
 
        case ETHERTYPE_LAT: