summaryrefslogtreecommitdiff
path: root/oui.c
diff options
context:
space:
mode:
authorhannes <hannes>2005-04-06 20:09:07 +0000
committerhannes <hannes>2005-04-06 20:09:07 +0000
commit9c2d2a42b58d7e4f7a4416bcfb2945d6a56f81a2 (patch)
treeb3162bc518bb3a0579da61437efa3c40e113dbdf /oui.c
parent46db8e8c994b6d3418565bb41a1cd4dc9f34b141 (diff)
downloadtcpdump-9c2d2a42b58d7e4f7a4416bcfb2945d6a56f81a2.tar.gz
move the SNAP OUI values out of the llc printer into
the global oui.c file and make all SNAP printers use it make the display output of the frame-relay SNAP printer consistent to the LLC SNAP printer (= print oui{id,name}, proto-id)
Diffstat (limited to 'oui.c')
-rw-r--r--oui.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/oui.c b/oui.c
index 326b15a6..f6ce2c84 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.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
@@ -28,9 +28,24 @@ 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[] = {
- { 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 */