update change log: add support for LACP, MARKER as per 802.3ad

[tcpdump] / llc.h

diff --git a/llc.h b/llc.h
index 5abecbd9d065c44d542fa33b003b67faa01509a7..c97975501ff231de36d952cf52c0bbaded008eb6 100644 (file)
--- a/llc.h
+++ b/llc.h
@@ -18,44 +18,13 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.11 2001-05-09 01:08:47 fenner Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.18 2005-04-26 07:26:33 guy Exp $ (LBL)
  */
 
 /*
- * This stuff should come from a system header file, but there's no
- * obviously portable way to do that and it's not really going
- * to change from system to system.
+ * Definitions for information in the LLC header.
  */
 
-/*
- * A somewhat abstracted view of the LLC header
- */
-
-struct llc {
-       u_int8_t dsap;
-       u_int8_t ssap;
-       union {
-               u_int8_t u_ctl;
-               u_int16_t is_ctl;
-               struct {
-                       u_int8_t snap_ui;
-                       u_int8_t snap_pi[5];
-               } snap;
-               struct {
-                       u_int8_t snap_ui;
-                       u_int8_t snap_orgcode[3];
-                       u_int8_t snap_ethertype[2];
-               } snap_ether;
-       } ctl;
-};
-
-#define        llcui           ctl.snap.snap_ui
-#define        llcpi           ctl.snap.snap_pi
-#define        orgcode         ctl.snap_ether.snap_orgcode
-#define        ethertype       ctl.snap_ether.snap_ethertype
-#define        llcis           ctl.is_ctl
-#define        llcu            ctl.u_ctl
-
 #define        LLC_U_FMT       3
 #define        LLC_GSAP        1
 #define LLC_S_FMT      1
@@ -124,3 +93,23 @@ struct llc {
 #ifndef LLCSAP_ISONS
 #define        LLCSAP_ISONS            0xfe
 #endif
+
+/*
+ * PIDs for use with OUI_CISCO.
+ */
+#define        PID_CISCO_CDP           0x2000  /* Cisco Discovery Protocol */
+
+/*
+ * PIDs for use with OUI_RFC2684.
+ */
+#define PID_RFC2684_ETH_FCS    0x0001  /* Ethernet, with FCS */
+#define PID_RFC2684_ETH_NOFCS  0x0007  /* Ethernet, without FCS */
+#define PID_RFC2684_802_4_FCS  0x0002  /* 802.4, with FCS */
+#define PID_RFC2684_802_4_NOFCS        0x0008  /* 802.4, without FCS */
+#define PID_RFC2684_802_5_FCS  0x0003  /* 802.5, with FCS */
+#define PID_RFC2684_802_5_NOFCS        0x0009  /* 802.5, without FCS */
+#define PID_RFC2684_FDDI_FCS   0x0004  /* FDDI, with FCS */
+#define PID_RFC2684_FDDI_NOFCS 0x000a  /* FDDI, without FCS */
+#define PID_RFC2684_802_6_FCS  0x0005  /* 802.6, with FCS */
+#define PID_RFC2684_802_6_NOFCS        0x000b  /* 802.6, without FCS */
+#define PID_RFC2684_BPDU       0x000e  /* BPDUs */