sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/sockopt: move BINDTODEVICE to socket level

Browse Source 
rename the UDP_BINDTODEVICE to SO_BINDTODEVICE to follow the linux
style to be compatible with non-UDP protocol binding requirements

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-08-24 10:37:49 +08:00 committed by Xiang Xiao
parent 0cdb2cfa48
commit 995aef9d99
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netutils/dhcpc/Kconfig
View File

@ -7,7 +7,7 @@ config NETUTILS_DHCPC
bool "DHCP client" bool "DHCP client"
default n default n
depends on NET_UDP && NET_BROADCAST && NET_IPv4 depends on NET_UDP && NET_BROADCAST && NET_IPv4
select NET_UDP_BINDTODEVICE if !NET_UDP_NO_STACK select NET_BINDTODEVICE if !NET_UDP_NO_STACK
---help--- ---help---
Enable support for the DHCP client. Enable support for the DHCP client.

4
netutils/dhcpc/dhcpc.c
View File

@ -565,14 +565,14 @@ FAR void *dhcpc_open(FAR const char *interface, FAR const void *macaddr,
return NULL; return NULL;
} }
#ifdef CONFIG_NET_UDP_BINDTODEVICE #ifdef CONFIG_NET_BINDTODEVICE
/* Bind socket to interface, because UDP packets have to be sent to the /* Bind socket to interface, because UDP packets have to be sent to the
* broadcast address at a moment when it is not possible to decide the * broadcast address at a moment when it is not possible to decide the
* target network device using the local or remote address (which is, * target network device using the local or remote address (which is,
* by definition and purpose of DHCP, undefined yet). * by definition and purpose of DHCP, undefined yet).
*/ */
ret = setsockopt(pdhcpc->sockfd, IPPROTO_UDP, UDP_BINDTODEVICE, ret = setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_BINDTODEVICE,
pdhcpc->interface, strlen(pdhcpc->interface)); pdhcpc->interface, strlen(pdhcpc->interface));
if (ret < 0) if (ret < 0)
{ {

4
netutils/dhcpd/dhcpd.c
View File

@ -864,14 +864,14 @@ static inline int dhcpd_socket(FAR const char *interface)
} }
#endif #endif
#ifdef CONFIG_NET_UDP_BINDTODEVICE #ifdef CONFIG_NET_BINDTODEVICE
/* Bind socket to interface, because UDP packets have to be sent to the /* Bind socket to interface, because UDP packets have to be sent to the
* broadcast address at a moment when it is not possible to decide the * broadcast address at a moment when it is not possible to decide the
* target network device using the local or remote address (which is, * target network device using the local or remote address (which is,
* by definition and purpose of DHCP, undefined yet). * by definition and purpose of DHCP, undefined yet).
*/ */
if (setsockopt(sockfd, IPPROTO_UDP, UDP_BINDTODEVICE, if (setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE,
interface, strlen(interface)) < 0) interface, strlen(interface)) < 0)
{ {
ninfo("ERROR: setsockopt UDP_BINDTODEVICE failed: %d\n", errno); ninfo("ERROR: setsockopt UDP_BINDTODEVICE failed: %d\n", errno);