Make the 5 packet methods into an array within module_t - now calling them

doesn't require a big switch()

diff --git a/src/include/modules.h b/src/include/modules.h
index fb7a663..789a7cc 100644 (file)
--- a/src/include/modules.h
+++ b/src/include/modules.h
@@ -9,17 +9,7 @@
 #define RADIUS_MODULES_H
 #include "conffile.h"
 
-/*
- *     The types of the functions which are supported by each module.
- *     The functional parameters are defined here, so we don't have to
- *     edit each and every module when we decide to add another type
- *     of request handler.
- */
-typedef int (*RLM_AUTHORIZE_FUNCP)(REQUEST *request);
-typedef int (*RLM_AUTHENTICATE_FUNCP)(REQUEST *request);
-typedef int (*RLM_POST_AUTHENTICATE_FUNCP)(REQUEST *request);
-typedef int (*RLM_PRE_ACCOUNTING_FUNCP)(REQUEST *request);
-typedef int (*RLM_ACCOUNTING_FUNCP)(REQUEST *request);
+typedef int (*packetmethod)(void *instance, REQUEST *request);
 
 #define RLM_COMPONENT_AUTH 0
 #define RLM_COMPONENT_AUTZ 1
@@ -36,15 +26,13 @@ typedef struct module_t {
        int     type;                   /* reserved */
        int     (*init)(void);
        int     (*instantiate)(CONF_SECTION *mod_cs, void **instance);
-       int     (*authorize)(void *instance, REQUEST *request);
-       int     (*authenticate)(void *instance, REQUEST *request);
-       int     (*preaccounting)(void *instance, REQUEST *request);
-       int     (*accounting)(void *instance, REQUEST *request);
-       int     (*checksimul)(void *instance, REQUEST *request);
+       packetmethod    methods[RLM_COMPONENT_COUNT];
        int     (*detach)(void *instance);
        int     (*destroy)(void);
 } module_t;
 
+extern const char *component_names[RLM_COMPONENT_COUNT];
+
 enum {
        RLM_MODULE_REJECT,      /* immediately reject the request */
        RLM_MODULE_FAIL,        /* module failed, don't reply */

diff --git a/src/main/modcall.c b/src/main/modcall.c
index c34e5cc..fa15918 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -198,28 +198,8 @@ static int call_modsingle(int component, modsingle *sp, REQUEST *request,
        int myresult = default_result;
 
        safe_lock(sp->modinst);
-       switch(component) {
-       case RLM_COMPONENT_AUTZ:
-               myresult = sp->modinst->entry->module->authorize(
-                                   sp->modinst->insthandle, request);
-               break;
-       case RLM_COMPONENT_AUTH:
-               myresult = sp->modinst->entry->module->authenticate(
-                                   sp->modinst->insthandle, request);
-               break;
-       case RLM_COMPONENT_PREACCT:
-               myresult = sp->modinst->entry->module->preaccounting(
-                                   sp->modinst->insthandle, request);
-               break;
-       case RLM_COMPONENT_ACCT:
-               myresult = sp->modinst->entry->module->accounting(
-                                   sp->modinst->insthandle, request);
-               break;
-       case RLM_COMPONENT_SESS:
-               myresult = sp->modinst->entry->module->checksimul(
-                                   sp->modinst->insthandle, request);
-               break;
-       }
+       myresult = sp->modinst->entry->module->methods[component](
+                           sp->modinst->insthandle, request);
        safe_unlock(sp->modinst);
 
        return myresult;
@@ -553,61 +533,12 @@ defaultactions[RLM_COMPONENT_COUNT][GROUPTYPE_COUNT][RLM_MODULE_NUMCODES] =
 static void sanity_check(int component, module_instance_t *inst, int lineno,
                         const char *filename)
 {
-       switch (component) {
-               case RLM_COMPONENT_AUTH:
-                       if (!inst->entry->module->authenticate) {
-                               radlog(L_ERR|L_CONS,
-                                       "%s[%d] Module %s does not contain "
-                                       "an 'authenticate' entry\n",
-                                       filename, lineno,
-                                       inst->entry->module->name);
-                               exit(1);
-                       }
-                       break;
-               case RLM_COMPONENT_AUTZ:
-                       if (!inst->entry->module->authorize) {
-                               radlog(L_ERR|L_CONS,
-                                       "%s[%d] Module %s does not contain "
-                                       "an 'authorize' entry\n",
-                                       filename, lineno,
-                                       inst->entry->module->name);
-                               exit(1);
-                       }
-                       break;
-               case RLM_COMPONENT_PREACCT:
-                       if (!inst->entry->module->preaccounting) {
-                               radlog(L_ERR|L_CONS,
-                                       "%s[%d] Module %s does not contain "
-                                       "a 'preacct' entry\n",
-                                       filename, lineno,
-                                       inst->entry->module->name);
-                               exit(1);
-                       }
-                       break;
-               case RLM_COMPONENT_ACCT:
-                       if (!inst->entry->module->accounting) {
-                               radlog(L_ERR|L_CONS,
-                                       "%s[%d] Module %s does not contain "
-                                       "an 'accounting' entry\n",
-                                       filename, lineno,
-                                       inst->entry->module->name);
-                               exit(1);
-                       }
-                       break;
-               case RLM_COMPONENT_SESS:
-                       if (!inst->entry->module->checksimul) {
-                               radlog(L_ERR|L_CONS,
-                                       "%s[%d] Module %s does not contain "
-                                       "a 'checksimul' entry\n",
-                                       filename, lineno,
-                                       inst->entry->module->name);
-                               exit(1);
-                       }
-                       break;
-               default:
-                       radlog(L_ERR|L_CONS, "%s[%d] Unknown component %d.\n",
-                              filename, lineno, component);
-                       exit(1);
+       if (!inst->entry->module->methods[component]) {
+               radlog(L_ERR|L_CONS,
+                       "%s[%d] Module %s does not contain a method for '%s'",
+                       filename, lineno, inst->entry->module->name,
+                       component_names[component]);
+               exit(1);
        }
 }
 

diff --git a/src/main/modules.c b/src/main/modules.c
index 5771584..55e28de 100644 (file)
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -66,7 +66,7 @@ static indexed_modcallable *components[RLM_COMPONENT_COUNT];
  *     Hmm... we probably should be getting these from the configuration
  *     file, too.
  */
-static const char *component_names[RLM_COMPONENT_COUNT] =
+const char *component_names[RLM_COMPONENT_COUNT] =
 {
   "authenticate",
   "authorize",

diff --git a/src/modules/rlm_acct_unique/rlm_acct_unique.c b/src/modules/rlm_acct_unique/rlm_acct_unique.c
index c56c987..c060cf3 100644 (file)
--- a/src/modules/rlm_acct_unique/rlm_acct_unique.c
+++ b/src/modules/rlm_acct_unique/rlm_acct_unique.c
@@ -227,11 +227,13 @@ module_t rlm_acct_unique = {
   0,                           /* type: reserved */
   NULL,                                /* initialization */
   unique_instantiate,          /* instantiation */
-  NULL,                                /* authorization */
-  NULL,                                /* authentication */
-  NULL,                                /* preaccounting */
-  unique_accounting,           /* accounting */
-  NULL,                                /* checksimul */
+  {
+         NULL,                 /* authentication */
+         NULL,                 /* authorization */
+         NULL,                 /* preaccounting */
+         unique_accounting,    /* accounting */
+         NULL                  /* checksimul */
+  },
   unique_detach,               /* detach */
   NULL,                                /* destroy */
 };

diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c
index 2b99372..4525a9e 100644 (file)
--- a/src/modules/rlm_always/rlm_always.c
+++ b/src/modules/rlm_always/rlm_always.c
@@ -159,11 +159,13 @@ module_t rlm_always = {
        RLM_TYPE_THREAD_SAFE,           /* type */
        NULL,                           /* initialization */
        always_instantiate,             /* instantiation */
-       always_return,                  /* authorization */
-       always_return,                  /* authentication */
-       always_return,                  /* preaccounting */
-       always_return,                  /* accounting */
-       always_checksimul,              /* checksimul */
+       {
+               always_return,          /* authentication */
+               always_return,          /* authorization */
+               always_return,          /* preaccounting */
+               always_return,          /* accounting */
+               always_checksimul       /* checksimul */
+       },
        always_detach,                  /* detach */
        NULL,                           /* destroy */
 };

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index 23fd05a..5a8dbff 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -442,11 +442,13 @@ module_t rlm_attr_filter = {
        0,                              /* type: reserved */
        NULL,                           /* initialization */
        attr_filter_instantiate,        /* instantiation */
-        attr_filter_authorize,                 /* authorization */
-       NULL,                           /* authentication */
-       NULL,                           /* preaccounting */
-       NULL,                           /* accounting */
-       NULL,                           /* checksimul */
+       {
+               NULL,                   /* authentication */
+               attr_filter_authorize,  /* authorization */
+               NULL,                   /* preaccounting */
+               NULL,                   /* accounting */
+               NULL                    /* checksimul */
+       },
        attr_filter_detach,             /* detach */
        NULL                            /* destroy */
 };

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 34898aa..8c6ecfb 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -217,11 +217,13 @@ module_t rlm_detail = {
        0,                              /* type: reserved */
        NULL,                           /* initialization */
        detail_instantiate,             /* instantiation */
-       NULL,                           /* authorization */
-       NULL,                           /* authentication */
-       NULL,                           /* preaccounting */
-       detail_accounting,              /* accounting */
-       NULL,                           /* checksimul */
+       {
+               NULL,                   /* authentication */
+               NULL,                   /* authorization */
+               NULL,                   /* preaccounting */
+               detail_accounting,      /* accounting */
+               NULL                    /* checksimul */
+       },
        detail_detach,                  /* detach */
        NULL                            /* destroy */
 };

diff --git a/src/modules/rlm_dictionary/rlm_dictionary.c b/src/modules/rlm_dictionary/rlm_dictionary.c
index 2d1d131..42cc130 100644 (file)
--- a/src/modules/rlm_dictionary/rlm_dictionary.c
+++ b/src/modules/rlm_dictionary/rlm_dictionary.c
@@ -58,11 +58,13 @@ module_t rlm_dictionary = {
        0,                              /* type: reserved */
        radius_init,                    /* initialization */
        NULL,                           /* instantiation */
-       NULL,                           /* authorization */
-       NULL,                           /* authentication */
-       NULL,                           /* preaccounting */
-       NULL,                           /* accounting */
-       NULL,                           /* checksimul */
+       {
+               NULL,                   /* authentication */
+               NULL,                   /* authorization */
+               NULL,                   /* preaccounting */
+               NULL,                   /* accounting */
+               NULL                    /* checksimul */
+       },
        NULL,                           /* detach */
        NULL                            /* destroy */
 };

diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c
index 58ebc00..c6ec873 100644 (file)
--- a/src/modules/rlm_example/rlm_example.c
+++ b/src/modules/rlm_example/rlm_example.c
@@ -233,11 +233,13 @@ module_t rlm_example = {
        RLM_TYPE_THREAD_SAFE,           /* type */
        example_init,                   /* initialization */
        example_instantiate,            /* instantiation */
-       example_authorize,              /* authorization */
-       example_authenticate,           /* authentication */
-       example_preacct,                /* preaccounting */
-       example_accounting,             /* accounting */
-       example_checksimul,             /* checksimul */
+       {
+               example_authenticate,   /* authentication */
+               example_authorize,      /* authorization */
+               example_preacct,        /* preaccounting */
+               example_accounting,     /* accounting */
+               example_checksimul      /* checksimul */
+       },
        example_detach,                 /* detach */
        NULL,                           /* destroy */
 };

diff --git a/src/modules/rlm_fastusers/rlm_fastusers.c b/src/modules/rlm_fastusers/rlm_fastusers.c
index e0e1f90..9abe657 100644 (file)
--- a/src/modules/rlm_fastusers/rlm_fastusers.c
+++ b/src/modules/rlm_fastusers/rlm_fastusers.c
@@ -781,14 +781,16 @@ static int fastuser_accounting(void *instance, REQUEST *request)
 module_t rlm_fastusers = {
        "fastusers",
        0,                              /* type: reserved */
-       NULL,                   /* initialization */
+       NULL,                           /* initialization */
        fastuser_instantiate,           /* instantiation */
-       fastuser_authorize,             /* authorization */
-       fastuser_authenticate,          /* authentication */
-       fastuser_preacct,                       /* preaccounting */
-       fastuser_accounting,            /* accounting */
-       NULL,                                                                   /* checksimul */
-       fastuser_detach,                        /* detach */
+       {
+               fastuser_authenticate,  /* authentication */
+               fastuser_authorize,     /* authorization */
+               fastuser_preacct,       /* preaccounting */
+               fastuser_accounting,    /* accounting */
+               NULL                    /* checksimul */
+       },
+       fastuser_detach,                /* detach */
        NULL                            /* destroy */
 };
 

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index bc490e7..ce7411b 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -462,11 +462,13 @@ module_t rlm_files = {
        0,                              /* type: reserved */
        NULL,                           /* initialization */
        file_instantiate,               /* instantiation */
-       file_authorize,                 /* authorization */
-       NULL,                           /* authentication */
-       file_preacct,                   /* preaccounting */
-       NULL,                           /* accounting */
-       NULL,                           /* checksimul */
+       {
+               NULL,                   /* authentication */
+               file_authorize,         /* authorization */
+               file_preacct,           /* preaccounting */
+               NULL,                   /* accounting */
+               NULL                    /* checksimul */
+       },
        file_detach,                    /* detach */
        NULL                            /* destroy */
 };

diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 1868031..e857863 100644 (file)
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -153,11 +153,13 @@ module_t rlm_krb5 = {
   RLM_TYPE_THREAD_UNSAFE,      /* type: not thread safe */
   NULL,                                /* initialize */
   krb5_instantiate,            /* instantiation */
-  NULL,                                /* authorize */
-  krb5_auth,                   /* authenticate */
-  NULL,                                /* pre-accounting */
-  NULL,                                /* accounting */
-  NULL,                                /* checksimul */
+  {
+         krb5_auth,            /* authenticate */
+         NULL,                 /* authorize */
+         NULL,                 /* pre-accounting */
+         NULL,                 /* accounting */
+         NULL                  /* checksimul */
+  },
   krb5_detach,                 /* detach */
   NULL,                                /* destroy */
 };

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 533788a..d7e5ff2 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -811,11 +811,13 @@ module_t        rlm_ldap = {
        RLM_TYPE_THREAD_UNSAFE, /* type: reserved        */
        NULL,                   /* initialization        */
        ldap_instantiate,       /* instantiation         */
-       ldap_authorize,         /* authorization         */
-       ldap_authenticate,      /* authentication        */
-       NULL,                   /* preaccounting         */
-       NULL,                   /* accounting            */
-       NULL,                   /* checksimul            */
+       {
+               ldap_authenticate,      /* authentication        */
+               ldap_authorize,         /* authorization         */
+               NULL,                   /* preaccounting         */
+               NULL,                   /* accounting            */
+               NULL                    /* checksimul            */
+       },
        ldap_detach,            /* detach                */
        NULL,                   /* destroy               */
 };

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index 1f34bbd..33ed3ff 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -185,11 +185,13 @@ module_t rlm_mschap = {
   0,                           /* type */
   NULL,                                /* initialize */
   NULL,                                /* instantiation */
-  NULL,                                /* authorize */
-  mschap_auth,                 /* authenticate */
-  NULL,                                /* pre-accounting */
-  NULL,                                /* accounting */
-  NULL,                                /* checksimul */
+  {
+         mschap_auth,          /* authenticate */
+         NULL,                 /* authorize */
+         NULL,                 /* pre-accounting */
+         NULL,                 /* accounting */
+         NULL                  /* checksimul */
+  },
   NULL,                                /* detach */
   NULL,                                /* destroy */
 };

diff --git a/src/modules/rlm_ns_mta_md5/rlm_ns_mta_md5.c b/src/modules/rlm_ns_mta_md5/rlm_ns_mta_md5.c
index cbaed84..0fb1994 100644 (file)
--- a/src/modules/rlm_ns_mta_md5/rlm_ns_mta_md5.c
+++ b/src/modules/rlm_ns_mta_md5/rlm_ns_mta_md5.c
@@ -165,11 +165,13 @@ module_t rlm_ns_mta_md5 = {
   0,                           /* type: reserved */
   NULL,                                /* initialize */
   NULL,                                /* instantiation */
-  NULL,                                /* authorize */
-  module_auth,                 /* authenticate */
-  NULL,                                /* pre-accounting */
-  NULL,                                /* accounting */
-  NULL,                                /* checksimul */
+  {
+         module_auth,          /* authenticate */
+         NULL,                 /* authorize */
+         NULL,                 /* pre-accounting */
+         NULL,                 /* accounting */
+         NULL                  /* checksimul */
+  },
   NULL,                                /* detach */
   NULL,                                /* destroy */
 };

diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c
index 357aa63..a36fec8 100644 (file)
--- a/src/modules/rlm_pam/rlm_pam.c
+++ b/src/modules/rlm_pam/rlm_pam.c
@@ -267,11 +267,13 @@ module_t rlm_pam = {
   0,                           /* type: reserved */
   NULL,                                /* initialize */
   pam_instantiate,             /* instantiation */
-  NULL,                                /* authorize */
-  pam_auth,                    /* authenticate */
-  NULL,                                /* pre-accounting */
-  NULL,                                /* accounting */
-  NULL,                                /* checksimul */
+  {
+         pam_auth,             /* authenticate */
+         NULL,                 /* authorize */
+         NULL,                 /* pre-accounting */
+         NULL,                 /* accounting */
+         NULL                  /* checksimul */
+  },
   pam_detach,                  /* detach */
   NULL,                                /* destroy */
 };

diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c
index 1cdb785..0cbd69c 100644 (file)
--- a/src/modules/rlm_preprocess/rlm_preprocess.c
+++ b/src/modules/rlm_preprocess/rlm_preprocess.c
@@ -653,11 +653,13 @@ module_t rlm_preprocess = {
        0,                      /* type: reserved */
        NULL,                   /* initialization */
        preprocess_instantiate, /* instantiation */
-       preprocess_authorize,   /* authorization */
-       NULL,                   /* authentication */
-       preprocess_preaccounting, /* pre-accounting */
-       NULL,                   /* accounting */
-       NULL,                   /* checksimul */
+       {
+               NULL,                   /* authentication */
+               preprocess_authorize,   /* authorization */
+               preprocess_preaccounting, /* pre-accounting */
+               NULL,                   /* accounting */
+               NULL                    /* checksimul */
+       },
        preprocess_detach,      /* detach */
        NULL,                   /* destroy */
 };

diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index 630ce4d..a714275 100644 (file)
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -602,11 +602,13 @@ module_t rlm_radutmp = {
   0,                            /* type: reserved */
   NULL,                        /* initialization */
   radutmp_instantiate,          /* instantiation */
-  NULL,                         /* authorization */
-  NULL,                         /* authentication */
-  NULL,                         /* preaccounting */
-  radutmp_accounting,           /* accounting */
-  radutmp_checksimul,          /* checksimul */
+  {
+         NULL,                 /* authentication */
+         NULL,                 /* authorization */
+         NULL,                 /* preaccounting */
+         radutmp_accounting,   /* accounting */
+         radutmp_checksimul    /* checksimul */
+  },
   radutmp_detach,               /* detach */
   NULL,                        /* destroy */
 };

diff --git a/src/modules/rlm_realm/rlm_realm.c b/src/modules/rlm_realm/rlm_realm.c
index 424be8c..57ccf44 100644 (file)
--- a/src/modules/rlm_realm/rlm_realm.c
+++ b/src/modules/rlm_realm/rlm_realm.c
@@ -336,11 +336,13 @@ module_t rlm_realm = {
   0,                           /* type: reserved */
   NULL,                                /* initialization */
   realm_instantiate,           /* instantiation */
-  realm_authorize,             /* authorization */
-  NULL,                                /* authentication */
-  realm_preacct,               /* preaccounting */
-  NULL,                                /* accounting */
-  NULL,                                /* checksimul */
+  {
+         NULL,                 /* authentication */
+         realm_authorize,      /* authorization */
+         realm_preacct,        /* preaccounting */
+         NULL,                 /* accounting */
+         NULL                  /* checksimul */
+  },
   realm_detach,                        /* detach */
   NULL,                                /* destroy */
 };

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 909336c..ba93ddd 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -485,11 +485,13 @@ module_t rlm_sql = {
        RLM_TYPE_THREAD_SAFE,   /* type: reserved */
        rlm_sql_init,           /* initialization */
        rlm_sql_instantiate,    /* instantiation */
-       rlm_sql_authorize,      /* authorization */
-       rlm_sql_authenticate,   /* authentication */
-       NULL,                   /* preaccounting */
-       rlm_sql_accounting,     /* accounting */
-       NULL,                   /* checksimul */
+       {
+               rlm_sql_authenticate,   /* authentication */
+               rlm_sql_authorize,      /* authorization */
+               NULL,                   /* preaccounting */
+               rlm_sql_accounting,     /* accounting */
+               NULL                    /* checksimul */
+       },
        rlm_sql_detach,         /* detach */
        rlm_sql_destroy,        /* destroy */
 };

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index dcad1ea..b00af56 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -600,11 +600,13 @@ module_t rlm_unix = {
   0,                            /* type: reserved */
   unix_init,                    /* initialization */
   unix_instantiate,            /* instantiation */
-  NULL,                         /* authorization */
-  unix_authenticate,            /* authentication */
-  NULL,                         /* preaccounting */
-  unix_accounting,              /* accounting */
-  NULL,                        /* checksimul */
+  {
+         unix_authenticate,    /* authentication */
+         NULL,                 /* authorization */
+         NULL,                 /* preaccounting */
+         unix_accounting,      /* accounting */
+         NULL                  /* checksimul */
+  },
   unix_detach,                         /* detach */
   unix_destroy,                  /* destroy */
 };