TEL-6201 Add new functions for setting and getting dialplan function.

src/include/switch_caller.h

@@ -185,6 +185,22 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(_In_ switch_core_se
 															 _In_ switch_caller_extension_t *caller_extension,
 															 _In_z_ const char *application_name, _In_z_ const char *extra_data);
 
+/*!
+  \brief Insert an application (instruction) to the given extension, before any of the low priority applications
+  \param session session associated with the extension (bound by scope)
+  \param caller_extension extension to add the application to
+  \param application_names the name of the applications
+  \param application_data optional argument to the applications
+  \param app_count number of applications in the array
+  \param low_priority_applications array of application names to insert before
+  \param low_priority_count number of applications in the array
+*/
+SWITCH_DECLARE(void) switch_caller_extension_insert_applications(_In_ switch_core_session_t *session,
+															 _In_ switch_caller_extension_t *caller_extension,
+															 _In_z_ const char **application_names, _In_z_ const char **application_data,
+															 _In_z_ size_t app_count, _In_opt_ char **low_priority_applications,
+															 _In_z_ size_t low_priority_count);
+
 /*!
   \brief Add an application (instruction) to the given extension
   \param session session associated with the extension (bound by scope)

src/include/switch_channel.h

@@ -720,6 +720,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_bind_device_state_handler(switch_
 SWITCH_DECLARE(switch_status_t) switch_channel_unbind_device_state_handler(switch_device_state_function_t function);
 SWITCH_DECLARE(const char *) switch_channel_device_state2str(switch_device_state_t device_state);
 SWITCH_DECLARE(switch_status_t) switch_channel_pass_sdp(switch_channel_t *from_channel, switch_channel_t *to_channel, const char *sdp);
+SWITCH_DECLARE(void) switch_channel_set_post_dialplan_function(switch_channel_t *channel, switch_post_dialplan_function_t function);
+SWITCH_DECLARE(switch_post_dialplan_function_t) switch_channel_get_post_dialplan_function(switch_channel_t *channel);
 
 SWITCH_END_EXTERN_C
 #endif

src/include/switch_types.h

@@ -2571,6 +2571,8 @@ typedef switch_status_t (*switch_input_callback_function_t) (switch_core_session
 typedef switch_status_t (*switch_read_frame_callback_function_t) (switch_core_session_t *session, switch_frame_t *frame, void *user_data);
 typedef struct switch_say_interface switch_say_interface_t;
 
+typedef void (*switch_post_dialplan_function_t) (switch_core_session_t *, switch_caller_extension_t *, const char *);
+
 #define DMACHINE_MAX_DIGIT_LEN 512
 
 typedef enum {

src/switch_caller.c

@@ -570,8 +570,6 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session
 		caller_application->application_name = switch_core_session_strdup(session, application_name);
 		caller_application->application_data = switch_core_session_strdup(session, application_data);
 
-
-
 		if (caller_application->application_data && strstr(caller_application->application_data, "\\'")) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "App not added, Invalid character sequence in data string [%s]\n",
 							  caller_application->application_data);
@@ -587,7 +585,92 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session
 		caller_extension->last_application = caller_application;
 		caller_extension->current_application = caller_extension->applications;
 	}
+}
 
+SWITCH_DECLARE(void) switch_caller_extension_insert_applications(switch_core_session_t *session,
+																switch_caller_extension_t *caller_extension,
+																const char **application_names,
+																const char **application_data,
+																size_t app_count,
+																char **low_priority_applications,
+																size_t low_priority_count)
+{
+    switch_caller_application_t *new_applications = NULL, *last_new_application = NULL;
+	switch_caller_application_t *prev = NULL, *current;
+
+	switch_assert(session != NULL);
+    switch_assert(application_names != NULL);
+    switch_assert(application_data != NULL);
+
+    // Allocate memory for all applications upfront
+    for (size_t i = 0; i < app_count; ++i) {
+    	switch_caller_application_t *caller_application;
+
+    	if (!application_names[i] || !application_data[i]) {
+            switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
+                              "Skipping null application name or data at index [%zu]\n", i);
+            continue;
+        }
+
+        // Allocate and populate new application
+        caller_application = switch_core_session_alloc(session, sizeof(switch_caller_application_t));
+        caller_application->application_name = switch_core_session_strdup(session, application_names[i]);
+        caller_application->application_data = switch_core_session_strdup(session, application_data[i]);
+
+        if (caller_application->application_data && strstr(caller_application->application_data, "\\'")) {
+            switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
+                              "Skipping invalid character sequence in application data [%s]\n",
+                              caller_application->application_data);
+            continue;
+        }
+
+        // Append to the local new applications list
+        if (!new_applications) {
+            new_applications = caller_application;
+        } else {
+            last_new_application->next = caller_application;
+        }
+        last_new_application = caller_application;
+    }
+
+    if (!new_applications) {
+        // No valid applications to insert
+        return;
+    }
+
+    // Traverse the existing applications list to find the insertion point
+    current = caller_extension->applications;
+    while (current) {
+        for (size_t i = 0; i < low_priority_count; ++i) {
+            if (low_priority_applications[i] && strcmp(current->application_name, low_priority_applications[i]) == 0) {
+                // Insert the new applications before the current application
+                if (prev) {
+                    prev->next = new_applications;
+                } else {
+                    caller_extension->applications = new_applications;
+                }
+                last_new_application->next = current;
+
+                // Update the last_application if needed
+                if (current == caller_extension->last_application) {
+                    caller_extension->last_application = last_new_application;
+                }
+                return;
+            }
+        }
+        prev = current;
+        current = current->next;
+    }
+
+    // Append to the end if no priority match was found
+    if (!caller_extension->applications) {
+        caller_extension->applications = new_applications;
+    } else if (caller_extension->last_application) {
+        caller_extension->last_application->next = new_applications;
+    }
+
+    caller_extension->last_application = last_new_application;
+    caller_extension->current_application = caller_extension->applications;
 }
 
 /* For Emacs:

src/switch_channel.c

@@ -189,6 +189,7 @@ struct switch_channel {
 	switch_device_node_t *device_node;
 	char *device_id;
 	switch_event_t *log_tags;
+	switch_post_dialplan_function_t post_dialplan_function;
 };
 
 static void process_device_hup(switch_channel_t *channel);
@@ -5846,6 +5847,22 @@ SWITCH_DECLARE(switch_status_t) switch_channel_pass_sdp(switch_channel_t *from_c
 	return status;
 }
 
+SWITCH_DECLARE(void) switch_channel_set_post_dialplan_function(switch_channel_t *channel, switch_post_dialplan_function_t function)
+{
+	assert(function != NULL);
+	if (channel) {
+		channel->post_dialplan_function = function;
+	}
+}
+
+SWITCH_DECLARE(switch_post_dialplan_function_t) switch_channel_get_post_dialplan_function(switch_channel_t *channel)
+{
+	if (channel) {
+		return channel->post_dialplan_function;
+	}
+	return NULL;
+}
+
 /* For Emacs:
  * Local Variables:
  * mode:c

src/switch_core_state_machine.c

@@ -238,6 +238,7 @@ static void switch_core_standard_on_routing(switch_core_session_t *session)
 	switch_caller_extension_t *extension = NULL;
 	char *expanded = NULL;
 	char *dpstr = NULL;
+	const char *profile_name = NULL;
 
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard ROUTING\n", switch_channel_get_name(session->channel));
 
@@ -289,6 +290,14 @@ static void switch_core_standard_on_routing(switch_core_session_t *session)
 					UNPROTECT_INTERFACE(dialplan_interface);
 
 					if (extension) {
+						profile_name = switch_channel_get_variable(session->channel, "sofia_profile_name");
+						if (!zstr(profile_name)) {
+							switch_post_dialplan_function_t func = switch_channel_get_post_dialplan_function(session->channel);
+							if (func) {
+								func(session, extension, profile_name);
+							}
+						}
+
 						switch_channel_set_caller_extension(session->channel, extension);
 						switch_channel_set_state(session->channel, CS_EXECUTE);
 						goto end;
@@ -370,9 +379,7 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
 		switch_channel_set_variable(session->channel, "next_application_on_execute", "");
 		switch_channel_set_variable(session->channel, "next_application_data_on_execute", "");
 	}
-
-
-
+
 	while (switch_channel_get_state(session->channel) == CS_EXECUTE && extension->current_application) {
 		switch_caller_application_t *current_application = extension->current_application;
 

tests/unit/Makefile.am

@@ -4,7 +4,7 @@ noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils swi
 			   switch_ivr_play_say switch_core_codec switch_rtp switch_xml
 noinst_PROGRAMS += switch_core_video switch_core_db switch_vad switch_packetizer switch_core_session test_sofia switch_ivr_async switch_core_asr switch_log
 
-noinst_PROGRAMS+= switch_hold switch_sip
+noinst_PROGRAMS+= switch_hold switch_sip switch_mod_telnyx
 
 if HAVE_PCAP
 noinst_PROGRAMS += switch_rtp_pcap