diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-07-18 16:01:11 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-07-18 16:01:11 +0000 |
| commit | 31c67f8a03e704912f11e9c4972b53efe6595e55 (patch) | |
| tree | 5f6086e86db78d00f5b5198f5b21c345f7ceac9f | |
| parent | 28006dfb4f93b04ce08b00e435b5c47364587eae (diff) | |
| download | wireshark-31c67f8a03e704912f11e9c4972b53efe6595e55.tar.gz | |
Added some ARP options from RFC 5494.
svn path=/trunk/; revision=33568
| -rw-r--r-- | epan/arptypes.h | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-arp.c | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/epan/arptypes.h b/epan/arptypes.h index c10cb060d0..6f5fc2d0dd 100644 --- a/epan/arptypes.h +++ b/epan/arptypes.h @@ -72,6 +72,9 @@ extern "C" { #define ARPHRD_TIA_102_PRJ_25_CAI 33 /* TIA-102 Project 25 CAI */ #define ARPHRD_WIEGAND_INTERFACE 34 /* Wiegand Interface */ #define ARPHRD_PURE_IP 35 /* Pure IP */ +#define ARPHDR_HW_EXP1 36 /* HW_EXP1 */ +#define ARPHDR_HFI 37 /* HFI */ +#define ARPHDR_HW_EXP2 256 /* HW_EXP2 */ /* Virtual ARP types for non ARP hardware used in Linux cooked mode. */ #define ARPHRD_IPGRE 778 /* GRE over IP */ diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index ea6579054e..b3d8da03fa 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -141,6 +141,12 @@ struct address_hash_value { #ifndef ATMARPOP_NAK #define ATMARPOP_NAK 10 /* ATMARP NAK. */ #endif +#ifndef ARPOP_EXP1 +#define ARPOP_EXP1 24 /* Experimental 1 */ +#endif +#ifndef ARPOP_EXP2 +#define ARPOP_EXP2 25 /* Experimental 2 */ +#endif static const value_string op_vals[] = { {ARPOP_REQUEST, "request" }, @@ -149,6 +155,8 @@ static const value_string op_vals[] = { {ARPOP_RREPLY, "reverse reply" }, {ARPOP_IREQUEST, "inverse request"}, {ARPOP_IREPLY, "inverse reply" }, + {ARPOP_EXP1, "experimental 1" }, + {ARPOP_EXP2, "experimental 2" }, {0, NULL } }; static const value_string atmop_vals[] = { @@ -296,6 +304,9 @@ static const value_string hrd_vals[] = { {ARPHRD_TIA_102_PRJ_25_CAI, "TIA-102 Project 25 CAI"}, {ARPHRD_WIEGAND_INTERFACE, "Wiegand Interface"}, {ARPHRD_PURE_IP, "Pure IP" }, + {ARPHDR_HW_EXP1, "Experimental 1"}, + {ARPHDR_HFI, "HFI" }, + {ARPHDR_HW_EXP2, "Experimental 2"}, {0, NULL } }; const gchar * |