module dependencies: Be able to easily specify N dependencies

Author: liviuchircu

sr_module_deps.c

@@ -45,15 +45,25 @@ static struct sr_module_dep unsolved_deps;
 	 type == MOD_TYPE_AAA ? "aaa module" : \
 	 "module")
 
+
 module_dependency_t *alloc_module_dep(enum module_type mod_type, char *mod_name,
 									  enum dep_type dep_type)
 {
+	return _alloc_module_dep(mod_type, mod_name, dep_type, MOD_TYPE_NULL);
+}
+
+
+module_dependency_t *_alloc_module_dep(enum module_type mod_type, char *mod_name,
+                             enum dep_type dep_type, ... /* , MOD_TYPE_NULL */)
+{
+	va_list ap;
 	module_dependency_t *md;
+	int ndeps = 1;
 
-	/* also allocate a zeroed entry in the end */
+	/* always keep a zeroed entry at the end */
 	md = pkg_malloc(2 * sizeof *md);
 	if (!md) {
-		LM_ERR("out of pkg\n");
+		LM_ERR("oom\n");
 		return NULL;
 	}
 
@@ -62,9 +72,32 @@ module_dependency_t *alloc_module_dep(enum module_type mod_type, char *mod_name,
 	md->mod_name = mod_name;
 	md->type = dep_type;
 
+	va_start(ap, dep_type);
+
+	for (;;) {
+		mod_type = va_arg(ap, enum module_type);
+		if (mod_type == MOD_TYPE_NULL)
+			break;
+
+		ndeps++;
+
+		md = pkg_realloc(md, (ndeps + 1) * sizeof *md);
+		if (!md) {
+			LM_ERR("oom\n");
+			return NULL;
+		}
+		memset(&md[ndeps], 0, sizeof *md);
+
+		md[ndeps - 1].mod_type = mod_type;
+		md[ndeps - 1].mod_name = va_arg(ap, char *);
+		md[ndeps - 1].type = va_arg(ap, enum dep_type);
+	}
+
+	va_end(ap);
 	return md;
 }
 
+
 module_dependency_t *get_deps_sqldb_url(param_export_t *param)
 {
 	char *db_url = *(char **)param->param_pointer;
@@ -78,6 +111,7 @@ module_dependency_t *get_deps_sqldb_url(param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_SQLDB, NULL, DEP_WARN);
 }
 
+
 module_dependency_t *get_deps_cachedb_url(param_export_t *param)
 {
 	char *cdb_url = *(char **)param->param_pointer;
@@ -88,6 +122,7 @@ module_dependency_t *get_deps_cachedb_url(param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_CACHEDB, NULL, DEP_ABORT);
 }
 
+
 static int add_module_dependency(struct sr_module *mod, module_dependency_t *dep,
 								 char *script_param)
 {
@@ -125,6 +160,7 @@ static int add_module_dependency(struct sr_module *mod, module_dependency_t *dep
 	return 0;
 }
 
+
 /*
  * register all OpenSIPS module dependencies of a single module parameter
  */
@@ -178,6 +214,7 @@ int add_modparam_dependencies(struct sr_module *mod, param_export_t *param)
 	return 0;
 }
 
+
 /*
  * register all OpenSIPS module dependencies of a single module
  */
@@ -195,6 +232,7 @@ int add_module_dependencies(struct sr_module *mod)
 	return 0;
 }
 
+
 int solve_module_dependencies(struct sr_module *modules)
 {
 	struct sr_module_dep *md, *it;
@@ -317,6 +355,7 @@ int solve_module_dependencies(struct sr_module *modules)
 	return 0;
 }
 
+
 /* after all modules are properly loaded, free all sr_module_dep structures */
 void free_module_dependencies(struct sr_module *modules)
 {

sr_module_deps.h

@@ -56,6 +56,8 @@
  *		- it is up to the module writers to prevent such side effects
  */
 
+#include <stdarg.h>
+
 #include "str.h"
 
 #define MAX_MOD_DEPS 10
@@ -90,10 +92,18 @@ typedef struct modparam_dependency {
 	struct module_dependency *(*get_deps_f)(param_export_t *param);
 } modparam_dependency_t;
 
+
 /* helps to avoid duplicate code when writing "get_deps_f" functions */
 module_dependency_t *alloc_module_dep(enum module_type mod_type, char *mod_name,
 									  enum dep_type dep_type);
 
+
+/* same as above, but with VLA, (3 * N + 1) arguments
+ * and _must_ end with the special MOD_TYPE_NULL value */
+module_dependency_t *_alloc_module_dep(enum module_type mod_type, char *mod_name,
+                             enum dep_type dep_type, ... /* , MOD_TYPE_NULL */);
+
+
 /* commonly used modparam dependency functions */
 
 /**