FS-3246 --resolve all [] {} and <> can be stacked and override the delim per set…

FS-3246 --resolve all [] {} and <> can be stacked and override the delim per set <><^^:>{}{^^:}{^^;}[][^^:]

src/include/switch_event.h

@@ -285,7 +285,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_free_subclass_detailed(const char *
 SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, char **str, switch_bool_t encode);
 SWITCH_DECLARE(switch_status_t) switch_event_serialize_json(switch_event_t *event, char **str);
 SWITCH_DECLARE(switch_status_t) switch_event_create_json(switch_event_t **event, const char *json);
-SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a, char b, char c, switch_event_t **event, char **new_data);
+SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a, char b, char c, switch_event_t **event, char **new_data, switch_bool_t dup);
 
 #ifndef SWIG
 /*!

src/mod/applications/mod_fifo/mod_fifo.c

@@ -1238,7 +1238,7 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
 		struct call_helper *h = cbh->rows[i];
 		char *parsed = NULL;
 
-		switch_event_create_brackets(h->originate_string, '{', '}', ',', &ovars, &parsed);
+		switch_event_create_brackets(h->originate_string, '{', '}', ',', &ovars, &parsed, SWITCH_TRUE);
 		switch_event_del_header(ovars, "fifo_outbound_uuid");
 		
 		if (!h->timeout) h->timeout = node->ring_timeout;
@@ -3870,7 +3870,7 @@ static void extract_fifo_outbound_uuid(char *string, char *uuid, switch_size_t l
 	
 	switch_event_create(&ovars, SWITCH_EVENT_REQUEST_PARAMS);
 	
-	switch_event_create_brackets(string, '{', '}', ',', &ovars, &parsed);
+	switch_event_create_brackets(string, '{', '}', ',', &ovars, &parsed, SWITCH_TRUE);
 	
 	if ((fifo_outbound_uuid = switch_event_get_header(ovars, "fifo_outbound_uuid"))) {
 		switch_snprintf(uuid, len, "%s", fifo_outbound_uuid);

src/switch_event.c

@@ -1075,17 +1075,21 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
 }
 
 
-SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a, char b, char c, switch_event_t **event, char **new_data)
+SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a, char b, char c, switch_event_t **event, char **new_data, switch_bool_t dup)
 {
-	char *vdata, *vdatap;
+	char *vdata, *vdatap = NULL;
 	char *end, *check_a, *check_b;
 	switch_event_t *e = *event;
 	char *var_array[1024] = { 0 };
 	int var_count = 0;
 	char *next;
 
+	if (dup) {
 		vdatap = strdup(data);
 		vdata = vdatap;
+	} else {
+		vdata = data;
+	}
 
 	end = switch_find_end_paren(vdata, a, b);
 	
@@ -1103,7 +1107,9 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a,
 		vdata++;
 		*end++ = '\0';
 	} else {
+		if (dup) {
 			free(vdatap);
+		}
 		return SWITCH_STATUS_FALSE;
 	}
 	
@@ -1122,6 +1128,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a,
 			}
 		}
 			
+
+		if (vdata) {
+			if (*vdata == '^' && *(vdata + 1) == '^') {
+				vdata += 2;
+				c = *vdata++;
+			}
+		}
+			
 		if ((var_count = switch_separate_string(vdata, c, var_array, (sizeof(var_array) / sizeof(var_array[0]))))) {
 			int x = 0;
 			for (x = 0; x < var_count; x++) {
@@ -1130,6 +1144,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a,
 
 				if ((inner_var_count = switch_separate_string(var_array[x], '=',
 															  inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Parsing variable [%s]=[%s]\n", inner_var_array[0], inner_var_array[1]);
 					switch_event_add_header_string(e, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]);
 				}
 			}
@@ -1144,8 +1159,13 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a,
 	}
 
 	*event = e;
+
+	if (dup) {
 		*new_data = strdup(end);
 		free(vdatap);
+	} else {
+		*new_data = end;
+	}
 	
 	return SWITCH_STATUS_SUCCESS;