s/fr_app_process_t/fr_app_worker_t/

This structure is called by the worker to process a particular
application

diff --git a/src/lib/io/application.h b/src/lib/io/application.h
index 303eafdba50c9e51cffad99939b929ab1bc3343c..cbfc32ada815e688810cbb92de9bb92d9a9874d0 100644 (file)
--- a/src/lib/io/application.h
+++ b/src/lib/io/application.h
@@ -123,8 +123,8 @@ typedef struct {
                                                        ///< to all #fr_app_io_t can be performed by the #fr_app_t.
 
        fr_app_entry_point_set_t        entry_point_set;//!< Callback to Set the entry point into the state machine
-                                                       ///< provided by the fr_app_process_t.
-                                                       ///< We need a function this as the #fr_app_process_t might
+                                                       ///< provided by the fr_app_worker_t.
+                                                       ///< We need a function this as the #fr_app_worker_t might
                                                        ///< change based on the packet we received.
 
        fr_app_priority_get_t           priority;       //!< Assign a priority to the packet.
@@ -132,7 +132,7 @@ typedef struct {
 
 /** Public structure describing an application (protocol) specialisation
  *
- * The fr_app_process_t provides the state machine that's used to process
+ * The fr_app_worker_t provides the state machine that's used to process
  * the packet after its been decoded.
  */
 typedef struct {
@@ -141,7 +141,7 @@ typedef struct {
        fr_app_bootstrap_t              bootstrap;
        fr_app_instantiate_t            instantiate;
        fr_io_process_t                 entry_point;    //!< Entry point into the protocol subtype's state machine.
-} fr_app_process_t;
+} fr_app_worker_t;
 
 /** Public structure describing an I/O path for a protocol
  *

diff --git a/src/lib/io/io.h b/src/lib/io/io.h
index c0d1b5efce14ee7166962a6a4b51eeed1e6bb89a..8a1141f351adee5dd23cf4f401e5b43c11cc2b26 100644 (file)
--- a/src/lib/io/io.h
+++ b/src/lib/io/io.h
@@ -306,8 +306,8 @@ typedef int (*fr_io_signal_t)(void const *instance);
 
 /** Process a request through the transport async state machine.
  *
- * @param[in] instance         Usually the #fr_app_process_t instance data.
- *                             for the #fr_app_process_t that gave us the
+ * @param[in] instance         Usually the #fr_app_worker_t instance data.
+ *                             for the #fr_app_worker_t that gave us the
  *                             entry point.
  */
 typedef        fr_io_final_t (*fr_io_process_t)(void const *instance, REQUEST *request, fr_io_action_t action);

diff --git a/src/modules/proto_detail/proto_detail.c b/src/modules/proto_detail/proto_detail.c
index a5b8f8045d6aee0b2f17e7a46cd5ae0f90b829e6..f626538cfeb1445845582a7753c1927858fbf3f5 100644 (file)
--- a/src/modules/proto_detail/proto_detail.c
+++ b/src/modules/proto_detail/proto_detail.c
@@ -389,12 +389,12 @@ static ssize_t mod_encode(UNUSED void const *instance, REQUEST *request, uint8_t
 static void mod_entry_point_set(void const *instance, REQUEST *request)
 {
        proto_detail_t const *inst = talloc_get_type_abort_const(instance, proto_detail_t);
-       fr_app_process_t const *app_process;
+       fr_app_worker_t const *app_process;
 
        /*
         *      Only one "process" function: proto_detail_process.
         */
-       app_process = (fr_app_process_t const *)inst->type_submodule->module->common;
+       app_process = (fr_app_worker_t const *)inst->type_submodule->module->common;
 
        request->server_cs = inst->server_cs;
        request->async->process = app_process->entry_point;
@@ -522,9 +522,9 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         *      Instantiate the process module.
         */
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
-               fr_app_process_t const *app_process;
+               fr_app_worker_t const *app_process;
 
-               app_process = (fr_app_process_t const *)inst->type_submodule->module->common;
+               app_process = (fr_app_worker_t const *)inst->type_submodule->module->common;
                if (app_process->instantiate && (app_process->instantiate(inst->type_submodule->data,
                                                                          inst->type_submodule->conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
@@ -588,7 +588,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
         */
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
                dl_t const              *module = talloc_get_type_abort_const(inst->type_submodule->module, dl_t);
-               fr_app_process_t const  *app_process = (fr_app_process_t const *)module->common;
+               fr_app_worker_t const   *app_process = (fr_app_worker_t const *)module->common;
 
                if (app_process->bootstrap && (app_process->bootstrap(inst->type_submodule->data,
                                                                      inst->type_submodule->conf) < 0)) {

diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c
index 268a104c599695879f0e976841cef16f374af4ab..49eec3d7f5e831adcc5807201ff300f4cab73f9c 100644 (file)
--- a/src/modules/proto_detail/proto_detail_process.c
+++ b/src/modules/proto_detail/proto_detail_process.c
@@ -231,8 +231,8 @@ static int mod_instantiate(void *instance, CONF_SECTION *listen_cs)
        return 0;
 }
 
-extern fr_app_process_t proto_detail_process;
-fr_app_process_t proto_detail_process = {
+extern fr_app_worker_t proto_detail_process;
+fr_app_worker_t proto_detail_process = {
        .magic          = RLM_MODULE_INIT,
        .name           = "detail_process",
        .inst_size      = sizeof(proto_detail_process_t),

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index 1c3664342c16f8a244cd77264ab9d465598294cb..5528aa09a0dfa69b4d2d18a2021a38610a5f95f1 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -429,9 +429,9 @@ static void mod_entry_point_set(void const *instance, REQUEST *request)
         *      'track' can be NULL when there's no network listener.
         */
        if (inst->io.app_io && (track->dynamic == request->async->recv_time)) {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
 
-               app_process = (fr_app_process_t const *) inst->dynamic_submodule->module->common;
+               app_process = (fr_app_worker_t const *) inst->dynamic_submodule->module->common;
 
                request->async->process = app_process->entry_point;
                track->dynamic = 0;
@@ -444,7 +444,7 @@ static void mod_entry_point_set(void const *instance, REQUEST *request)
                return;
        }
 
-       request->async->process = ((fr_app_process_t const *)type_submodule->module->common)->entry_point;
+       request->async->process = ((fr_app_worker_t const *)type_submodule->module->common)->entry_point;
        request->async->process_inst = type_submodule->data;
 }
 
@@ -650,11 +650,11 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         */
        i = 0;
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
                fr_dict_enum_t const    *enumv;
                int code;
 
-               app_process = (fr_app_process_t const *)inst->type_submodule[i]->module->common;
+               app_process = (fr_app_worker_t const *)inst->type_submodule[i]->module->common;
                if (app_process->instantiate && (app_process->instantiate(inst->type_submodule[i]->data,
                                                                          inst->type_submodule[i]->conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
@@ -715,9 +715,9 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         *      Instantiate proto_dhcpv4_dynamic_client
         */
        {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
 
-               app_process = (fr_app_process_t const *)inst->dynamic_submodule->module->common;
+               app_process = (fr_app_worker_t const *)inst->dynamic_submodule->module->common;
                if (app_process->instantiate && (app_process->instantiate(inst->dynamic_submodule->data, conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
                        return -1;
@@ -759,7 +759,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
                char const              *value;
                dl_t const              *module = talloc_get_type_abort_const(inst->type_submodule[i]->module, dl_t);
-               fr_app_process_t const  *app_process = (fr_app_process_t const *)module->common;
+               fr_app_worker_t const   *app_process = (fr_app_worker_t const *)module->common;
 
                if (app_process->bootstrap && (app_process->bootstrap(inst->type_submodule[i]->data,
                                                                      inst->type_submodule[i]->conf) < 0)) {

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
index 5331c176861d4927533d2656b127600f6d4e9a70..ce5706bf111cb72a2e69bb2b75bdfe9a16e5e0a2 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
@@ -223,8 +223,8 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 }
 
 
-extern fr_app_process_t proto_dhcpv4_base;
-fr_app_process_t proto_dhcpv4_base = {
+extern fr_app_worker_t proto_dhcpv4_base;
+fr_app_worker_t proto_dhcpv4_base = {
        .magic          = RLM_MODULE_INIT,
        .name           = "dhcpv4_base",
        .entry_point    = mod_process,

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index 020fd941862c8f5c39b9d06f657fcd389ea5cf87..67c931793019cef695204e0185df51ae543e5741 100644 (file)
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -515,9 +515,9 @@ static void mod_entry_point_set(void const *instance, REQUEST *request)
         *      'track' can be NULL when there's no network listener.
         */
        if (inst->io.app_io && (track->dynamic == request->async->recv_time)) {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
 
-               app_process = (fr_app_process_t const *) inst->dynamic_submodule->module->common;
+               app_process = (fr_app_worker_t const *) inst->dynamic_submodule->module->common;
 
                request->async->process = app_process->entry_point;
                request->async->process_inst = inst->dynamic_submodule;
@@ -531,7 +531,7 @@ static void mod_entry_point_set(void const *instance, REQUEST *request)
                return;
        }
 
-       request->async->process = ((fr_app_process_t const *)type_submodule->module->common)->entry_point;
+       request->async->process = ((fr_app_worker_t const *)type_submodule->module->common)->entry_point;
        request->async->process_inst = type_submodule->data;
 }
 
@@ -765,11 +765,11 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         */
        i = 0;
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
                fr_dict_enum_t const    *enumv;
                int                     code;
 
-               app_process = (fr_app_process_t const *)inst->type_submodule[i]->module->common;
+               app_process = (fr_app_worker_t const *)inst->type_submodule[i]->module->common;
                if (app_process->instantiate &&
                    (app_process->instantiate(inst->type_submodule[i]->data, inst->type_submodule[i]->conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
@@ -827,9 +827,9 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         *      Instantiate proto_radius_dynamic_client
         */
        {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
 
-               app_process = (fr_app_process_t const *)inst->dynamic_submodule->module->common;
+               app_process = (fr_app_worker_t const *)inst->dynamic_submodule->module->common;
                if (app_process->instantiate && (app_process->instantiate(inst->dynamic_submodule->data, conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
                        return -1;
@@ -867,7 +867,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
                char const              *value;
                dl_t const              *module = talloc_get_type_abort_const(inst->type_submodule[i]->module, dl_t);
-               fr_app_process_t const  *app_process = (fr_app_process_t const *)module->common;
+               fr_app_worker_t const   *app_process = (fr_app_worker_t const *)module->common;
 
                if (app_process->bootstrap && (app_process->bootstrap(inst->type_submodule[i]->data,
                                                                      inst->type_submodule[i]->conf) < 0)) {

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index 6f7a0f92d8db58a2ca048064e0ba08b5f9cc04e7..b5e478a8f858e6feeb8794761dd8c2b94cc3ee27 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -185,8 +185,8 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 }
 
 
-extern fr_app_process_t proto_radius_acct;
-fr_app_process_t proto_radius_acct = {
+extern fr_app_worker_t proto_radius_acct;
+fr_app_worker_t proto_radius_acct = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_acct",
        .entry_point    = mod_process,

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index c37690070929862048c8ba747e08c353bb1c7be2..cc28e754883d43370cd855b2e193e99cc4e8e4b8 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -625,8 +625,8 @@ static int mod_instantiate(UNUSED void *instance, CONF_SECTION *process_app_cs)
        return 0;
 }
 
-extern fr_app_process_t proto_radius_auth;
-fr_app_process_t proto_radius_auth = {
+extern fr_app_worker_t proto_radius_auth;
+fr_app_worker_t proto_radius_auth = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_auth",
        .config         = proto_radius_auth_config,

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index c4b4bb321fd005f9ce532b3519e7c82529464a22..8cf991d7b3b41c45f7dc1decf9600d4e9fe9f159 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -236,8 +236,8 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 }
 
 
-extern fr_app_process_t proto_radius_coa;
-fr_app_process_t proto_radius_coa = {
+extern fr_app_worker_t proto_radius_coa;
+fr_app_worker_t proto_radius_coa = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_coa",
        .entry_point    = mod_process,

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index b629be97e33ebd0c400adc7f2ee781f128984527..24e50b3a12c7410a445809552e45054f406316ae 100644 (file)
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -234,8 +234,8 @@ static int mod_instantiate(UNUSED void *instance, CONF_SECTION *listen_cs)
        return 0;
 }
 
-extern fr_app_process_t proto_radius_dynamic_client;
-fr_app_process_t proto_radius_dynamic_client = {
+extern fr_app_worker_t proto_radius_dynamic_client;
+fr_app_worker_t proto_radius_dynamic_client = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_dynamic_client",
        .instantiate    = mod_instantiate,

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index 128ea920d5757e9e733fb8b905605be37fd29c1a..dd92ffa2216b15b804f9e01f8ee56b5174876b29 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -197,8 +197,8 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 }
 
 
-extern fr_app_process_t proto_radius_status;
-fr_app_process_t proto_radius_status = {
+extern fr_app_worker_t proto_radius_status;
+fr_app_worker_t proto_radius_status = {
        .magic          = RLM_MODULE_INIT,
        .name           = "radius_status",
        .entry_point    = mod_process,

diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index 2778947f5727fbca11dc2f77a5565686be44b348..f55495496899f04b57cba08f5beddc3ad6c37da5 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -385,9 +385,9 @@ static void mod_entry_point_set(void const *instance, REQUEST *request)
         *      'track' can be NULL when there's no network listener.
         */
        if (inst->io.app_io && (track->dynamic == request->async->recv_time)) {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
 
-               app_process = (fr_app_process_t const *) inst->dynamic_submodule->module->common;
+               app_process = (fr_app_worker_t const *) inst->dynamic_submodule->module->common;
 
                request->async->process = app_process->entry_point;
                track->dynamic = 0;
@@ -589,10 +589,10 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         */
        i = 0;
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
                fr_dict_enum_t const    *enumv;
 
-               app_process = (fr_app_process_t const *)inst->type_submodule[i]->module->common;
+               app_process = (fr_app_worker_t const *)inst->type_submodule[i]->module->common;
                if (app_process->instantiate && (app_process->instantiate(inst->type_submodule[i]->data,
                                                                          inst->type_submodule[i]->conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
@@ -652,9 +652,9 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
         *      Instantiate proto_vmps_dynamic_client
         */
        {
-               fr_app_process_t const  *app_process;
+               fr_app_worker_t const   *app_process;
 
-               app_process = (fr_app_process_t const *)inst->dynamic_submodule->module->common;
+               app_process = (fr_app_worker_t const *)inst->dynamic_submodule->module->common;
                if (app_process->instantiate && (app_process->instantiate(inst->dynamic_submodule->data, conf) < 0)) {
                        cf_log_err(conf, "Instantiation failed for \"%s\"", app_process->name);
                        return -1;
@@ -696,7 +696,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
        while ((cp = cf_pair_find_next(conf, cp, "type"))) {
                char const              *value;
                dl_t const              *module = talloc_get_type_abort_const(inst->type_submodule[i]->module, dl_t);
-               fr_app_process_t const  *app_process = (fr_app_process_t const *)module->common;
+               fr_app_worker_t const   *app_process = (fr_app_worker_t const *)module->common;
 
                if (app_process->bootstrap && (app_process->bootstrap(inst->type_submodule[i]->data,
                                                                      inst->type_submodule[i]->conf) < 0)) {

diff --git a/src/modules/proto_vmps/proto_vmps_all.c b/src/modules/proto_vmps/proto_vmps_all.c
index 1a67f50ad31823216dd562c1fa67a02d373efd3e..b7430bcffb7f96b54c9686f9c5c3911fe8dd4ab0 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_all.c
+++ b/src/modules/proto_vmps/proto_vmps_all.c
@@ -193,8 +193,8 @@ static fr_io_final_t mod_process(UNUSED void const *instance, REQUEST *request,
 }
 
 
-extern fr_app_process_t proto_vmps_all;
-fr_app_process_t proto_vmps_all = {
+extern fr_app_worker_t proto_vmps_all;
+fr_app_worker_t proto_vmps_all = {
        .magic          = RLM_MODULE_INIT,
        .name           = "vmps_all",
        .entry_point    = mod_process,

diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
index 717fd88872a101f0090b3d870f7910be72880afa..962a833bfa7eda4968fcf872e5a236aed1b546ee 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_dynamic_client.c
+++ b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
@@ -204,8 +204,8 @@ static int mod_instantiate(UNUSED void *instance, CONF_SECTION *listen_cs)
        return 0;
 }
 
-extern fr_app_process_t proto_vmps_dynamic_client;
-fr_app_process_t proto_vmps_dynamic_client = {
+extern fr_app_worker_t proto_vmps_dynamic_client;
+fr_app_worker_t proto_vmps_dynamic_client = {
        .magic          = RLM_MODULE_INIT,
        .name           = "vmps_dynamic_client",
        .instantiate    = mod_instantiate,