diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2018-01-23 08:25:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 08:25:01 +0100 |
| commit | d6fed381094ba34c04166b08cd16af01f6c263ea (patch) | |
| tree | 84eef98e9afe3c57dc9dff2e28a117c79511b936 /zebra/zebra_vrf.c | |
| parent | 5c6580957d18884f12dd8cdab9945b6f6bafd0ce (diff) | |
| parent | 61408536df768ec97b235b463453b64f4e813369 (diff) | |
Merge pull request #1618 from donaldsharp/zebra_startup_ordering
zebra route-leaking for static routes
Diffstat (limited to 'zebra/zebra_vrf.c')
| -rw-r--r-- | zebra/zebra_vrf.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index 1ae9eac61f..95426683a8 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -476,12 +476,18 @@ static int vrf_config_write(struct vty *vty) if (!zvrf) continue; - if (strcmp(zvrf_name(zvrf), VRF_DEFAULT_NAME)) { + if (vrf->vrf_id != VRF_DEFAULT) vty_out(vty, "vrf %s\n", zvrf_name(zvrf)); - if (zvrf->l3vni) - vty_out(vty, " vni %u\n", zvrf->l3vni); + + static_config(vty, zvrf, AFI_IP, SAFI_UNICAST, "ip route"); + static_config(vty, zvrf, AFI_IP, SAFI_MULTICAST, "ip mroute"); + static_config(vty, zvrf, AFI_IP6, SAFI_UNICAST, "ipv6 route"); + + if (vrf->vrf_id != VRF_DEFAULT && zvrf->l3vni) + vty_out(vty, " vni %u\n", zvrf->l3vni); + + if (vrf->vrf_id != VRF_DEFAULT) vty_out(vty, "!\n"); - } } return 0; } |