diff options
| author | Marian Durkovic <md@bts.sk> | 2014-08-17 11:24:14 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-08-18 00:51:45 +0000 |
| commit | 4095bbf9e802fa64c3424659739f673e8a29a01b (patch) | |
| tree | 6e117c6ee9a62f7414006ab729271be887588699 /epan | |
| parent | b8293f95ad18bc1cc00363627471c880d0f4e5a2 (diff) | |
Make TRILL NEIGHBOR TLV (145) known to ISIS dissector
Update RFC references
Change-Id: I977190e6bfce2c27d33f940d058be3be6a5ef3c0
Reviewed-on: https://code.wireshark.org/review/3669
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-isis-clv.h | 13 | ||||
| -rw-r--r-- | epan/dissectors/packet-isis-hello.c | 19 |
2 files changed, 24 insertions, 8 deletions
diff --git a/epan/dissectors/packet-isis-clv.h b/epan/dissectors/packet-isis-clv.h index a0abf86539..3178b47f5c 100644 --- a/epan/dissectors/packet-isis-clv.h +++ b/epan/dissectors/packet-isis-clv.h @@ -58,13 +58,10 @@ #define ISIS_CLV_EXTD_IP_REACH 135 /* draft-ietf-isis-traffic-05 */ #define ISIS_CLV_HOSTNAME 137 /* rfc2763 */ #define ISIS_CLV_SHARED_RISK_GROUP 138 /* draft-ietf-isis-gmpls-extensions */ -#define ISIS_GRP_ADDR 142 /* draft-ieft-trill-isis-05*//* Our sub-packet dismantle structure for CLV's */ -#define ISIS_CLV_MT_PORT_CAP 143 /* MT port capability (draft-ietf-isis-layer2-11) */ -#define ISIS_CLV_MT_CAP 144 /* MT capability (draft-ietf-isis-ieee-aq-05) - * also: IEEE P802.1aq/D3.6, - * http://www.ietf.org/mail-archive/web/spb-isis/current/msg00007.html - * http://www.iana.org/assignments/isis-tlv-codepoints/isis-tlv-codepoints.xml#tlv-143, - */ +#define ISIS_GRP_ADDR 142 /* rfc7176 */ +#define ISIS_CLV_MT_PORT_CAP 143 /* rfc6165, rfc7176 */ +#define ISIS_CLV_MT_CAP 144 /* rfc6329, rfc7176 */ +#define ISIS_CLV_TRILL_NEIGHBOR 145 /* rfc7176 */ #define ISIS_CLV_RESTART 211 /* draft-ietf-isis-restart-01 */ #define ISIS_CLV_MT_IS_REACH 222 /* draft-ietf-isis-wg-multi-topology-05 */ #define ISIS_CLV_MT_SUPPORTED 229 /* draft-ietf-isis-wg-multi-topology-05 */ @@ -74,7 +71,7 @@ #define ISIS_CLV_MT_IP6_REACH 237 /* draft-ietf-isis-wg-multi-topology-05 */ #define ISIS_CLV_PTP_ADJ_STATE 240 /* rfc3373 */ #define ISIS_CLV_IIH_SEQNR 241 /* draft-shen-isis-iih-sequence-00 */ -#define ISIS_CLV_RT_CAPABLE 242 /* TRILL use of IS-IS RFC 6326 */ +#define ISIS_CLV_RT_CAPABLE 242 /* rfc4971, rfc7176 */ #define ISIS_CLV_VENDOR_PRIVATE 250 /* draft-ietf-isis-proprietary-tlv-00 */ /* diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 15aa5e3ed6..6aa9e58884 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -126,6 +126,7 @@ static gint ett_isis_hello_clv_mt_port_cap_spb_mcid = -1; static gint ett_isis_hello_clv_mt_port_cap_spb_aux_mcid = -1; static gint ett_isis_hello_clv_mt_port_cap_spb_digest = -1; static gint ett_isis_hello_clv_mt_port_cap_spb_bvid_tuples = -1; +static gint ett_isis_hello_clv_trill_neighbor = -1; static gint ett_isis_hello_clv_checksum = -1; static expert_field ei_isis_hello_short_packet = EI_INIT; @@ -518,6 +519,17 @@ dissect_hello_ip_authentication_clv(tvbuff_t *tvb, packet_info* pinfo _U_, } /* + * Name: dissect_hello_trill_neighbor_clv + */ +static void +dissect_hello_trill_neighbor_clv(tvbuff_t *tvb, packet_info* pinfo, + proto_tree *tree, int offset, int id_length _U_, int length) { + + /* TODO Implement dissector according to RFC7176 section 2.5 */ + +} + +/* * Name: dissect_hello_checksum_clv() * * Description: @@ -773,6 +785,12 @@ static const isis_clv_handle_t clv_l1_hello_opts[] = { dissect_hello_mt_clv }, { + ISIS_CLV_TRILL_NEIGHBOR, + "TRILL Neighbor", + &ett_isis_hello_clv_trill_neighbor, + dissect_hello_trill_neighbor_clv + }, + { ISIS_CLV_CHECKSUM, "Checksum", &ett_isis_hello_clv_checksum, @@ -1177,6 +1195,7 @@ proto_register_isis_hello(void) &ett_isis_hello_clv_mt_port_cap_spb_aux_mcid, &ett_isis_hello_clv_mt_port_cap_spb_digest, &ett_isis_hello_clv_mt_port_cap_spb_bvid_tuples, + &ett_isis_hello_clv_trill_neighbor, &ett_isis_hello_clv_checksum }; |