Corrected fix for bug #34072 (UDP broadcast is received from wrong UDP pcb if udp port matches): pcbs bound to IPADDR_ANY did not receive broadcasts any more (bug #34294)

This commit is contained in:
Simon Goldschmidt 2011-09-22 06:24:58 +02:00 committed by goldsimon
parent 3d48abb98d
commit d5eb52868e

View File

@ -247,10 +247,12 @@ udp_input(struct pbuf *p, struct netif *inp)
#endif /* LWIP_IGMP */ #endif /* LWIP_IGMP */
#if IP_SOF_BROADCAST_RECV #if IP_SOF_BROADCAST_RECV
(broadcast && (pcb->so_options & SOF_BROADCAST) && (broadcast && (pcb->so_options & SOF_BROADCAST) &&
ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask))) { (ip_addr_isany(&pcb->local_ip) ||
ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask)))) {
#else /* IP_SOF_BROADCAST_RECV */ #else /* IP_SOF_BROADCAST_RECV */
(broadcast && (broadcast &&
ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask))) { (ip_addr_isany(&pcb->local_ip) ||
ip_addr_netcmp(&pcb->local_ip, ip_current_dest_addr(), &inp->netmask)))) {
#endif /* IP_SOF_BROADCAST_RECV */ #endif /* IP_SOF_BROADCAST_RECV */
local_match = 1; local_match = 1;
if ((uncon_pcb == NULL) && if ((uncon_pcb == NULL) &&