ip6: fix ip6 address deletion

We couldn't add a previously added IPv6 on an interface, either through
the command line, or for link local ip when we add/delete/add an interface.

In rib6_cleanup, call rib6_delete with the prefixlen instead of the max
prefix.

Add these checks in the existing test.

Signed-off-by: Christophe Fontaine <[email protected]>

Author: christophefontaine

modules/ip6/control/address.c

@@ -213,8 +213,13 @@ static struct api_out addr6_del(const void *request, void ** /*response*/) {
 	struct rte_ipv6_addr solicited_node;
 	struct nexthop *nh = NULL;
 	struct hoplist *addrs;
+	struct iface *iface;
 	unsigned i = 0;
 
+	iface = iface_from_id(req->addr.iface_id);
+	if (iface == NULL)
+		return api_out(errno, 0);
+
 	if ((addrs = addr6_get_all(req->addr.iface_id)) == NULL)
 		return api_out(errno, 0);
 
@@ -299,7 +304,7 @@ static const struct rte_ipv6_addr well_known_mcast_addrs[] = {
 	RTE_IPV6_ADDR_ALLROUTERS_SITE_LOCAL,
 };
 
-static void ip6_iface_event_handler(uint32_t event, const void *obj) {
+static void ip6_iface_event_handler(iface_event_t event, const void *obj) {
 	struct rte_ipv6_addr link_local, solicited_node;
 	const struct iface *iface = obj;
 	struct rte_ether_addr mac;

modules/ip6/control/route.c

@@ -393,7 +393,7 @@ void rib6_cleanup(struct nexthop *nh) {
 	struct rte_rib6 *rib;
 	uintptr_t nh_id;
 
-	rib6_delete(nh->vrf_id, nh->iface_id, &nh->ipv6, RTE_IPV6_MAX_DEPTH);
+	rib6_delete(nh->vrf_id, nh->iface_id, &nh->ipv6, nh->prefixlen);
 	local_ip = nh->ipv6;
 	local_depth = nh->prefixlen;
 

smoke/ip6_add_del_test.sh

@@ -6,9 +6,13 @@
 
 p0=${run_id}0
 
+grcli add interface port $p0 devargs net_tap0,iface=$p0 mac f0:0d:ac:dc:00:00
+grcli del interface $p0
 grcli add interface port $p0 devargs net_tap0,iface=$p0 mac f0:0d:ac:dc:00:00
 
 grcli add ip6 address 2001::1/64 iface $p0
 grcli show ip6 address
 grcli del ip6 address 2001::1/64 iface $p0
 grcli show ip6 address
+grcli add ip6 address 2001::1/64 iface $p0
+grcli show ip6 address