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

miniupnpd.c: parselanaddr() pow parses 192.168.1.1/255.255.255.0 

Change parselanaddr() function to allow 192.168.1.1/255.255.255.0 in
addition to 192.168.1.1/24 in configuration file.
This commit is contained in:
Thomas Bernard 2012-02-15 23:48:20 +01:00
parent 9fb0a2ae2d
commit f01dc59aa3
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
miniupnpd/Changelog.txt
View File

@ -1,4 +1,8 @@
$Id: Changelog.txt,v 1.259 2012/02/12 13:02:54 nanard Exp $
$Id: Changelog.txt,v 1.260 2012/02/15 22:44:26 nanard Exp $
2012/02/15:
Change parselanaddr() function to allow 192.168.1.1/255.255.255.0 in
configuration file.
2012/02/12:
More syntax checks in upnppermissions.c

53
miniupnpd/miniupnpd.c
View File

@ -1,4 +1,4 @@
/* $Id: miniupnpd.c,v 1.145 2012/02/09 20:15:01 nanard Exp $ */
/* $Id: miniupnpd.c,v 1.147 2012/02/15 22:43:56 nanard Exp $ */
/* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2012 Thomas Bernard
@ -514,7 +514,7 @@ struct runtime_vars {
/* parselanaddr()
* parse address with mask
* ex: 192.168.1.1/24
* ex: 192.168.1.1/24 or 192.168.1.1/255.255.255.0
* When MULTIPLE_EXTERNAL_IP is enabled, the ip address of the
* external interface associated with the lan subnet follows.
* ex : 192.168.1.1/24 81.21.41.11
@ -526,31 +526,49 @@ static int
parselanaddr(struct lan_addr_s * lan_addr, const char * str)
{
const char * p;
int nbits = 24; /* by default, networks are /24 */
int n;
char tmp[16];
p = str;
while(*p && *p != '/' && !isspace(*p))
p++;
n = p - str;
if(*p == '/')
{
nbits = atoi(++p);
while(*p && !isspace(*p))
p++;
}
if(n>15)
{
fprintf(stderr, "Error parsing address/mask : %s\n", str);
return -1;
}
goto parselan_error;
memcpy(lan_addr->str, str, n);
lan_addr->str[n] = '\0';
if(!inet_aton(lan_addr->str, &lan_addr->addr))
goto parselan_error;
if(*p == '/')
{
fprintf(stderr, "Error parsing address/mask : %s\n", str);
return -1;
const char * q = ++p;
while(*p && isdigit(*p))
p++;
if(*p=='.')
{
while(*p && (*p=='.' || isdigit(*p)))
p++;
n = p - q;
if(n>15)
goto parselan_error;
memcpy(tmp, q, n);
tmp[n] = '\0';
if(!inet_aton(tmp, &lan_addr->mask))
goto parselan_error;
}
else
{
int nbits = atoi(q);
if(nbits > 32 || nbits < 0)
goto parselan_error;
lan_addr->mask.s_addr = htonl(nbits ? (0xffffffffu << (32 - nbits)) : 0);
}
}
else
{
/* by default, networks are /24 */
lan_addr->mask.s_addr = htonl(0xffffff00u);
}
lan_addr->mask.s_addr = htonl(nbits ? (0xffffffff << (32 - nbits)) : 0);
#ifdef MULTIPLE_EXTERNAL_IP
/* skip spaces */
while(*p && isspace(*p))
@ -571,6 +589,9 @@ parselanaddr(struct lan_addr_s * lan_addr, const char * str)
}
#endif
return 0;
parselan_error:
fprintf(stderr, "Error parsing address/mask : %s\n", str);
return -1;
}
/* init phase :