script_helper: Fix build

Move flags parser in a .h file, so script_helper sees it as well.

Author: liviuchircu

modules/dialog/dialog.c

@@ -39,7 +39,6 @@
 #include "../../script_var.h"
 #include "../../mem/mem.h"
 #include "../../mi/mi.h"
-#include "../../lib/csv.h"
 #include "../rr/api.h"
 #include "../../bin_interface.h"
 #include "../clusterer/api.h"
@@ -605,60 +604,14 @@ static int free_fixup_route(void** param)
 	return 0;
 }
 
-/*
- * Keep this array in sync with create_dlg_flags[] below: if you add, remove
- * or reorder a create_dialog() flag here, make the identical change there.
- */
-static str create_dlg_flag_names[] = {
-	str_init("bye-on-timeout"),       /* DLG_FLAG_BYEONTIMEOUT */
-	str_init("options-ping-caller"),  /* DLG_FLAG_PING_CALLER */
-	str_init("options-ping-callee"),  /* DLG_FLAG_PING_CALLEE */
-	str_init("reinvite-ping-caller"), /* DLG_FLAG_REINVITE_PING_CALLER */
-	str_init("reinvite-ping-callee"), /* DLG_FLAG_REINVITE_PING_CALLEE */
-	str_init("end-on-race-condition"), /* DLG_FLAG_END_ON_RACE_CONDITION */
-	str_init("auto-prack"),           /* DLG_FLAG_AUTOPRACK */
-	STR_NULL
-};
-
 static int fixup_create_dlg_flags(void **param)
 {
-	static const unsigned int create_dlg_flags[] = {
-		DLG_FLAG_BYEONTIMEOUT,
-		DLG_FLAG_PING_CALLER,
-		DLG_FLAG_PING_CALLEE,
-		DLG_FLAG_REINVITE_PING_CALLER,
-		DLG_FLAG_REINVITE_PING_CALLEE,
-		DLG_FLAG_END_ON_RACE_CONDITION,
-		DLG_FLAG_AUTOPRACK
-	};
 	str *flags_str = (str *)*param;
-	csv_record *list, *rec;
-	unsigned int flags = 0;
-	int i;
+	int flags;
 
-	list = parse_csv_record(flags_str);
-	if (!list) {
-		LM_ERR("Failed to parse list of create_dialog flags\n");
+	flags = parse_create_dlg_flags(flags_str);
+	if (flags < 0)
 		return -1;
-	}
-
-	for (rec = list; rec; rec = rec->next) {
-		for (i = 0; create_dlg_flag_names[i].s; i++) {
-			if (str_strcasecmp(&rec->s, &create_dlg_flag_names[i]) == 0) {
-				flags |= create_dlg_flags[i];
-				break;
-			}
-		}
-
-		if (!create_dlg_flag_names[i].s) {
-			LM_ERR("Unknown create_dialog flag: %.*s\n",
-				rec->s.len, rec->s.s);
-			free_csv_record(list);
-			return -1;
-		}
-	}
-
-	free_csv_record(list);
 	*param = (void *)(unsigned long)flags;
 	return 0;
 }

modules/dialog/dlg_load.h

@@ -22,8 +22,10 @@
 #ifndef _DIALOG_DLG_LOAD_H_
 #define _DIALOG_DLG_LOAD_H_
 
+#include "../../lib/csv.h"
 #include "dlg_cb.h"
 #include "dlg_ctx.h"
+#include "dlg_hash.h"
 #include "dlg_handlers.h"
 #include "dlg_profile.h"
 #include "dlg_vals.h"
@@ -87,6 +89,62 @@ typedef int(*load_dlg_f)( struct dlg_binds *dlgb );
 int load_dlg( struct dlg_binds *dlgb);
 
 
+static inline int parse_create_dlg_flags(str *flags_str)
+{
+	/* Keep this array in sync with create_dlg_flags[] below: if you add,
+	 * remove or reorder a create_dialog() flag here, make the identical
+	 * change there as well.
+	 */
+	static const str create_dlg_flag_names[] = {
+		str_init("bye-on-timeout"),
+		str_init("options-ping-caller"),
+		str_init("options-ping-callee"),
+		str_init("reinvite-ping-caller"),
+		str_init("reinvite-ping-callee"),
+		str_init("end-on-race-condition"),
+		str_init("auto-prack"),
+		STR_NULL
+	};
+	static const unsigned int create_dlg_flags[] = {
+		DLG_FLAG_BYEONTIMEOUT,
+		DLG_FLAG_PING_CALLER,
+		DLG_FLAG_PING_CALLEE,
+		DLG_FLAG_REINVITE_PING_CALLER,
+		DLG_FLAG_REINVITE_PING_CALLEE,
+		DLG_FLAG_END_ON_RACE_CONDITION,
+		DLG_FLAG_AUTOPRACK
+	};
+	csv_record *list, *rec;
+	unsigned int flags = 0;
+	int i;
+
+	list = parse_csv_record(flags_str);
+	if (!list) {
+		LM_ERR("failed to parse list of create_dialog flags\n");
+		return -1;
+	}
+
+	for (rec = list; rec; rec = rec->next) {
+		for (i = 0; create_dlg_flag_names[i].s; i++) {
+			if (str_strcasecmp(&rec->s, &create_dlg_flag_names[i]) == 0) {
+				flags |= create_dlg_flags[i];
+				break;
+			}
+		}
+
+		if (!create_dlg_flag_names[i].s) {
+			LM_ERR("unknown create_dialog flag: %.*s\n",
+				rec->s.len, rec->s.s);
+			free_csv_record(list);
+			return -1;
+		}
+	}
+
+	free_csv_record(list);
+	return (int)flags;
+}
+
+
 static inline int load_dlg_api( struct dlg_binds *dlgb )
 {
 	load_dlg_f load_dlg;

modules/script_helper/README

@@ -106,7 +106,7 @@ modparam("script_helper", "use_dialog", 1)
 
    Example 1.2. Setting create_dialog_flags
 ...
-modparam("script_helper", "create_dialog_flags", "PpB")
+modparam("script_helper", "create_dialog_flags", "options-ping-caller,options-ping-callee,bye-on-timeout")
 ...
 
 1.4.3. sequential_route (string)

modules/script_helper/doc/script_helper_admin.xml

@@ -122,7 +122,7 @@ modparam("script_helper", "use_dialog", 1)
 		<title>Setting <varname>create_dialog_flags</varname></title>
 		<programlisting format="linespecific">
 ...
-modparam("script_helper", "create_dialog_flags", "PpB")
+modparam("script_helper", "create_dialog_flags", "options-ping-caller,options-ping-callee,bye-on-timeout")
 ...
 </programlisting>
 		</example>
@@ -164,4 +164,3 @@ route [sequential_handling]
 
 </section>
 </chapter>
-