add tracefiles for infinite loop testing

[tcpdump] / print-llc.c

diff --git a/print-llc.c b/print-llc.c
index 2d49d6180ee4c1e15e900c9d03fc46fe072b8c4a..df5a29e6db548de31794c07491f6bafb540e2a79 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -23,21 +23,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.34 2001-01-15 03:24:00 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
 
 #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>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -46,6 +41,24 @@ static const char rcsid[] =
 #include "extract.h"                   /* must come after interface.h */
 
 #include "llc.h"
 #include "extract.h"                   /* must come after interface.h */
 
 #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" },
 
 static struct tok cmd2str[] = {
        { LLC_UI,       "ui" },


@@ -80,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)));
 
        /* 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
        if (llc.ssap == LLCSAP_GLOBAL && llc.dsap == LLCSAP_GLOBAL) {
                /*
                 * This is an Ethernet_802.3 IPX frame; it has an


@@ -89,24 +110,27 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 * the IPX packet starts right after the Ethernet header,
                 * with a signature of two bytes of 0xFF (which is
                 * LLCSAP_GLOBAL).
                 * the IPX packet starts right after the Ethernet header,
                 * with a signature of two bytes of 0xFF (which is
                 * LLCSAP_GLOBAL).

+                *
+                * (It might also have been an Ethernet_802.3 IPX at
+                * one time, but got bridged onto another network,
+                * such as an 802.11 network; this has appeared in at
+                * least one capture file.)

                 */
                 */

+               printf("(NOV-802.3) ");

                ipx_print(p, length);
                return (1);
        }
 
                ipx_print(p, length);
                return (1);
        }
 

-       /* Cisco Discovery Protocol  - SNAP & ether type 0x2000 */
-       if(llc.ssap == LLCSAP_SNAP && llc.dsap == LLCSAP_SNAP &&
-               llc.llcui == LLC_UI && 
-               llc.ethertype[0] == 0x20 && llc.ethertype[1] == 0x00 ) {
-                   cdp_print( p, length, caplen, esrc, edst);
-                   return (1);
-       }
-

        if (llc.ssap == LLCSAP_8021D && llc.dsap == LLCSAP_8021D) {
                stp_print(p, length);
                return (1);
        }
 
        if (llc.ssap == LLCSAP_8021D && llc.dsap == LLCSAP_8021D) {
                stp_print(p, length);
                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) {
                /*
        if (llc.ssap == LLCSAP_IPX && llc.dsap == LLCSAP_IPX &&
            llc.llcui == LLC_UI) {
                /*


@@ -116,6 +140,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                 *
                 * Skip DSAP, LSAP, and control field.
                 */
                 *
                 * Skip DSAP, LSAP, and control field.
                 */

+               printf("(NOV-802.2) ");

                p += 3;
                length -= 3;
                caplen -= 3;
                p += 3;
                length -= 3;
                caplen -= 3;


@@ -123,7 +148,8 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                return (1);
        }
 
                return (1);
        }
 

-       if (llc.ssap == 0xf0 && llc.dsap == 0xf0
+#ifdef TCPDUMP_DO_SMB
+       if (llc.ssap == LLCSAP_NETBEUI && llc.dsap == LLCSAP_NETBEUI

            && (!(llc.llcu & LLC_S_FMT) || llc.llcu == LLC_U_FMT)) {
                /*
                 * we don't actually have a full netbeui parser yet, but the
            && (!(llc.llcu & LLC_S_FMT) || llc.llcu == LLC_U_FMT)) {
                /*
                 * we don't actually have a full netbeui parser yet, but the


@@ -164,39 +190,45 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                        length -= 2;
                        caplen -= 2;
                }
                        length -= 2;
                        caplen -= 2;
                }

-               netbeui_print(control, p, p + min(caplen, length));
+               netbeui_print(control, p, length);

                return (1);
        }
                return (1);
        }

+#endif

        if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS
            && llc.llcui == LLC_UI) {
        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);
        }
 
        if (llc.ssap == LLCSAP_SNAP && llc.dsap == LLCSAP_SNAP
            && llc.llcui == LLC_UI) {
                return (1);
        }
 
        if (llc.ssap == LLCSAP_SNAP && llc.dsap == LLCSAP_SNAP
            && llc.llcui == LLC_UI) {

+               u_int32_t orgcode;
+

                if (caplen < sizeof(llc)) {
                        (void)printf("[|llc-snap]");
                        default_print((u_char *)p, caplen);
                        return (0);
                }
                if (caplen < sizeof(llc)) {
                        (void)printf("[|llc-snap]");
                        default_print((u_char *)p, caplen);
                        return (0);
                }

-               if (vflag)
-                       (void)printf("snap %s ", protoid_string(llc.llcpi));

 
                caplen -= sizeof(llc);
                length -= sizeof(llc);
                p += sizeof(llc);
 
 
                caplen -= sizeof(llc);
                length -= sizeof(llc);
                p += sizeof(llc);
 

-               /* This is an encapsulated Ethernet packet */
-               et = EXTRACT_16BITS(&llc.ethertype[0]);
-               ret = ether_encap_print(et, p, length, caplen,
-                   extracted_ethertype);
+               orgcode = EXTRACT_24BITS(&llc.llc_orgcode[0]);
+               et = EXTRACT_16BITS(&llc.llc_ethertype[0]);
+               /*
+                * XXX - what *is* the right bridge pad value here?
+                * Does anybody ever bridge one form of LAN traffic
+                * over a networking type that uses 802.2 LLC?
+                */
+               ret = snap_print(p, length, caplen, extracted_ethertype,
+                   orgcode, et, 2);

                if (ret)
                        return (ret);
        }
 
        if ((llc.ssap & ~LLC_GSAP) == llc.dsap) {
                if (ret)
                        return (ret);
        }
 
        if ((llc.ssap & ~LLC_GSAP) == llc.dsap) {

-               if (eflag)
+               if (eflag || esrc == NULL || edst == NULL)

                        (void)printf("%s ", llcsap_string(llc.dsap));
                else
                        (void)printf("%s > %s %s ",
                        (void)printf("%s ", llcsap_string(llc.dsap));
                else
                        (void)printf("%s > %s %s ",


@@ -204,7 +236,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                                        etheraddr_string(edst),
                                        llcsap_string(llc.dsap));
        } else {
                                        etheraddr_string(edst),
                                        llcsap_string(llc.dsap));
        } else {

-               if (eflag)
+               if (eflag || esrc == NULL || edst == NULL)

                        (void)printf("%s > %s ",
                                llcsap_string(llc.ssap & ~LLC_GSAP),
                                llcsap_string(llc.dsap));
                        (void)printf("%s > %s ",
                                llcsap_string(llc.ssap & ~LLC_GSAP),
                                llcsap_string(llc.dsap));


@@ -261,7 +293,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                }
 
                if ((control & LLC_S_FMT) == LLC_S_FMT) {
                }
 
                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),
                        (void)printf("%s (r=%d,%c)",
                                llc_s[LLC_S_CMD(control)],
                                LLC_IS_NR(control),


@@ -279,3 +311,119 @@ llc_print(const u_char *p, u_int length, u_int caplen,
        (void)printf(" len=%d", length);
        return(1);
 }
        (void)printf(" len=%d", length);
        return(1);
 }

+
+int
+snap_print(const u_char *p, u_int length, u_int caplen,
+    u_short *extracted_ethertype, u_int32_t orgcode, u_short et,
+    u_int bridge_pad)
+{
+       register int ret;
+
+       switch (orgcode) {
+       case OUI_ENCAP_ETHER:
+       case OUI_CISCO_90:
+               /*
+                * This is an encapsulated Ethernet packet,
+                * or a packet bridged by some piece of
+                * Cisco hardware; the protocol ID is
+                * an Ethernet protocol type.
+                */
+               ret = ether_encap_print(et, p, length, caplen,
+                   extracted_ethertype);
+               if (ret)
+                       return (ret);
+               break;
+
+       case OUI_APPLETALK:
+               if (et == ETHERTYPE_ATALK) {
+                       /*
+                        * No, I have no idea why Apple used one
+                        * of their own OUIs, rather than
+                        * 0x000000, and an Ethernet packet
+                        * type, for Appletalk data packets,
+                        * but used 0x000000 and an Ethernet
+                        * packet type for AARP packets.
+                        */
+                       ret = ether_encap_print(et, p, length, caplen,
+                           extracted_ethertype);
+                       if (ret)
+                               return (ret);
+               }
+               break;
+
+       case OUI_CISCO:
+               if (et == PID_CISCO_CDP) {
+                       cdp_print(p, length, caplen);
+                       return (1);
+               }
+               break;
+
+       case OUI_RFC2684:
+               switch (et) {
+
+               case PID_RFC2684_ETH_FCS:
+               case PID_RFC2684_ETH_NOFCS:
+                       /*
+                        * XXX - remove the last two bytes for
+                        * PID_RFC2684_ETH_FCS?
+                        */
+                       /*
+                        * Skip the padding.
+                        */
+                       caplen -= bridge_pad;
+                       length -= bridge_pad;
+                       p += bridge_pad;
+
+                       /*
+                        * What remains is an Ethernet packet.
+                        */
+                       ether_print(p, length, caplen);
+                       return (1);
+
+               case PID_RFC2684_802_5_FCS:
+               case PID_RFC2684_802_5_NOFCS:
+                       /*
+                        * XXX - remove the last two bytes for
+                        * PID_RFC2684_ETH_FCS?
+                        */
+                       /*
+                        * Skip the padding, but not the Access
+                        * Control field.
+                        */
+                       caplen -= bridge_pad;
+                       length -= bridge_pad;
+                       p += bridge_pad;
+
+                       /*
+                        * What remains is an 802.5 Token Ring
+                        * packet.
+                        */
+                       token_print(p, length, caplen);
+                       return (1);
+
+               case PID_RFC2684_FDDI_FCS:
+               case PID_RFC2684_FDDI_NOFCS:
+                       /*
+                        * XXX - remove the last two bytes for
+                        * PID_RFC2684_ETH_FCS?
+                        */
+                       /*
+                        * Skip the padding.
+                        */
+                       caplen -= bridge_pad + 1;
+                       length -= bridge_pad + 1;
+                       p += bridge_pad + 1;
+
+                       /*
+                        * What remains is an FDDI packet.
+                        */
+                       fddi_print(p, length, caplen);
+                       return (1);
+
+               case PID_RFC2684_BPDU:
+                       stp_print(p, length);
+                       return (1);
+               }
+       }
+       return (0);
+}