proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 17:32:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2028 from qlyoung/cleanup-static-route-consistent-ordering

Browse Source 
zebra: consistently order static route attributes
This commit is contained in:
Russ White 2018-04-04 20:55:59 -04:00 committed by GitHub
commit 0c842c46c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zebra/zebra_vty.c
View File

@ -2295,6 +2295,13 @@ int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
if (si->distance != ZEBRA_STATIC_DISTANCE_DEFAULT) if (si->distance != ZEBRA_STATIC_DISTANCE_DEFAULT)
vty_out(vty, " %d", si->distance); vty_out(vty, " %d", si->distance);
/* Label information */
if (si->snh_label.num_labels)
vty_out(vty, " label %s",
mpls_label2str(si->snh_label.num_labels,
si->snh_label.label, buf,
sizeof buf, 0));
if (si->nh_vrf_id != si->vrf_id) { if (si->nh_vrf_id != si->vrf_id) {
struct vrf *vrf; struct vrf *vrf;
@ -2303,13 +2310,6 @@ int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
(vrf) ? vrf->name : "Unknown"); (vrf) ? vrf->name : "Unknown");
} }
/* Label information */
if (si->snh_label.num_labels)
vty_out(vty, " label %s",
mpls_label2str(si->snh_label.num_labels,
si->snh_label.label, buf,
sizeof buf, 0));
vty_out(vty, "\n"); vty_out(vty, "\n");
write = 1; write = 1;