From 7c014c044e2716b0a3dfa832ecad83262c93fbc0 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 24 Jan 2017 16:40:13 -0800 Subject: Update comment, clean up identation. Change-Id: I30812657e3fa5dc21e64ed2fb7605e5f2a36ab03 Reviewed-on: https://code.wireshark.org/review/19770 Reviewed-by: Guy Harris --- epan/dissectors/packet-bgp.c | 144 +++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index eef1ca0adb..daedb19097 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -4392,8 +4392,8 @@ static int decode_evpn_nlri_esi(proto_tree *tree, tvbuff_t *tvb, gint offset, pa } /* - * * Decode EVPN NLRI, http://tools.ietf.org/html/draft-ietf-l2vpn-evpn-05#section-7.1 - * */ + * Decode EVPN NLRI, RFC 7432 section 7.7 + */ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet_info *pinfo) { int reader_offset = offset; int start_offset = offset+2; @@ -8689,7 +8689,7 @@ proto_register_bgp(void) { &hf_bgp_mdt_nlri_safi_ipv4_addr, { "IPv4 Address", "bgp.mdt_safi_ipv4_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_mdt_nlri_safi_group_addr, + { &hf_bgp_mdt_nlri_safi_group_addr, { "Group Address", "bgp.mdt_safi_group_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}}, /* BGP update extended community header field */ @@ -9284,212 +9284,212 @@ proto_register_bgp(void) { &hf_bgp_ls_node_flag_bits_abr, { "ABR Bit", "bgp.ls.node_flag_bits.abr", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x10, NULL, HFILL}}, - { &hf_bgp_evpn_nlri, + { &hf_bgp_evpn_nlri, { "EVPN NLRI", "bgp.evpn.nlri", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_bgp_evpn_nlri_rt, { "AFI", "bgp.evpn.nlri.rt", FT_UINT8, BASE_DEC, VALS(evpnrtypevals), 0x0, "EVPN Route Type", HFILL }}, - { &hf_bgp_evpn_nlri_len, - { "Length", "bgp.evpn.nlri.len", FT_UINT8, + { &hf_bgp_evpn_nlri_len, + { "Length", "bgp.evpn.nlri.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_rd, + { &hf_bgp_evpn_nlri_rd, { "Route Distinguisher", "bgp.evpn.nlri.rd", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_esi, + { &hf_bgp_evpn_nlri_esi, { "ESI", "bgp.evpn.nlri.esi", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_type, + { &hf_bgp_evpn_nlri_esi_type, { "ESI Type", "bgp.evpn.nlri.esi.type", FT_UINT8, BASE_DEC, VALS(evpn_nlri_esi_type), 0x0, "EVPN ESI type", HFILL }}, - { &hf_bgp_evpn_nlri_esi_lacp_mac, + { &hf_bgp_evpn_nlri_esi_lacp_mac, { "CE LACP system MAC", "bgp.evpn.nlri.esi.lacp_mac", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_portk, + { &hf_bgp_evpn_nlri_esi_portk, { "LACP port key", "bgp.evpn.nlri.esi.lacp_portkey", FT_BYTES, SEP_SPACE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_remain, + { &hf_bgp_evpn_nlri_esi_remain, { "Remaining bytes", "bgp.evpn.nlri.esi.remaining", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_reserved, + { &hf_bgp_evpn_nlri_esi_reserved, { "Reserved value all 0xff", "bgp.evpn.nlri.esi.reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_value, + { &hf_bgp_evpn_nlri_esi_value, { "ESI 9 bytes value", "bgp.evpn.nlri.esi.arbitrary_bytes", FT_BYTES, SEP_SPACE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_rb_mac, + { &hf_bgp_evpn_nlri_esi_rb_mac, { "ESI root bridge MAC", "bgp.evpn.nlri.esi.root_brige", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_rbprio, + { &hf_bgp_evpn_nlri_esi_rbprio, { "ESI root bridge priority", "bgp.evpn.nlri.esi.rb_prio", FT_BYTES, SEP_SPACE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_sys_mac, + { &hf_bgp_evpn_nlri_esi_sys_mac, { "ESI system MAC", "bgp.evpn.nlri.esi.system_mac", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_mac_discr, + { &hf_bgp_evpn_nlri_esi_mac_discr, { "ESI system mac discriminator", "bgp.evpn.nlri.esi.system_mac_discr", FT_BYTES, SEP_SPACE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_router_id, + { &hf_bgp_evpn_nlri_esi_router_id, { "ESI router ID", "bgp.evpn.nlri.esi.router_id", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_router_discr, + { &hf_bgp_evpn_nlri_esi_router_discr, { "ESI router discriminator", "bgp.evpn.nlri.esi.router_discr", FT_BYTES, SEP_SPACE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_asn, + { &hf_bgp_evpn_nlri_esi_asn, { "ESI ASN", "bgp.evpn.nlri.esi.asn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_esi_asn_discr, + { &hf_bgp_evpn_nlri_esi_asn_discr, { "ESI ASN discriminator", "bgp.evpn.nlri.esi.asn_discr", FT_BYTES, SEP_SPACE, NULL, 0x0, NULL, HFILL }}, - { &hf_bgp_evpn_nlri_etag, + { &hf_bgp_evpn_nlri_etag, { "Ethernet Tag ID", "bgp.evpn.nlri.etag", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_mpls_ls1, + { &hf_bgp_evpn_nlri_mpls_ls1, { "MPLS Label Stack 1", "bgp.evpn.nlri.mpls_ls1", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_mpls_ls2, + { &hf_bgp_evpn_nlri_mpls_ls2, { "MPLS Label Stack 2", "bgp.evpn.nlri.mpls_ls2", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_maclen, + { &hf_bgp_evpn_nlri_maclen, { "MAC Address Length", "bgp.evpn.nlri.maclen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_mac_addr, + { &hf_bgp_evpn_nlri_mac_addr, { "MAC Address", "bgp.evpn.nlri.mac_addr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_iplen, - { "IP Address Length", "bgp.evpn.nlri.iplen", FT_UINT8, + { &hf_bgp_evpn_nlri_iplen, + { "IP Address Length", "bgp.evpn.nlri.iplen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_prefix_len, + { &hf_bgp_evpn_nlri_prefix_len, { "IP prefix length", "bgp.evpn.nlri.prefix_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_ip_addr, + { &hf_bgp_evpn_nlri_ip_addr, { "IPv4 address", "bgp.evpn.nlri.ip.addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_ipv6_addr, + { &hf_bgp_evpn_nlri_ipv6_addr, { "IPv6 address", "bgp.evpn.nlri.ipv6.addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_ipv4_gtw, + { &hf_bgp_evpn_nlri_ipv4_gtw, { "IPv4 Gateway address", "bgp.evpn.nlri.ipv4.gtw_addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_evpn_nlri_ipv6_gtw, + { &hf_bgp_evpn_nlri_ipv6_gtw, { "IPv6 Gateway address", "bgp.evpn.nlri.ipv6.gtw_addr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}}, /* segment routing extentions to link state */ /* Node Attributes TLVs */ - { &hf_bgp_ls_sr_tlv_capabilities, + { &hf_bgp_ls_sr_tlv_capabilities, { "SR Capabilities", "bgp.ls.sr.tlv.capabilities", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_flags, + { &hf_bgp_ls_sr_tlv_capabilities_flags, { "Flags", "bgp.ls.sr.tlv.capabilities.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_flags_i, + { &hf_bgp_ls_sr_tlv_capabilities_flags_i, { "MPLS IPv4 flag (I)", "bgp.ls.sr.tlv.capabilities.flags.i", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_CAPABILITY_FLAG_I, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_flags_v, + { &hf_bgp_ls_sr_tlv_capabilities_flags_v, { "MPLS IPv6 flag (V)", "bgp.ls.sr.tlv.capabilities.flags.v", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_CAPABILITY_FLAG_V, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_flags_h, + { &hf_bgp_ls_sr_tlv_capabilities_flags_h, { "SR-IPv6 flag (H)", "bgp.ls.sr.tlv.capabilities.flags.h", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_CAPABILITY_FLAG_H, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_flags_reserved, + { &hf_bgp_ls_sr_tlv_capabilities_flags_reserved, { "Reserved", "bgp.ls.sr.tlv.capabilities.flags.reserved", FT_UINT8, BASE_HEX, NULL, 0x1F, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_range_size, + { &hf_bgp_ls_sr_tlv_capabilities_range_size, { "Range Size", "bgp.ls.sr.tlv.capabilities.range_size", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_sid_label, + { &hf_bgp_ls_sr_tlv_capabilities_sid_label, { "From Label", "bgp.ls.sr.tlv.capabilities.sid.label", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_capabilities_sid_index, + { &hf_bgp_ls_sr_tlv_capabilities_sid_index, { "From Index", "bgp.ls.sr.tlv.capabilities.sid.index", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_algorithm, + { &hf_bgp_ls_sr_tlv_algorithm, { "SR Algorithm", "bgp.ls.sr.tlv.algorithm", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_algorithm_value, + { &hf_bgp_ls_sr_tlv_algorithm_value, { "SR Algorithm", "bgp.ls.sr.tlv.algorithm.value", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, /* Prefix Attribute TLVs */ - { &hf_bgp_ls_sr_tlv_prefix_sid, + { &hf_bgp_ls_sr_tlv_prefix_sid, { "Prefix SID TLV", "bgp.ls.sr.tlv.prefix.sid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags, { "Flags", "bgp.ls.sr.tlv.prefix.sid.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_r, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_r, { "Re-advertisement (R)", "bgp.ls.sr.tlv.prefix.sid.flags.r", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_R, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_n, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_n, { "Node-SID (N)", "bgp.ls.sr.tlv.prefix.sid.flags.n", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_N, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_np, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_np, { "No-PHP (NP)", "bgp.ls.sr.tlv.prefix.sid.flags.np", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_NP, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_p, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_p, { "No-PHP (P)", "bgp.ls.sr.tlv.prefix.sid.flags.p", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_P, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_m, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_m, { "Mapping Server Flag (M)", "bgp.ls.sr.tlv.prefix.sid.flags.m", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_M, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_e, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_e, { "Explicit-Null (E)", "bgp.ls.sr.tlv.prefix.sid.flags.e", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_E, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_v, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_v, { "Value (V)", "bgp.ls.sr.tlv.prefix.sid.flags.v", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_V, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_flags_l, + { &hf_bgp_ls_sr_tlv_prefix_sid_flags_l, { "Local (L)", "bgp.ls.sr.tlv.prefix.sid.flags.l", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_PREFIX_SID_FLAG_L, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_algo, + { &hf_bgp_ls_sr_tlv_prefix_sid_algo, { "Algorithm", "bgp.ls.sr.tlv.prefix.sid.algo", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_label, + { &hf_bgp_ls_sr_tlv_prefix_sid_label, { "SID/Label", "bgp.ls.sr.tlv.prefix.sid.label", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_prefix_sid_index, + { &hf_bgp_ls_sr_tlv_prefix_sid_index, { "SID/Index", "bgp.ls.sr.tlv.prefix.sid.index", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, /* Adjacency Attribute TLVs */ - { &hf_bgp_ls_sr_tlv_adjacency_sid, + { &hf_bgp_ls_sr_tlv_adjacency_sid, { "Adjacency SID TLV", "bgp.ls.sr.tlv.adjacency.sid", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags, { "Flags", "bgp.ls.sr.tlv.adjacency.sid.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_fi, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_fi, { "Address-Family flag (F)", "bgp.ls.sr.tlv.adjacency.sid.flags.f", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_FI, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_bo, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_bo, { "Backup Flag (B)", "bgp.ls.sr.tlv.adjacency.sid.flags.b", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_BO, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_bi, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_bi, { "Backup Flag (B)", "bgp.ls.sr.tlv.adjacency.sid.flags.b", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_BI, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_vo, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_vo, { "Value Flag (V)", "bgp.ls.sr.tlv.adjacency.sid.flags.v", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_VO, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_vi, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_vi, { "Value Flag (V)", "bgp.ls.sr.tlv.adjacency.sid.flags.v", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_VI, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_lo, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_lo, { "Local Flag (L)", "bgp.ls.sr.tlv.adjacency.sid.flags.l", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_LO, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_li, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_li, { "Local Flag (L)", "bgp.ls.sr.tlv.adjacency.sid.flags.l", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_LI, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_so, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_so, { "Set Flag (S)", "bgp.ls.sr.tlv.adjacency.sid.flags.s", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_SO, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_si, + { &hf_bgp_ls_sr_tlv_adjacency_sid_flags_si, { "Set Flag (S)", "bgp.ls.sr.tlv.adjacency.sid.flags.s", FT_BOOLEAN, 8, TFS(&tfs_set_notset), BGP_LS_SR_ADJACENCY_SID_FLAG_SI, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_weight, + { &hf_bgp_ls_sr_tlv_adjacency_sid_weight, { "Weight", "bgp.ls.sr.tlv.adjacency.sid.weight", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_label, + { &hf_bgp_ls_sr_tlv_adjacency_sid_label, { "SID/Label", "bgp.ls.sr.tlv.adjacency.sid.label", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL}}, - { &hf_bgp_ls_sr_tlv_adjacency_sid_index, + { &hf_bgp_ls_sr_tlv_adjacency_sid_index, { "SID/Index", "bgp.ls.sr.tlv.adjacency.sid.index", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}} }; -- cgit v1.2.1