status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpd: fix ssdp notify on unrelated interfaces 

If several different interfaces share same ipv4 address on different
subnets (i.e. eth0 192.168.1.1/24 + eth1 192.168.1.1/16), miniupnpd
may pick any one of them, possibly wrong one w/o respecting exact
listening_ip interface.

syslog will contain something similar to:
    miniupnpd: sendto(udp_notify=6, 192.168.1.1): No such device
    miniupnpd: sendto(udp_notify=6, 192.168.1.1): No such device
    miniupnpd: try_sendto(sock=6, len=464, dest=239.255.255.250:1900): sendto: No such device
    miniupnpd: try_sendto(sock=6, len=464, dest=239.255.255.250:1900): sendto: No such device
    miniupnpd: try_sendto failed to send 11 packets

Fix that with specifying exact outgoing mcast interface for each
notify socket with help of IP_MULTICAST_IF/mreqn struct.
Since OpenAndConfSSDPNotifySocket() now takes lan_addr_s struct,
OpenAndConfSSDPNotifySocketIPv6() was similary changed for api
consistency.
This commit is contained in:
Vladislav Grishenko 2019-05-02 15:28:52 +05:00
parent 2ffc7afae9
commit 08b80d5abd
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniupnpd/Changelog.txt
View File

@ -1,5 +1,8 @@
$Id: Changelog.txt,v 1.446 2019/04/09 20:04:32 nanard Exp $ $Id: Changelog.txt,v 1.446 2019/04/09 20:04:32 nanard Exp $
2019/05/02:
Fix ssdp notify on unrelated interfaces
2019/04/09: 2019/04/09:
Fix buffer over-read in upnpevents.c with urls in the form http://ip:port Fix buffer over-read in upnpevents.c with urls in the form http://ip:port

35
miniupnpd/minissdp.c
View File

@ -83,11 +83,7 @@ AddMulticastMembership(int s, struct lan_addr_s * lan_addr)
#endif /* MULTIPLE_EXTERNAL_IP */ #endif /* MULTIPLE_EXTERNAL_IP */
#endif /* HAVE_IP_MREQN */ #endif /* HAVE_IP_MREQN */
#ifndef HAVE_IP_MREQN if (setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&imr, sizeof(imr)) < 0)
if (setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&imr, sizeof(struct ip_mreq)) < 0)
#else /* HAVE_IP_MREQN */
if (setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&imr, sizeof(struct ip_mreqn)) < 0)
#endif /* HAVE_IP_MREQN */
{ {
syslog(LOG_ERR, "setsockopt(udp, IP_ADD_MEMBERSHIP): %m"); syslog(LOG_ERR, "setsockopt(udp, IP_ADD_MEMBERSHIP): %m");
return -1; return -1;
@ -289,7 +285,7 @@ OpenAndConfSSDPReceiveSocket(int ipv6)
/* open the UDP socket used to send SSDP notifications to /* open the UDP socket used to send SSDP notifications to
* the multicast group reserved for them */ * the multicast group reserved for them */
static int static int
OpenAndConfSSDPNotifySocket(in_addr_t addr) OpenAndConfSSDPNotifySocket(struct lan_addr_s * lan_addr)
{ {
int s; int s;
unsigned char loopchar = 0; unsigned char loopchar = 0;
@ -298,7 +294,11 @@ OpenAndConfSSDPNotifySocket(in_addr_t addr)
The TTL for the IP packet SHOULD default to 2 and The TTL for the IP packet SHOULD default to 2 and
SHOULD be configurable. */ SHOULD be configurable. */
/* TODO: Make TTL be configurable */ /* TODO: Make TTL be configurable */
#ifndef HAVE_IP_MREQN
struct in_addr mc_if; struct in_addr mc_if;
#else /* HAVE_IP_MREQN */
struct ip_mreqn mc_if;
#endif /* HAVE_IP_MREQN */
struct sockaddr_in sockname; struct sockaddr_in sockname;
if( (s = socket(PF_INET, SOCK_DGRAM, 0)) < 0) if( (s = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
@ -307,7 +307,16 @@ OpenAndConfSSDPNotifySocket(in_addr_t addr)
return -1; return -1;
} }
mc_if.s_addr = addr; /*inet_addr(addr);*/ #ifndef HAVE_IP_MREQN
mc_if.s_addr = lan_addr->addr.s_addr; /*inet_addr(addr);*/
#else /* HAVE_IP_MREQN */
mc_if.imr_address.s_addr = lan_addr->addr.s_addr; /*inet_addr(addr);*/
#ifdef ENABLE_IPV6
mc_if.imr_ifindex = lan_addr->index;
#else /* ENABLE_IPV6 */
mc_if.imr_ifindex = if_nametoindex(lan_addr->ifname);
#endif /* ENABLE_IPV6 */
#endif /* HAVE_IP_MREQN */
if(setsockopt(s, IPPROTO_IP, IP_MULTICAST_LOOP, (char *)&loopchar, sizeof(loopchar)) < 0) if(setsockopt(s, IPPROTO_IP, IP_MULTICAST_LOOP, (char *)&loopchar, sizeof(loopchar)) < 0)
{ {
@ -341,7 +350,7 @@ OpenAndConfSSDPNotifySocket(in_addr_t addr)
* here it is used to se a specific sending address */ * here it is used to se a specific sending address */
memset(&sockname, 0, sizeof(struct sockaddr_in)); memset(&sockname, 0, sizeof(struct sockaddr_in));
sockname.sin_family = AF_INET; sockname.sin_family = AF_INET;
sockname.sin_addr.s_addr = addr; /*inet_addr(addr);*/ sockname.sin_addr.s_addr = lan_addr->addr.s_addr; /*inet_addr(addr);*/
if (bind(s, (struct sockaddr *)&sockname, sizeof(struct sockaddr_in)) < 0) if (bind(s, (struct sockaddr *)&sockname, sizeof(struct sockaddr_in)) < 0)
{ {
@ -357,7 +366,7 @@ OpenAndConfSSDPNotifySocket(in_addr_t addr)
/* open the UDP socket used to send SSDP notifications to /* open the UDP socket used to send SSDP notifications to
* the multicast group reserved for them. IPv6 */ * the multicast group reserved for them. IPv6 */
static int static int
OpenAndConfSSDPNotifySocketIPv6(unsigned int if_index) OpenAndConfSSDPNotifySocketIPv6(struct lan_addr_s * lan_addr)
{ {
int s; int s;
unsigned int loop = 0; unsigned int loop = 0;
@ -372,9 +381,9 @@ OpenAndConfSSDPNotifySocketIPv6(unsigned int if_index)
syslog(LOG_ERR, "socket(udp_notify IPv6): %m"); syslog(LOG_ERR, "socket(udp_notify IPv6): %m");
return -1; return -1;
} }
if(setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &if_index, sizeof(if_index)) < 0) if(setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &lan_addr->index, sizeof(lan_addr->index)) < 0)
{ {
syslog(LOG_ERR, "setsockopt(udp_notify IPv6, IPV6_MULTICAST_IF, %u): %m", if_index); syslog(LOG_ERR, "setsockopt(udp_notify IPv6, IPV6_MULTICAST_IF, %u): %m", lan_addr->index);
close(s); close(s);
return -1; return -1;
} }
@ -423,7 +432,7 @@ OpenAndConfSSDPNotifySockets(int * sockets)
lan_addr != NULL; lan_addr != NULL;
lan_addr = lan_addr->list.le_next) lan_addr = lan_addr->list.le_next)
{ {
sockets[i] = OpenAndConfSSDPNotifySocket(lan_addr->addr.s_addr); sockets[i] = OpenAndConfSSDPNotifySocket(lan_addr);
if(sockets[i] < 0) if(sockets[i] < 0)
goto error; goto error;
i++; i++;
@ -434,7 +443,7 @@ OpenAndConfSSDPNotifySockets(int * sockets)
} }
else else
{ {
sockets[i] = OpenAndConfSSDPNotifySocketIPv6(lan_addr->index); sockets[i] = OpenAndConfSSDPNotifySocketIPv6(lan_addr);
if(sockets[i] < 0) if(sockets[i] < 0)
goto error; goto error;
} }