Call submoule instantiate for proto modules before calling master.instantiate

diff --git a/src/listen/bfd/proto_bfd.c b/src/listen/bfd/proto_bfd.c
index 68fe3db2ac955ac7843fd37636d64e38be639457..b1b6863d4f6b2ff064dbde3bdb4546be6597a8fc 100644 (file)
--- a/src/listen/bfd/proto_bfd.c
+++ b/src/listen/bfd/proto_bfd.c
@@ -473,6 +473,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/control/proto_control.c b/src/listen/control/proto_control.c
index 079c0ff7e1ebe8c4e7bd664d5dc95654821675bf..ab82322aa2a79511aa0ec0d8b5e8ffb9968ae0bf 100644 (file)
--- a/src/listen/control/proto_control.c
+++ b/src/listen/control/proto_control.c
@@ -163,6 +163,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/cron/proto_cron.c b/src/listen/cron/proto_cron.c
index 2b515c59be3a49286cacb26a94923d525b9a882d..88581948dda82ae28e80ce058232ea86680c1b3e 100644 (file)
--- a/src/listen/cron/proto_cron.c
+++ b/src/listen/cron/proto_cron.c
@@ -242,6 +242,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index 1e349c0fbe9005d0f86fe81cfd1281e7674d760c..861e1763dde99c222f5b5a38c112d76c93dab8e2 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -433,6 +433,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index 7e2d4bc4a1308000559e7b2f7c698edbf8b39420..1a49dffcb3cf2f4390aa0c0094cb5b5f684ecdb0 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -414,6 +414,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index 5e2a10bd16cf150cd8d3696ceb50b83ecd831031..82c1e652972779c4ac4f1be96e42319c69282f31 100644 (file)
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -357,6 +357,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 64);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/load/proto_load.c b/src/listen/load/proto_load.c
index cf666f26b3caa5edbab11e5f136c4aeb75dd587d..9e728d5ef52687189e13c1a0e42ae741fb58f712 100644 (file)
--- a/src/listen/load/proto_load.c
+++ b/src/listen/load/proto_load.c
@@ -253,6 +253,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index 873e1557a59386832e0c526cbd7e9d1d848cd19c..fe59d5fc1a01ba7d50636eb76dc73a8c789462d8 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -508,6 +508,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
         */
        inst->io.mi = mctx->mi;
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index 5fddbff31c51de468927bf90ed48ea645f4c4984..a4e69ca6058f4f838eae6754fc64a18aa8ac29b2 100644 (file)
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -516,6 +516,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index 3e05c7c376d758f95b45da1a932b20d95335f303..ae17cda7797a64103e116ececbc4ec987307dbdb 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -379,6 +379,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, >=, 1024);
        FR_INTEGER_BOUND_CHECK("max_packet_size", inst->max_packet_size, <=, 65535);
 
+       /*
+        *      Instantiate the transport module before calling the
+        *      common instantiation function.
+        */
+       if (module_instantiate(inst->io.submodule) < 0) return -1;
+
        /*
         *      Instantiate the master io submodule
         */