From e4fce52f5ca7d1665a15c73675af9aad287e639c Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Fri, 2 Apr 2021 15:18:06 -0400 Subject: [PATCH] use better names --- src/include/realms.h | 2 +- src/main/listen.c | 2 +- src/main/process.c | 4 ++-- src/main/realms.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/include/realms.h b/src/include/realms.h index be4998ec08..355a87da50 100644 --- a/src/include/realms.h +++ b/src/include/realms.h @@ -129,7 +129,7 @@ typedef struct home_server { uint32_t coa_mrt; uint32_t coa_mrd; #ifdef WITH_COA_TUNNEL - char const *coa_server; //!< for accepting incoming CoA requests + char const *recv_coa_server; //!< for accepting incoming CoA requests #endif #endif #ifdef WITH_TLS diff --git a/src/main/listen.c b/src/main/listen.c index 9ebb2903a8..147e866a95 100644 --- a/src/main/listen.c +++ b/src/main/listen.c @@ -2993,7 +2993,7 @@ rad_listen_t *proxy_new_listener(TALLOC_CTX *ctx, home_server_t *home, uint16_t client->longname = client->shortname = talloc_typed_strdup(client, home->name); client->secret = talloc_typed_strdup(client, home->secret); client->nas_type = "none"; - client->server = talloc_typed_strdup(client, home->coa_server); + client->server = talloc_typed_strdup(client, home->recv_coa_server); } #endif } diff --git a/src/main/process.c b/src/main/process.c index 17b36f6005..86a18c6cf8 100644 --- a/src/main/process.c +++ b/src/main/process.c @@ -2540,8 +2540,8 @@ static int process_proxy_reply(REQUEST *request, RADIUS_PACKET *reply) request->server = request->home_server->server; #ifdef WITH_COA_TUNNEL - } else if (request->home_server && request->home_server->coa_server) { - request->server = request->home_server->coa_server; + } else if (request->home_server && request->home_server->recv_coa_server) { + request->server = request->home_server->recv_coa_server; #endif } else if (request->home_pool && request->home_pool->virtual_server) { diff --git a/src/main/realms.c b/src/main/realms.c index a8a88669a1..a4bc68828a 100644 --- a/src/main/realms.c +++ b/src/main/realms.c @@ -438,7 +438,7 @@ static CONF_PARSER home_server_coa[] = { #ifdef WITH_COA_TUNNEL static CONF_PARSER home_server_recv_coa[] = { - { "virtual_server", FR_CONF_OFFSET(PW_TYPE_STRING, home_server_t, coa_server), NULL }, + { "virtual_server", FR_CONF_OFFSET(PW_TYPE_STRING, home_server_t, recv_coa_server), NULL }, CONF_PARSER_TERMINATOR }; #endif @@ -701,7 +701,7 @@ bool realm_home_server_add(home_server_t *home) return false; } - if (!home->coa_server) { + if (!home->recv_coa_server) { ERROR("A 'virtual_server' configuration is required in order to accept CoA requests from a home server"); return false; } @@ -935,7 +935,7 @@ home_server_t *home_server_afrom_cs(TALLOC_CTX *ctx, realm_config_t *rc, CONF_SE goto error; } - if (!home->coa_server) { + if (!home->recv_coa_server) { ERROR("A 'virtual_server' configuration is required in order to accept CoA requests from a home server"); goto error; } @@ -950,8 +950,8 @@ home_server_t *home_server_afrom_cs(TALLOC_CTX *ctx, realm_config_t *rc, CONF_SE goto error; } - if (!cf_section_sub_find_name2(rc->cs, "server", home->coa_server)) { - cf_log_err_cs(cs, "No such coa server %s", home->coa_server); + if (!cf_section_sub_find_name2(rc->cs, "server", home->recv_coa_server)) { + cf_log_err_cs(cs, "No such coa server %s", home->recv_coa_server); goto error; } } -- 2.47.2