diff options
| author | Russ White <russ@riw.us> | 2018-04-04 20:55:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 20:55:59 -0400 |
| commit | 0c842c46c79e1464a67b5aab3d644ab86f09c8ef (patch) | |
| tree | 22feb5673e7d2e918191904454685f90ed5686fa | |
| parent | 43944e5c112a4b5618afb23623d22cf19cd04b67 (diff) | |
| parent | d7ca63748140a9c5b76ba3a701e71552e17322d1 (diff) | |
Merge pull request #2028 from qlyoung/cleanup-static-route-consistent-ordering
zebra: consistently order static route attributes
| -rw-r--r-- | zebra/zebra_vty.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index ea35c782fd..44f77f84b1 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -2295,6 +2295,13 @@ int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi, if (si->distance != ZEBRA_STATIC_DISTANCE_DEFAULT) 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) { struct vrf *vrf; @@ -2303,13 +2310,6 @@ int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi, (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"); write = 1; |