[nrf fromtree] net: socket: mgmt: Create proper socket options for net_mgmt sockets

We cannot use the network management event number directly as
a socket option value because the management value is uint64_t
and that cannot be mapped directly to 32 bit integer.
So have an intermediate socket option that is mapped to actual
network management request number in getsockopt() and setsockopt().

Signed-off-by: Jukka Rissanen <[email protected]>
(cherry picked from commit 2ed2232)
Signed-off-by: Robert Lubos <[email protected]>

Author: jukkar

include/zephyr/net/socket_net_mgmt.h

@@ -42,6 +42,19 @@ extern "C" {
 
 /** @endcond */
 
+/**
+ * @name Socket options for NET_MGMT sockets
+ * @{
+ */
+
+/** Set Ethernet Qav parameters */
+#define SO_NET_MGMT_ETHERNET_SET_QAV_PARAM 1
+
+/** Get Ethernet Qav parameters */
+#define SO_NET_MGMT_ETHERNET_GET_QAV_PARAM 2
+
+/** @} */ /* for @name */
+
 /**
  * struct sockaddr_nm - The sockaddr structure for NET_MGMT sockets
  *

subsys/net/lib/sockets/sockets_net_mgmt.c

@@ -237,7 +237,7 @@ static int znet_mgmt_getsockopt(struct net_mgmt_socket *mgmt, int level,
 	}
 
 	if (IS_ENABLED(CONFIG_NET_L2_ETHERNET_MGMT)) {
-		if (optname == NET_REQUEST_ETHERNET_GET_QAV_PARAM) {
+		if (optname == SO_NET_MGMT_ETHERNET_GET_QAV_PARAM) {
 			int ret;
 
 			ret = net_mgmt(NET_REQUEST_ETHERNET_GET_QAV_PARAM,
@@ -274,7 +274,7 @@ static int znet_mgmt_setsockopt(struct net_mgmt_socket *mgmt, int level,
 	}
 
 	if (IS_ENABLED(CONFIG_NET_L2_ETHERNET_MGMT)) {
-		if (optname == NET_REQUEST_ETHERNET_SET_QAV_PARAM) {
+		if (optname == SO_NET_MGMT_ETHERNET_SET_QAV_PARAM) {
 			int ret;
 
 			ret = net_mgmt(NET_REQUEST_ETHERNET_SET_QAV_PARAM,

tests/net/socket/net_mgmt/src/main.c

@@ -20,6 +20,19 @@ LOG_MODULE_REGISTER(net_test, CONFIG_NET_SOCKETS_LOG_LEVEL);
 #define STACK_SIZE 1024
 #define THREAD_PRIORITY K_PRIO_COOP(8)
 
+/* Use a base value for socket options that are not implemented.
+ * This is used to check if the socket option is implemented or not.
+ */
+#define NOT_IMPLEMENTED_SOCKET_OPTION_BASE (INT32_MAX - 1000)
+
+#if !defined(SO_NET_MGMT_ETHERNET_GET_PRIORITY_QUEUES_NUM)
+#define SO_NET_MGMT_ETHERNET_GET_PRIORITY_QUEUES_NUM (NOT_IMPLEMENTED_SOCKET_OPTION_BASE + 1)
+#endif /* !defined(SO_NET_MGMT_ETHERNET_GET_PRIORITY_QUEUES_NUM) */
+
+#if !defined(SO_NET_MGMT_ETHERNET_SET_MAC_ADDRESS)
+#define SO_NET_MGMT_ETHERNET_SET_MAC_ADDRESS (NOT_IMPLEMENTED_SOCKET_OPTION_BASE + 2)
+#endif /* !defined(SO_NET_MGMT_ETHERNET_SET_MAC_ADDRESS) */
+
 static struct net_if *default_iface;
 
 static ZTEST_BMEM int fd;
@@ -502,7 +515,7 @@ static void test_ethernet_set_qav(void)
 	params.qav_param.enabled = true;
 
 	ret = zsock_setsockopt(fd, SOL_NET_MGMT_RAW,
-			       NET_REQUEST_ETHERNET_SET_QAV_PARAM,
+			       SO_NET_MGMT_ETHERNET_SET_QAV_PARAM,
 			       &params, sizeof(params));
 	zassert_equal(ret, 0, "Cannot set Qav parameters");
 }
@@ -529,7 +542,7 @@ static void test_ethernet_get_qav(void)
 	params.qav_param.type = ETHERNET_QAV_PARAM_TYPE_STATUS;
 
 	ret = zsock_getsockopt(fd, SOL_NET_MGMT_RAW,
-			       NET_REQUEST_ETHERNET_GET_QAV_PARAM,
+			       SO_NET_MGMT_ETHERNET_GET_QAV_PARAM,
 			       &params, &optlen);
 	zassert_equal(ret, 0, "Cannot get Qav parameters (%d)", ret);
 	zassert_equal(optlen, sizeof(params), "Invalid optlen (%d)", optlen);
@@ -556,7 +569,7 @@ static void test_ethernet_get_unknown_option(void)
 	memset(&params, 0, sizeof(params));
 
 	ret = zsock_getsockopt(fd, SOL_NET_MGMT_RAW,
-			       NET_REQUEST_ETHERNET_GET_PRIORITY_QUEUES_NUM,
+			       SO_NET_MGMT_ETHERNET_GET_PRIORITY_QUEUES_NUM,
 			       &params, &optlen);
 	zassert_equal(ret, -1, "Could get prio queue parameters (%d)", errno);
 	zassert_equal(errno, EINVAL, "prio queue get parameters");
@@ -581,7 +594,7 @@ static void test_ethernet_set_unknown_option(void)
 	memset(&params, 0, sizeof(params));
 
 	ret = zsock_setsockopt(fd, SOL_NET_MGMT_RAW,
-			       NET_REQUEST_ETHERNET_SET_MAC_ADDRESS,
+			       SO_NET_MGMT_ETHERNET_SET_MAC_ADDRESS,
 			       &params, optlen);
 	zassert_equal(ret, -1, "Could set promisc_mode parameters (%d)", errno);
 	zassert_equal(errno, EINVAL, "promisc_mode set parameters");