More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / llc.h

diff --git a/llc.h b/llc.h
index 738a0d9db5c4a32f0ee7916ebc3e2bd26ee0ffb2..ec8d069e77b9d6af224ff92db4ca0da4c673121d 100644 (file)
--- a/llc.h
+++ b/llc.h
@@ -17,47 +17,15 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

- *
- * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.17 2005-04-06 20:09:07 hannes 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.

  */
 
 /*
  */
 
 /*

- * A somewhat abstracted view of the LLC header
+ * Definitions for information in 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        llc_orgcode     ctl.snap_ether.snap_orgcode
-#define        llc_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_U_FMT       3
 #define        LLC_GSAP        1

+#define        LLC_IG          1 /* Individual / Group */

 #define LLC_S_FMT      1
 
 #define        LLC_U_POLL      0x10
 #define LLC_S_FMT      1
 
 #define        LLC_U_POLL      0x10


@@ -74,7 +42,7 @@ struct llc {
 #define        LLC_XID         0xaf
 #define        LLC_FRMR        0x87
 
 #define        LLC_XID         0xaf
 #define        LLC_FRMR        0x87
 

-#define        LLC_S_CMD(is)   (((is) >> 1) & 0x03)
+#define        LLC_S_CMD(is)   (((is) >> 2) & 0x03)

 #define        LLC_RR          0x0001
 #define        LLC_RNR         0x0005
 #define        LLC_REJ         0x0009
 #define        LLC_RR          0x0001
 #define        LLC_RNR         0x0005
 #define        LLC_REJ         0x0009


@@ -94,6 +62,9 @@ struct llc {
 #ifndef LLCSAP_8021B_G
 #define        LLCSAP_8021B_G          0x03
 #endif
 #ifndef LLCSAP_8021B_G
 #define        LLCSAP_8021B_G          0x03
 #endif

+#ifndef LLCSAP_SNA
+#define        LLCSAP_SNA              0x04
+#endif

 #ifndef LLCSAP_IP
 #define        LLCSAP_IP               0x06
 #endif
 #ifndef LLCSAP_IP
 #define        LLCSAP_IP               0x06
 #endif


@@ -129,6 +100,11 @@ struct llc {
  * PIDs for use with OUI_CISCO.
  */
 #define        PID_CISCO_CDP           0x2000  /* Cisco Discovery Protocol */
  * PIDs for use with OUI_CISCO.
  */
 #define        PID_CISCO_CDP           0x2000  /* Cisco Discovery Protocol */

+#define        PID_CISCO_VTP           0x2003  /* Cisco VLAN Trunk Protocol */
+#define        PID_CISCO_DTP           0x2004  /* Cisco Dynamic Trunk Protocol */
+#define        PID_CISCO_UDLD          0x0111  /* Unidirectional Link Detection */
+#define        PID_CISCO_PVST          0x010b  /* Per VLAN Spanning Tree+ and RPVST+ */
+#define        PID_CISCO_VLANBRIDGE    0x010c  /* "VLAN Bridge", according to Wireshark */

 
 /*
  * PIDs for use with OUI_RFC2684.
 
 /*
  * PIDs for use with OUI_RFC2684.


@@ -144,4 +120,3 @@ struct llc {
 #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 */
 #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 */

-