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

upnpd/minissdp.c: enlarge SSDP packet buffer for sending

This commit is contained in:
Thomas Bernard 2014-04-09 15:36:38 +02:00
parent 6794650f5a
commit 123eca279c
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
miniupnpd/minissdp.c
View File

@ -33,6 +33,14 @@
#define LL_SSDP_MCAST_ADDR "FF02::C" #define LL_SSDP_MCAST_ADDR "FF02::C"
#define SL_SSDP_MCAST_ADDR "FF05::C" #define SL_SSDP_MCAST_ADDR "FF05::C"
/* maximum lenght of SSDP packets we are generating
* (reception is done in a 1500byte buffer) */
#ifdef ENABLE_HTTPS
#define SSDP_PACKET_MAX_LEN 768
#else
#define SSDP_PACKET_MAX_LEN 512
#endif
/* AddMulticastMembership() /* AddMulticastMembership()
* param s socket * param s socket
* param ifaddr ip v4 address * param ifaddr ip v4 address
@ -343,7 +351,7 @@ SendSSDPResponse(int s, const struct sockaddr * addr,
const char * uuidvalue, unsigned int delay) const char * uuidvalue, unsigned int delay)
{ {
int l, n; int l, n;
char buf[512]; char buf[SSDP_PACKET_MAX_LEN];
char addr_str[64]; char addr_str[64];
socklen_t addrlen; socklen_t addrlen;
int st_is_uuid; int st_is_uuid;
@ -405,8 +413,8 @@ SendSSDPResponse(int s, const struct sockaddr * addr,
} }
else if((unsigned)l>=sizeof(buf)) else if((unsigned)l>=sizeof(buf))
{ {
syslog(LOG_WARNING, "%s: truncated output", syslog(LOG_WARNING, "%s: truncated output (%u>=%u)",
"SendSSDPResponse()"); "SendSSDPResponse()", (unsigned)l, (unsigned)sizeof(buf));
l = sizeof(buf) - 1; l = sizeof(buf) - 1;
} }
addrlen = (addr->sa_family == AF_INET6) addrlen = (addr->sa_family == AF_INET6)
@ -469,7 +477,7 @@ SendSSDPNotify(int s, const struct sockaddr * dest,
const char * usn1, const char * usn2, const char * usn3, const char * usn1, const char * usn2, const char * usn3,
unsigned int lifetime, int ipv6) unsigned int lifetime, int ipv6)
{ {
char bufr[512]; char bufr[SSDP_PACKET_MAX_LEN];
int n, l; int n, l;
l = snprintf(bufr, sizeof(bufr), l = snprintf(bufr, sizeof(bufr),
@ -506,7 +514,8 @@ SendSSDPNotify(int s, const struct sockaddr * dest,
} }
else if((unsigned int)l >= sizeof(bufr)) else if((unsigned int)l >= sizeof(bufr))
{ {
syslog(LOG_WARNING, "SendSSDPNotify(): truncated output"); syslog(LOG_WARNING, "%s: truncated output (%u>=%u)",
"SendSSDPNotify()", (unsigned)l, (unsigned)sizeof(bufr));
l = sizeof(bufr) - 1; l = sizeof(bufr) - 1;
} }
n = sendto_or_schedule(s, bufr, l, 0, dest, n = sendto_or_schedule(s, bufr, l, 0, dest,
@ -1020,7 +1029,7 @@ SendSSDPbyebye(int s, const struct sockaddr * dest,
int ipv6) int ipv6)
{ {
int n, l; int n, l;
char bufr[512]; char bufr[SSDP_PACKET_MAX_LEN];
l = snprintf(bufr, sizeof(bufr), l = snprintf(bufr, sizeof(bufr),
"NOTIFY * HTTP/1.1\r\n" "NOTIFY * HTTP/1.1\r\n"
@ -1040,12 +1049,13 @@ SendSSDPbyebye(int s, const struct sockaddr * dest,
upnp_bootid, upnp_bootid, upnp_configid); upnp_bootid, upnp_bootid, upnp_configid);
if(l<0) if(l<0)
{ {
syslog(LOG_ERR, "SendSSDPbyebye() snprintf error"); syslog(LOG_ERR, "%s: snprintf error", "SendSSDPbyebye()");
return -1; return -1;
} }
else if((unsigned int)l >= sizeof(bufr)) else if((unsigned int)l >= sizeof(bufr))
{ {
syslog(LOG_WARNING, "SendSSDPbyebye(): truncated output"); syslog(LOG_WARNING, "%s: truncated output (%u>=%u)",
"SendSSDPbyebye()", (unsigned)l, (unsigned)sizeof(bufr));
l = sizeof(bufr) - 1; l = sizeof(bufr) - 1;
} }
n = sendto_or_schedule(s, bufr, l, 0, dest, n = sendto_or_schedule(s, bufr, l, 0, dest,