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

miniupnpd/minissdp.c: rename SendSSDPAnnounce2() to SendSSDPResponse()

This commit is contained in:
Thomas Bernard 2013-06-11 20:03:15 +02:00
parent 63ece30b87
commit 01bffe494d
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
miniupnpd/minissdp.c
View File

@ -1,4 +1,4 @@
/* $Id: minissdp.c,v 1.50 2013/06/05 09:18:23 nanard Exp $ */ /* $Id: minissdp.c,v 1.51 2013/06/11 18:02:18 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2013 Thomas Bernard * (c) 2006-2013 Thomas Bernard
@ -313,10 +313,15 @@ USN:uuid:upnp-InternetGatewayDevice-1_0-0090a2777777::upnp:rootdevice
EXT: EXT:
*/ */
/* not really an SSDP "announce" as it is the response /* Responds to a SSDP "M-SEARCH"
* to a SSDP "M-SEARCH" */ * s : socket to use
* addr : peer
* st, st_len : ST: header
* suffix : suffix for USN: header
* host, port : our HTTP host, port
*/
static void static void
SendSSDPAnnounce2(int s, const struct sockaddr * addr, SendSSDPResponse(int s, const struct sockaddr * addr,
const char * st, int st_len, const char * suffix, const char * st, int st_len, const char * suffix,
const char * host, unsigned short port) const char * host, unsigned short port)
{ {
@ -371,12 +376,14 @@ SendSSDPAnnounce2(int s, const struct sockaddr * addr,
upnp_bootid, upnp_bootid, upnp_configid); upnp_bootid, upnp_bootid, upnp_configid);
if(l<0) if(l<0)
{ {
syslog(LOG_ERR, "SendSSDPAnnounce2(): snprintf failed %m"); syslog(LOG_ERR, "%s: snprintf failed %m",
"SendSSDPResponse()");
return; return;
} }
else if((unsigned)l>=sizeof(buf)) else if((unsigned)l>=sizeof(buf))
{ {
syslog(LOG_WARNING, "SendSSDPAnnounce2(): truncated output"); syslog(LOG_WARNING, "%s: truncated output",
"SendSSDPResponse()");
l = sizeof(buf) - 1; l = sizeof(buf) - 1;
} }
addrlen = (addr->sa_family == AF_INET6) addrlen = (addr->sa_family == AF_INET6)
@ -742,7 +749,7 @@ ProcessSSDPData(int s, const char *bufr, int n,
) )
{ {
syslog(LOG_INFO, "Single search found"); syslog(LOG_INFO, "Single search found");
SendSSDPAnnounce2(s, sender, SendSSDPResponse(s, sender,
st, st_len, "", st, st_len, "",
announced_host, port); announced_host, port);
break; break;
@ -760,12 +767,12 @@ ProcessSSDPData(int s, const char *bufr, int n,
else else
snprintf(ver_str, sizeof(ver_str), "%d", known_service_types[i].version); snprintf(ver_str, sizeof(ver_str), "%d", known_service_types[i].version);
l = (int)strlen(known_service_types[i].s); l = (int)strlen(known_service_types[i].s);
SendSSDPAnnounce2(s, sender, SendSSDPResponse(s, sender,
known_service_types[i].s, l, ver_str, known_service_types[i].s, l, ver_str,
announced_host, port); announced_host, port);
} }
/* also answer for uuid */ /* also answer for uuid */
SendSSDPAnnounce2(s, sender, uuidvalue, strlen(uuidvalue), "", SendSSDPResponse(s, sender, uuidvalue, strlen(uuidvalue), "",
announced_host, port); announced_host, port);
} }
/* responds to request by UUID value */ /* responds to request by UUID value */
@ -773,7 +780,7 @@ ProcessSSDPData(int s, const char *bufr, int n,
if(l==st_len && (0 == memcmp(st, uuidvalue, l))) if(l==st_len && (0 == memcmp(st, uuidvalue, l)))
{ {
syslog(LOG_INFO, "ssdp:uuid found"); syslog(LOG_INFO, "ssdp:uuid found");
SendSSDPAnnounce2(s, sender, st, st_len, "", SendSSDPResponse(s, sender, st, st_len, "",
announced_host, port); announced_host, port);
} }
} }