diff options
author | Simon Zhong <szhong.jnpr@gmail.com> | 2017-03-10 14:11:23 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-03-11 18:43:00 +0000 |
commit | 7d28e99a7c73b9a51be3d2b96dd5f7f2bfb253f3 (patch) | |
tree | e7d9521e01c93eb7ba471c0185c942788907db0f | |
parent | ef05fa513448c82dcdf2b95fdf7534966c925b4d (diff) | |
download | wireshark-7d28e99a7c73b9a51be3d2b96dd5f7f2bfb253f3.tar.gz wireshark-7d28e99a7c73b9a51be3d2b96dd5f7f2bfb253f3.tar.bz2 wireshark-7d28e99a7c73b9a51be3d2b96dd5f7f2bfb253f3.zip |
Updated Address Family Numbers with latest (Last Updated 2016-08-26) IANA table.
Change-Id: I4286a249ca9603732f06e2715c1804a201c105e9
Reviewed-on: https://code.wireshark.org/review/20489
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | epan/afn.c | 11 | ||||
-rw-r--r-- | epan/afn.h | 81 |
2 files changed, 56 insertions, 36 deletions
diff --git a/epan/afn.c b/epan/afn.c index 4574dfa11c..c325cb436d 100644 --- a/epan/afn.c +++ b/epan/afn.c @@ -53,6 +53,11 @@ const value_string afn_vals[] = { { AFNUM_GWID, "GWID" }, { AFNUM_L2VPN, "Layer-2 VPN" }, { AFNUM_L2VPN_OLD, "Layer-2 VPN (old)" }, + { AFNUM_MPLS_TP_SEI, "MPLS-TP Section Endpoint Identifier"}, + { AFNUM_MPLS_TP_LSPEI, "MPLS-TP LSP Endpoint Identifier"}, + { AFNUM_MPLS_TP_PEI, "MPLS-TP Pseudowire Endpoint Identifier"}, + { AFNUM_MT_IP, "MT IP: Multi-Topology IP version 4"}, + { AFNUM_MT_IPV6, "MT IPv6: Multi-Topology IP version 6"}, { AFNUM_EIGRP_COMMON, "EIGRP Common Service Family" }, { AFNUM_EIGRP_IPV4, "EIGRP IPv4 Service Family" }, { AFNUM_EIGRP_IPV6, "EIGRP IPv6 Service Family" }, @@ -60,6 +65,12 @@ const value_string afn_vals[] = { { AFNUM_BGP_LS, "BGP-LS" }, { AFNUM_EUI48, "48-bit MAC Address" }, { AFNUM_EUI64, "64-bit MAC Address" }, + { AFNUM_OUI, "OUI"}, + { AFNUM_MAC_24, "MAC/24"}, + { AFNUM_MAC_40, "MAC/40"}, + { AFNUM_IPv6_64, "IPv6/64"}, + { AFNUM_RB_PID, "RBridge Port ID"}, + { AFNUM_TRILL_NICKNAME, "TRILL Nickname"}, { 65535, "Reserved" }, { 0, NULL }, }; diff --git a/epan/afn.h b/epan/afn.h index 992e3b9d5d..d44e38676d 100644 --- a/epan/afn.h +++ b/epan/afn.h @@ -32,42 +32,51 @@ extern "C" { * * http://www.iana.org/assignments/address-family-numbers */ -#define AFNUM_RESERVED 0 /* Reserved */ -#define AFNUM_INET 1 /* IP (IP version 4) */ -#define AFNUM_INET6 2 /* IP6 (IP version 6) */ -#define AFNUM_NSAP 3 /* NSAP */ -#define AFNUM_HDLC 4 /* HDLC (8-bit multidrop) */ -#define AFNUM_BBN1822 5 /* BBN 1822 */ -#define AFNUM_802 6 /* 802 (includes all 802 media plus Ethernet "canonical format") */ -#define AFNUM_E163 7 /* E.163 */ -#define AFNUM_E164 8 /* E.164 (SMDS, Frame Relay, ATM) */ -#define AFNUM_F69 9 /* F.69 (Telex) */ -#define AFNUM_X121 10 /* X.121 (X.25, Frame Relay) */ -#define AFNUM_IPX 11 /* IPX */ -#define AFNUM_ATALK 12 /* Appletalk */ -#define AFNUM_DECNET 13 /* Decnet IV */ -#define AFNUM_BANYAN 14 /* Banyan Vines */ -#define AFNUM_E164NSAP 15 /* E.164 with NSAP format subaddress */ -#define AFNUM_DNS 16 /* DNS (Domain Name System) */ -#define AFNUM_DISTNAME 17 /* Distinguished Name */ -#define AFNUM_AS_NUMBER 18 /* AS Number */ -#define AFNUM_XTP_IP4 19 /* XTP over IP version 4 */ -#define AFNUM_XTP_IP6 20 /* XTP over IP version 6 */ -#define AFNUM_XTP 21 /* XTP native mode XTP */ -#define AFNUM_FC_WWPN 22 /* Fibre Channel World-Wide Port Name */ -#define AFNUM_FC_WWNN 23 /* Fibre Channel World-Wide Node Name */ -#define AFNUM_GWID 24 /* GWID */ -/* draft-kompella-ppvpn-l2vpn */ -#define AFNUM_L2VPN 25 -#define AFNUM_L2VPN_OLD 196 -#define AFNUM_EIGRP_COMMON 16384 /* EIGRP Common Service Family */ -#define AFNUM_EIGRP_IPV4 16385 /* EIGRP IPv4 Service Family */ -#define AFNUM_EIGRP_IPV6 16386 /* EIGRP IPv6 Service Family */ -#define AFNUM_LCAF 16387 /* LISP Canonical Address Format */ -#define AFNUM_BGP_LS 16388 /* RFC7752 */ -#define AFNUM_EUI48 16389 /* 48-bit MAC Address */ -#define AFNUM_EUI64 16390 /* 64-bit MAC Address */ - +#define AFNUM_RESERVED 0 /* Reserved */ +#define AFNUM_INET 1 /* IP (IP version 4) */ +#define AFNUM_INET6 2 /* IP6 (IP version 6) */ +#define AFNUM_NSAP 3 /* NSAP */ +#define AFNUM_HDLC 4 /* HDLC (8-bit multidrop) */ +#define AFNUM_BBN1822 5 /* BBN 1822 */ +#define AFNUM_802 6 /* 802 (includes all 802 media plus Ethernet "canonical format") */ +#define AFNUM_E163 7 /* E.163 */ +#define AFNUM_E164 8 /* E.164 (SMDS, Frame Relay, ATM) */ +#define AFNUM_F69 9 /* F.69 (Telex) */ +#define AFNUM_X121 10 /* X.121 (X.25, Frame Relay) */ +#define AFNUM_IPX 11 /* IPX */ +#define AFNUM_ATALK 12 /* Appletalk */ +#define AFNUM_DECNET 13 /* Decnet IV */ +#define AFNUM_BANYAN 14 /* Banyan Vines */ +#define AFNUM_E164NSAP 15 /* E.164 with NSAP format subaddress */ +#define AFNUM_DNS 16 /* DNS (Domain Name System) */ +#define AFNUM_DISTNAME 17 /* Distinguished Name */ +#define AFNUM_AS_NUMBER 18 /* AS Number */ +#define AFNUM_XTP_IP4 19 /* XTP over IP version 4 */ +#define AFNUM_XTP_IP6 20 /* XTP over IP version 6 */ +#define AFNUM_XTP 21 /* XTP native mode XTP */ +#define AFNUM_FC_WWPN 22 /* Fibre Channel World-Wide Port Name */ +#define AFNUM_FC_WWNN 23 /* Fibre Channel World-Wide Node Name */ +#define AFNUM_GWID 24 /* GWID */ +#define AFNUM_L2VPN 25 /* RFC4761 RFC6074 */ +#define AFNUM_L2VPN_OLD 196 +#define AFNUM_MPLS_TP_SEI 26 /* MPLS-TP Section Endpoint Identifier, RFC7212 */ +#define AFNUM_MPLS_TP_LSPEI 27 /* MPLS-TP LSP Endpoint Identifier, RFC7212 */ +#define AFNUM_MPLS_TP_PEI 28 /* MPLS-TP Pseudowire Endpoint Identifier, RFC7212 */ +#define AFNUM_MT_IP 29 /* MT IP: Multi-Topology IP version 4, RFC7307 */ +#define AFNUM_MT_IPV6 30 /* MT IPv6: Multi-Topology IP version 6, RFC7307 */ +#define AFNUM_EIGRP_COMMON 16384 /* EIGRP Common Service Family, Donnie Savage */ +#define AFNUM_EIGRP_IPV4 16385 /* EIGRP IPv4 Service Family, Donnie Savage */ +#define AFNUM_EIGRP_IPV6 16386 /* EIGRP IPv6 Service Family, Donnie Savage */ +#define AFNUM_LCAF 16387 /* LISP Canonical Address Format, David Meyer */ +#define AFNUM_BGP_LS 16388 /* BGP-LS, RFC7752 */ +#define AFNUM_EUI48 16389 /* 48-bit MAC, RFC7042 */ +#define AFNUM_EUI64 16390 /* 64-bit MAC, RFC7042 */ +#define AFNUM_OUI 16391 /* OUI, RFC7961 */ +#define AFNUM_MAC_24 16392 /* MAC/24, RFC7961 */ +#define AFNUM_MAC_40 16393 /* MAC/40, RFC7961 */ +#define AFNUM_IPv6_64 16394 /* IPv6/64, RFC7961 */ +#define AFNUM_RB_PID 16395 /* RBridge Port ID, RFC7961 */ +#define AFNUM_TRILL_NICKNAME 16396 /* TRILL Nickname, RFC7455 */ extern const value_string afn_vals[]; #ifdef __cplusplus |