remove "compile" from processing modules

it's now handled by the main proto_radius

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index 874c728905ee8dde17e699c383f893588538d84b..a41bb36db1900bc84562e1413ccc09a062125ed3 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -176,40 +176,9 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 }
 
 
-static int mod_instantiate(UNUSED void *instance, CONF_SECTION *listen_cs)
-{
-       int rcode;
-       CONF_SECTION *server_cs;
-
-       rad_assert(listen_cs);
-
-       server_cs = cf_item_to_section(cf_parent(listen_cs));
-       rad_assert(strcmp(cf_section_name1(server_cs), "server") == 0);
-
-       rcode = unlang_compile_subsection(server_cs, "recv", "Accounting-Request", MOD_PREACCT);
-       if (rcode < 0) return rcode;
-       if (rcode == 0) {
-               cf_log_err(server_cs, "Failed finding 'recv Accounting-Request { ... }' section of virtual server %s",
-                             cf_section_name2(server_cs));
-               return -1;
-       }
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Accounting-Response", MOD_ACCOUNTING);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Do-Not-Respond", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Protocol-Error", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       return 0;
-}
-
 extern fr_app_process_t proto_radius_acct;
 fr_app_process_t proto_radius_acct = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_acct",
-       .instantiate    = mod_instantiate,
        .process        = mod_process,
 };

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index cdc725faf1c90db7e82cbe4f62660ecff25af4bc..b9c67762fca6183a0c816dd8c39ecf28fb05f5ef 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -536,36 +536,8 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
  */
 static int auth_listen_compile(CONF_SECTION *server_cs, UNUSED CONF_SECTION *listen_cs)
 {
-       int rcode;
        CONF_SECTION *subcs = NULL;
 
-       rcode = unlang_compile_subsection(server_cs, "recv", "Access-Request", MOD_AUTHORIZE);
-       if (rcode < 0) return rcode;
-
-       if (rcode == 0) {
-               cf_log_err(server_cs, "Failed finding 'recv Access-Request { ... }' section of virtual server %s",
-                             cf_section_name2(server_cs));
-               return -1;
-       }
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Access-Accept", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Access-Reject", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Do-Not-Respond", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Protocol-Error", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       /*
-        *      It's OK to not have an Access-Challenge section.
-        */
-       rcode = unlang_compile_subsection(server_cs, "send", "Access-Challenge", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
        while ((subcs = cf_section_find_next(server_cs, subcs, "authenticate", NULL))) {
                char const *name2;
 

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index 13e1bc8702094f80bede1f22ecba6539aa2659f9..bb88ec543b10f6e0fbe380616c4ac97a78ce8010 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -224,49 +224,9 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 }
 
 
-static int mod_instantiate(UNUSED void *instance, CONF_SECTION *listen_cs)
-{
-       int rcode;
-       CONF_SECTION *server_cs;
-
-       rad_assert(listen_cs);
-
-       server_cs = cf_item_to_section(cf_parent(listen_cs));
-       rad_assert(strcmp(cf_section_name1(server_cs), "server") == 0);
-
-       rcode = unlang_compile_subsection(server_cs, "recv", "CoA-Request", MOD_RECV_COA);
-       if (rcode < 0) return rcode;
-       if (rcode == 1) {
-               rcode = unlang_compile_subsection(server_cs, "send", "CoA-ACK", MOD_SEND_COA);
-               if (rcode < 0) return rcode;
-
-               rcode = unlang_compile_subsection(server_cs, "send", "CoA-NAK", MOD_SEND_COA);
-               if (rcode < 0) return rcode;
-       }
-
-       rcode = unlang_compile_subsection(server_cs, "recv", "Disconnect-Request", MOD_RECV_COA);
-       if (rcode < 0) return rcode;
-       if (rcode == 1) {
-               rcode = unlang_compile_subsection(server_cs, "send", "Disconnect-ACK", MOD_SEND_COA);
-               if (rcode < 0) return rcode;
-
-               rcode = unlang_compile_subsection(server_cs, "send", "Disconnect-NAK", MOD_SEND_COA);
-               if (rcode < 0) return rcode;
-       }
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Do-Not-Respond", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Protocol-Error", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       return 0;
-}
-
 extern fr_app_process_t proto_radius_coa;
 fr_app_process_t proto_radius_coa = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_coa",
-       .instantiate    = mod_instantiate,
        .process        = mod_process,
 };

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index 6064b4fde9f46cb6a45fbff76f7359b330f4d566..1cafdf39298582dd0b7ef30ea35d75faef027ce1 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -189,46 +189,9 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 }
 
 
-/*
- *     Ensure that the "recv foo" etc. sections are compiled.
- */
-static int mod_instantiate(UNUSED void *instance, CONF_SECTION *listen_cs)
-{
-       int rcode;
-       CONF_SECTION *server_cs;
-
-       rad_assert(listen_cs);
-
-       server_cs = cf_item_to_section(cf_parent(listen_cs));
-       rad_assert(strcmp(cf_section_name1(server_cs), "server") == 0);
-
-       rcode = unlang_compile_subsection(server_cs, "recv", "Status-Server", MOD_AUTHORIZE);
-       if (rcode < 0) return rcode;
-       if (rcode == 0) {
-               cf_log_err(server_cs, "Failed finding 'recv Status-Server { ... }' section of virtual server %s",
-                             cf_section_name2(server_cs));
-               return -1;
-       }
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Access-Accept", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Access-Reject", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Protocol-Error", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       rcode = unlang_compile_subsection(server_cs, "send", "Do-Not-Respond", MOD_POST_AUTH);
-       if (rcode < 0) return rcode;
-
-       return 0;
-}
-
 extern fr_app_process_t proto_radius_status;
 fr_app_process_t proto_radius_status = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_status",
-       .instantiate    = mod_instantiate,
        .process        = mod_process,
 };