net: socket: Set default protocol if proto == 0

If proto field in socket() call is set to 0, then we should have a sane default for it that depends on the type of the socket. Fixes zephyrproject-rtos#18873 Signed-off-by: Jukka Rissanen <[email protected]>
bseazeng · Sep 12, 2019 · 2f8f5fd · 2f8f5fd
1 parent e182f31
commit 2f8f5fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
@@ -91,6 +91,16 @@ int zsock_socket_internal(int family, int type, int proto)
 		return -1;
 	}
 
+	if (proto == 0) {
+		if (family == AF_INET || family == AF_INET6) {
+			if (type == SOCK_DGRAM) {
+				proto = IPPROTO_UDP;
+			} else if (type == SOCK_STREAM) {
+				proto = IPPROTO_TCP;
+			}
+		}
+	}
+
 	res = net_context_get(family, type, proto, &ctx);
 	if (res < 0) {
 		z_free_fd(fd);

diff --git a/subsys/net/lib/sockets/sockets_packet.c b/subsys/net/lib/sockets/sockets_packet.c
@@ -47,6 +47,12 @@ static int zpacket_socket(int family, int type, int proto)
 		return -1;
 	}
 
+	if (proto == 0) {
+		if (type == SOCK_RAW) {
+			proto = IPPROTO_RAW;
+		}
+	}
+
 	ret = net_context_get(family, type, proto, &ctx);
 	if (ret < 0) {
 		z_free_fd(fd);