add dependencies function in module_exports

Add a new function in module_exports that is run to determine what kind of dependencies (of other modules) a module has. This function is ran before running the initialization phase of the module. (cherry picked from commit b29931e)
OpenSIPS · Sep 19, 2019 · 36b37f6 · 36b37f6
1 parent f9bc3ce
commit 36b37f6
Show file tree

Hide file tree

Showing 159 changed files with 210 additions and 16 deletions.
diff --git a/main.c b/main.c
@@ -1415,6 +1415,12 @@ int main(int argc, char** argv)
 		goto error;
 	}
 
+	/* init modules dependencies */
+	if (init_modules_deps() != 0) {
+		LM_ERR("error while initializing modules dependencies\n");
+		goto error;
+	}
+
 	/* init modules */
 	if (init_modules() != 0) {
 		LM_ERR("error while initializing modules\n");

diff --git a/modules/aaa_radius/aaa_radius.c b/modules/aaa_radius/aaa_radius.c
@@ -142,6 +142,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,			/* dlopen flags */
 	0,							/* load function */
 	NULL,						/* OpenSIPS module dependencies */
+	0,							/* OpenSIPS dependencies function */
 	cmds,						/* exported functions */
 	acmds,						/* exported async functions */
 	params,						/* exported parameters */

diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c
@@ -262,6 +262,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,       /* exported functions */
 	0,          /* exported async functions */
 	params,     /* exported params */

diff --git a/modules/alias_db/alias_db.c b/modules/alias_db/alias_db.c
@@ -111,6 +111,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	0,          /* Exported async functions */
 	params,     /* Exported parameters */

diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c
@@ -182,6 +182,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,

diff --git a/modules/auth_aaa/authaaa_mod.c b/modules/auth_aaa/authaaa_mod.c
@@ -129,6 +129,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	0,          /* Exported async functions */
 	params,     /* Exported parameters */

diff --git a/modules/auth_db/authdb_mod.c b/modules/auth_db/authdb_mod.c
@@ -190,6 +190,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	0,          /* Exported async functions */
 	params,     /* Exported parameters */
@@ -312,4 +313,4 @@ static int fixup_check_outvar(void **param)
 	}
 
 	return 0;
-}
+}
diff --git a/modules/avpops/avpops.c b/modules/avpops/avpops.c
@@ -250,6 +250,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	acmds,      /* Exported async functions */
 	params,     /* Exported parameters */

diff --git a/modules/b2b_entities/b2b_entities.c b/modules/b2b_entities/b2b_entities.c
@@ -129,6 +129,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,                /* dlopen flags */
 	0,				                /* load function */
 	&deps,                          /* OpenSIPS module dependencies */
+	0,                              /* OpenSIPS dependencies function */
 	cmds,                           /* exported functions */
 	NULL,                           /* exported async functions */
 	params,                         /* exported parameters */

diff --git a/modules/b2b_logic/b2b_logic.c b/modules/b2b_logic/b2b_logic.c
@@ -212,6 +212,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,                /* dlopen flags */
 	0,				                /* load function */
 	&deps,                          /* OpenSIPS module dependencies */
+	0,                              /* OpenSIPS dependencies function */
 	cmds,                           /* exported functions */
 	0,                              /* exported async functions */
 	params,                         /* exported parameters */

diff --git a/modules/b2b_sca/b2b_sca.c b/modules/b2b_sca/b2b_sca.c
@@ -190,6 +190,7 @@ struct module_exports exports= {
         DEFAULT_DLFLAGS,                /* dlopen flags */
         0,				                /* load function */
         &deps,                          /* OpenSIPS module dependencies */
+        0,                              /* OpenSIPS dependencies function */
         cmds,                           /* exported functions */
         0,                              /* exported async functions */
         params,                         /* exported parameters */

diff --git a/modules/benchmark/benchmark.c b/modules/benchmark/benchmark.c
@@ -181,6 +181,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS,
 	0,          /* load function */
 	NULL,       /* OpenSIPS module dependencies */
+	0,          /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	0,          /* Exported async functions */
 	params,     /* Exported parameters */

diff --git a/modules/cachedb_cassandra/cachedb_cassandra.c b/modules/cachedb_cassandra/cachedb_cassandra.c
@@ -73,6 +73,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	NULL,            /* exported functions */
 	0,               /* exported async functions */
 	params,          /* param exports */

diff --git a/modules/cachedb_couchbase/cachedb_couchbase.c b/modules/cachedb_couchbase/cachedb_couchbase.c
@@ -73,6 +73,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,			/* dlopen flags */
 	0,							/* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	0,						/* exported functions */
 	0,						/* exported async functions */
 	params,						/* exported parameters */

diff --git a/modules/cachedb_local/cachedb_local.c b/modules/cachedb_local/cachedb_local.c
@@ -117,6 +117,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,            /* dlopen flags */
 	0,                          /* load functionpen flags */
 	&deps,            /* OpenSIPS module dependencies */
+	0,                /* OpenSIPS dependencies function */
 	cmds,                       /* exported functions */
 	0,                          /* exported async functions */
 	params,                     /* exported parameters */

diff --git a/modules/cachedb_memcached/cachedb_memcached.c b/modules/cachedb_memcached/cachedb_memcached.c
@@ -87,6 +87,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,            /* dlopen flags */
 	0,				            /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	0,                          /* exported functions */
 	0,                          /* exported async functions */
 	params,                     /* exported parameters */

diff --git a/modules/cachedb_mongodb/cachedb_mongodb.c b/modules/cachedb_mongodb/cachedb_mongodb.c
@@ -81,6 +81,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,			/* dlopen flags */
 	0,							/* load function */
 	&deps,            /* OpenSIPS module dependencies */
+	0,                /* OpenSIPS dependencies function */
 	0,						/* exported functions */
 	0,						/* exported async functions */
 	params,						/* exported parameters */

diff --git a/modules/cachedb_redis/cachedb_redis.c b/modules/cachedb_redis/cachedb_redis.c
@@ -69,6 +69,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,			/* dlopen flags */
 	0,							/* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	0,						/* exported functions */
 	0,						/* exported async functions */
 	params,						/* exported parameters */

diff --git a/modules/cachedb_sql/cachedb_sql.c b/modules/cachedb_sql/cachedb_sql.c
@@ -100,6 +100,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS,            /* dlopen flags */
 	0,				            /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	0,                          /* exported functions */
 	0,                          /* exported async functions */
 	params,                     /* exported parameters */

diff --git a/modules/call_center/call_center.c b/modules/call_center/call_center.c
@@ -187,6 +187,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,            /* exported functions */
 	0,               /* exported async functions */
 	mod_params,      /* param exports */

diff --git a/modules/call_control/call_control.c b/modules/call_control/call_control.c
@@ -203,6 +203,7 @@ struct module_exports exports = {
     DEFAULT_DLFLAGS,  // dlopen flags
     NULL,             // load function
     &deps,            // OpenSIPS module dependencies
+    0,                // OpenSIPS dependencies function
     commands,         // exported functions
     NULL,             // exported async functions
     parameters,       // exported parameters

diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c
@@ -262,6 +262,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,            /* OpenSIPS module dependencies */
+	0,                /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	0,          /* Exported async functions */
 	params,     /* Export parameters */

diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c
@@ -277,6 +277,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,        /* exported functions */
 	acmds,       /* exported async functions */
 	params,      /* exported parameters */

diff --git a/modules/cgrates/cgrates.c b/modules/cgrates/cgrates.c
@@ -150,6 +150,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	acmds,
 	params,

diff --git a/modules/clusterer/clusterer_mod.c b/modules/clusterer/clusterer_mod.c
@@ -242,6 +242,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS,		/* dlopen flags */
 	0,						/* load function */
 	&deps,            		/* OpenSIPS module dependencies */
+	0,                      /* OpenSIPS dependencies function */
 	cmds,					/* exported functions */
 	0,						/* exported async functions */
 	params,					/* exported parameters */

diff --git a/modules/compression/compression.c b/modules/compression/compression.c
@@ -183,6 +183,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,		/* dlopen flags */
 	0,						/* load function */
 	NULL,				/* module dependencies */
+	0,					/* OpenSIPS dependencies function */
 	cmds,			/* exported functions */
 	0,				/* exported async functions */
 	mod_params,		/* param exports */

diff --git a/modules/cpl_c/cpl.c b/modules/cpl_c/cpl.c
@@ -201,6 +201,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,     /* Exported functions */
 	0,        /* Exported async functions */
 	params,   /* Exported parameters */

diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c
@@ -98,7 +98,8 @@ struct module_exports exports = {
 	MODULE_VERSION,
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
-	NULL,            /* OpenSIPS module dependencies */
+	NULL,			 /* OpenSIPS module dependencies */
+	0,				 /* OpenSIPS dependencies function */
 	cmds,     /* Exported functions */
 	0,        /* Exported async functions */
 	params,   /* Exported parameters */

diff --git a/modules/db_cachedb/db_cachedb.c b/modules/db_cachedb/db_cachedb.c
@@ -77,6 +77,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	NULL,
 	params,          /* module parameters */

diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c
@@ -117,6 +117,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,      /*  module parameters */

diff --git a/modules/db_http/db_http.c b/modules/db_http/db_http.c
@@ -85,6 +85,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,          /*  module parameters */

diff --git a/modules/db_mysql/db_mysql.c b/modules/db_mysql/db_mysql.c
@@ -97,7 +97,8 @@ struct module_exports exports = {
 	MODULE_VERSION,
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,               /* load function */
-	&deps,            /* OpenSIPS module dependencies */
+	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,               /* exported async functions */
 	params,          /* module parameters */

diff --git a/modules/db_oracle/db_oracle.c b/modules/db_oracle/db_oracle.c
@@ -63,6 +63,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,          /*  module parameters */

diff --git a/modules/db_perlvdb/perlvdb.c b/modules/db_perlvdb/perlvdb.c
@@ -74,6 +74,7 @@ struct module_exports exports = {
 	RTLD_NOW | RTLD_GLOBAL, /* dlopen flags */
 	0,           /* load function */
 	&deps,       /* OpenSIPS module dependencies */
+	0,           /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,      /*  module parameters */

diff --git a/modules/db_postgres/db_postgres.c b/modules/db_postgres/db_postgres.c
@@ -78,6 +78,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,            /*  module functions */
 	0,               /*  module async functions */
 	params,          /*  module parameters */

diff --git a/modules/db_sqlite/db_sqlite.c b/modules/db_sqlite/db_sqlite.c
@@ -71,6 +71,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,               /* exported async functions */
 	params,          /* module parameters */

diff --git a/modules/db_text/dbtext.c b/modules/db_text/dbtext.c
@@ -95,6 +95,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,     /* Exported functions */
 	NULL,     /* Exported async functions */
 	params,   /* Exported parameters */

diff --git a/modules/db_unixodbc/db_unixodbc.c b/modules/db_unixodbc/db_unixodbc.c
@@ -63,6 +63,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,     /*  module parameters */

diff --git a/modules/db_virtual/db_virtual.c b/modules/db_virtual/db_virtual.c
@@ -133,6 +133,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS,  /* dlopen flags */
 	0,				  /* load function */
 	&deps,            /* OpenSIPS module dependencies */
+	0,                /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,           /*  module parameters */

diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c
@@ -471,6 +471,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,            /* exported functions */
 	0,               /* exported async functions */
 	mod_params,      /* param exports */

diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c
@@ -154,6 +154,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,            /* exported functions */
 	0,               /* exported async functions */
 	mod_params,     /* param exports */

diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c
@@ -333,6 +333,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,
 	0,
 	params,

diff --git a/modules/diversion/diversion.c b/modules/diversion/diversion.c
@@ -90,6 +90,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,       /* Exported functions */
 	0,          /* Exported async functions */
 	params,     /* Exported parameters */

diff --git a/modules/dns_cache/dns_cache.c b/modules/dns_cache/dns_cache.c
@@ -78,6 +78,7 @@ struct module_exports exports= {
 	DEFAULT_DLFLAGS,			/* dlopen flags */
 	0,							/* load function */
 	&deps,              /* OpenSIPS module dependencies */
+	0,                  /* OpenSIPS dependencies function */
 	0,					/* exported functions */
 	0,					/* exported async functions */
 	params,					/* exported parameters */

diff --git a/modules/domain/domain_mod.c b/modules/domain/domain_mod.c
@@ -150,6 +150,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	NULL,            /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,      /* Exported functions */
 	0,         /* Exported async functions */
 	params,    /* Exported parameters */

diff --git a/modules/domainpolicy/domainpolicy_mod.c b/modules/domainpolicy/domainpolicy_mod.c
@@ -142,6 +142,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,      /* exported functions */
 	0,         /* exported async functions */
 	params,    /* exported parameters */

diff --git a/modules/drouting/drouting.c b/modules/drouting/drouting.c
@@ -529,6 +529,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds,            /* Exported functions */
 	0,               /* Exported async functions */
 	params,          /* Exported parameters */

diff --git a/modules/emergency/emergency_methods.c b/modules/emergency/emergency_methods.c
@@ -109,6 +109,7 @@ struct module_exports exports = {
 	DEFAULT_DLFLAGS, /* dlopen flags */
 	0,				 /* load function */
 	&deps,           /* OpenSIPS module dependencies */
+	0,               /* OpenSIPS dependencies function */
 	cmds, /* Exported functions */
 	NULL,      /* Exported async functions */
 	params, /* Exported parameters */