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

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>
This commit is contained in:
Marian Durkovic 2014-08-17 11:24:14 +02:00 committed by Michael Mann
parent b8293f95ad
commit 4095bbf9e8
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-isis-clv.h
View File

@ -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 */
/*

19
epan/dissectors/packet-isis-hello.c
View File

@ -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;
@ -517,6 +518,17 @@ dissect_hello_ip_authentication_clv(tvbuff_t *tvb, packet_info* pinfo _U_,
isis_dissect_ip_authentication_clv(tvb, tree, offset, length);
}
/*
* 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()
*
@ -772,6 +784,12 @@ static const isis_clv_handle_t clv_l1_hello_opts[] = {
&ett_isis_hello_clv_mt,
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",
@ -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
};