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

add -f command line option to filter for a specific device type 

fixes #138
This commit is contained in:
Thomas Bernard 2015-08-06 16:07:33 +02:00
parent 6ddb505f68
commit 8ec33b7691
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
minissdpd/Changelog.txt
View File

@ -2,6 +2,7 @@ $Id: Changelog.txt,v 1.43 2015/08/06 14:05:49 nanard Exp $
2015/08/06: 2015/08/06:
disable multicast loop disable multicast loop
add -f command line option to filter for a specific device type
VERSION 1.4: VERSION 1.4:

31
minissdpd/minissdpd.c
View File

@ -1,4 +1,4 @@
/* $Id: minissdpd.c,v 1.49 2015/08/06 13:16:58 nanard Exp $ */ /* $Id: minissdpd.c,v 1.50 2015/08/06 14:05:49 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* (c) 2007-2015 Thomas Bernard * (c) 2007-2015 Thomas Bernard
* website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
@ -492,7 +492,8 @@ containsForbiddenChars(const unsigned char * p, int len)
* 1 : a device was added. */ * 1 : a device was added. */
static int static int
ParseSSDPPacket(int s, const char * p, ssize_t n, ParseSSDPPacket(int s, const char * p, ssize_t n,
const struct sockaddr * addr) const struct sockaddr * addr,
const char * searched_device)
{ {
const char * linestart; const char * linestart;
const char * lineend; const char * lineend;
@ -648,6 +649,10 @@ ParseSSDPPacket(int s, const char * p, ssize_t n,
case METHOD_NOTIFY: case METHOD_NOTIFY:
if(nts==NTS_SSDP_ALIVE || nts==NTS_SSDP_UPDATE) { if(nts==NTS_SSDP_ALIVE || nts==NTS_SSDP_UPDATE) {
if(headers[HEADER_NT].p && headers[HEADER_USN].p && headers[HEADER_LOCATION].p) { if(headers[HEADER_NT].p && headers[HEADER_USN].p && headers[HEADER_LOCATION].p) {
/* filter if needed */
if(searched_device &&
0 != memcmp(headers[HEADER_NT].p, searched_device, headers[HEADER_NT].l))
break;
r = updateDevice(headers, time(NULL) + lifetime); r = updateDevice(headers, time(NULL) + lifetime);
} else { } else {
syslog(LOG_WARNING, "missing header nt=%p usn=%p location=%p", syslog(LOG_WARNING, "missing header nt=%p usn=%p location=%p",
@ -993,13 +998,14 @@ sigterm(int sig)
#define UPNP_MCAST_LL_ADDR "FF02::C" /* link-local */ #define UPNP_MCAST_LL_ADDR "FF02::C" /* link-local */
#define UPNP_MCAST_SL_ADDR "FF05::C" /* site-local */ #define UPNP_MCAST_SL_ADDR "FF05::C" /* site-local */
/* send the M-SEARCH request for all devices */ /* send the M-SEARCH request for devices
void ssdpDiscoverAll(int s, int ipv6) * either all devices (third argument is NULL or "*") or a specific one */
static void ssdpDiscover(int s, int ipv6, const char * search)
{ {
static const char MSearchMsgFmt[] = static const char MSearchMsgFmt[] =
"M-SEARCH * HTTP/1.1\r\n" "M-SEARCH * HTTP/1.1\r\n"
"HOST: %s:" XSTR(PORT) "\r\n" "HOST: %s:" XSTR(PORT) "\r\n"
"ST: ssdp:all\r\n" "ST: %s\r\n"
"MAN: \"ssdp:discover\"\r\n" "MAN: \"ssdp:discover\"\r\n"
"MX: %u\r\n" "MX: %u\r\n"
"\r\n"; "\r\n";
@ -1014,7 +1020,8 @@ void ssdpDiscoverAll(int s, int ipv6)
MSearchMsgFmt, MSearchMsgFmt,
ipv6 ? ipv6 ?
(linklocal ? "[" UPNP_MCAST_LL_ADDR "]" : "[" UPNP_MCAST_SL_ADDR "]") (linklocal ? "[" UPNP_MCAST_LL_ADDR "]" : "[" UPNP_MCAST_SL_ADDR "]")
: UPNP_MCAST_ADDR, mx); : UPNP_MCAST_ADDR,
(search ? search : "ssdp:all"), mx);
memset(&sockudp_w, 0, sizeof(struct sockaddr_storage)); memset(&sockudp_w, 0, sizeof(struct sockaddr_storage));
if(ipv6) { if(ipv6) {
struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_w; struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_w;
@ -1077,6 +1084,7 @@ int main(int argc, char * * argv)
socklen_t sendername6_len; socklen_t sendername6_len;
#endif /* ENABLE_IPV6 */ #endif /* ENABLE_IPV6 */
unsigned char ttl = 2; /* UDA says it should default to 2 */ unsigned char ttl = 2; /* UDA says it should default to 2 */
const char * searched_device = NULL; /* if not NULL, search/filter a specific device type */
LIST_INIT(&reqlisthead); LIST_INIT(&reqlisthead);
LIST_INIT(&servicelisthead); LIST_INIT(&servicelisthead);
@ -1113,6 +1121,8 @@ int main(int argc, char * * argv)
pidfilename = argv[++i]; pidfilename = argv[++i];
else if(0==strcmp(argv[i], "-t")) else if(0==strcmp(argv[i], "-t"))
ttl = (unsigned char)atoi(argv[++i]); ttl = (unsigned char)atoi(argv[++i]);
else if(0==strcmp(argv[i], "-f"))
searched_device = argv[++i];
else else
fprintf(stderr, "unknown commandline option %s.\n", argv[i]); fprintf(stderr, "unknown commandline option %s.\n", argv[i]);
} }
@ -1125,6 +1135,7 @@ int main(int argc, char * * argv)
"[-6] " "[-6] "
#endif /* ENABLE_IPV6 */ #endif /* ENABLE_IPV6 */
"[-s socket] [-p pidfile] [-t TTL] " "[-s socket] [-p pidfile] [-t TTL] "
"-f device "
"-i <interface> [-i <interface2>] ...\n", "-i <interface> [-i <interface2>] ...\n",
argv[0]); argv[0]);
fprintf(stderr, fprintf(stderr,
@ -1244,9 +1255,9 @@ int main(int argc, char * * argv)
/* send M-SEARCH ssdp:all Requests */ /* send M-SEARCH ssdp:all Requests */
if(s_ssdp >= 0) if(s_ssdp >= 0)
ssdpDiscoverAll(s_ssdp, 0); ssdpDiscover(s_ssdp, 0, searched_device);
if(s_ssdp6 >= 0) if(s_ssdp6 >= 0)
ssdpDiscoverAll(s_ssdp6, 1); ssdpDiscover(s_ssdp6, 1, searched_device);
/* Main loop */ /* Main loop */
while(!quitting) { while(!quitting) {
@ -1312,7 +1323,7 @@ int main(int argc, char * * argv)
/* Parse and process the packet received */ /* Parse and process the packet received */
/*printf("%.*s", n, buf);*/ /*printf("%.*s", n, buf);*/
i = ParseSSDPPacket(s_ssdp6, buf, n, i = ParseSSDPPacket(s_ssdp6, buf, n,
(struct sockaddr *)&sendername6); (struct sockaddr *)&sendername6, searched_device);
syslog(LOG_DEBUG, "** i=%d deltadev=%d **", i, deltadev); syslog(LOG_DEBUG, "** i=%d deltadev=%d **", i, deltadev);
if(i==0 || (i*deltadev < 0)) if(i==0 || (i*deltadev < 0))
{ {
@ -1346,7 +1357,7 @@ int main(int argc, char * * argv)
/* Parse and process the packet received */ /* Parse and process the packet received */
/*printf("%.*s", n, buf);*/ /*printf("%.*s", n, buf);*/
i = ParseSSDPPacket(s_ssdp, buf, n, i = ParseSSDPPacket(s_ssdp, buf, n,
(struct sockaddr *)&sendername); (struct sockaddr *)&sendername, searched_device);
syslog(LOG_DEBUG, "** i=%d deltadev=%d **", i, deltadev); syslog(LOG_DEBUG, "** i=%d deltadev=%d **", i, deltadev);
if(i==0 || (i*deltadev < 0)) if(i==0 || (i*deltadev < 0))
{ {