osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update ARP hardware types from http://www.iana.org/assignments/arp-parameters/ 

svn path=/trunk/; revision=27120
This commit is contained in:
Jaap Keuter 2008-12-27 14:30:46 +00:00
parent 0f486eb479
commit 5f96568834
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/arptypes.h
View File

@ -64,6 +64,14 @@ extern "C" {
#define ARPHRD_MAPOS 25 /* MAPOS */
#define ARPHRD_TWINAX 26 /* Twinaxial */
#define ARPHRD_EUI_64 27 /* EUI-64 */
#define ARPHRD_HIPARP 28 /* HIPARP */
#define ARPHRD_IP_ARP_ISO_7816_3 29 /* IP and ARP over ISO 7816-3 */
#define ARPHRD_ARPSEC 30 /* ARPSec */
#define ARPHRD_IPSEC_TUNNEL 31 /* IPsec tunnel */
#define ARPHRD_INFINIBAND 32 /* InfiniBand */
#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 */
/* Virtual ARP types for non ARP hardware used in Linux cooked mode. */
#define ARPHRD_IPGRE 778 /* GRE over IP */

8
epan/dissectors/packet-arp.c
View File

@ -288,6 +288,14 @@ static const value_string hrd_vals[] = {
{ARPHRD_MAPOS, "MAPOS" },
{ARPHRD_TWINAX, "Twinaxial" },
{ARPHRD_EUI_64, "EUI-64" },
{ARPHRD_HIPARP, "HIPARP" },
{ARPHRD_IP_ARP_ISO_7816_3, "IP and ARP over ISO 7816-3"},
{ARPHRD_ARPSEC, "ARPSec" },
{ARPHRD_IPSEC_TUNNEL, "IPsec tunnel"},
{ARPHRD_INFINIBAND, "InfiniBand" },
{ARPHRD_TIA_102_PRJ_25_CAI, "TIA-102 Project 25 CAI"},
{ARPHRD_WIEGAND_INTERFACE, "Wiegand Interface"},
{ARPHRD_PURE_IP, "Pure IP" },
{0, NULL } };
const gchar *