Correctly check for various values of the ICMP type field.

[tcpdump] / oui.c

diff --git a/oui.c b/oui.c
index f6ce2c84798c473bff65d4e42f48e0631ebcf2e7..422cd161b847cffa48a613ba6fa2a577efb4fc2a 100644 (file)
--- a/oui.c
+++ b/oui.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.3 2005-04-06 20:09:07 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.9 2008-01-09 09:40:47 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -28,34 +28,45 @@ static const char rcsid[] _U_ =
 
 /* FIXME complete OUI list using a script */
 
 
 /* FIXME complete OUI list using a script */
 

-#define        OUI_ENCAP_ETHER 0x000000        /* encapsulated Ethernet */
-#define        OUI_CISCO       0x00000c        /* Cisco protocols */
-#define        OUI_CISCO_90    0x0000f8        /* Cisco bridging */
-#define OUI_RFC2684    0x0080c2        /* RFC 2684 bridged Ethernet */
-#define        OUI_APPLETALK   0x080007        /* Appletalk */
-#define OUI_JUNIPER     0x009069        /* Juniper */
-
-struct tok oui_values[] = {
+const struct tok oui_values[] = {

     { OUI_ENCAP_ETHER, "Ethernet" },
     { OUI_CISCO, "Cisco" },
     { OUI_ENCAP_ETHER, "Ethernet" },
     { OUI_CISCO, "Cisco" },

+    { OUI_NORTEL, "Nortel Networks SONMP" },

     { OUI_CISCO_90, "Cisco bridged" },
     { OUI_RFC2684, "Ethernet bridged" },
     { OUI_CISCO_90, "Cisco bridged" },
     { OUI_RFC2684, "Ethernet bridged" },

+    { OUI_ATM_FORUM, "ATM Forum" },
+    { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" },

     { OUI_APPLETALK, "Appletalk" },
     { OUI_APPLETALK, "Appletalk" },

-    { OUI_JUNIPER, "Juniper"},
-};
-
-static struct tok snap_oui_values[] = {
-    { 0,           NULL }
+    { OUI_JUNIPER, "Juniper" },
+    { OUI_HP, "Hewlett-Packard" },
+    { OUI_IEEE_8021_PRIVATE, "IEEE 802.1 Private"},
+    { OUI_IEEE_8023_PRIVATE, "IEEE 802.3 Private"},
+    { OUI_TIA, "ANSI/TIA"},
+    { 0, NULL }

 };
 
 };
 

-/* list taken from ethereal/packet-radius.c */
-
-struct tok smi_values[] = {
+/*
+ * 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.
+ */
+const struct tok smi_values[] = {
+    { SMI_IETF,                 "IETF (reserved)"},

     { SMI_ACC,                  "ACC"},
     { SMI_CISCO,                "Cisco"},
     { SMI_ACC,                  "ACC"},
     { SMI_CISCO,                "Cisco"},

+    { SMI_HEWLETT_PACKARD,      "Hewlett Packard"},
+    { SMI_SUN_MICROSYSTEMS,     "Sun Microsystems"},
+    { SMI_MERIT,                "Merit"},

     { SMI_SHIVA,                "Shiva"},
     { SMI_SHIVA,                "Shiva"},

-    { SMI_MICROSOFT,            "Microsoft"},
+    { SMI_ERICSSON,             "Ericsson AB"},
+    { SMI_CISCO_VPN5000,        "Cisco VPN 5000"},

     { SMI_LIVINGSTON,           "Livingston"},
     { SMI_LIVINGSTON,           "Livingston"},

+    { SMI_MICROSOFT,            "Microsoft"},

     { SMI_3COM,                 "3Com"},
     { SMI_ASCEND,               "Ascend"},
     { SMI_BAY,                  "Bay Networks"},
     { SMI_3COM,                 "3Com"},
     { SMI_ASCEND,               "Ascend"},
     { SMI_BAY,                  "Bay Networks"},


@@ -64,14 +75,24 @@ struct tok smi_values[] = {
     { SMI_REDBACK,              "Redback"},
     { SMI_JUNIPER,              "Juniper Networks"},
     { SMI_APTIS,                "Aptis"},
     { SMI_REDBACK,              "Redback"},
     { SMI_JUNIPER,              "Juniper Networks"},
     { SMI_APTIS,                "Aptis"},

+    { SMI_CISCO_VPN3000,        "Cisco VPN 3000"},

     { SMI_COSINE,               "CoSine Communications"},
     { SMI_COSINE,               "CoSine Communications"},

+    { SMI_NETSCREEN,            "Netscreen"},

     { SMI_SHASTA,               "Shasta"},
     { SMI_NOMADIX,              "Nomadix"},
     { SMI_SHASTA,               "Shasta"},
     { SMI_NOMADIX,              "Nomadix"},

+    { SMI_SIEMENS,              "Siemens"},
+    { SMI_CABLELABS,            "CableLabs"},

     { SMI_UNISPHERE,            "Unisphere Networks"},
     { 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_ISSANNI,              "Issanni Communications"},
     { SMI_QUINTUM,              "Quintum"},

+    { SMI_INTERLINK,            "Interlink"},

     { SMI_COLUBRIS,             "Colubris"},
     { SMI_COLUMBIA_UNIVERSITY,  "Columbia University"},
     { SMI_THE3GPP,              "3GPP"},
     { SMI_COLUBRIS,             "Colubris"},
     { SMI_COLUMBIA_UNIVERSITY,  "Columbia University"},
     { SMI_THE3GPP,              "3GPP"},

-    { 0, NULL }
+    { SMI_GEMTEK_SYSTEMS,       "Gemtek-Systems"},
+    { SMI_WIFI_ALLIANCE,        "Wi-Fi Alliance"},
+    { 0, NULL}

 };
 };