GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

when reading IPv4 routes ensure they are read/converted to proper format

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-10-28 13:54:38 +01:00
parent f55ff1dde5
commit 97d6074ed3
5 changed files with 100 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/config.c
View File

@@ -574,11 +574,13 @@ static void parse_kkdcp(struct cfg_st *config, char **urlfw, unsigned urlfw_size
}
#endif
static void append_iroutes_from_file(struct cfg_st *config, const char *file)
{
tOptionValue const * pov;
const tOptionValue* val;
int ret;
unsigned j;
pov = configFileLoad(file);
if (pov == NULL)
@@ -594,6 +596,12 @@ static void append_iroutes_from_file(struct cfg_st *config, const char *file)
fprintf(stderr, "Error loading iroute from %s\n", file);
}
for (j=0;j<config->known_iroutes_size;j++) {
if (ip_route_sanity_check(config->known_iroutes, &config->known_iroutes[j]) != 0)
exit(1);
}
exit:
optionUnloadNested(pov);
return;
@@ -616,11 +624,6 @@ static void load_iroutes(struct cfg_st *config)
} while(r != NULL);
}
closedir(dir);
unsigned i;
for (i=0;i<config->known_iroutes_size;i++){
fprintf(stderr, "iroute: %s\n", config->known_iroutes[i]);
}
}
static void parse_cfg_file(void *pool, const char* file, struct perm_cfg_st *perm_config, unsigned reload)
@@ -954,6 +957,9 @@ size_t urlfw_size = 0;
READ_MULTI_LINE("route", config->network.routes, config->network.routes_size);
for (j=0;j<config->network.routes_size;j++) {
if (ip_route_sanity_check(config->network.routes, &config->network.routes[j]) != 0)
exit(1);
if (strcmp(config->network.routes[j], "0.0.0.0/0") == 0 ||
strcmp(config->network.routes[j], "default") == 0) {
/* set default route */
@@ -965,6 +971,10 @@ size_t urlfw_size = 0;
}
READ_MULTI_LINE("no-route", config->network.no_routes, config->network.no_routes_size);
for (j=0;j<config->network.no_routes_size;j++) {
if (ip_route_sanity_check(config->network.no_routes, &config->network.no_routes[j]) != 0)
exit(1);
}
READ_STRING("default-select-group", config->default_select_group);
READ_TF("auto-select-group", auto_select_group, 0);