Router advertisement & Router sollicitation

.github/workflows/check.yml

@@ -66,7 +66,8 @@ jobs:
           sudo NEEDRESTART_MODE=l apt-get install -qy --no-install-recommends \
             git socat tcpdump traceroute graphviz \
             iproute2 iputils-ping libasan8 libedit2 \
-            libevent-2.1-7t64 libsmartcols1 libnuma1
+            libevent-2.1-7t64 libsmartcols1 libnuma1 \
+            ndisc6
       - uses: actions/checkout@v4
         with:
           persist-credentials: false

README.md

@@ -237,17 +237,28 @@ image.
 ```sh
 dnf install gcc git make meson ninja-build pkgconf scdoc python3-pyelftools \
         libcmocka-devel libedit-devel libevent-devel numactl-devel \
-        libsmartcols-devel libarchive-devel rdma-core-devel \
-        clang-tools-extra jq curl traceroute graphviz
+        libsmartcols-devel libarchive-devel rdma-core-devel
 ```
 
 or
 
 ```sh
 apt install git gcc make meson ninja-build pkgconf scdoc python3-pyelftools \
         libcmocka-dev libedit-dev libevent-dev libnuma-dev \
-        libsmartcols-dev libarchive-dev libibverbs-dev \
-        clang-format jq curl traceroute graphviz
+        libsmartcols-dev libarchive-dev libibverbs-dev
+```
+
+### Install optional dependencies
+In order to run "make smoke-test" and "make update-graph", you'll need additional packages:
+
+```sh
+dnf install clang-tools-extra jq curl traceroute graphviz ndisc6
+```
+
+or
+
+```sh
+apt install clang-format jq curl traceroute graphviz ndisc6
 ```
 
 ### Build

modules/ip6/api/gr_ip6.h

@@ -132,4 +132,41 @@ struct gr_ip6_addr_list_resp {
 	struct gr_ip6_ifaddr addrs[/* n_addrs */];
 };
 
+// router advertisement ////////////////////////////////////////////////////////
+#define GR_IP6_IFACE_RA_SET REQUEST_TYPE(GR_IP6_MODULE, 0x0030)
+struct gr_ip6_ra_set_req {
+	uint16_t iface_id;
+	uint16_t set_interval : 1;
+	uint16_t set_lifetime : 1;
+	uint16_t set_preference : 1;
+
+	uint16_t interval;
+	uint16_t lifetime;
+	uint16_t preference;
+};
+// struct gr_ip6_ra_set_resp { };
+
+#define GR_IP6_IFACE_RA_CLEAR REQUEST_TYPE(GR_IP6_MODULE, 0x0031)
+struct gr_ip6_ra_clear_req {
+	uint16_t iface_id;
+};
+// struct gr_ip6_ra_clear_resp { };
+
+#define GR_IP6_IFACE_RA_SHOW REQUEST_TYPE(GR_IP6_MODULE, 0x0032)
+struct gr_ip6_ra_show_req {
+	uint16_t iface_id;
+};
+
+struct gr_ip6_ra_conf {
+	bool enabled;
+	uint16_t iface_id;
+	uint16_t interval;
+	uint16_t lifetime;
+	uint16_t preference;
+};
+
+struct gr_ip6_ra_show_resp {
+	uint16_t n_ras;
+	struct gr_ip6_ra_conf ras[];
+};
 #endif

modules/ip6/cli/ip.h

@@ -9,5 +9,8 @@
 #define IP6_ADD_CTX(root) CLI_CONTEXT(root, CTX_ADD, CTX_ARG("ip6", "Create IPv6 stack elements."))
 #define IP6_DEL_CTX(root) CLI_CONTEXT(root, CTX_DEL, CTX_ARG("ip6", "Delete IPv6 stack elements."))
 #define IP6_SHOW_CTX(root) CLI_CONTEXT(root, CTX_SHOW, CTX_ARG("ip6", "Show IPv6 stack details."))
+#define IP6_SET_CTX(root) CLI_CONTEXT(root, CTX_SET, CTX_ARG("ip6", "Set IPv6 stack elements."))
+#define IP6_CLEAR_CTX(root)                                                                        \
+	CLI_CONTEXT(root, CTX_CLEAR, CTX_ARG("ip6", "Clear IPv6 stack elements."))
 
 #endif

modules/ip6/cli/meson.build

@@ -5,4 +5,5 @@ cli_src += files(
   'address.c',
   'nexthop.c',
   'route.c',
+  'router_advert.c',
 )

modules/ip6/cli/router_advert.c

@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: BSD-3-Clause
+// Copyright (c) 2025 Christophe Fontaine
+
+#include "ip.h"
+
+#include <gr_api.h>
+#include <gr_cli.h>
+#include <gr_cli_iface.h>
+#include <gr_ip6.h>
+#include <gr_net_types.h>
+#include <gr_table.h>
+
+#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;
+	void *resp_ptr = NULL;
+
+	if (!iface_from_name(c, arg_str(p, "IFACE"), &iface))
+		req.iface_id = iface.id;
+	else
+		req.iface_id = 0;
+
+	if (gr_api_client_send_recv(c, GR_IP6_IFACE_RA_SHOW, sizeof(req), &req, &resp_ptr) < 0)
+		return CMD_ERROR;
+	resp = resp_ptr;
+
+	scols_table_new_column(table, "IFACE", 0, 0);
+	scols_table_new_column(table, "RA", 0, 0);
+	scols_table_new_column(table, "interval", 0, 0);
+	scols_table_new_column(table, "lifetime", 0, 0);
+	scols_table_set_column_separator(table, "  ");
+
+	for (uint16_t i = 0; i < resp->n_ras; i++) {
+		struct libscols_line *line = scols_table_new_line(table, NULL);
+		if (iface_from_id(c, resp->ras[i].iface_id, &iface) == 0)
+			scols_line_sprintf(line, 0, "%s", iface.name);
+		else
+			scols_line_sprintf(line, 0, "%u", resp->ras[i].iface_id);
+		scols_line_sprintf(line, 1, "%u", resp->ras[i].enabled);
+		scols_line_sprintf(line, 2, "%u", resp->ras[i].interval);
+		scols_line_sprintf(line, 3, "%u", resp->ras[i].lifetime);
+	}
+
+	scols_print_table(table);
+	scols_unref_table(table);
+	free(resp_ptr);
+	return CMD_SUCCESS;
+}
+
+static cmd_status_t ra_set(const struct gr_api_client *c, const struct ec_pnode *p) {
+	struct gr_ip6_ra_set_req req = {0};
+	struct gr_iface iface;
+
+	if (iface_from_name(c, arg_str(p, "IFACE"), &iface) < 0)
+		return CMD_ERROR;
+
+	req.iface_id = iface.id;
+	if (!arg_u16(p, "IT", &req.interval))
+		req.set_interval = 1;
+
+	if (!arg_u16(p, "LT", &req.lifetime))
+		req.set_lifetime = 1;
+
+	if (gr_api_client_send_recv(c, GR_IP6_IFACE_RA_SET, sizeof(req), &req, NULL) < 0)
+		return CMD_ERROR;
+	return CMD_SUCCESS;
+}
+
+static cmd_status_t ra_clear(const struct gr_api_client *c, const struct ec_pnode *p) {
+	struct gr_ip6_ra_clear_req req;
+	struct gr_iface iface;
+
+	if (iface_from_name(c, arg_str(p, "IFACE"), &iface) < 0)
+		return CMD_ERROR;
+
+	req.iface_id = iface.id;
+	if (gr_api_client_send_recv(c, GR_IP6_IFACE_RA_CLEAR, sizeof(req), &req, NULL) < 0)
+		return CMD_ERROR;
+	return CMD_SUCCESS;
+}
+
+static int ctx_init(struct ec_node *root) {
+	int ret;
+
+	ret = CLI_COMMAND(
+		IP6_SHOW_CTX(root),
+		"router-advert [IFACE]",
+		ra_show,
+		"Show router advertisement configuration",
+		with_help("Interface name.", ec_node_dyn("IFACE", complete_iface_names, NULL))
+	);
+	if (ret < 0)
+		return ret;
+
+	ret = CLI_COMMAND(
+		IP6_SET_CTX(root),
+		"router-advert IFACE [interval IT] [lifetime LT]",
+		ra_set,
+		"Set router advertisement parameters",
+		with_help("Interface name.", ec_node_dyn("IFACE", complete_iface_names, NULL)),
+		with_help("Interval", ec_node_uint("IT", 0, UINT16_MAX - 1, 10)),
+		with_help("Life time", ec_node_uint("LT", 0, UINT16_MAX - 1, 10))
+	);
+	if (ret < 0)
+		return ret;
+
+	ret = CLI_COMMAND(
+		IP6_CLEAR_CTX(root),
+		"router-advert IFACE",
+		ra_clear,
+		"Disable router advertisement and reset parameters",
+		with_help("Interface name.", ec_node_dyn("IFACE", complete_iface_names, NULL))
+	);
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+static struct gr_cli_context ctx = {
+	.name = "ipv6 router-advert",
+	.init = ctx_init,
+};
+
+static void __attribute__((constructor, used)) init(void) {
+	register_context(&ctx);
+}

modules/ip6/control/address.c

@@ -304,14 +304,10 @@ static void ip6_iface_event_handler(iface_event_t event, struct iface *iface) {
 			rte_ipv6_solnode_from_addr(&solicited_node, &link_local);
 			if (ip6_mcast_addr_add(iface, &solicited_node) < 0)
 				LOG(INFO, "%s: mcast_addr_add: %s", iface->name, strerror(errno));
-
-			for (i = 0; i < ARRAY_DIM(well_known_mcast_addrs); i++) {
-				if (ip6_mcast_addr_add(iface, &well_known_mcast_addrs[i]) < 0)
-					LOG(INFO,
-					    "%s: mcast_addr_add: %s",
-					    iface->name,
-					    strerror(errno));
-			}
+		}
+		for (i = 0; i < ARRAY_DIM(well_known_mcast_addrs); i++) {
+			if (ip6_mcast_addr_add(iface, &well_known_mcast_addrs[i]) < 0)
+				LOG(INFO, "%s: mcast_addr_add: %s", iface->name, strerror(errno));
 		}
 		break;
 	case IFACE_EVENT_PRE_REMOVE:

modules/ip6/control/gr_ip6_control.h

@@ -26,6 +26,7 @@ struct nexthop *ip6_nexthop_new(uint16_t vrf_id, uint16_t iface_id, const struct
 
 void ip6_nexthop_unreachable_cb(struct rte_mbuf *m);
 void ndp_probe_input_cb(struct rte_mbuf *m);
+void ndp_router_sollicit_input_cb(struct rte_mbuf *m);
 
 int ip6_route_insert(uint16_t vrf_id, uint16_t iface_id, const struct rte_ipv6_addr *, uint8_t prefixlen, struct nexthop *);
 int ip6_route_delete(

modules/ip6/control/meson.build

@@ -5,5 +5,6 @@ src += files(
   'address.c',
   'nexthop.c',
   'route.c',
+  'router_advert.c',
 )
 inc += include_directories('.')