Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1 insertions, 269 deletions

diff --git a/zebra/router-id.c b/zebra/router-id.c
index ef87d92..2f251a7 100644
--- a/zebra/router-id.c
+++ b/zebra/router-id.c
@@ -109,7 +109,7 @@ int router_id_get(afi_t afi, struct prefix *p, struct zebra_vrf *zvrf)
 	assert(!"Reached end of function we should never hit");
 }
 
-static int router_id_set(afi_t afi, struct prefix *p, struct zebra_vrf *zvrf)
+int router_id_set(afi_t afi, struct prefix *p, struct zebra_vrf *zvrf)
 {
 	struct prefix after, before;
 	struct listnode *node;
@@ -241,256 +241,6 @@ void router_id_del_address(struct connected *ifc)
 		zsend_router_id_update(client, afi, &after, zvrf_id(zvrf));
 }
 
-void router_id_write(struct vty *vty, struct zebra_vrf *zvrf)
-{
-	char space[2];
-
-	memset(space, 0, sizeof(space));
-
-	if (zvrf_id(zvrf) != VRF_DEFAULT)
-		snprintf(space, sizeof(space), "%s", " ");
-
-	if (zvrf->rid_user_assigned.u.prefix4.s_addr != INADDR_ANY) {
-		vty_out(vty, "%sip router-id %pI4\n", space,
-			&zvrf->rid_user_assigned.u.prefix4);
-	}
-	if (!router_id_v6_is_any(&zvrf->rid6_user_assigned)) {
-		vty_out(vty, "%sipv6 router-id %pI6\n", space,
-			&zvrf->rid_user_assigned.u.prefix6);
-	}
-}
-
-DEFUN (ip_router_id,
-       ip_router_id_cmd,
-       "ip router-id A.B.C.D vrf NAME",
-       IP_STR
-       "Manually set the router-id\n"
-       "IP address to use for router-id\n"
-       VRF_CMD_HELP_STR)
-{
-	int idx = 0;
-	struct prefix rid;
-	vrf_id_t vrf_id;
-	struct zebra_vrf *zvrf;
-
-	argv_find(argv, argc, "A.B.C.D", &idx);
-
-	if (!inet_pton(AF_INET, argv[idx]->arg, &rid.u.prefix4))
-		return CMD_WARNING_CONFIG_FAILED;
-
-	rid.prefixlen = IPV4_MAX_BITLEN;
-	rid.family = AF_INET;
-
-	argv_find(argv, argc, "NAME", &idx);
-	VRF_GET_ID(vrf_id, argv[idx]->arg, false);
-
-	zvrf = zebra_vrf_lookup_by_id(vrf_id);
-	router_id_set(AFI_IP, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-ALIAS (ip_router_id,
-       router_id_cmd,
-       "router-id A.B.C.D vrf NAME",
-       "Manually set the router-id\n"
-       "IP address to use for router-id\n"
-       VRF_CMD_HELP_STR);
-
-DEFUN (ipv6_router_id,
-       ipv6_router_id_cmd,
-       "ipv6 router-id X:X::X:X vrf NAME",
-       IPV6_STR
-       "Manually set the router-id\n"
-       "IPv6 address to use for router-id\n"
-       VRF_CMD_HELP_STR)
-{
-	int idx = 0;
-	struct prefix rid;
-	vrf_id_t vrf_id;
-	struct zebra_vrf *zvrf;
-
-	argv_find(argv, argc, "X:X::X:X", &idx);
-
-	if (!inet_pton(AF_INET6, argv[idx]->arg, &rid.u.prefix6))
-		return CMD_WARNING_CONFIG_FAILED;
-
-	rid.prefixlen = IPV6_MAX_BITLEN;
-	rid.family = AF_INET6;
-
-	argv_find(argv, argc, "NAME", &idx);
-	VRF_GET_ID(vrf_id, argv[idx]->arg, false);
-
-	zvrf = zebra_vrf_lookup_by_id(vrf_id);
-	router_id_set(AFI_IP6, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-
-DEFUN (ip_router_id_in_vrf,
-       ip_router_id_in_vrf_cmd,
-       "ip router-id A.B.C.D",
-       IP_STR
-       "Manually set the router-id\n"
-       "IP address to use for router-id\n")
-{
-	ZEBRA_DECLVAR_CONTEXT_VRF(vrf, zvrf);
-	int idx = 0;
-	struct prefix rid;
-
-	argv_find(argv, argc, "A.B.C.D", &idx);
-
-	if (!inet_pton(AF_INET, argv[idx]->arg, &rid.u.prefix4))
-		return CMD_WARNING_CONFIG_FAILED;
-
-	rid.prefixlen = IPV4_MAX_BITLEN;
-	rid.family = AF_INET;
-
-	router_id_set(AFI_IP, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-ALIAS (ip_router_id_in_vrf,
-       router_id_in_vrf_cmd,
-       "router-id A.B.C.D",
-       "Manually set the router-id\n"
-       "IP address to use for router-id\n");
-
-DEFUN (ipv6_router_id_in_vrf,
-       ipv6_router_id_in_vrf_cmd,
-       "ipv6 router-id X:X::X:X",
-       IP6_STR
-       "Manually set the IPv6 router-id\n"
-       "IPV6 address to use for router-id\n")
-{
-	ZEBRA_DECLVAR_CONTEXT_VRF(vrf, zvrf);
-	int idx = 0;
-	struct prefix rid;
-
-	argv_find(argv, argc, "X:X::X:X", &idx);
-
-	if (!inet_pton(AF_INET6, argv[idx]->arg, &rid.u.prefix6))
-		return CMD_WARNING_CONFIG_FAILED;
-
-	rid.prefixlen = IPV6_MAX_BITLEN;
-	rid.family = AF_INET6;
-
-	router_id_set(AFI_IP6, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN (no_ip_router_id,
-       no_ip_router_id_cmd,
-       "no ip router-id [A.B.C.D vrf NAME]",
-       NO_STR
-       IP_STR
-       "Remove the manually configured router-id\n"
-       "IP address to use for router-id\n"
-       VRF_CMD_HELP_STR)
-{
-	int idx = 0;
-	struct prefix rid;
-	vrf_id_t vrf_id = VRF_DEFAULT;
-	struct zebra_vrf *zvrf;
-
-	rid.u.prefix4.s_addr = 0;
-	rid.prefixlen = 0;
-	rid.family = AF_INET;
-
-	if (argv_find(argv, argc, "NAME", &idx))
-		VRF_GET_ID(vrf_id, argv[idx]->arg, false);
-
-	zvrf = zebra_vrf_lookup_by_id(vrf_id);
-	router_id_set(AFI_IP, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-ALIAS (no_ip_router_id,
-       no_router_id_cmd,
-       "no router-id [A.B.C.D vrf NAME]",
-       NO_STR
-       "Remove the manually configured router-id\n"
-       "IP address to use for router-id\n"
-       VRF_CMD_HELP_STR);
-
-DEFUN (no_ipv6_router_id,
-       no_ipv6_router_id_cmd,
-       "no ipv6 router-id [X:X::X:X vrf NAME]",
-       NO_STR
-       IPV6_STR
-       "Remove the manually configured IPv6 router-id\n"
-       "IPv6 address to use for router-id\n"
-       VRF_CMD_HELP_STR)
-{
-	int idx = 0;
-	struct prefix rid;
-	vrf_id_t vrf_id = VRF_DEFAULT;
-	struct zebra_vrf *zvrf;
-
-	memset(&rid, 0, sizeof(rid));
-	rid.family = AF_INET;
-
-	if (argv_find(argv, argc, "NAME", &idx))
-		VRF_GET_ID(vrf_id, argv[idx]->arg, false);
-
-	zvrf = zebra_vrf_lookup_by_id(vrf_id);
-	router_id_set(AFI_IP6, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-DEFUN (no_ip_router_id_in_vrf,
-       no_ip_router_id_in_vrf_cmd,
-       "no ip router-id [A.B.C.D]",
-       NO_STR
-       IP_STR
-       "Remove the manually configured router-id\n"
-       "IP address to use for router-id\n")
-{
-	ZEBRA_DECLVAR_CONTEXT_VRF(vrf, zvrf);
-
-	struct prefix rid;
-
-	rid.u.prefix4.s_addr = 0;
-	rid.prefixlen = 0;
-	rid.family = AF_INET;
-
-	router_id_set(AFI_IP, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
-ALIAS (no_ip_router_id_in_vrf,
-       no_router_id_in_vrf_cmd,
-       "no router-id [A.B.C.D]",
-       NO_STR
-       "Remove the manually configured router-id\n"
-       "IP address to use for router-id\n");
-
-DEFUN (no_ipv6_router_id_in_vrf,
-       no_ipv6_router_id_in_vrf_cmd,
-       "no ipv6 router-id [X:X::X:X]",
-       NO_STR
-       IP6_STR
-       "Remove the manually configured IPv6 router-id\n"
-       "IPv6 address to use for router-id\n")
-{
-	ZEBRA_DECLVAR_CONTEXT_VRF(vrf, zvrf);
-
-	struct prefix rid;
-
-	memset(&rid, 0, sizeof(rid));
-	rid.family = AF_INET;
-
-	router_id_set(AFI_IP6, &rid, zvrf);
-
-	return CMD_SUCCESS;
-}
-
 DEFUN (show_ip_router_id,
        show_ip_router_id_cmd,
        "show [ip|ipv6] router-id [vrf NAME]",
@@ -557,24 +307,6 @@ static int router_id_v6_cmp(void *a, void *b)
 
 void router_id_cmd_init(void)
 {
-	install_element(CONFIG_NODE, &ip_router_id_cmd);
-	install_element(CONFIG_NODE, &router_id_cmd);
-	install_element(CONFIG_NODE, &ipv6_router_id_cmd);
-	install_element(CONFIG_NODE, &no_ip_router_id_cmd);
-	install_element(CONFIG_NODE, &no_router_id_cmd);
-	install_element(CONFIG_NODE, &ip_router_id_in_vrf_cmd);
-	install_element(VRF_NODE, &ip_router_id_in_vrf_cmd);
-	install_element(CONFIG_NODE, &router_id_in_vrf_cmd);
-	install_element(VRF_NODE, &router_id_in_vrf_cmd);
-	install_element(CONFIG_NODE, &ipv6_router_id_in_vrf_cmd);
-	install_element(VRF_NODE, &ipv6_router_id_in_vrf_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_router_id_cmd);
-	install_element(CONFIG_NODE, &no_ip_router_id_in_vrf_cmd);
-	install_element(VRF_NODE, &no_ip_router_id_in_vrf_cmd);
-	install_element(CONFIG_NODE, &no_router_id_in_vrf_cmd);
-	install_element(VRF_NODE, &no_router_id_in_vrf_cmd);
-	install_element(CONFIG_NODE, &no_ipv6_router_id_in_vrf_cmd);
-	install_element(VRF_NODE, &no_ipv6_router_id_in_vrf_cmd);
 	install_element(VIEW_NODE, &show_ip_router_id_cmd);
 }