Skip to content

[SAL] fix the IPv4&v6 compiling issue. #7938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 10, 2023
Merged

[SAL] fix the IPv4&v6 compiling issue. #7938

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0a7d25
[SAL] fix the IPv4&v6 compiling issue.
BernardXiong Aug 9, 2023
72d6f71
Update components/net/sal/src/sal_socket.c
mysterywolf Aug 10, 2023
6b5b692
Update components/net/sal/src/sal_socket.c
mysterywolf Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion components/net/sal/src/sal_socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "Do not only support IPV6"
#endif /* NETDEV_IPV4 && NETDEV_IPV6 */

return 0;
}
}
Expand Down