[core] Update switch_ivr_record_session_event() to check event vars f…

…or RECORD_STEREO, etc
rts-cn · Oct 23, 2021 · 60faf1a · 60faf1a
1 parent a7fa9bf
commit 60faf1a
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 62 deletions.
diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
@@ -685,6 +685,7 @@ SWITCH_DECLARE(void) switch_channel_mark_hold(switch_channel_t *channel, switch_
 /** @} */
 
 SWITCH_DECLARE(switch_status_t) switch_channel_execute_on(switch_channel_t *channel, const char *variable_prefix);
+SWITCH_DECLARE(switch_status_t) switch_channel_execute_on_value(switch_channel_t *channel, const char *variable_value);
 SWITCH_DECLARE(switch_status_t) switch_channel_api_on(switch_channel_t *channel, const char *variable_prefix);
 SWITCH_DECLARE(void) switch_channel_process_device_hangup(switch_channel_t *channel);
 SWITCH_DECLARE(switch_caller_extension_t *) switch_channel_get_queued_extension(switch_channel_t *channel);

diff --git a/src/include/test/switch_test.h b/src/include/test/switch_test.h
@@ -522,6 +522,7 @@ static switch_status_t fst_init_core_and_modload(const char *confdir, const char
 			switch_channel_set_variable(fst_channel, "send_silence_when_idle", "-1"); \
 			switch_channel_set_variable(fst_channel, "RECORD_STEREO", "true"); \
 			switch_ivr_record_session(fst_session, (char *)"/tmp/"#name".wav", 0, NULL); \
+			switch_channel_set_variable(fst_channel, "RECORD_STEREO", NULL); \
 			for(;;) {
 
 /**

diff --git a/src/switch_channel.c b/src/switch_channel.c
@@ -3759,15 +3759,16 @@ SWITCH_DECLARE(switch_status_t) switch_channel_api_on(switch_channel_t *channel,
 	return x ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE;
 }
 
-static void do_execute_on(switch_channel_t *channel, const char *variable)
+SWITCH_DECLARE(switch_status_t) switch_channel_execute_on_value(switch_channel_t *channel, const char *variable_value)
 {
+	switch_status_t status;
 	char *arg = NULL;
 	char *p;
 	int bg = 0;
 	char *app;
 	char *expanded = NULL;
 
-	app = switch_core_session_strdup(channel->session, variable);
+	app = switch_core_session_strdup(channel->session, variable_value);
 
 	for(p = app; p && *p; p++) {
 		if (*p == ' ' || (*p == ':' && (*(p+1) != ':'))) {
@@ -3792,14 +3793,16 @@ static void do_execute_on(switch_channel_t *channel, const char *variable)
 	}
 
 	if (bg) {
-		switch_core_session_execute_application_async(channel->session, app, arg);
+		status = switch_core_session_execute_application_async(channel->session, app, arg);
 	} else {
-		switch_core_session_execute_application(channel->session, app, arg);
+		status = switch_core_session_execute_application(channel->session, app, arg);
 	}
 
 	if (expanded && expanded != arg) {
 		free(expanded);
 	}
+
+	return status;
 }
 
 SWITCH_DECLARE(switch_status_t) switch_channel_execute_on(switch_channel_t *channel, const char *variable_prefix)
@@ -3821,11 +3824,11 @@ SWITCH_DECLARE(switch_status_t) switch_channel_execute_on(switch_channel_t *chan
 				int i;
 				for (i = 0; i < hp->idx; i++) {
 					x++;
-					do_execute_on(channel, hp->array[i]);
+					switch_channel_execute_on_value(channel, hp->array[i]);
 				}
 			} else {
 				x++;
-				do_execute_on(channel, val);
+				switch_channel_execute_on_value(channel, val);
 			}
 		}
 	}