diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-21 21:34:08 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-22 17:19:27 -0700 |
| commit | c0551cbbaf8984a55ee688416ec2801c9429bc2c (patch) | |
| tree | e0f125b28ce440fd7f3446d65f6b1a5c61b21b1c /zebra/zebra_vty.c | |
| parent | ff40e335bbbed5e4fb36536d0c7cecf3edbb330e (diff) | |
zebra: Collapse struct static_ipv[4|6] into struct static_route
The 'struct static_ipv4' and 'struct static_ipv6' structures
are essentially the same. Collapse them into one data structure
'struct static_route'.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_vty.c')
| -rw-r--r-- | zebra/zebra_vty.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index a797b88391..89fb933aa6 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1747,7 +1747,7 @@ static int static_config_ipv4 (struct vty *vty) { struct route_node *rn; - struct static_ipv4 *si; + struct static_route *si; struct route_table *stable; int write; @@ -1767,10 +1767,10 @@ static_config_ipv4 (struct vty *vty) 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"); @@ -2909,7 +2909,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; @@ -2931,14 +2931,14 @@ static_config_ipv6 (struct vty *vty) switch (si->type) { case STATIC_IPV6_GATEWAY: - vty_out (vty, " %s", inet_ntop (AF_INET6, &si->ipv6, buf, BUFSIZ)); + 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->ipv6, buf, BUFSIZ), si->ifname); + inet_ntop (AF_INET6, &si->addr.ipv6, buf, BUFSIZ), si->ifname); break; } |