Ip6 fixes

modules/ip6/cli/router_advert.c

@@ -13,10 +13,7 @@
 #include <ecoli.h>
 #include <libsmartcols.h>
 
-#include <errno.h>
-
 static cmd_status_t ra_show(const struct gr_api_client *c, const struct ec_pnode *p) {
-	struct libscols_table *table = scols_new_table();
 	struct gr_ip6_ra_show_resp *resp;
 	struct gr_ip6_ra_show_req req;
 	struct gr_iface iface;
@@ -31,6 +28,7 @@ static cmd_status_t ra_show(const struct gr_api_client *c, const struct ec_pnode
 		return CMD_ERROR;
 	resp = resp_ptr;
 
+	struct libscols_table *table = scols_new_table();
 	scols_table_new_column(table, "IFACE", 0, 0);
 	scols_table_new_column(table, "RA", 0, 0);
 	scols_table_new_column(table, "interval", 0, 0);

modules/ip6/control/address.c

@@ -59,6 +59,21 @@ struct nexthop *addr6_get_preferred(uint16_t iface_id, const struct rte_ipv6_add
 	return pref;
 }
 
+struct nexthop *addr6_get_linklocal(uint16_t iface_id) {
+	struct hoplist *addrs = addr6_get_all(iface_id);
+	struct nexthop *nh;
+
+	if (addrs == NULL)
+		return NULL;
+
+	gr_vec_foreach (nh, addrs->nh) {
+		if (rte_ipv6_addr_is_linklocal(&nh->ipv6))
+			return nh;
+	}
+
+	return errno_set_null(EADDRNOTAVAIL);
+}
+
 static struct hoplist *iface_mcast_addrs;
 
 struct nexthop *mcast6_get_member(uint16_t iface_id, const struct rte_ipv6_addr *mcast) {

modules/ip6/control/gr_ip6_control.h

@@ -42,6 +42,8 @@ struct nexthop *rib6_lookup(uint16_t vrf_id, uint16_t iface_id, const struct rte
 
 // get the default address for a given interface
 struct nexthop *addr6_get_preferred(uint16_t iface_id, const struct rte_ipv6_addr *);
+// get the link-local address for a given interface
+struct nexthop *addr6_get_linklocal(uint16_t iface_id);
 // get all addresses for a given interface
 struct hoplist *addr6_get_all(uint16_t iface_id);
 // determine if the given interface is member of the provided multicast address group

modules/ip6/control/router_advert.c

@@ -87,7 +87,7 @@ static struct api_out iface_ra_show(const void *request, void **response) {
 	n_ras = 0;
 	for (iface_id = 0; iface_id < MAX_IFACES; iface_id++) {
 		addrs = addr6_get_all(iface_id);
-		if (addrs == NULL || gr_vec_len(addrs) == 0)
+		if (addrs == NULL || gr_vec_len(addrs->nh) == 0)
 			continue;
 		if (show_all == false && iface_id != req->iface_id)
 			continue;
@@ -102,7 +102,7 @@ static struct api_out iface_ra_show(const void *request, void **response) {
 	n_ras = 0;
 	for (uint16_t iface_id = 0; iface_id < MAX_IFACES; iface_id++) {
 		addrs = addr6_get_all(iface_id);
-		if (addrs == NULL || gr_vec_len(addrs) == 0)
+		if (addrs == NULL || gr_vec_len(addrs->nh) == 0)
 			continue;
 		if (show_all == false && iface_id != req->iface_id)
 			continue;

modules/ip6/datapath/icmp6_input.c

@@ -26,6 +26,7 @@ enum {
 	BAD_CHECKSUM,
 	INVALID,
 	UNSUPPORTED,
+	NO_LOCAL_ADDR,
 	EDGE_COUNT,
 };
 
@@ -57,8 +58,19 @@ icmp6_input_process(struct rte_graph *graph, struct rte_node *node, void **objs,
 				goto next;
 			}
 			icmp6->type = ICMP6_TYPE_ECHO_REPLY;
-			// swap source/destination addresses
-			tmp_ip = d->dst;
+			if (rte_ipv6_addr_is_mcast(&d->dst)) {
+				struct nexthop *local = addr6_get_linklocal(
+					mbuf_data(mbuf)->iface->id
+				);
+				if (local == NULL) {
+					next = NO_LOCAL_ADDR;
+					goto next;
+				}
+				tmp_ip = local->ipv6;
+			} else {
+				// swap source/destination addresses
+				tmp_ip = d->dst;
+			}
 			d->dst = d->src;
 			d->src = tmp_ip;
 			next = ICMP6_OUTPUT;
@@ -120,6 +132,7 @@ static struct rte_node_register icmp6_input_node = {
 		[BAD_CHECKSUM] = "icmp6_input_bad_checksum",
 		[INVALID] = "icmp6_input_invalid",
 		[UNSUPPORTED] = "icmp6_input_unsupported",
+		[NO_LOCAL_ADDR] = "icmp6_input_no_local_addr",
 	},
 };
 
@@ -134,3 +147,4 @@ GR_NODE_REGISTER(icmp6_input_info);
 GR_DROP_REGISTER(icmp6_input_bad_checksum);
 GR_DROP_REGISTER(icmp6_input_invalid);
 GR_DROP_REGISTER(icmp6_input_unsupported);
+GR_DROP_REGISTER(icmp6_input_no_local_addr);