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

net/udp: Restore some legacy behavior that was lost with the implementation of CONFIG_NET_UDP_BINDTODEVICE: If no device has a local address when the broadcast packet is sent and the UDP socket is not bound to a device, there select some arbitrary device. This is certainly lunacy in the case where there are multiple network devices registered because the wrong device will probably be returned. It works find, however, for the legacy case where only a single network device is registered.

Browse Source
This commit is contained in:
Gregory Nutt 2018-07-04 07:35:51 -06:00
parent 75f7663427
commit 254924029b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/udp/udp.h
View File

@ -522,7 +522,8 @@ int udp_ipv6_input(FAR struct net_driver_s *dev);
* conn - UDP connection structure (not currently used). * conn - UDP connection structure (not currently used).
* *
* Returned Value: * Returned Value:
* A pointer to the network driver to use. * A pointer to the network driver to use. NULL is returned if driver is
* not bound to any local device.
* *
****************************************************************************/ ****************************************************************************/

17
net/udp/udp_finddev.c
View File

@ -66,7 +66,9 @@
* Returned Value: * Returned Value:
* A reference to the bound device. If the retained interface index no * A reference to the bound device. If the retained interface index no
* longer refers to a valid device, this function will unbind the device * longer refers to a valid device, this function will unbind the device
* and return NULL * and return an arbitrary network device at the head of the list of
* registered devices. This supports legacy IPv4 DHCPD behavior when
* there is only a single registered network device.
* *
****************************************************************************/ ****************************************************************************/
@ -94,10 +96,16 @@ static FAR struct net_driver_s *upd_bound_device(FAR struct udp_conn_s *conn)
} }
} }
return dev; /* REVISIT: If no device was bound or the bound device is no longer valid,
* then just return the arbitrary device at the head of the list of
* registered devices. This is lunacy if there are multiple, registered
* network devices but makes perfectly good since if there is only one.
*/
return dev == NULL ? g_netdevices : dev;
} }
#else #else
# define upd_bound_device(c) NULL # define upd_bound_device(c) g_netdevices
#endif #endif
@ -119,7 +127,8 @@ static FAR struct net_driver_s *upd_bound_device(FAR struct udp_conn_s *conn)
* conn - UDP connection structure (not currently used). * conn - UDP connection structure (not currently used).
* *
* Returned Value: * Returned Value:
* A pointer to the network driver to use. * A pointer to the network driver to use. NULL is returned if driver is
* not bound to any local device.
* *
****************************************************************************/ ****************************************************************************/