use better names

diff --git a/src/include/realms.h b/src/include/realms.h
index be4998ec08619b0a0662f7d2c760446383f95a33..355a87da508b45fe300b530ac93722329b92ced1 100644 (file)
--- 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 9ebb2903a8822aff8123f9ca95fd55d019d1df9a..147e866a9550ccde2c3dc8da9c82e739b31251a7 100644 (file)
--- 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 17b36f60058393ae2e4862e8f7e90d64c8585817..86a18c6cf81140bf2ae6eeecda476c919836bc18 100644 (file)
--- 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 a8a88669a1cbfa8f5e30e2120a0115d057433058..a4bc68828a2daaf3c2ed0120ed17d91915397379 100644 (file)
--- 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;
                }
        }