]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-llc.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix the pointer tests in the non-ndoified TTEST2() macro as well.
[tcpdump] / print-llc.c
diff --git a/print-llc.c b/print-llc.c
index 2cb81f457dda3d1176b3f7794bdea55618af3166..e78378d05b5afb5db7531cde88175b953ff6e7eb 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -22,20 +22,13 @@
  *     with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 
  *     with an awful lot of hacking by Jeffrey Mogul, DECWRL
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.71 2007-02-08 07:06:54 guy Exp $";
-#endif
-
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
@@ -44,7 +37,7 @@ static const char rcsid[] _U_ =
 #include "ethertype.h"
 #include "oui.h"
 
 #include "ethertype.h"
 #include "oui.h"
 
-static struct tok llc_values[] = {
+static const struct tok llc_values[] = {
         { LLCSAP_NULL,     "Null" },
         { LLCSAP_GLOBAL,   "Global" },
         { LLCSAP_8021B_I,  "802.1B I" },
         { LLCSAP_NULL,     "Null" },
         { LLCSAP_GLOBAL,   "Global" },
         { LLCSAP_8021B_I,  "802.1B I" },
@@ -63,7 +56,7 @@ static struct tok llc_values[] = {
         { 0,               NULL },
 };
 
         { 0,               NULL },
 };
 
-static struct tok llc_cmd_values[] = {
+static const struct tok llc_cmd_values[] = {
        { LLC_UI,       "ui" },
        { LLC_TEST,     "test" },
        { LLC_XID,      "xid" },
        { LLC_UI,       "ui" },
        { LLC_TEST,     "test" },
        { LLC_XID,      "xid" },
@@ -75,7 +68,7 @@ static struct tok llc_cmd_values[] = {
        { 0,            NULL }
 };
 
        { 0,            NULL }
 };
 
-static const struct tok llc_flag_values[] = { 
+static const struct tok llc_flag_values[] = {
         { 0, "Command" },
         { LLC_GSAP, "Response" },
         { LLC_U_POLL, "Poll" },
         { 0, "Command" },
         { LLC_GSAP, "Response" },
         { LLC_U_POLL, "Poll" },
@@ -86,14 +79,14 @@ static const struct tok llc_flag_values[] = {
 };
 
 
 };
 
 
-static const struct tok llc_ig_flag_values[] = { 
+static const struct tok llc_ig_flag_values[] = {
         { 0, "Individual" },
         { LLC_IG, "Group" },
        { 0, NULL }
 };
 
 
         { 0, "Individual" },
         { LLC_IG, "Group" },
        { 0, NULL }
 };
 
 
-static const struct tok llc_supervisory_values[] = { 
+static const struct tok llc_supervisory_values[] = {
         { 0, "Receiver Ready" },
         { 1, "Receiver not Ready" },
         { 2, "Reject" },
         { 0, "Receiver Ready" },
         { 1, "Receiver not Ready" },
         { 2, "Reject" },
@@ -101,14 +94,17 @@ static const struct tok llc_supervisory_values[] = {
 };
 
 
 };
 
 
-static const struct tok cisco_values[] = { 
+static const struct tok cisco_values[] = {
        { PID_CISCO_CDP, "CDP" },
        { PID_CISCO_VTP, "VTP" },
        { PID_CISCO_DTP, "DTP" },
        { PID_CISCO_CDP, "CDP" },
        { PID_CISCO_VTP, "VTP" },
        { PID_CISCO_DTP, "DTP" },
+       { PID_CISCO_UDLD, "UDLD" },
+       { PID_CISCO_PVST, "PVST" },
+       { PID_CISCO_VLANBRIDGE, "VLAN Bridge" },
        { 0,             NULL }
 };
 
        { 0,             NULL }
 };
 
-static const struct tok bridged_values[] = { 
+static const struct tok bridged_values[] = {
        { PID_RFC2684_ETH_FCS,     "Ethernet + FCS" },
        { PID_RFC2684_ETH_NOFCS,   "Ethernet w/o FCS" },
        { PID_RFC2684_802_4_FCS,   "802.4 + FCS" },
        { PID_RFC2684_ETH_FCS,     "Ethernet + FCS" },
        { PID_RFC2684_ETH_NOFCS,   "Ethernet w/o FCS" },
        { PID_RFC2684_802_4_FCS,   "802.4 + FCS" },
@@ -123,12 +119,12 @@ static const struct tok bridged_values[] = {
        { 0,                       NULL },
 };
 
        { 0,                       NULL },
 };
 
-static const struct tok null_values[] = { 
+static const struct tok null_values[] = {
        { 0,             NULL }
 };
 
 struct oui_tok {
        { 0,             NULL }
 };
 
 struct oui_tok {
-       u_int32_t       oui;
+       uint32_t        oui;
        const struct tok *tok;
 };
 
        const struct tok *tok;
 };
 
@@ -145,19 +141,19 @@ static const struct oui_tok oui_to_tok[] = {
  * Returns non-zero IFF it succeeds in printing the header
  */
 int
  * Returns non-zero IFF it succeeds in printing the header
  */
 int
-llc_print(const u_char *p, u_int length, u_int caplen,
+llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
          const u_char *esrc, const u_char *edst, u_short *extracted_ethertype)
 {
          const u_char *esrc, const u_char *edst, u_short *extracted_ethertype)
 {
-       u_int8_t dsap_field, dsap, ssap_field, ssap;
-       u_int16_t control;
+       uint8_t dsap_field, dsap, ssap_field, ssap;
+       uint16_t control;
        int is_u;
        register int ret;
 
        *extracted_ethertype = 0;
 
        if (caplen < 3) {
        int is_u;
        register int ret;
 
        *extracted_ethertype = 0;
 
        if (caplen < 3) {
-               (void)printf("[|llc]");
-               default_print((u_char *)p, caplen);
+               ND_PRINT((ndo, "[|llc]"));
+               ND_DEFAULTPRINT((u_char *)p, caplen);
                return(0);
        }
 
                return(0);
        }
 
@@ -182,8 +178,8 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * 2 bytes...
                 */
                if (caplen < 4) {
                 * 2 bytes...
                 */
                if (caplen < 4) {
-                       (void)printf("[|llc]");
-                       default_print((u_char *)p, caplen);
+                       ND_PRINT((ndo, "[|llc]"));
+                       ND_DEFAULTPRINT((u_char *)p, caplen);
                        return(0);
                }
 
                        return(0);
                }
 
@@ -210,41 +206,41 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * least one capture file.)
                 */
 
                 * least one capture file.)
                 */
 
-            if (eflag)
-               printf("IPX 802.3: ");
+            if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "IPX 802.3: "));
 
 
-            ipx_print(p, length);
+            ipx_print(ndo, p, length);
             return (1);
        }
 
        dsap = dsap_field & ~LLC_IG;
        ssap = ssap_field & ~LLC_GSAP;
 
             return (1);
        }
 
        dsap = dsap_field & ~LLC_IG;
        ssap = ssap_field & ~LLC_GSAP;
 
-       if (eflag) {
-                printf("LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",
+       if (ndo->ndo_eflag) {
+                ND_PRINT((ndo, "LLC, dsap %s (0x%02x) %s, ssap %s (0x%02x) %s",
                        tok2str(llc_values, "Unknown", dsap),
                        dsap,
                        tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG),
                        tok2str(llc_values, "Unknown", ssap),
                        ssap,
                        tok2str(llc_values, "Unknown", dsap),
                        dsap,
                        tok2str(llc_ig_flag_values, "Unknown", dsap_field & LLC_IG),
                        tok2str(llc_values, "Unknown", ssap),
                        ssap,
-                       tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP));
+                       tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP)));
 
                if (is_u) {
 
                if (is_u) {
-                       printf(", ctrl 0x%02x: ", control);
+                       ND_PRINT((ndo, ", ctrl 0x%02x: ", control));
                } else {
                } else {
-                       printf(", ctrl 0x%04x: ", control);
+                       ND_PRINT((ndo, ", ctrl 0x%04x: ", control));
                }
        }
 
        if (ssap == LLCSAP_8021D && dsap == LLCSAP_8021D &&
            control == LLC_UI) {
                }
        }
 
        if (ssap == LLCSAP_8021D && dsap == LLCSAP_8021D &&
            control == LLC_UI) {
-               stp_print(p+3, length-3);
+               stp_print(ndo, p+3, length-3);
                return (1);
        }
 
        if (ssap == LLCSAP_IP && dsap == LLCSAP_IP &&
            control == LLC_UI) {
                return (1);
        }
 
        if (ssap == LLCSAP_IP && dsap == LLCSAP_IP &&
            control == LLC_UI) {
-               ip_print(gndo, p+4, length-4);
+               ip_print(ndo, p+4, length-4);
                return (1);
        }
 
                return (1);
        }
 
@@ -257,10 +253,10 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 *
                 * Skip DSAP, LSAP, and control field.
                 */
                 *
                 * Skip DSAP, LSAP, and control field.
                 */
-                if (eflag)
-                        printf("IPX 802.2: ");
+                if (ndo->ndo_eflag)
+                        ND_PRINT((ndo, "IPX 802.2: "));
 
 
-               ipx_print(p+3, length-3);
+               ipx_print(ndo, p+3, length-3);
                return (1);
        }
 
                return (1);
        }
 
@@ -284,19 +280,17 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                if (is_u) {
                        p += 3;
                        length -= 3;
                if (is_u) {
                        p += 3;
                        length -= 3;
-                       caplen -= 3;
                } else {
                        p += 4;
                        length -= 4;
                } else {
                        p += 4;
                        length -= 4;
-                       caplen -= 4;
                }
                }
-               netbeui_print(control, p, length);
+               netbeui_print(ndo, control, p, length);
                return (1);
        }
 #endif
        if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
            && control == LLC_UI) {
                return (1);
        }
 #endif
        if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
            && control == LLC_UI) {
-               isoclns_print(p + 3, length - 3, caplen - 3);
+               isoclns_print(ndo, p + 3, length - 3, caplen - 3);
                return (1);
        }
 
                return (1);
        }
 
@@ -307,87 +301,77 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * Does anybody ever bridge one form of LAN traffic
                 * over a networking type that uses 802.2 LLC?
                 */
                 * Does anybody ever bridge one form of LAN traffic
                 * over a networking type that uses 802.2 LLC?
                 */
-               ret = snap_print(p+3, length-3, caplen-3, extracted_ethertype,
-                   2);
+               ret = snap_print(ndo, p+3, length-3, caplen-3, 2);
                if (ret)
                        return (ret);
        }
 
                if (ret)
                        return (ret);
        }
 
-       if (!eflag) {
+       if (!ndo->ndo_eflag) {
                if (ssap == dsap) {
                        if (esrc == NULL || edst == NULL)
                if (ssap == dsap) {
                        if (esrc == NULL || edst == NULL)
-                               (void)printf("%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                               ND_PRINT((ndo, "%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                        else
                        else
-                               (void)printf("%s > %s %s ",
-                                               etheraddr_string(esrc),
-                                               etheraddr_string(edst),
-                                               tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                               ND_PRINT((ndo, "%s > %s %s ",
+                                               etheraddr_string(ndo, esrc),
+                                               etheraddr_string(ndo, edst),
+                                               tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                } else {
                        if (esrc == NULL || edst == NULL)
                } else {
                        if (esrc == NULL || edst == NULL)
-                               (void)printf("%s > %s ",
+                               ND_PRINT((ndo, "%s > %s ",
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
-                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                        else
                        else
-                               (void)printf("%s %s > %s %s ",
-                                       etheraddr_string(esrc),
+                               ND_PRINT((ndo, "%s %s > %s %s ",
+                                       etheraddr_string(ndo, esrc),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
-                                       etheraddr_string(edst),
-                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap));
+                                       etheraddr_string(ndo, edst),
+                                       tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
                }
        }
 
        if (is_u) {
                }
        }
 
        if (is_u) {
-               printf("Unnumbered, %s, Flags [%s], length %u",
+               ND_PRINT((ndo, "Unnumbered, %s, Flags [%s], length %u",
                        tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)),
                        tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)),
                        tok2str(llc_cmd_values, "%02x", LLC_U_CMD(control)),
                        tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_U_POLL)),
-                       length);
+                       length));
 
                p += 3;
 
                p += 3;
-               length -= 3;
-               caplen -= 3;
 
                if ((control & ~LLC_U_POLL) == LLC_XID) {
                        if (*p == LLC_XID_FI) {
 
                if ((control & ~LLC_U_POLL) == LLC_XID) {
                        if (*p == LLC_XID_FI) {
-                               printf(": %02x %02x", p[1], p[2]);
-                               p += 3;
-                               length -= 3;
-                               caplen -= 3;
+                               ND_PRINT((ndo, ": %02x %02x", p[1], p[2]));
                        }
                }
        } else {
                if ((control & LLC_S_FMT) == LLC_S_FMT) {
                        }
                }
        } else {
                if ((control & LLC_S_FMT) == LLC_S_FMT) {
-                       (void)printf("Supervisory, %s, rcv seq %u, Flags [%s], length %u",
+                       ND_PRINT((ndo, "Supervisory, %s, rcv seq %u, Flags [%s], length %u",
                                tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
                                tok2str(llc_supervisory_values,"?",LLC_S_CMD(control)),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
-                                length);
+                                length));
                } else {
                } else {
-                       (void)printf("Information, send seq %u, rcv seq %u, Flags [%s], length %u",
+                       ND_PRINT((ndo, "Information, send seq %u, rcv seq %u, Flags [%s], length %u",
                                LLC_I_NS(control),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
                                LLC_I_NS(control),
                                LLC_IS_NR(control),
                                tok2str(llc_flag_values,"?",(ssap_field & LLC_GSAP) | (control & LLC_IS_POLL)),
-                                length);
+                                length));
                }
                }
-               p += 4;
-               length -= 4;
-               caplen -= 4;
        }
        return(1);
 }
 
 int
        }
        return(1);
 }
 
 int
-snap_print(const u_char *p, u_int length, u_int caplen,
-    u_short *extracted_ethertype, u_int bridge_pad)
+snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
 {
 {
-       u_int32_t orgcode;
+       uint32_t orgcode;
        register u_short et;
        register int ret;
 
        register u_short et;
        register int ret;
 
-       TCHECK2(*p, 5);
+       ND_TCHECK2(*p, 5);
        orgcode = EXTRACT_24BITS(p);
        et = EXTRACT_16BITS(p + 3);
 
        orgcode = EXTRACT_24BITS(p);
        et = EXTRACT_16BITS(p + 3);
 
-       if (eflag) {
+       if (ndo->ndo_eflag) {
                const struct tok *tok = null_values;
                const struct oui_tok *otp;
 
                const struct tok *tok = null_values;
                const struct oui_tok *otp;
 
@@ -397,12 +381,12 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                                break;
                        }
                }
                                break;
                        }
                }
-               (void)printf("oui %s (0x%06x), %s %s (0x%04x): ",
+               ND_PRINT((ndo, "oui %s (0x%06x), %s %s (0x%04x): ",
                     tok2str(oui_values, "Unknown", orgcode),
                     orgcode,
                     (orgcode == 0x000000 ? "ethertype" : "pid"),
                     tok2str(tok, "Unknown", et),
                     tok2str(oui_values, "Unknown", orgcode),
                     orgcode,
                     (orgcode == 0x000000 ? "ethertype" : "pid"),
                     tok2str(tok, "Unknown", et),
-                    et);
+                    et));
        }
        p += 5;
        length -= 5;
        }
        p += 5;
        length -= 5;
@@ -417,8 +401,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                 * Cisco hardware; the protocol ID is
                 * an Ethernet protocol type.
                 */
                 * Cisco hardware; the protocol ID is
                 * an Ethernet protocol type.
                 */
-               ret = ether_encap_print(et, p, length, caplen,
-                   extracted_ethertype);
+               ret = ethertype_print(ndo, et, p, length, caplen);
                if (ret)
                        return (ret);
                break;
                if (ret)
                        return (ret);
                break;
@@ -433,18 +416,33 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                         * but used 0x000000 and an Ethernet
                         * packet type for AARP packets.
                         */
                         * but used 0x000000 and an Ethernet
                         * packet type for AARP packets.
                         */
-                       ret = ether_encap_print(et, p, length, caplen,
-                           extracted_ethertype);
+                       ret = ethertype_print(ndo, et, p, length, caplen);
                        if (ret)
                                return (ret);
                }
                break;
 
        case OUI_CISCO:
                        if (ret)
                                return (ret);
                }
                break;
 
        case OUI_CISCO:
-               if (et == PID_CISCO_CDP) {
-                       cdp_print(p, length, caplen);
-                       return (1);
-               }
+                switch (et) {
+                case PID_CISCO_CDP:
+                        cdp_print(ndo, p, length, caplen);
+                        return (1);
+                case PID_CISCO_DTP:
+                        dtp_print(ndo, p, length);
+                        return (1);
+                case PID_CISCO_UDLD:
+                        udld_print(ndo, p, length);
+                        return (1);
+                case PID_CISCO_VTP:
+                        vtp_print(ndo, p, length);
+                        return (1);
+                case PID_CISCO_PVST:
+                case PID_CISCO_VLANBRIDGE:
+                        stp_print(ndo, p, length);
+                        return (1);
+                default:
+                        break;
+                }
                break;
 
        case OUI_RFC2684:
                break;
 
        case OUI_RFC2684:
@@ -459,7 +457,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                        /*
                         * Skip the padding.
                         */
                        /*
                         * Skip the padding.
                         */
-                       TCHECK2(*p, bridge_pad);
+                       ND_TCHECK2(*p, bridge_pad);
                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;
                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;
@@ -467,7 +465,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                        /*
                         * What remains is an Ethernet packet.
                         */
                        /*
                         * What remains is an Ethernet packet.
                         */
-                       ether_print(p, length, caplen);
+                       ether_print(ndo, p, length, caplen, NULL, NULL);
                        return (1);
 
                case PID_RFC2684_802_5_FCS:
                        return (1);
 
                case PID_RFC2684_802_5_FCS:
@@ -480,7 +478,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                         * Skip the padding, but not the Access
                         * Control field.
                         */
                         * Skip the padding, but not the Access
                         * Control field.
                         */
-                       TCHECK2(*p, bridge_pad);
+                       ND_TCHECK2(*p, bridge_pad);
                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;
                        caplen -= bridge_pad;
                        length -= bridge_pad;
                        p += bridge_pad;
@@ -489,7 +487,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                         * What remains is an 802.5 Token Ring
                         * packet.
                         */
                         * What remains is an 802.5 Token Ring
                         * packet.
                         */
-                       token_print(p, length, caplen);
+                       token_print(ndo, p, length, caplen);
                        return (1);
 
                case PID_RFC2684_FDDI_FCS:
                        return (1);
 
                case PID_RFC2684_FDDI_FCS:
@@ -501,7 +499,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                        /*
                         * Skip the padding.
                         */
                        /*
                         * Skip the padding.
                         */
-                       TCHECK2(*p, bridge_pad + 1);
+                       ND_TCHECK2(*p, bridge_pad + 1);
                        caplen -= bridge_pad + 1;
                        length -= bridge_pad + 1;
                        p += bridge_pad + 1;
                        caplen -= bridge_pad + 1;
                        length -= bridge_pad + 1;
                        p += bridge_pad + 1;
@@ -509,18 +507,18 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                        /*
                         * What remains is an FDDI packet.
                         */
                        /*
                         * What remains is an FDDI packet.
                         */
-                       fddi_print(p, length, caplen);
+                       fddi_print(ndo, p, length, caplen);
                        return (1);
 
                case PID_RFC2684_BPDU:
                        return (1);
 
                case PID_RFC2684_BPDU:
-                       stp_print(p, length);
+                       stp_print(ndo, p, length);
                        return (1);
                }
        }
        return (0);
 
 trunc:
                        return (1);
                }
        }
        return (0);
 
 trunc:
-       (void)printf("[|snap]");
+       ND_PRINT((ndo, "[|snap]"));
        return (1);
 }
 
        return (1);
 }
 
[mirror] the TCPdump network dissector