move OUI #defines to the header file for other printer to share

diff --git a/oui.c b/oui.c
index f6ce2c84798c473bff65d4e42f48e0631ebcf2e7..9f1748860ac46710ca6acc0b6ff2f19e34b01b18 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.3 2005-04-06 20:09:07 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.4 2005-04-06 20:13:13 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -28,13 +28,6 @@ static const char rcsid[] _U_ =
 
 /* 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[] = {
     { OUI_ENCAP_ETHER, "Ethernet" },
     { OUI_CISCO, "Cisco" },
@@ -44,10 +37,6 @@ struct tok oui_values[] = {
     { OUI_JUNIPER, "Juniper"},
 };
 
-static struct tok snap_oui_values[] = {
-    { 0,           NULL }
-};
-
 /* list taken from ethereal/packet-radius.c */
 
 struct tok smi_values[] = {

diff --git a/oui.h b/oui.h
index a2245e77a3e7dc6c6dfbc3eaf768ef6f84d9f94c..9150daf8e3dfde9e2ffa236ef710aa57776c6c13 100644 (file)
--- a/oui.h
+++ b/oui.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/oui.h,v 1.2 2004-01-25 09:56:15 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/oui.h,v 1.3 2005-04-06 20:13:13 hannes Exp $ (LBL) */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
@@ -17,6 +17,13 @@
 extern struct tok oui_values[];
 extern struct tok smi_values[];
 
+#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 */
+
 #define SMI_ACC                      5
 #define SMI_CISCO                    9
 #define SMI_SHIVA                    166