From: Denis Ovsienko Date: Tue, 27 Dec 2011 14:49:15 +0000 (+0400) Subject: zebra: fix output of IPv6 ND RA options X-Git-Tag: frr-2.0-rc1~1907 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6134b875f39986564aced5e2d7329fcd852f17f4;p=mirror%2Ffrr.git zebra: fix output of IPv6 ND RA options The following options could be configured for an interface, but were never visible in the config text: ipv6 nd adv-interval-option ipv6 nd home-agent-preference ipv6 nd home-agent-lifetime ipv6 nd home-agent-config-flag --- diff --git a/zebra/rtadv.c b/zebra/rtadv.c index e0941357d7..bc1abcaf38 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -1511,10 +1511,24 @@ rtadv_config_write (struct vty *vty, struct interface *ifp) vty_out (vty, " ipv6 nd ra-interval %d%s", interval / 1000, VTY_NEWLINE); + if (zif->rtadv.AdvIntervalOption) + vty_out (vty, " ipv6 nd adv-interval-option%s", VTY_NEWLINE); + if (zif->rtadv.AdvDefaultLifetime != RTADV_ADV_DEFAULT_LIFETIME) vty_out (vty, " ipv6 nd ra-lifetime %d%s", zif->rtadv.AdvDefaultLifetime, VTY_NEWLINE); + if (zif->rtadv.HomeAgentPreference) + vty_out (vty, " ipv6 nd home-agent-preference %u%s", + zif->rtadv.HomeAgentPreference, VTY_NEWLINE); + + if (zif->rtadv.HomeAgentLifetime) + vty_out (vty, " ipv6 nd home-agent-lifetime %u%s", + zif->rtadv.HomeAgentLifetime, VTY_NEWLINE); + + if (zif->rtadv.AdvHomeAgentFlag) + vty_out (vty, " ipv6 nd home-agent-config-flag%s", VTY_NEWLINE); + if (zif->rtadv.AdvReachableTime) vty_out (vty, " ipv6 nd reachable-time %d%s", zif->rtadv.AdvReachableTime, VTY_NEWLINE);