net: sockets: Refactor accept() to support objcore better

If user has not supplied address pointer when calling accept(),
then we would not be able to figure out the used socket domain
properly. But as there is now SO_DOMAIN option supported, use
that to get the correct socket domain.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

subsys/net/lib/sockets/socket_obj_core.c

@@ -158,9 +158,11 @@ int sock_obj_core_alloc(int sock, struct net_socket_register *reg,
 	return ret;
 }
 
-int sock_obj_core_alloc_find(int sock, int new_sock, int family, int type)
+int sock_obj_core_alloc_find(int sock, int new_sock, int type)
 {
 	struct net_socket_register *reg = NULL;
+	socklen_t optlen = sizeof(int);
+	int family;
 	int ret;
 
 	if (new_sock < 0) {
@@ -172,6 +174,12 @@ int sock_obj_core_alloc_find(int sock, int new_sock, int family, int type)
 		goto out;
 	}
 
+	ret = zsock_getsockopt(sock, SOL_SOCKET, SO_DOMAIN, &family, &optlen);
+	if (ret < 0) {
+		NET_ERR("Cannot get socket domain (%d)", -errno);
+		goto out;
+	}
+
 	ret = sock_obj_core_alloc(new_sock, reg, family, type, ret);
 	if (ret < 0) {
 		NET_ERR("Cannot allocate core object for socket %d (%d)",

subsys/net/lib/sockets/sockets.c

@@ -684,9 +684,7 @@ int z_impl_zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
 
 	new_sock = VTABLE_CALL(accept, sock, addr, addrlen);
 
-	if (addr) {
-		(void)sock_obj_core_alloc_find(sock, new_sock, addr->sa_family, SOCK_STREAM);
-	}
+	(void)sock_obj_core_alloc_find(sock, new_sock, SOCK_STREAM);
 
 	return new_sock;
 }

subsys/net/lib/sockets/sockets_internal.h

@@ -82,7 +82,7 @@ size_t msghdr_non_empty_iov_count(const struct msghdr *msg);
 #if defined(CONFIG_NET_SOCKETS_OBJ_CORE)
 int sock_obj_core_alloc(int sock, struct net_socket_register *reg,
 			int family, int type, int proto);
-int sock_obj_core_alloc_find(int sock, int new_sock, int family, int type);
+int sock_obj_core_alloc_find(int sock, int new_sock, int type);
 int sock_obj_core_dealloc(int sock);
 void sock_obj_core_update_send_stats(int sock, int bytes);
 void sock_obj_core_update_recv_stats(int sock, int bytes);
@@ -100,12 +100,10 @@ static inline int sock_obj_core_alloc(int sock,
 	return -ENOTSUP;
 }
 
-static inline int sock_obj_core_alloc_find(int sock, int new_sock,
-					   int family, int type)
+static inline int sock_obj_core_alloc_find(int sock, int new_sock, int type)
 {
 	ARG_UNUSED(sock);
 	ARG_UNUSED(new_sock);
-	ARG_UNUSED(family);
 	ARG_UNUSED(type);
 
 	return -ENOTSUP;