More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / llc.h

diff --git a/llc.h b/llc.h
index c97975501ff231de36d952cf52c0bbaded008eb6..ec8d069e77b9d6af224ff92db4ca0da4c673121d 100644 (file)
--- a/llc.h
+++ b/llc.h
@@ -17,8 +17,6 @@
  * 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.18 2005-04-26 07:26:33 guy Exp $ (LBL)
  */
 
 /*
@@ -27,6 +25,7 @@
 
 #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
@@ -43,7 +42,7 @@
 #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
@@ -63,6 +62,9 @@
 #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
@@ -98,6 +100,11 @@
  * 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.