summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/user/ipv6.rst9
-rw-r--r--lib/command.c1
-rw-r--r--lib/command.h1
-rw-r--r--vtysh/vtysh_config.c8
-rw-r--r--zebra/rtadv.c22
-rw-r--r--zebra/rtadv.h3
6 files changed, 37 insertions, 7 deletions
diff --git a/doc/user/ipv6.rst b/doc/user/ipv6.rst
index 9d079028ca..e4293944b6 100644
--- a/doc/user/ipv6.rst
+++ b/doc/user/ipv6.rst
@@ -184,6 +184,14 @@ 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::
@@ -191,3 +199,4 @@ 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/lib/command.c b/lib/command.c
index b7438b2d23..3bbea63060 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -55,7 +55,6 @@ const char *node_names[] = {
"auth enable", // AUTH_ENABLE_NODE,
"enable", // ENABLE_NODE,
"config", // CONFIG_NODE,
- "service", // SERVICE_NODE,
"debug", // DEBUG_NODE,
"vrf debug", // VRF_DEBUG_NODE,
"vnc debug", // DEBUG_VNC_NODE,
diff --git a/lib/command.h b/lib/command.h
index f2a8693e64..26c1ac73b9 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -78,7 +78,6 @@ enum node_type {
AUTH_ENABLE_NODE, /* Authentication mode for change enable. */
ENABLE_NODE, /* Enable node. */
CONFIG_NODE, /* Config node. Default mode of config file. */
- SERVICE_NODE, /* Service node. */
DEBUG_NODE, /* Debug node. */
VRF_DEBUG_NODE, /* Vrf Debug node. */
DEBUG_VNC_NODE, /* Debug VNC node. */
diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index 348053c727..b7e50ca5b8 100644
--- a/vtysh/vtysh_config.c
+++ b/vtysh/vtysh_config.c
@@ -283,8 +283,6 @@ void vtysh_config_parse_line(void *arg, const char *line)
strlen("ip forwarding"))
== 0))
config = config_get(FORWARDING_NODE, line);
- else if (strncmp(line, "service", strlen("service")) == 0)
- config = config_get(SERVICE_NODE, line);
else if (strncmp(line, "debug vrf", strlen("debug vrf")) == 0)
config = config_get(VRF_DEBUG_NODE, line);
else if (strncmp(line, "debug", strlen("debug")) == 0)
@@ -328,9 +326,9 @@ void vtysh_config_parse_line(void *arg, const char *line)
((I) == ACCESS_NODE || (I) == PREFIX_NODE || (I) == IP_NODE \
|| (I) == AS_LIST_NODE || (I) == COMMUNITY_LIST_NODE \
|| (I) == ACCESS_IPV6_NODE || (I) == ACCESS_MAC_NODE \
- || (I) == PREFIX_IPV6_NODE || (I) == SERVICE_NODE \
- || (I) == FORWARDING_NODE || (I) == DEBUG_NODE || (I) == AAA_NODE \
- || (I) == VRF_DEBUG_NODE || (I) == MPLS_NODE)
+ || (I) == PREFIX_IPV6_NODE || (I) == FORWARDING_NODE \
+ || (I) == DEBUG_NODE || (I) == AAA_NODE || (I) == VRF_DEBUG_NODE \
+ || (I) == MPLS_NODE)
/* Display configuration to file pointer. */
void vtysh_config_dump(FILE *fp)
diff --git a/zebra/rtadv.c b/zebra/rtadv.c
index c695b65660..d62ed3a5e4 100644
--- a/zebra/rtadv.c
+++ b/zebra/rtadv.c
@@ -45,6 +45,8 @@
#include "zebra/zebra_vrf.h"
extern struct zebra_privs_t zserv_privs;
+/* currently undefined in icmp6.h */
+bool AdvGoAwayFlag;
#if defined(HAVE_RTADV)
@@ -224,6 +226,9 @@ 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
@@ -1495,6 +1500,19 @@ 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)
{
@@ -1626,6 +1644,9 @@ 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)));
@@ -1744,6 +1765,7 @@ 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 03db13fd69..5db2c40366 100644
--- a/zebra/rtadv.h
+++ b/zebra/rtadv.h
@@ -28,6 +28,9 @@
/* 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. */
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-09 07:00:22 +0000