summaryrefslogtreecommitdiff
path: root/zebra/zebra_vty.c
diff options
context:
space:
mode:
Diffstat (limited to 'zebra/zebra_vty.c')
-rw-r--r--zebra/zebra_vty.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 4341152e09..57c0e8265e 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -3006,7 +3006,7 @@ static int
static_config_ipv4 (struct vty *vty, safi_t safi, const char *cmd)
{
struct route_node *rn;
- struct static_ipv4 *si;
+ struct static_route *si;
struct route_table *stable;
struct zebra_vrf *zvrf;
vrf_iter_t iter;
@@ -3029,10 +3029,10 @@ static_config_ipv4 (struct vty *vty, safi_t safi, const char *cmd)
switch (si->type)
{
case STATIC_IPV4_GATEWAY:
- vty_out (vty, " %s", inet_ntoa (si->gate.ipv4));
+ vty_out (vty, " %s", inet_ntoa (si->addr.ipv4));
break;
case STATIC_IPV4_IFNAME:
- vty_out (vty, " %s", si->gate.ifname);
+ vty_out (vty, " %s", si->ifname);
break;
case STATIC_IPV4_BLACKHOLE:
vty_out (vty, " Null0");
@@ -5128,7 +5128,7 @@ static int
static_config_ipv6 (struct vty *vty)
{
struct route_node *rn;
- struct static_ipv6 *si;
+ struct static_route *si;
int write;
char buf[BUFSIZ];
struct route_table *stable;
@@ -5148,21 +5148,19 @@ static_config_ipv6 (struct vty *vty)
{
vty_out (vty, "ipv6 route %s", prefix2str (&rn->p, buf, sizeof buf));
- switch (si->type)
- {
- case STATIC_IPV6_GATEWAY:
- vty_out (vty, " %s",
- inet_ntop (AF_INET6, &si->ipv6, buf, BUFSIZ));
- break;
- case STATIC_IPV6_IFNAME:
- vty_out (vty, " %s", si->ifname);
- break;
- case STATIC_IPV6_GATEWAY_IFNAME:
- vty_out (vty, " %s %s",
- inet_ntop (AF_INET6, &si->ipv6, buf, BUFSIZ),
- si->ifname);
- break;
- }
+ switch (si->type)
+ {
+ case STATIC_IPV6_GATEWAY:
+ vty_out (vty, " %s", inet_ntop (AF_INET6, &si->addr.ipv6, buf, BUFSIZ));
+ break;
+ case STATIC_IPV6_IFNAME:
+ vty_out (vty, " %s", si->ifname);
+ break;
+ case STATIC_IPV6_GATEWAY_IFNAME:
+ vty_out (vty, " %s %s",
+ inet_ntop (AF_INET6, &si->addr.ipv6, buf, BUFSIZ), si->ifname);
+ break;
+ }
if (CHECK_FLAG(si->flags, ZEBRA_FLAG_REJECT))
vty_out (vty, " %s", "reject");