diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-12-26 22:26:02 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-12-26 22:26:02 +0000 |
commit | 122051638848c5030b14ba330935b014a7c1d8ae (patch) | |
tree | 0b8405f45e3e1c68b9de09132280bca5f4e363df /epan/dissectors/packet-arp.c | |
parent | dce666e0d111398ffc9f0adbc62557e43d35b421 (diff) |
From Yaniv Kaul: add Ethernet address-to-name (or, at least, address-to-
vendor-name-and-next-three-bytes-in-hex) resolution for Ethernet/802.x
hardware addresses.
Move the ARP hardware types into a header file, for use by dissectors
other than the ARP dissector.
svn path=/trunk/; revision=12839
Diffstat (limited to 'epan/dissectors/packet-arp.c')
-rw-r--r-- | epan/dissectors/packet-arp.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 1af20b4a2f..15d310bea9 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -30,6 +30,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/strutil.h> +#include <epan/arptypes.h> #include <epan/addr_resolv.h> #include "packet-arp.h" #include "etypes.h" @@ -78,36 +79,6 @@ static dissector_handle_t atmarp_handle; */ -/* ARP protocol HARDWARE identifiers. */ -#define ARPHRD_NETROM 0 /* from KA9Q: NET/ROM pseudo */ -#define ARPHRD_ETHER 1 /* Ethernet 10Mbps */ -#define ARPHRD_EETHER 2 /* Experimental Ethernet */ -#define ARPHRD_AX25 3 /* AX.25 Level 2 */ -#define ARPHRD_PRONET 4 /* PROnet token ring */ -#define ARPHRD_CHAOS 5 /* Chaosnet */ -#define ARPHRD_IEEE802 6 /* IEEE 802.2 Ethernet/TR/TB */ -#define ARPHRD_ARCNET 7 /* ARCnet */ -#define ARPHRD_HYPERCH 8 /* Hyperchannel */ -#define ARPHRD_LANSTAR 9 /* Lanstar */ -#define ARPHRD_AUTONET 10 /* Autonet Short Address */ -#define ARPHRD_LOCALTLK 11 /* Localtalk */ -#define ARPHRD_LOCALNET 12 /* LocalNet (IBM PCNet/Sytek LocalNET) */ -#define ARPHRD_ULTRALNK 13 /* Ultra link */ -#define ARPHRD_SMDS 14 /* SMDS */ -#define ARPHRD_DLCI 15 /* Frame Relay DLCI */ -#define ARPHRD_ATM 16 /* ATM */ -#define ARPHRD_HDLC 17 /* HDLC */ -#define ARPHRD_FIBREC 18 /* Fibre Channel */ -#define ARPHRD_ATM2225 19 /* ATM (RFC 2225) */ -#define ARPHRD_SERIAL 20 /* Serial Line */ -#define ARPHRD_ATM2 21 /* ATM */ -#define ARPHRD_MS188220 22 /* MIL-STD-188-220 */ -#define ARPHRD_METRICOM 23 /* Metricom STRIP */ -#define ARPHRD_IEEE1394 24 /* IEEE 1394.1995 */ -#define ARPHRD_MAPOS 25 /* MAPOS */ -#define ARPHRD_TWINAX 26 /* Twinaxial */ -#define ARPHRD_EUI_64 27 /* EUI-64 */ - /* ARP / RARP structs and definitions */ #ifndef ARPOP_REQUEST #define ARPOP_REQUEST 1 /* ARP request. */ |