move the SNAP OUI values out of the llc printer into

[tcpdump] / oui.c

diff --git a/oui.c b/oui.c
index 326b15a6ff4255665d90b70f8ffaf1762f4c3a78..f6ce2c84798c473bff65d4e42f48e0631ebcf2e7 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.2 2004-01-25 09:56:15 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/oui.c,v 1.3 2005-04-06 20:09:07 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -28,9 +28,24 @@ 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[] = {
 struct tok oui_values[] = {

-    { 0x009069, "Juniper"},
-    { 0x00000c, "Cisco"},
+    { OUI_ENCAP_ETHER, "Ethernet" },
+    { OUI_CISCO, "Cisco" },
+    { OUI_CISCO_90, "Cisco bridged" },
+    { OUI_RFC2684, "Ethernet bridged" },
+    { OUI_APPLETALK, "Appletalk" },
+    { OUI_JUNIPER, "Juniper"},
+};
+
+static struct tok snap_oui_values[] = {
+    { 0,           NULL }

 };
 
 /* list taken from ethereal/packet-radius.c */
 };
 
 /* list taken from ethereal/packet-radius.c */