tcpdump.1 is generated from tcpdump.1.in.

[tcpdump] / print-llc.c

diff --git a/print-llc.c b/print-llc.c
index a797804ba938947c487ea5c2ce00f42b8da40921..0c8259fbb6b8a3b38ba1405cf28c515e33de8119 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.67 2005-11-13 12:12:42 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.75 2007-04-13 09:43:11 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -80,20 +80,33 @@ static const struct tok llc_flag_values[] = {
         { LLC_GSAP, "Response" },
         { LLC_U_POLL, "Poll" },
         { LLC_GSAP|LLC_U_POLL, "Final" },
+        { LLC_IS_POLL, "Poll" },
         { LLC_GSAP|LLC_IS_POLL, "Final" },
        { 0, NULL }
 };
 
+
+static const struct tok llc_ig_flag_values[] = { 
+        { 0, "Individual" },
+        { LLC_IG, "Group" },
+       { 0, NULL }
+};
+
+
 static const struct tok llc_supervisory_values[] = { 
         { 0, "Receiver Ready" },
-        { 1, "Reject" },
-        { 2, "Receiver not Ready" },
+        { 1, "Receiver not Ready" },
+        { 2, "Reject" },
        { 0,             NULL }
 };
 
 
 static const struct tok cisco_values[] = { 
        { PID_CISCO_CDP, "CDP" },
+       { PID_CISCO_VTP, "VTP" },
+       { PID_CISCO_DTP, "DTP" },
+       { PID_CISCO_UDLD, "UDLD" },
+       { PID_CISCO_PVST, "PVST" },
        { 0,             NULL }
 };
 
@@ -112,6 +125,10 @@ static const struct tok bridged_values[] = {
        { 0,                       NULL },
 };
 
+static const struct tok null_values[] = { 
+       { 0,             NULL }
+};
+
 struct oui_tok {
        u_int32_t       oui;
        const struct tok *tok;
@@ -206,16 +223,18 @@ llc_print(const u_char *p, u_int length, u_int caplen,
        ssap = ssap_field & ~LLC_GSAP;
 
        if (eflag) {
-                printf("LLC, dsap %s (0x%02x), ssap %s (0x%02x)",
+                printf("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);
+                       ssap,
+                       tok2str(llc_flag_values, "Unknown", ssap_field & LLC_GSAP));
 
                if (is_u) {
-                       printf(", cmd 0x%02x: ", control);
+                       printf(", ctrl 0x%02x: ", control);
                } else {
-                       printf(", cmd 0x%04x: ", control);
+                       printf(", ctrl 0x%04x: ", control);
                }
        }
 
@@ -371,7 +390,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
        et = EXTRACT_16BITS(p + 3);
 
        if (eflag) {
-               const struct tok *tok = NULL;
+               const struct tok *tok = null_values;
                const struct oui_tok *otp;
 
                for (otp = &oui_to_tok[0]; otp->tok != NULL; otp++) {
@@ -424,11 +443,25 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                break;
 
        case OUI_CISCO:
-               if (et == PID_CISCO_CDP) {
-                       cdp_print(p, length, caplen);
-                       return (1);
-               }
-               break;
+                switch (et) {
+                case PID_CISCO_CDP:
+                        cdp_print(p, length, caplen);
+                        return (1);
+                case PID_CISCO_DTP:
+                        dtp_print(p, length); 
+                        return (1);
+                case PID_CISCO_UDLD:
+                        udld_print(p, length);
+                        return (1);
+                case PID_CISCO_VTP:
+                        vtp_print(p, length);
+                        return (1);
+                case PID_CISCO_PVST:
+                        stp_print(p, length);
+                        return (1);
+                default:
+                        break;
+                }
 
        case OUI_RFC2684:
                switch (et) {