More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / oui.h

diff --git a/oui.h b/oui.h
index a2245e77a3e7dc6c6dfbc3eaf768ef6f84d9f94c..bf87099d26ce5fa46bf3f6941fda6300aeb9d2d5 100644 (file)
--- a/oui.h
+++ b/oui.h
@@ -1,5 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/oui.h,v 1.2 2004-01-25 09:56:15 hannes Exp $ (LBL) */
-/* 
+/*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  * distributions retain the above copyright notice and this paragraph
@@ -14,12 +13,43 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
-extern struct tok oui_values[];
-extern struct tok smi_values[];
+extern const struct tok oui_values[];
+extern const struct tok smi_values[];
 
+#define OUI_ENCAP_ETHER 0x000000        /* encapsulated Ethernet */
+#define OUI_CISCO       0x00000c        /* Cisco protocols */
+#define OUI_NORTEL      0x000081        /* Nortel SONMP */
+#define OUI_CISCO_90    0x0000f8        /* Cisco bridging */
+#define OUI_RFC2684     0x0080c2        /* RFC 2427/2684 bridged Ethernet */
+#define OUI_ATM_FORUM   0x00A03E        /* ATM Forum */
+#define OUI_CABLE_BPDU  0x00E02F        /* DOCSIS spanning tree BPDU */
+#define OUI_APPLETALK   0x080007        /* Appletalk */
+#define OUI_JUNIPER     0x009069        /* Juniper */
+#define OUI_HP          0x080009        /* Hewlett-Packard */
+#define OUI_IEEE_8021_PRIVATE 0x0080c2      /* IEEE 802.1 Organisation Specific - Annex F */
+#define OUI_IEEE_8023_PRIVATE 0x00120f      /* IEEE 802.3 Organisation Specific - Annex G */
+#define OUI_TIA         0x0012bb        /* TIA - Telecommunications Industry Association - ANSI/TIA-1057- 2006 */
+#define OUI_DCBX        0x001B21        /* DCBX */
+
+/*
+ * These are SMI Network Management Private Enterprise Codes for
+ * organizations; see
+ *
+ *     http://www.iana.org/assignments/enterprise-numbers
+ *
+ * for a list.
+ *
+ * List taken from Ethereal's epan/sminmpec.h.
+ */
+#define SMI_IETF                     0 /* reserved - used by the IETF in L2TP? */
 #define SMI_ACC                      5
 #define SMI_CISCO                    9
+#define SMI_HEWLETT_PACKARD          11
+#define SMI_SUN_MICROSYSTEMS         42
+#define SMI_MERIT                    61
 #define SMI_SHIVA                    166
+#define SMI_ERICSSON                 193
+#define SMI_CISCO_VPN5000            255
 #define SMI_LIVINGSTON               307
 #define SMI_MICROSOFT                311
 #define SMI_3COM                     429
@@ -30,12 +60,22 @@ extern struct tok smi_values[];
 #define SMI_REDBACK                  2352
 #define SMI_JUNIPER                  2636
 #define SMI_APTIS                    2637
+#define SMI_CISCO_VPN3000            3076
 #define SMI_COSINE                   3085
 #define SMI_SHASTA                   3199
+#define SMI_NETSCREEN                3224
 #define SMI_NOMADIX                  3309
+#define SMI_SIEMENS                  4329
+#define SMI_CABLELABS                4491
 #define SMI_UNISPHERE                4874
+#define SMI_CISCO_BBSM               5263
+#define SMI_THE3GPP2                 5535
+#define SMI_IP_UNPLUGGED             5925
 #define SMI_ISSANNI                  5948
 #define SMI_QUINTUM                  6618
+#define SMI_INTERLINK                6728
 #define SMI_COLUBRIS                 8744
 #define SMI_COLUMBIA_UNIVERSITY      11862
 #define SMI_THE3GPP                  10415
+#define SMI_GEMTEK_SYSTEMS           10529
+#define SMI_WIFI_ALLIANCE            14122