add tracefiles for infinite loop testing

[tcpdump] / print-llc.c

diff --git a/print-llc.c b/print-llc.c
index 1deb7c9160cb613dfbc0e94809566bd965391d72..df5a29e6db548de31794c07491f6bafb540e2a79 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -23,21 +23,16 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.47 2002-07-11 08:27:03 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.53.2.3 2003-12-29 22:33:18 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
+#include <tcpdump-stdinc.h>
 
-#include <netinet/in.h>
-
-#include <ctype.h>
-#include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -48,6 +43,23 @@ static const char rcsid[] =
 #include "llc.h"
 #include "ethertype.h"
 
+static struct tok llc_values[] = {
+        { LLCSAP_NULL,     "Null" },
+        { LLCSAP_GLOBAL,   "Global" },
+        { LLCSAP_8021B_I,  "802.1B I" },
+        { LLCSAP_8021B_G,  "802.1B G" },
+        { LLCSAP_IP,       "IP" },
+        { LLCSAP_PROWAYNM, "ProWay NM" },
+        { LLCSAP_8021D,    "STP" },
+        { LLCSAP_RS511,    "RS511" },
+        { LLCSAP_ISO8208,  "ISO8208" },
+        { LLCSAP_PROWAY,   "ProWay" },
+        { LLCSAP_SNAP,     "SNAP" },
+        { LLCSAP_IPX,      "IPX" },
+        { LLCSAP_NETBEUI,  "NetBeui" },
+        { LLCSAP_ISONS,    "OSI" },
+};
+
 static struct tok cmd2str[] = {
        { LLC_UI,       "ui" },
        { LLC_TEST,     "test" },
@@ -81,6 +93,14 @@ llc_print(const u_char *p, u_int length, u_int caplen,
        /* Watch out for possible alignment problems */
        memcpy((char *)&llc, (char *)p, min(caplen, sizeof(llc)));
 
+       if (eflag)
+         printf("LLC, dsap %s (0x%02x), ssap %s (0x%02x), cmd 0x%02x, ",
+                 tok2str(llc_values,"Unknown",llc.dsap),
+                llc.dsap,
+                 tok2str(llc_values,"Unknown",llc.ssap),
+                llc.ssap,
+                llc.llcu);
+
        if (llc.ssap == LLCSAP_GLOBAL && llc.dsap == LLCSAP_GLOBAL) {
                /*
                 * This is an Ethernet_802.3 IPX frame; it has an
@@ -106,6 +126,11 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                return (1);
        }
 
+       if (llc.ssap == LLCSAP_IP && llc.dsap == LLCSAP_IP) {
+               ip_print(p+4, length-4);
+               return (1);
+       }
+
        if (llc.ssap == LLCSAP_IPX && llc.dsap == LLCSAP_IPX &&
            llc.llcui == LLC_UI) {
                /*
@@ -171,7 +196,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
 #endif
        if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS
            && llc.llcui == LLC_UI) {
-               isoclns_print(p + 3, length - 3, caplen - 3, esrc, edst);
+               isoclns_print(p + 3, length - 3, caplen - 3);
                return (1);
        }
 
@@ -184,8 +209,6 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                        default_print((u_char *)p, caplen);
                        return (0);
                }
-               if (vflag)
-                       (void)printf("snap %s ", protoid_string(llc.llcpi));
 
                caplen -= sizeof(llc);
                length -= sizeof(llc);
@@ -198,8 +221,8 @@ 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?
                 */
-               ret = snap_print(p, length, caplen, esrc, edst,
-                   extracted_ethertype, orgcode, et, 2);
+               ret = snap_print(p, length, caplen, extracted_ethertype,
+                   orgcode, et, 2);
                if (ret)
                        return (ret);
        }
@@ -270,7 +293,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                }
 
                if ((control & LLC_S_FMT) == LLC_S_FMT) {
-                       static char *llc_s[] = { "rr", "rej", "rnr", "03" };
+                       static const char *llc_s[] = { "rr", "rej", "rnr", "03" };
                        (void)printf("%s (r=%d,%c)",
                                llc_s[LLC_S_CMD(control)],
                                LLC_IS_NR(control),
@@ -291,8 +314,8 @@ llc_print(const u_char *p, u_int length, u_int caplen,
 
 int
 snap_print(const u_char *p, u_int length, u_int caplen,
-    const u_char *esrc, const u_char *edst, u_short *extracted_ethertype,
-    u_int32_t orgcode, u_short et, u_int bridge_pad)
+    u_short *extracted_ethertype, u_int32_t orgcode, u_short et,
+    u_int bridge_pad)
 {
        register int ret;
 
@@ -330,7 +353,7 @@ snap_print(const u_char *p, u_int length, u_int caplen,
 
        case OUI_CISCO:
                if (et == PID_CISCO_CDP) {
-                       cdp_print(p, length, caplen, esrc, edst);
+                       cdp_print(p, length, caplen);
                        return (1);
                }
                break;