net: event: provide complete information about the prefix in events

At the moment, NET_EVENT_IPV6_PREFIX_ADD and NET_EVENT_IPV6_PREFIX_DEL
events provide provide information about an address without its length
and lifetime.

Signed-off-by: Konrad Derda <[email protected]>

Author: kderda

include/zephyr/net/net_event.h

@@ -214,7 +214,6 @@ enum net_event_l4_cmd {
 
 /** @endcond */
 
-#ifdef CONFIG_NET_MGMT_EVENT_INFO
 /**
  * @brief Network Management event information structure
  * Used to pass information on network events like
@@ -236,7 +235,7 @@ struct net_event_ipv6_addr {
  *   NET_EVENT_IPV6_NBR_DEL
  * when CONFIG_NET_MGMT_EVENT_INFO enabled and event generator pass the
  * information.
- * @Note: idx will be '-1' in case of NET_EVENT_IPV6_NBR_DEL event.
+ * @note: idx will be '-1' in case of NET_EVENT_IPV6_NBR_DEL event.
  */
 struct net_event_ipv6_nbr {
 	struct in6_addr addr;
@@ -257,7 +256,19 @@ struct net_event_ipv6_route {
 	uint8_t prefix_len;
 };
 
-#endif /* CONFIG_NET_MGMT_EVENT_INFO */
+/**
+ * @brief Network Management event information structure
+ * Used to pass information on network events like
+ *   NET_EVENT_IPV6_PREFIX_ADD and
+ *   NET_EVENT_IPV6_PREFIX_DEL
+ * when CONFIG_NET_MGMT_EVENT_INFO is enabled and event generator pass the
+ * information.
+ */
+struct net_event_ipv6_prefix {
+	struct in6_addr addr; /* prefix */
+	uint8_t len;
+	uint32_t lifetime;
+};
 
 #ifdef __cplusplus
 }

subsys/net/ip/net_if.c

@@ -16,6 +16,7 @@ LOG_MODULE_REGISTER(net_if, CONFIG_NET_IF_LOG_LEVEL);
 #include <string.h>
 #include <zephyr/net/igmp.h>
 #include <zephyr/net/net_core.h>
+#include <zephyr/net/net_event.h>
 #include <zephyr/net/net_pkt.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/net_mgmt.h>
@@ -2220,9 +2221,20 @@ static void prefix_lifetime_expired(struct net_if_ipv6_prefix *ifprefix)
 	remove_prefix_addresses(ifprefix->iface, ipv6, &ifprefix->prefix,
 				ifprefix->len);
 
-	net_mgmt_event_notify_with_info(
-		NET_EVENT_IPV6_PREFIX_DEL, ifprefix->iface,
-		&ifprefix->prefix, sizeof(struct in6_addr));
+	if (IS_ENABLED(CONFIG_NET_MGMT_EVENT_INFO)) {
+		struct net_event_ipv6_prefix info;
+
+		net_ipaddr_copy(&info.addr, &ifprefix->prefix);
+		info.len = ifprefix->len;
+		info.lifetime = 0;
+
+		net_mgmt_event_notify_with_info(NET_EVENT_IPV6_PREFIX_DEL,
+						ifprefix->iface,
+						(const void *) &info,
+						sizeof(struct net_event_ipv6_prefix));
+	} else {
+		net_mgmt_event_notify(NET_EVENT_IPV6_PREFIX_DEL, ifprefix->iface);
+	}
 
 	net_if_unlock(ifprefix->iface);
 }
@@ -2384,9 +2396,19 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,
 		NET_DBG("[%d] interface %p prefix %s/%d added", i, iface,
 			net_sprint_ipv6_addr(prefix), len);
 
-		net_mgmt_event_notify_with_info(
-			NET_EVENT_IPV6_PREFIX_ADD, iface,
-			&ipv6->prefix[i].prefix, sizeof(struct in6_addr));
+		if (IS_ENABLED(CONFIG_NET_MGMT_EVENT_INFO)) {
+			struct net_event_ipv6_prefix info;
+
+			net_ipaddr_copy(&info.addr, prefix);
+			info.len = len;
+			info.lifetime = lifetime;
+
+			net_mgmt_event_notify_with_info(NET_EVENT_IPV6_PREFIX_ADD,
+							iface, (const void *) &info,
+							sizeof(struct net_event_ipv6_prefix));
+		} else {
+			net_mgmt_event_notify(NET_EVENT_IPV6_PREFIX_ADD, iface);
+		}
 
 		ifprefix = &ipv6->prefix[i];
 		goto out;
@@ -2431,9 +2453,19 @@ bool net_if_ipv6_prefix_rm(struct net_if *iface, struct in6_addr *addr,
 		 */
 		remove_prefix_addresses(iface, ipv6, addr, len);
 
-		net_mgmt_event_notify_with_info(
-			NET_EVENT_IPV6_PREFIX_DEL, iface,
-			&ipv6->prefix[i].prefix, sizeof(struct in6_addr));
+		if (IS_ENABLED(CONFIG_NET_MGMT_EVENT_INFO)) {
+			struct net_event_ipv6_prefix info;
+
+			net_ipaddr_copy(&info.addr, addr);
+			info.len = len;
+			info.lifetime = 0;
+
+			net_mgmt_event_notify_with_info(NET_EVENT_IPV6_PREFIX_DEL,
+							iface, (const void *) &info,
+							sizeof(struct net_event_ipv6_prefix));
+		} else {
+			net_mgmt_event_notify(NET_EVENT_IPV6_PREFIX_DEL, iface);
+		}
 
 		ret = true;
 		goto out;

subsys/net/ip/net_private.h

@@ -34,9 +34,12 @@ union net_mgmt_events {
 	struct wifi_raw_scan_result raw_scan_result;
 #endif /* CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS */
 #endif /* CONFIG_NET_L2_WIFI_MGMT */
-#if defined(CONFIG_NET_IPV6) && defined(CONFIG_NET_IPV6_MLD)
+#if defined(CONFIG_NET_IPV6)
+	struct net_event_ipv6_prefix ipv6_prefix;
+#if defined(CONFIG_NET_IPV6_MLD)
 	struct net_event_ipv6_route ipv6_route;
-#endif /* CONFIG_NET_IPV6 && CONFIG_NET_IPV6_MLD */
+#endif /* CONFIG_NET_IPV6_MLD */
+#endif /* CONFIG_NET_IPV6 */
 	char default_event[DEFAULT_NET_EVENT_INFO_SIZE];
 };