j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix gateway parsing in invitation files.

Browse source
This commit is contained in:
Guus Sliepen 2016-04-17 13:55:18 +02:00
parent 6d04528966
commit a08860ff8c
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/ifconfig.c
View file

@ -120,15 +120,16 @@ void ifconfig_address(FILE *out, const char *value) {
void ifconfig_route(FILE *out, const char *value) { void ifconfig_route(FILE *out, const char *value) {
subnet_t subnet = {}, gateway = {}; subnet_t subnet = {}, gateway = {};
char subnet_str[MAXNETSTR] = "", gateway_str[MAXNETSTR] = ""; char subnet_str[MAXNETSTR] = "", gateway_str[MAXNETSTR] = "";
const char *sep = strchr(value, ' '); char *sep = strchr(value, ' ');
if(sep)
*sep++ = 0;
if(!str2net(&subnet, value) || !net2str(subnet_str, sizeof subnet_str, &subnet) || subnet.type == SUBNET_MAC) { if(!str2net(&subnet, value) || !net2str(subnet_str, sizeof subnet_str, &subnet) || subnet.type == SUBNET_MAC) {
fprintf(stderr, "Could not parse Ifconfig statement\n"); fprintf(stderr, "Could not parse subnet in Route statement\n");
return; return;
} }
if(sep) { if(sep) {
sep++;
if(!str2net(&gateway, sep) || !net2str(gateway_str, sizeof gateway_str, &gateway) || gateway.type != subnet.type) { if(!str2net(&gateway, sep) || !net2str(gateway_str, sizeof gateway_str, &gateway) || gateway.type != subnet.type) {
fprintf(stderr, "Could not parse Ifconfig statement\n"); fprintf(stderr, "Could not parse gateway in Route statement\n");
return; return;
} }
char *slash = strchr(gateway_str, '/'); if(slash) *slash = 0; char *slash = strchr(gateway_str, '/'); if(slash) *slash = 0;