Pointers into packet data should usually be pointers to unsigned 1-byte

[tcpdump] / oui.c

diff --git a/oui.c b/oui.c
index c78f46afd8cf6de73b31938c2594b211b3fdfb59..d6106252993ebaa95ac1cb0ab57df6a88bff483e 100644 (file)
--- a/oui.c
+++ b/oui.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.1 2003-11-26 08:49:14 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.6 2005-04-09 21:49:48 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -26,31 +26,70 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 #include "oui.h"
 
-
-/* list taken from ethereal/packet-radius.c */
+/* FIXME complete OUI list using a script */
 
 struct tok oui_values[] = {
-    { OUI_ACC,                  "ACC"},
-    { OUI_CISCO,                "Cisco"},
-    { OUI_SHIVA,                "Shiva"},
-    { OUI_MICROSOFT,            "Microsoft"},
-    { OUI_LIVINGSTON,           "Livingston"},
-    { OUI_3COM,                 "3Com"},
-    { OUI_ASCEND,               "Ascend"},
-    { OUI_BAY,                  "Bay Networks"},
-    { OUI_FOUNDRY,              "Foundry"},
-    { OUI_VERSANET,             "Versanet"},
-    { OUI_REDBACK,              "Redback"},
-    { OUI_JUNIPER,              "Juniper Networks"},
-    { OUI_APTIS,                "Aptis"},
-    { OUI_COSINE,               "CoSine Communications"},
-    { OUI_SHASTA,               "Shasta"},
-    { OUI_NOMADIX,              "Nomadix"},
-    { OUI_UNISPHERE,            "Unisphere Networks"},
-    { OUI_ISSANNI,              "Issanni Communications"},
-    { OUI_QUINTUM,              "Quintum"},
-    { OUI_COLUBRIS,             "Colubris"},
-    { OUI_COLUMBIA_UNIVERSITY,  "Columbia University"},
-    { OUI_THE3GPP,              "3GPP"},
+    { OUI_ENCAP_ETHER, "Ethernet" },
+    { OUI_CISCO, "Cisco" },
+    { OUI_NORTEL, "Nortel Networks SONMP" },
+    { OUI_CISCO_90, "Cisco bridged" },
+    { OUI_RFC2684, "Ethernet bridged" },
+    { OUI_ATM_FORUM, "ATM Forum" },
+    { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" },
+    { OUI_APPLETALK, "Appletalk" },
+    { OUI_JUNIPER, "Juniper" },
+    { OUI_HP, "Hewlett-Packard" },
     { 0, NULL }
 };
+
+/*
+ * SMI Network Management Private Enterprise Codes for organizations.
+ *
+ * XXX - these also appear in FreeRadius dictionary files, with items such
+ * as
+ *
+ *     VENDOR          Cisco           9
+ *
+ * List taken from Ethereal's epan/sminmpec.c.
+ */
+struct tok smi_values[] = {
+    { SMI_IETF,                 "IETF (reserved)"},
+    { SMI_ACC,                  "ACC"},
+    { SMI_CISCO,                "Cisco"},
+    { SMI_HEWLETT_PACKARD,      "Hewlett Packard"},
+    { SMI_SUN_MICROSYSTEMS,     "Sun Microsystems"},
+    { SMI_MERIT,                "Merit"},
+    { SMI_SHIVA,                "Shiva"},
+    { SMI_ERICSSON,             "Ericsson AB"},
+    { SMI_CISCO_VPN5000,        "Cisco VPN 5000"},
+    { SMI_LIVINGSTON,           "Livingston"},
+    { SMI_MICROSOFT,            "Microsoft"},
+    { SMI_3COM,                 "3Com"},
+    { SMI_ASCEND,               "Ascend"},
+    { SMI_BAY,                  "Bay Networks"},
+    { SMI_FOUNDRY,              "Foundry"},
+    { SMI_VERSANET,             "Versanet"},
+    { SMI_REDBACK,              "Redback"},
+    { SMI_JUNIPER,              "Juniper Networks"},
+    { SMI_APTIS,                "Aptis"},
+    { SMI_CISCO_VPN3000,        "Cisco VPN 3000"},
+    { SMI_COSINE,               "CoSine Communications"},
+    { SMI_NETSCREEN,            "Netscreen"},
+    { SMI_SHASTA,               "Shasta"},
+    { SMI_NOMADIX,              "Nomadix"},
+    { SMI_SIEMENS,              "Siemens"},
+    { SMI_CABLELABS,            "CableLabs"},
+    { SMI_UNISPHERE,            "Unisphere Networks"},
+    { SMI_CISCO_BBSM,           "Cisco BBSM"},
+    { SMI_THE3GPP2,             "3rd Generation Partnership Project 2 (3GPP2)"},
+    { SMI_IP_UNPLUGGED,         "ipUnplugged"},
+    { SMI_ISSANNI,              "Issanni Communications"},
+    { SMI_QUINTUM,              "Quintum"},
+    { SMI_INTERLINK,            "Interlink"},
+    { SMI_COLUBRIS,             "Colubris"},
+    { SMI_COLUMBIA_UNIVERSITY,  "Columbia University"},
+    { SMI_THE3GPP,              "3GPP"},
+    { SMI_GEMTEK_SYSTEMS,       "Gemtek-Systems"},
+    { SMI_WIFI_ALLIANCE,        "Wi-Fi Alliance"},
+    { 0, NULL}
+};