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

Set the applicable DNS and NBNS servers in complete_vpn_info().

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2014-06-25 10:11:00 +02:00
parent a144fde0e4
commit e48ad13e82
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/worker-auth.c
View File

@@ -613,8 +613,6 @@ static int recv_cookie_auth_reply(worker_st * ws)
for (i = 0; i < ws->dns_size; i++) {
ws->dns[i] = talloc_strdup(ws, msg->dns[i]);
}
ws->vinfo.dns = ws->dns;
ws->vinfo.dns_size = ws->dns_size;
}
ws->nbns = talloc_size(ws, msg->n_nbns*sizeof(char*));
@@ -623,8 +621,6 @@ static int recv_cookie_auth_reply(worker_st * ws)
for (i = 0; i < ws->nbns_size; i++) {
ws->nbns[i] = talloc_strdup(ws, msg->nbns[i]);
}
ws->vinfo.nbns = ws->nbns;
ws->vinfo.nbns_size = ws->nbns_size;
}
} else {
oclog(ws, LOG_ERR, "error in received message");

22
src/worker-misc.c
View File

@@ -197,13 +197,23 @@ int complete_vpn_info(worker_st * ws, struct vpn_st *vinfo)
return -1;
}
vinfo->dns_size = ws->config->network.dns_size;
if (ws->config->network.dns_size > 0)
vinfo->dns = ws->config->network.dns;
if (ws->dns_size > 0) {
vinfo->dns_size = ws->dns_size;
vinfo->dns = ws->dns;
} else {
vinfo->dns_size = ws->config->network.dns_size;
if (ws->config->network.dns_size > 0)
vinfo->dns = ws->config->network.dns;
}
vinfo->nbns_size = ws->config->network.nbns_size;
if (ws->config->network.nbns_size > 0)
vinfo->nbns = ws->config->network.nbns;
if (ws->nbns_size > 0) {
vinfo->nbns_size = ws->nbns_size;
vinfo->nbns = ws->nbns;
} else {
vinfo->nbns_size = ws->config->network.nbns_size;
if (ws->config->network.nbns_size > 0)
vinfo->nbns = ws->config->network.nbns;
}
vinfo->routes_size = ws->config->network.routes_size;
if (ws->config->network.routes_size > 0)