From a0a7d25d045ab2f17391a112bf8a482814a8524c Mon Sep 17 00:00:00 2001 From: bernard Date: Thu, 10 Aug 2023 00:00:48 +0800 Subject: [PATCH 1/3] [SAL] fix the IPv4&v6 compiling issue. --- components/net/sal/src/sal_socket.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/components/net/sal/src/sal_socket.c b/components/net/sal/src/sal_socket.c index 9d343b8c1f4..df18d028f71 100644 --- a/components/net/sal/src/sal_socket.c +++ b/components/net/sal/src/sal_socket.c @@ -1097,7 +1097,14 @@ int sal_ioctlsocket(int socket, long cmd, void *arg) if (!strcmp(ifr->ifr_ifrn.ifrn_name, netdev->name)) { addr_in = (struct sockaddr_in *)&(ifr->ifr_ifru.ifru_addr); - addr_in->sin_addr.s_addr = netdev->ip_addr.addr; + #if NETDEV_IPV4 && NETDEV_IPV6 + addr_in->sin_addr.s_addr = sock->netdev->ip_addr.u_addr.ip4.addr; + #elif NETDEV_IPV4 + addr_in->sin_addr.s_addr = sock->netdev->ip_addr.addr; + #elif NETDEV_IPV6 + #error "not only support IPV6" + #endif /* NETDEV_IPV4 && NETDEV_IPV6*/ + return 0; } } From 72d6f717acc395f3ec5df2e3f57789f6141b94a4 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Thu, 10 Aug 2023 18:46:41 -0400 Subject: [PATCH 2/3] Update components/net/sal/src/sal_socket.c --- components/net/sal/src/sal_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/net/sal/src/sal_socket.c b/components/net/sal/src/sal_socket.c index df18d028f71..42506a2614f 100644 --- a/components/net/sal/src/sal_socket.c +++ b/components/net/sal/src/sal_socket.c @@ -1102,7 +1102,7 @@ int sal_ioctlsocket(int socket, long cmd, void *arg) #elif NETDEV_IPV4 addr_in->sin_addr.s_addr = sock->netdev->ip_addr.addr; #elif NETDEV_IPV6 - #error "not only support IPV6" + #error "Do not only support IPV6" #endif /* NETDEV_IPV4 && NETDEV_IPV6*/ return 0; From 6b5b692a42a797521b11942b952c2e4a05678264 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Thu, 10 Aug 2023 18:47:13 -0400 Subject: [PATCH 3/3] Update components/net/sal/src/sal_socket.c --- components/net/sal/src/sal_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/net/sal/src/sal_socket.c b/components/net/sal/src/sal_socket.c index 42506a2614f..f59ee454fe0 100644 --- a/components/net/sal/src/sal_socket.c +++ b/components/net/sal/src/sal_socket.c @@ -1103,7 +1103,7 @@ int sal_ioctlsocket(int socket, long cmd, void *arg) addr_in->sin_addr.s_addr = sock->netdev->ip_addr.addr; #elif NETDEV_IPV6 #error "Do not only support IPV6" - #endif /* NETDEV_IPV4 && NETDEV_IPV6*/ + #endif /* NETDEV_IPV4 && NETDEV_IPV6 */ return 0; }