function params interface: add flag that forces use of static strings

OpenSIPS · Apr 12, 2019 · 2251fae · 2251fae
1 parent ff98be9
commit 2251fae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/mod_fix.c b/mod_fix.c
@@ -165,10 +165,20 @@ int fix_cmd(struct cmd_param *params, action_elem_t *elems)
 						goto error;
 					}
 				} else {
+					if (param->flags & CMD_PARAM_STATIC) {
+						LM_ERR("Param [%d] does not support formatted strings\n",i);
+						return E_CFG;
+					}
+
 					gp->pval = pve;
 					gp->type = GPARAM_TYPE_PVE;
 				}
 			} else if (elems[i].type == SCRIPTVAR_ST) {
+				if (param->flags & CMD_PARAM_STATIC) {
+					LM_ERR("Param [%d] does not support variables\n",i);
+					return E_CFG;
+				}
+
 				gp->pval = elems[i].u.data;
 				gp->type = GPARAM_TYPE_PVS;
 			} else {

diff --git a/sr_module.h b/sr_module.h
@@ -118,6 +118,7 @@ typedef int (*mod_proc_wrapper)();
 #define CMD_PARAM_OPT        (1<<4)  /* optional parameter */
 #define CMD_PARAM_FIX_NULL   (1<<5)  /* run fixup even if optional parameter is omitted */
 #define CMD_PARAM_NO_EXPAND  (1<<6)  /* TMPHACK: do not pv-expand strings */
+#define CMD_PARAM_STATIC	 (1<<7)  /* don't accept variables or formatted string */
 
 struct cmd_param {
 	int flags;              /* parameter flags */