Revert "zebra: implement draft-bz-v4goawayflag-00"

This reverts commit 3fec765a8d986664a555c161b814b4bf3332cdf0.

April fools!

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/doc/user/ipv6.rst b/doc/user/ipv6.rst
index e4293944b652442adb8e562cdc7124b5f5afea87..9d079028caf91b1fdc2dac07d1ca2f7a65edd5d8 100644 (file)
--- a/doc/user/ipv6.rst
+++ b/doc/user/ipv6.rst
@@ -184,14 +184,6 @@ Router Advertisement
             no ipv6 nd suppress-ra
             ipv6 nd prefix 2001:0DB8:5009::/64
 
-.. index:: [no] ipv6 nd v4 goaway
-.. clicmd:: [no] ipv6 nd v4 goaway
-
-   Set whether or not to transmit the V4 GoAway option. This option indicates
-   to the destination that they should disable IPv4 on the link.
-
-   Implements draft-bz-v4goawayflag-00.
-
 
 .. seealso::
 
@@ -199,4 +191,3 @@ Router Advertisement
    - :rfc:`4861` (Neighbor Discovery for IP Version 6 (IPv6))
    - :rfc:`6275` (Mobility Support in IPv6)
    - :rfc:`4191` (Default Router Preferences and More-Specific Routes)
-   - https://www.ietf.org/id/draft-bz-v4goawayflag-00.txt

diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index d62ed3a5e4f02364517bdb3563fd9c2a00432b09..c695b65660ca542514738f46a3591bfaa20cb55b 100644 (file)
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -45,8 +45,6 @@
 #include "zebra/zebra_vrf.h"
 
 extern struct zebra_privs_t zserv_privs;
-/* currently undefined in icmp6.h */
-bool AdvGoAwayFlag;
 
 #if defined(HAVE_RTADV)
 
@@ -226,9 +224,6 @@ static void rtadv_send_packet(int sock, struct interface *ifp)
                rtadv->nd_ra_flags_reserved |= ND_RA_FLAG_OTHER;
        if (zif->rtadv.AdvHomeAgentFlag)
                rtadv->nd_ra_flags_reserved |= ND_RA_FLAG_HOME_AGENT;
-       if (AdvGoAwayFlag)
-               rtadv->nd_ra_flags_reserved |= ND_RA_FLAG_V4_GOAWAY;
-
        /* Note that according to Neighbor Discovery (RFC 4861 [18]),
         * AdvDefaultLifetime is by default based on the value of
         * MaxRtrAdvInterval.  AdvDefaultLifetime is used in the Router Lifetime
@@ -1500,19 +1495,6 @@ DEFUN (no_ipv6_nd_mtu,
        return CMD_SUCCESS;
 }
 
-DEFUN (ipv6_nd_v4_goaway,
-       ipv6_nd_v4_goaway_cmd,
-       "[no] ipv6 nd v4 goaway",
-       NO_STR
-       "Interface IPv6 config commands\n"
-       "Neighbor discovery\n"
-       "v4 RA flags\n"
-       "Set V4 GoAway Flag\n")
-{
-       AdvGoAwayFlag = !strmatch(argv[0]->text, "no");
-       return CMD_SUCCESS;
-}
-
 /* Dump interface ND information to vty. */
 static int nd_dump_vty(struct vty *vty, struct interface *ifp)
 {
@@ -1644,9 +1626,6 @@ static int rtadv_config_write(struct vty *vty, struct interface *ifp)
        if (zif->rtadv.AdvLinkMTU)
                vty_out(vty, " ipv6 nd mtu %d\n", zif->rtadv.AdvLinkMTU);
 
-       if (AdvGoAwayFlag)
-               vty_out(vty, " ipv6 nd v4 goaway\n");
-
        for (ALL_LIST_ELEMENTS_RO(zif->rtadv.AdvPrefixList, node, rprefix)) {
                vty_out(vty, " ipv6 nd prefix %s",
                        prefix2str(&rprefix->prefix, buf, sizeof(buf)));
@@ -1765,7 +1744,6 @@ void rtadv_cmd_init(void)
        install_element(INTERFACE_NODE, &no_ipv6_nd_router_preference_cmd);
        install_element(INTERFACE_NODE, &ipv6_nd_mtu_cmd);
        install_element(INTERFACE_NODE, &no_ipv6_nd_mtu_cmd);
-       install_element(INTERFACE_NODE, &ipv6_nd_v4_goaway_cmd);
 }
 
 static int if_join_all_router(int sock, struct interface *ifp)

diff --git a/zebra/rtadv.h b/zebra/rtadv.h
index 5db2c403660557d5bb6f7603a45b01aae4fe22e5..03db13fd69bb1ccd1f77752e0289a841816365a7 100644 (file)
--- a/zebra/rtadv.h
+++ b/zebra/rtadv.h
@@ -28,9 +28,6 @@
 /* NB: RTADV is defined in zebra/interface.h above */
 #if defined(HAVE_RTADV)
 
-/* currently undefined in icmp6.h */
-#define ND_RA_FLAG_V4_GOAWAY 0x01
-
 /* Router advertisement prefix. */
 struct rtadv_prefix {
        /* Prefix to be advertised. */