scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 18:07:52 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

WIFI-2346: Fix proxy not initiating radsec connection

Browse Source 
Fix server to tls block reference in configuration.

Signed-off-by: Arif Alam <arif.alam@netexperience.com>
This commit is contained in:
Arif Alam
2021-05-12 17:34:35 -04:00
committed by Rick Sommerville
parent 93baf6d334
commit 811f5e60aa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
feeds/wlan-ap/opensync/src/platform/openwrt/src/lib/target/src/radius_proxy.c
View File

@@ -216,6 +216,7 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
char name[256]; char name[256];
char server_name[256] = {}; char server_name[256] = {};
char acct_server_name[256] = {}; char acct_server_name[256] = {};
char tls_name[256] = {};
struct schema_APC_State apc_conf; struct schema_APC_State apc_conf;
/* Configure only if APC selects this as master AP (DR) */ /* Configure only if APC selects this as master AP (DR) */
@@ -253,6 +254,7 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
/* Configure TLS/non-TLS and server blocks */ /* Configure TLS/non-TLS and server blocks */
sprintf(server_name, "%s%s", conf->radius_config_name, "server"); sprintf(server_name, "%s%s", conf->radius_config_name, "server");
sprintf(acct_server_name, "%s%s", conf->radius_config_name, "Acctserver"); sprintf(acct_server_name, "%s%s", conf->radius_config_name, "Acctserver");
sprintf(tls_name, "%s%s", conf->radius_config_name, "tls");
if (conf->radsec) if (conf->radsec)
{ {
blob_buf_init(&uci_buf, 0); blob_buf_init(&uci_buf, 0);
@@ -263,7 +265,7 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
radsec_download_cert("clientdec.key", radsec_download_cert("clientdec.key",
conf->radius_config_name, conf->client_key); conf->radius_config_name, conf->client_key);
blobmsg_add_string(&uci_buf, "name", conf->server); blobmsg_add_string(&uci_buf, "name", tls_name);
memset(path, '\0', sizeof(path)); memset(path, '\0', sizeof(path));
sprintf(path, "/tmp/radsec/certs/%s/cacert.pem", sprintf(path, "/tmp/radsec/certs/%s/cacert.pem",
@@ -283,15 +285,14 @@ static bool radius_proxy_config_set(struct schema_Radius_Proxy_Config *conf )
if (strlen(conf->passphrase) > 0) if (strlen(conf->passphrase) > 0)
blobmsg_add_string(&uci_buf, "certificateKeyPassword", conf->passphrase); blobmsg_add_string(&uci_buf, "certificateKeyPassword", conf->passphrase);
memset(name, '\0', sizeof(name)); blob_to_uci_section(uci, "radsecproxy", tls_name,
sprintf(name, "%s%s", conf->radius_config_name, "tls");
blob_to_uci_section(uci, "radsecproxy", name,
"tls", uci_buf.head, &radius_proxy_tls_param, NULL); "tls", uci_buf.head, &radius_proxy_tls_param, NULL);
blob_buf_init(&uci_buf, 0); blob_buf_init(&uci_buf, 0);
blobmsg_add_string(&uci_buf, "name", conf->server); blobmsg_add_string(&uci_buf, "name", server_name);
blobmsg_add_string(&uci_buf, "host", conf->server);
blobmsg_add_string(&uci_buf, "type", "tls"); blobmsg_add_string(&uci_buf, "type", "tls");
blobmsg_add_string(&uci_buf, "tls", conf->server); blobmsg_add_string(&uci_buf, "tls", tls_name);
blobmsg_add_u32(&uci_buf, "port", conf->port); blobmsg_add_u32(&uci_buf, "port", conf->port);
blobmsg_add_string(&uci_buf, "secret", "radsec"); blobmsg_add_string(&uci_buf, "secret", "radsec");
blobmsg_add_bool(&uci_buf, "statusServer", 0); blobmsg_add_bool(&uci_buf, "statusServer", 0);