Add common fields to the proto modules

diff --git a/src/lib/server/process.h b/src/lib/server/process.h
index 955bf68709b135e51684711d89e954666f3b7b99..73bfe6000f8f9d4a2d8f993eb076876705e9f79c 100644 (file)
--- a/src/lib/server/process.h
+++ b/src/lib/server/process.h
@@ -52,10 +52,7 @@ extern "C" {
 /** Common public symbol definition for all process modules
  */
 typedef struct fr_process_module_s {
-       DL_MODULE_COMMON;                               //!< Common fields for all loadable modules.
-       module_instantiate_t            bootstrap;
-       module_instantiate_t            instantiate;
-       int                             type;   /* flags */
+       module_t                        common;         //!< Common fields for all loadable modules.
 
        module_method_t                 process;        //!< Process packets
        virtual_server_compile_t const  *compile_list;  //!< list of processing sections

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 09d59e30caf8c0e4cae50277d2dfcccb431bca3f..7dae3eb67b3f07e628ad1e9b5833ccc599ed171e 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -737,8 +737,8 @@ static int process_instantiate(CONF_SECTION *server_cs, dl_module_inst_t *dl_ins
 {
        fr_process_module_t const *process = (fr_process_module_t const *) dl_inst->module->common;
 
-       if (process->instantiate &&
-           (process->instantiate(MODULE_INST_CTX(dl_inst)) < 0)) {
+       if (process->common.instantiate &&
+           (process->common.instantiate(MODULE_INST_CTX(dl_inst)) < 0)) {
                cf_log_err(dl_inst->conf, "Instantiate failed");
                return -1;
        }
@@ -893,8 +893,8 @@ static int process_bootstrap(dl_module_inst_t *dl_inst, char const *namespace)
 {
        fr_process_module_t const *process = (fr_process_module_t const *) dl_inst->module->common;
 
-       if (process->bootstrap &&
-           (process->bootstrap(MODULE_INST_CTX(dl_inst)) < 0)) {
+       if (process->common.bootstrap &&
+           (process->common.bootstrap(MODULE_INST_CTX(dl_inst)) < 0)) {
                cf_log_err(dl_inst->conf, "Bootstrap failed");
                return -1;
        }

diff --git a/src/process/arp/base.c b/src/process/arp/base.c
index f84bf757c8ee9e406994ee53e36e7cfd14c48b51..651fea3f222de3f3fb2fda3fa690cc377c9b430f 100644 (file)
--- a/src/process/arp/base.c
+++ b/src/process/arp/base.c
@@ -242,9 +242,11 @@ static const virtual_server_compile_t compile_list[] = {
 
 extern fr_process_module_t process_arp;
 fr_process_module_t process_arp = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_arp",
-       .inst_size      = sizeof(process_arp_t),
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_arp",
+               .inst_size      = sizeof(process_arp_t)
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_arp,

diff --git a/src/process/control/base.c b/src/process/control/base.c
index b75181b80864c8444bcb0828818f2cb19988021a..c303446cb31c2e13605450eed2953aae06e19454 100644 (file)
--- a/src/process/control/base.c
+++ b/src/process/control/base.c
@@ -51,8 +51,10 @@ static unlang_action_t mod_process(rlm_rcode_t *p_result, UNUSED module_ctx_t co
 
 extern fr_process_module_t process_control;
 fr_process_module_t process_control = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_control",
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_control"
+       },
        .process        = mod_process,
-       .dict           = &dict_freeradius,
+       .dict           = &dict_freeradius
 };

diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index 9a989e673ffc8d6c6283fdf47844cd4666ce7738..4d8e2eabd59b679705cbb33ca7112fa99b5a762b 100644 (file)
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -451,10 +451,12 @@ static const virtual_server_compile_t compile_list[] = {
 
 extern fr_process_module_t process_dhcpv4;
 fr_process_module_t process_dhcpv4 = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_dhcpv4",
-       .inst_size      = sizeof(process_dhcpv4_t),
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_dhcpv4",
+               .inst_size      = sizeof(process_dhcpv4_t)
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
-       .dict           = &dict_dhcpv4,
+       .dict           = &dict_dhcpv4
 };

diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index 84d3e62daf9a0792b24b7f90375810dc965bedd5..6b95f731d7d90b88e37e966f4b2f8f3ae67ca38b 100644 (file)
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -1231,13 +1231,14 @@ static fr_process_state_t const process_state[] = {
 
 extern fr_process_module_t process_dhcpv6;
 fr_process_module_t process_dhcpv6 = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_dhcpv6",
-       .config         = dhcpv6_process_config,
-       .inst_size      = sizeof(process_dhcpv6_t),
-
-       .bootstrap      = mod_bootstrap,
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_dhcpv6",
+               .config         = dhcpv6_process_config,
+               .inst_size      = sizeof(process_dhcpv6_t),
 
+               .bootstrap      = mod_bootstrap
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_dhcpv6

diff --git a/src/process/dns/base.c b/src/process/dns/base.c
index 9734bbb9f2339215adff1c57f2e9cb37e5a7bd50..a28ca562cf66ef9a0c4dbb7b1ae922f061e917ce 100644 (file)
--- a/src/process/dns/base.c
+++ b/src/process/dns/base.c
@@ -190,9 +190,11 @@ static const virtual_server_compile_t compile_list[] = {
 
 extern fr_process_module_t process_dns;
 fr_process_module_t process_dns = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_dns",
-       .inst_size      = sizeof(process_dns_t),
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_dns",
+               .inst_size      = sizeof(process_dns_t)
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_dns,

diff --git a/src/process/eap_aka/base.c b/src/process/eap_aka/base.c
index 275c128a200d8c7df317a503ab07a3a248f8f33e..d9e6c51d4dd53f5b35250b10a1771e483ce24671 100644 (file)
--- a/src/process/eap_aka/base.c
+++ b/src/process/eap_aka/base.c
@@ -265,15 +265,16 @@ static void mod_unload(void)
 
 extern fr_process_module_t process_eap_aka;
 fr_process_module_t process_eap_aka = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_eap_aka",
-       .onload         = mod_load,
-       .unload         = mod_unload,
-       .config         = submodule_config,
-       .instantiate    = mod_instantiate,
-       .inst_size      = sizeof(eap_aka_sim_process_conf_t),
-       .inst_type      = "eap_aka_sim_process_conf_t",
-
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_eap_aka",
+               .onload         = mod_load,
+               .unload         = mod_unload,
+               .config         = submodule_config,
+               .instantiate    = mod_instantiate,
+               .inst_size      = sizeof(eap_aka_sim_process_conf_t),
+               .inst_type      = "eap_aka_sim_process_conf_t"
+       },
        .process        = eap_aka_sim_state_machine_process,
        .compile_list   = compile_list,
        .dict           = &dict_eap_aka_sim,

diff --git a/src/process/eap_aka_prime/base.c b/src/process/eap_aka_prime/base.c
index 30551213240b6bb24eb525429ca2e17ad2a95460..e0b6d5bd437b4a67044fdfd9b9ecb13f8c9ee579 100644 (file)
--- a/src/process/eap_aka_prime/base.c
+++ b/src/process/eap_aka_prime/base.c
@@ -266,15 +266,16 @@ static void mod_unload(void)
 
 extern fr_process_module_t process_eap_aka_prime;
 fr_process_module_t process_eap_aka_prime = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_eap_aka_prime",
-       .onload         = mod_load,
-       .unload         = mod_unload,
-       .config         = submodule_config,
-       .instantiate    = mod_instantiate,
-       .inst_size      = sizeof(eap_aka_sim_process_conf_t),
-       .inst_type      = "eap_aka_sim_process_conf_t",
-
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_eap_aka_prime",
+               .onload         = mod_load,
+               .unload         = mod_unload,
+               .config         = submodule_config,
+               .instantiate    = mod_instantiate,
+               .inst_size      = sizeof(eap_aka_sim_process_conf_t),
+               .inst_type      = "eap_aka_sim_process_conf_t"
+       },
        .process        = eap_aka_sim_state_machine_process,
        .compile_list   = compile_list,
        .dict           = &dict_eap_aka_sim,

diff --git a/src/process/eap_sim/base.c b/src/process/eap_sim/base.c
index a05a6c9a93ee83591f647cc5c797d06814db68ad..afa97c75b20d73be18b5184514e3c32f7cc2de37 100644 (file)
--- a/src/process/eap_sim/base.c
+++ b/src/process/eap_sim/base.c
@@ -253,15 +253,16 @@ static void mod_unload(void)
 
 extern fr_process_module_t process_eap_sim;
 fr_process_module_t process_eap_sim = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_eap_sim",
-       .onload         = mod_load,
-       .unload         = mod_unload,
-       .config         = submodule_config,
-       .instantiate    = mod_instantiate,
-       .inst_size      = sizeof(eap_aka_sim_process_conf_t),
-       .inst_type      = "eap_aka_sim_process_conf_t",
-
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_eap_sim",
+               .onload         = mod_load,
+               .unload         = mod_unload,
+               .config         = submodule_config,
+               .instantiate    = mod_instantiate,
+               .inst_size      = sizeof(eap_aka_sim_process_conf_t),
+               .inst_type      = "eap_aka_sim_process_conf_t"
+       },
        .process        = eap_aka_sim_state_machine_process,
        .compile_list   = compile_list,
        .dict           = &dict_eap_aka_sim,

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 2cff7ce919651cdece4de67cef2a459c359cab76..efd365c0202477f4b23775fd7892b27d1e8c28c1 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -1125,14 +1125,15 @@ static virtual_server_compile_t const compile_list[] = {
 
 extern fr_process_module_t process_radius;
 fr_process_module_t process_radius = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_radius",
-       .config         = config,
-       .inst_size      = sizeof(process_radius_t),
-
-       .bootstrap      = mod_bootstrap,
-       .instantiate    = mod_instantiate,
-
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_radius",
+               .config         = config,
+               .inst_size      = sizeof(process_radius_t),
+
+               .bootstrap      = mod_bootstrap,
+               .instantiate    = mod_instantiate
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_radius,

diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index 07886e95f6d2a89d1cc94816cb6a12ea3e2974fe..8a633d7cc613154b6ed19363b2f1d7d77c14ea82 100644 (file)
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -705,12 +705,14 @@ static virtual_server_compile_t compile_list[] = {
 
 extern fr_process_module_t process_tacacs;
 fr_process_module_t process_tacacs = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_tacacs",
-       .config         = config,
-       .inst_size      = sizeof(process_tacacs_t),
-       .bootstrap      = mod_bootstrap,
-       .instantiate    = mod_instantiate,
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_tacacs",
+               .config         = config,
+               .inst_size      = sizeof(process_tacacs_t),
+               .bootstrap      = mod_bootstrap,
+               .instantiate    = mod_instantiate
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_tacacs,

diff --git a/src/process/tls/base.c b/src/process/tls/base.c
index d18b62d0def8d1fbbb6f8b36166f56925e36b27d..025aeff734fae5853c10d24f0a4d9382546d845f 100644 (file)
--- a/src/process/tls/base.c
+++ b/src/process/tls/base.c
@@ -181,9 +181,11 @@ static const virtual_server_compile_t compile_list[] = {
 
 extern fr_process_module_t process_tls;
 fr_process_module_t process_tls = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_tls",
-       .inst_size      = sizeof(process_tls_t),
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_tls",
+               .inst_size      = sizeof(process_tls_t)
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_tls,

diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 13e3123afeb5efcd0d5c2af657672ca2f9000e22..ebf275eb53546dfd216f0b92b19f65699edbd32c 100644 (file)
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -819,15 +819,16 @@ static virtual_server_compile_t const compile_list[] = {
 
 extern fr_process_module_t process_ttls;
 fr_process_module_t process_ttls = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_ttls",
-       .config         = config,
-       .inst_size      = sizeof(process_ttls_t),
-
-       .bootstrap      = mod_bootstrap,
-       .instantiate    = mod_instantiate,
-
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_ttls",
+               .config         = config,
+               .inst_size      = sizeof(process_ttls_t),
+
+               .bootstrap      = mod_bootstrap,
+               .instantiate    = mod_instantiate
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
-       .dict           = &dict_radius,
+       .dict           = &dict_radius
 };

diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c
index c613c73ae84a11d389f7bf7160dd88c7bc7b850c..450ce25c102cc359bf9c9ea4bc3568345dc88017 100644 (file)
--- a/src/process/vmps/base.c
+++ b/src/process/vmps/base.c
@@ -259,10 +259,11 @@ static const virtual_server_compile_t compile_list[] = {
 
 extern fr_process_module_t process_vmps;
 fr_process_module_t process_vmps = {
-       .magic          = MODULE_MAGIC_INIT,
-       .name           = "process_vmps",
-       .inst_size      = sizeof(process_vmps_t),
-
+       .common = {
+               .magic          = MODULE_MAGIC_INIT,
+               .name           = "process_vmps",
+               .inst_size      = sizeof(process_vmps_t)
+       },
        .process        = mod_process,
        .compile_list   = compile_list,
        .dict           = &dict_vmps,