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

sup-config/file: Addressed issue with ipv4-network not reading prefix

Browse Source 
That is the syntax now accepts options such as:
"ipv4-network = x.x.x.x/y". Reported by Frank Rosquin.
This commit is contained in:
Nikos Mavrogiannopoulos
2016-02-23 14:46:13 +01:00
parent 260b07955c
commit cbcd4c8279
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sup-config/file.c
View File

@@ -164,7 +164,7 @@ int parse_group_cfg_file(struct cfg_st *global_config,
tOptionValue const * pov;
const tOptionValue* val, *prev;
char *tmp;
unsigned prefix = 0;
unsigned prefix = 0, prefix4 = 0;
int ret;
unsigned j;
@@ -234,11 +234,17 @@ unsigned j;
READ_RAW_STRING("cgroup", msg->config->cgroup);
READ_RAW_STRING("ipv4-network", msg->config->ipv4_net);
READ_RAW_STRING("ipv6-network", msg->config->ipv6_net);
READ_RAW_STRING("ipv4-netmask", msg->config->ipv4_netmask);
READ_RAW_STRING("explicit-ipv4", msg->config->explicit_ipv4);
READ_RAW_STRING("explicit-ipv6", msg->config->explicit_ipv6);
prefix4 = extract_prefix(msg->config->ipv4_net);
if (prefix4 == 0) {
READ_RAW_STRING("ipv4-netmask", msg->config->ipv4_netmask);
} else {
msg->config->ipv4_netmask = ipv4_prefix_to_strmask(pool, prefix4);
}
READ_RAW_STRING("ipv6-network", msg->config->ipv6_net);
READ_RAW_STRING("explicit-ipv6", msg->config->explicit_ipv6);
READ_RAW_NUMERIC("ipv6-subnet-prefix", msg->config->ipv6_subnet_prefix, msg->config->has_ipv6_subnet_prefix);
msg->config->ipv6_prefix = extract_prefix(msg->config->ipv6_net);