proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3876 from qlyoung/fmt-fixes

Browse Source 
style fixes...
This commit is contained in:
Mark Stapp 2019-02-28 15:16:16 -05:00 committed by GitHub
commit fd2d11fb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_route.c
View File

@ -3283,7 +3283,7 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id,
extra = bgp_path_info_extra_get(pi); extra = bgp_path_info_extra_get(pi);
if (extra->label != label) { if (extra->label != label) {
memcpy(&extra->label, label, memcpy(&extra->label, label,
num_labels * sizeof(mpls_label_t)); num_labels * sizeof(mpls_label_t));
extra->num_labels = num_labels; extra->num_labels = num_labels;
} }
if (!(afi == AFI_L2VPN && safi == SAFI_EVPN)) if (!(afi == AFI_L2VPN && safi == SAFI_EVPN))
@ -3455,7 +3455,8 @@ int bgp_update(struct peer *peer, struct prefix *p, uint32_t addpath_id,
if (has_valid_label) { if (has_valid_label) {
extra = bgp_path_info_extra_get(new); extra = bgp_path_info_extra_get(new);
if (extra->label != label) { if (extra->label != label) {
memcpy(&extra->label, label, num_labels * sizeof(mpls_label_t)); memcpy(&extra->label, label,
num_labels * sizeof(mpls_label_t));
extra->num_labels = num_labels; extra->num_labels = num_labels;
} }
if (!(afi == AFI_L2VPN && safi == SAFI_EVPN)) if (!(afi == AFI_L2VPN && safi == SAFI_EVPN))

12
zebra/zebra_vxlan.c
View File

@ -7090,9 +7090,10 @@ void zebra_vxlan_print_vnis_detail(struct vty *vty, struct zebra_vrf *zvrf,
zes.zvrf = zvrf; zes.zvrf = zvrf;
/* Display all L2-VNIs */ /* Display all L2-VNIs */
hash_iterate(zvrf->vni_table, (void (*)(struct hash_bucket *, hash_iterate(
void *))zvni_print_hash_detail, zvrf->vni_table,
&zes); (void (*)(struct hash_bucket *, void *))zvni_print_hash_detail,
&zes);
/* Display all L3-VNIs */ /* Display all L3-VNIs */
hash_iterate(zrouter.l3vni_table, hash_iterate(zrouter.l3vni_table,
@ -7101,8 +7102,9 @@ void zebra_vxlan_print_vnis_detail(struct vty *vty, struct zebra_vrf *zvrf,
&zes); &zes);
if (use_json) { if (use_json) {
vty_out(vty, "%s\n", json_object_to_json_string_ext( vty_out(vty, "%s\n",
json, JSON_C_TO_STRING_PRETTY)); json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json_object_free(json); json_object_free(json);
} }
} }