fixed confusion around OUI and SMI values

3 files changed, 56 insertions, 49 deletions

diff --git a/oui.c b/oui.c
index c78f46af..326b15a6 100644
--- 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.2 2004-01-25 09:56:15 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -26,31 +26,37 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 #include "oui.h"
 
+/* FIXME complete OUI list using a script */
+
+struct tok oui_values[] = {
+    { 0x009069, "Juniper"},
+    { 0x00000c, "Cisco"},
+};
 
 /* list taken from ethereal/packet-radius.c */
 
-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"},
+struct tok smi_values[] = {
+    { SMI_ACC,                  "ACC"},
+    { SMI_CISCO,                "Cisco"},
+    { SMI_SHIVA,                "Shiva"},
+    { SMI_MICROSOFT,            "Microsoft"},
+    { SMI_LIVINGSTON,           "Livingston"},
+    { 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_COSINE,               "CoSine Communications"},
+    { SMI_SHASTA,               "Shasta"},
+    { SMI_NOMADIX,              "Nomadix"},
+    { SMI_UNISPHERE,            "Unisphere Networks"},
+    { SMI_ISSANNI,              "Issanni Communications"},
+    { SMI_QUINTUM,              "Quintum"},
+    { SMI_COLUBRIS,             "Colubris"},
+    { SMI_COLUMBIA_UNIVERSITY,  "Columbia University"},
+    { SMI_THE3GPP,              "3GPP"},
     { 0, NULL }
 };
diff --git a/oui.h b/oui.h
index 5a41805b..a2245e77 100644
--- a/oui.h
+++ b/oui.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/oui.h,v 1.1 2003-11-26 08:49:14 hannes Exp $ (LBL) */
+/* @(#) $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
@@ -15,26 +15,27 @@
  */
 
 extern struct tok oui_values[];
+extern struct tok smi_values[];
 
-#define OUI_ACC                      5
-#define OUI_CISCO                    9
-#define OUI_SHIVA                    166
-#define OUI_LIVINGSTON               307
-#define OUI_MICROSOFT                311
-#define OUI_3COM                     429
-#define OUI_ASCEND                   529
-#define OUI_BAY                      1584
-#define OUI_FOUNDRY                  1991
-#define OUI_VERSANET                 2180
-#define OUI_REDBACK                  2352
-#define OUI_JUNIPER                  2636
-#define OUI_APTIS                    2637
-#define OUI_COSINE                   3085
-#define OUI_SHASTA                   3199
-#define OUI_NOMADIX                  3309
-#define OUI_UNISPHERE                4874
-#define OUI_ISSANNI                  5948
-#define OUI_QUINTUM                  6618
-#define OUI_COLUBRIS                 8744
-#define OUI_COLUMBIA_UNIVERSITY      11862
-#define OUI_THE3GPP                  10415
+#define SMI_ACC                      5
+#define SMI_CISCO                    9
+#define SMI_SHIVA                    166
+#define SMI_LIVINGSTON               307
+#define SMI_MICROSOFT                311
+#define SMI_3COM                     429
+#define SMI_ASCEND                   529
+#define SMI_BAY                      1584
+#define SMI_FOUNDRY                  1991
+#define SMI_VERSANET                 2180
+#define SMI_REDBACK                  2352
+#define SMI_JUNIPER                  2636
+#define SMI_APTIS                    2637
+#define SMI_COSINE                   3085
+#define SMI_SHASTA                   3199
+#define SMI_NOMADIX                  3309
+#define SMI_UNISPHERE                4874
+#define SMI_ISSANNI                  5948
+#define SMI_QUINTUM                  6618
+#define SMI_COLUBRIS                 8744
+#define SMI_COLUMBIA_UNIVERSITY      11862
+#define SMI_THE3GPP                  10415
diff --git a/print-radius.c b/print-radius.c
index a99d036d..b4fc6f61 100644
--- a/print-radius.c
+++ b/print-radius.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "$Id: print-radius.c,v 1.25 2004-01-25 09:31:14 hannes Exp $";
+    "$Id: print-radius.c,v 1.26 2004-01-25 09:56:15 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -503,7 +503,7 @@ print_vendor_attr(register u_char *data, u_int length, u_short attr_code _U_)
     length-=4;
 
     printf("Vendor: %s (%u)",
-           tok2str(oui_values,"Unknown",vendor_id),
+           tok2str(smi_values,"Unknown",vendor_id),
            vendor_id);
 
     while (length >= 2) {