Resync SMI list against Wireshark

diff --git a/oui.c b/oui.c
index 07993622b4132586c70257c1f6014bd4f019020a..9d4c818ef9bc7b6c29238cbcbcc461990499e851 100644 (file)
--- a/oui.c
+++ b/oui.c
@@ -68,6 +68,8 @@ const struct tok smi_values[] = {
     { SMI_HEWLETT_PACKARD,      "Hewlett Packard"},
     { SMI_SUN_MICROSYSTEMS,     "Sun Microsystems"},
     { SMI_MERIT,                "Merit"},
+    { SMI_AT_AND_T,             "AT&T"},
+    { SMI_MOTOROLA,             "Motorola"},
     { SMI_SHIVA,                "Shiva"},
     { SMI_ERICSSON,             "Ericsson AB"},
     { SMI_CISCO_VPN5000,        "Cisco VPN 5000"},
@@ -81,24 +83,46 @@ const struct tok smi_values[] = {
     { SMI_REDBACK,              "Redback"},
     { SMI_JUNIPER,              "Juniper Networks"},
     { SMI_APTIS,                "Aptis"},
+    { SMI_DT_AG,                "Deutsche Telekom AG"},
+    { SMI_IXIA,                 "Ixia Communications"},
     { SMI_CISCO_VPN3000,        "Cisco VPN 3000"},
     { SMI_COSINE,               "CoSine Communications"},
     { SMI_NETSCREEN,            "Netscreen"},
     { SMI_SHASTA,               "Shasta"},
     { SMI_NOMADIX,              "Nomadix"},
+    { SMI_T_MOBILE,             "T-Mobile"},
+    { SMI_BROADBAND_FORUM,      "The Broadband Forum"},
+    { SMI_ZTE,                  "ZTE"},
     { SMI_SIEMENS,              "Siemens"},
     { SMI_CABLELABS,            "CableLabs"},
     { SMI_UNISPHERE,            "Unisphere Networks"},
     { SMI_CISCO_BBSM,           "Cisco BBSM"},
     { SMI_THE3GPP2,             "3rd Generation Partnership Project 2 (3GPP2)"},
+    { SMI_SKT_TELECOM,          "SK Telecom"},
     { SMI_IP_UNPLUGGED,         "ipUnplugged"},
     { SMI_ISSANNI,              "Issanni Communications"},
+    { SMI_NETSCALER,            "Netscaler"},
+    { SMI_DE_TE_MOBIL,          "T-Mobile"},
     { SMI_QUINTUM,              "Quintum"},
     { SMI_INTERLINK,            "Interlink"},
+    { SMI_CNCTC,                "CNCTC"},
+    { SMI_STARENT_NETWORKS,     "Starent Networks"},
     { SMI_COLUBRIS,             "Colubris"},
-    { SMI_COLUMBIA_UNIVERSITY,  "Columbia University"},
     { SMI_THE3GPP,              "3GPP"},
     { SMI_GEMTEK_SYSTEMS,       "Gemtek-Systems"},
+    { SMI_BARRACUDA,            "Barracuda Networks"},
+    { SMI_ERICSSON_PKT_CORE,    "Ericsson AB - Packet Core Networks"},
+    { SMI_DACOM,                "dacom"},
+    { SMI_COLUMBIA_UNIVERSITY,  "Columbia University"},
+    { SMI_FORTINET,             "Fortinet"},
+    { SMI_VERIZON,              "Verizon Wireless"},
+    { SMI_PLIXER,               "Plixer"},
     { SMI_WIFI_ALLIANCE,        "Wi-Fi Alliance"},
+    { SMI_T_SYSTEMS_NOVA,       "T-Systems Nova"},
+    { SMI_CHINATELECOM_GUANZHOU, "China Telecom - Guangzhou Research Institute"},
+    { SMI_GIGAMON,              "Gigamon Systems"},
+    { SMI_CACE,                 "CACE Technologies"},
+    { SMI_NTOP,                 "ntop"},
+    { SMI_ERICSSON_CANADA_INC,  "Ericsson Canada"},
     { 0, NULL}
 };

diff --git a/oui.h b/oui.h
index a9f732a7cabfd2cf4ffc1fe556bf1bfad147cc69..70708e2c2cd64e447dfffeac2f74740c1ee572e2 100644 (file)
--- a/oui.h
+++ b/oui.h
@@ -57,6 +57,8 @@ extern const struct tok smi_values[];
 #define SMI_HEWLETT_PACKARD          11
 #define SMI_SUN_MICROSYSTEMS         42
 #define SMI_MERIT                    61
+#define SMI_AT_AND_T                 74
+#define SMI_MOTOROLA                 161
 #define SMI_SHIVA                    166
 #define SMI_ERICSSON                 193
 #define SMI_CISCO_VPN5000            255
@@ -70,22 +72,45 @@ extern const struct tok smi_values[];
 #define SMI_REDBACK                  2352
 #define SMI_JUNIPER                  2636
 #define SMI_APTIS                    2637
+#define SMI_DT_AG                    2937
+#define SMI_IXIA                     3054
 #define SMI_CISCO_VPN3000            3076
 #define SMI_COSINE                   3085
 #define SMI_SHASTA                   3199
 #define SMI_NETSCREEN                3224
 #define SMI_NOMADIX                  3309
+#define SMI_T_MOBILE                 3414
+#define SMI_BROADBAND_FORUM          3561
+#define SMI_ZTE                      3902
 #define SMI_SIEMENS                  4329
 #define SMI_CABLELABS                4491
 #define SMI_UNISPHERE                4874
 #define SMI_CISCO_BBSM               5263
 #define SMI_THE3GPP2                 5535
+#define SMI_SKT_TELECOM              5806
 #define SMI_IP_UNPLUGGED             5925
 #define SMI_ISSANNI                  5948
+#define SMI_NETSCALER                5951
+#define SMI_DE_TE_MOBIL              6490
 #define SMI_QUINTUM                  6618
 #define SMI_INTERLINK                6728
+#define SMI_CNCTC                    7951
+#define SMI_STARENT_NETWORKS         8164
 #define SMI_COLUBRIS                 8744
-#define SMI_COLUMBIA_UNIVERSITY      11862
 #define SMI_THE3GPP                  10415
 #define SMI_GEMTEK_SYSTEMS           10529
+#define SMI_BARRACUDA                10704
+#define SMI_ERICSSON_PKT_CORE        10923
+#define SMI_DACOM                    11665
+#define SMI_COLUMBIA_UNIVERSITY      11862
+#define SMI_FORTINET                 12356
+#define SMI_VERIZON                  12951
+#define SMI_PLIXER                   13745
 #define SMI_WIFI_ALLIANCE            14122
+#define SMI_T_SYSTEMS_NOVA           16787
+#define SMI_CHINATELECOM_GUANZHOU    20942
+#define SMI_GIGAMON                  26866
+#define SMI_CACE                     32622
+/* Greater than 32,767 need to be tagged unsigned. */
+#define SMI_NTOP                     35632u
+#define SMI_ERICSSON_CANADA_INC      46098u