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

minissdpd.c: improve comments and logging

This commit is contained in:
Thomas Bernard 2014-02-03 16:50:37 +01:00
parent 2e4d11ba28
commit 612d0e44fb
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
minissdpd/minissdpd.c
View File

@ -1,6 +1,6 @@
/* $Id: minissdpd.c,v 1.35 2012/05/21 17:13:11 nanard Exp $ */ /* $Id: minissdpd.c,v 1.36 2014/02/03 15:45:07 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* (c) 2007-2012 Thomas Bernard * (c) 2007-2014 Thomas Bernard
* website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* This software is subject to the conditions detailed * This software is subject to the conditions detailed
* in the LICENCE file provided within the distribution */ * in the LICENCE file provided within the distribution */
@ -282,8 +282,10 @@ processMSEARCH(int s, const char * st, int st_len,
} }
} else { } else {
/* find matching services */ /* find matching services */
/* remove version at the end of the ST string */
if(st[st_len-2]==':' && isdigit(st[st_len-1])) if(st[st_len-2]==':' && isdigit(st[st_len-1]))
st_len -= 2; st_len -= 2;
/* answer for each matching service */
for(serv = servicelisthead.lh_first; for(serv = servicelisthead.lh_first;
serv; serv;
serv = serv->entries.le_next) { serv = serv->entries.le_next) {
@ -338,6 +340,7 @@ ParseSSDPPacket(int s, const char * p, ssize_t n,
unsigned int lifetime = 180; /* 3 minutes by default */ unsigned int lifetime = 180; /* 3 minutes by default */
const char * st = NULL; const char * st = NULL;
int st_len = 0; int st_len = 0;
memset(headers, 0, sizeof(headers)); memset(headers, 0, sizeof(headers));
for(methodlen = 0; for(methodlen = 0;
methodlen < n && (isalpha(p[methodlen]) || p[methodlen]=='-'); methodlen < n && (isalpha(p[methodlen]) || p[methodlen]=='-');
@ -566,9 +569,9 @@ void processRequest(struct reqelem * req)
syslog(LOG_INFO, "(s=%d) request type=%d str='%.*s'", syslog(LOG_INFO, "(s=%d) request type=%d str='%.*s'",
req->socket, type, l, p); req->socket, type, l, p);
switch(type) { switch(type) {
case 1: case 1: /* request by type */
case 2: case 2: /* request by USN (unique id) */
case 3: case 3: /* everything */
while(d && (nrep < 255)) { while(d && (nrep < 255)) {
if(d->t < t) { if(d->t < t) {
syslog(LOG_INFO, "outdated device"); syslog(LOG_INFO, "outdated device");
@ -633,12 +636,14 @@ void processRequest(struct reqelem * req)
} }
} }
rbuf[0] = nrep; rbuf[0] = nrep;
syslog(LOG_DEBUG, "(s=%d) response : %d device%s",
req->socket, nrep, (nrep > 1) ? "s" : "");
if(write(req->socket, rbuf, rp - rbuf) < 0) { if(write(req->socket, rbuf, rp - rbuf) < 0) {
syslog(LOG_ERR, "(s=%d) write: %m", req->socket); syslog(LOG_ERR, "(s=%d) write: %m", req->socket);
goto error; goto error;
} }
break; break;
case 4: case 4: /* submit service */
newserv = malloc(sizeof(struct service)); newserv = malloc(sizeof(struct service));
if(!newserv) { if(!newserv) {
syslog(LOG_ERR, "cannot allocate memory"); syslog(LOG_ERR, "cannot allocate memory");