mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-02-10 03:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

udp: fix udp_bind for IPADDR_TYPE_ANY

Browse Source 
See bug #55171

Signed-off-by: Simon Goldschmidt <goldsimon@gmx.de>
(cherry picked from commit 752cdb1a53863ce241b1eb9e712bd223b6556360)
This commit is contained in:
Simon Goldschmidt 2019-02-26 14:48:44 +01:00
parent aad77fcacb
commit fee64d7515
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/udp.c
View File

@ -997,11 +997,13 @@ udp_bind(struct udp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port)
{ {
/* port matches that of PCB in list and REUSEADDR not set -> reject */ /* port matches that of PCB in list and REUSEADDR not set -> reject */
if ((ipcb->local_port == port) && if ((ipcb->local_port == port) &&
(IP_GET_TYPE(&ipcb->local_ip) == IP_GET_TYPE(ipaddr)) && ((IP_GET_TYPE(&ipcb->local_ip) == IP_GET_TYPE(ipaddr)) &&
/* IP address matches or any IP used? */ /* IP address matches or any IP used? */
(ip_addr_cmp(&ipcb->local_ip, ipaddr) || (ip_addr_cmp(&ipcb->local_ip, ipaddr) ||
ip_addr_isany(ipaddr) || ip_addr_isany(ipaddr) ||
ip_addr_isany(&ipcb->local_ip))) { ip_addr_isany(&ipcb->local_ip))) ||
(IP_GET_TYPE(&ipcb->local_ip) == IPADDR_TYPE_ANY) ||
(IP_GET_TYPE(ipaddr) == IPADDR_TYPE_ANY)) {
/* other PCB already binds to this local IP and port */ /* other PCB already binds to this local IP and port */
LWIP_DEBUGF(UDP_DEBUG, LWIP_DEBUGF(UDP_DEBUG,
("udp_bind: local port %"U16_F" already bound by another pcb\n", port)); ("udp_bind: local port %"U16_F" already bound by another pcb\n", port));

18
test/unit/udp/test_udp.c
View File

@ -377,7 +377,7 @@ START_TEST(test_udp_bind)
udp_remove(pcb1); udp_remove(pcb1);
udp_remove(pcb2); udp_remove(pcb2);
/* bind on same port using SAME IPv4 address type */ /* bind on same port using SAME IPv6 address type */
ip_addr_set_any_val(1, ip1); ip_addr_set_any_val(1, ip1);
ip_addr_set_any_val(1, ip2); ip_addr_set_any_val(1, ip2);
@ -440,6 +440,22 @@ START_TEST(test_udp_bind)
udp_remove(pcb1); udp_remove(pcb1);
udp_remove(pcb2); udp_remove(pcb2);
/* bind on same port using ANY + IPv4 */
ip1 = *IP_ANY_TYPE;
IP_ADDR4(&ip2, 1, 2, 3, 4);
pcb1 = udp_new_ip_type(IPADDR_TYPE_ANY);
pcb2 = udp_new_ip_type(IPADDR_TYPE_V4);
err1 = udp_bind(pcb1, &ip1, 2105);
err2 = udp_bind(pcb2, &ip2, 2105);
fail_unless(err1 == ERR_OK);
fail_unless(err2 == ERR_USE);
udp_remove(pcb1);
udp_remove(pcb2);
} }
END_TEST END_TEST