mod_directory: add third argument for the transfer context. If not set, use the...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16839 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_directory/mod_directory.c b/src/mod/applications/mod_directory/mod_directory.c
index f4335d51df95c55b928618d541f1e354f9b9f1dd..3a09216877520ab2e367af50aa154793ac01736d 100644 (file)
--- a/src/mod/applications/mod_directory/mod_directory.c
+++ b/src/mod/applications/mod_directory/mod_directory.c
@@ -311,7 +311,7 @@ static switch_bool_t directory_execute_sql_callback(switch_mutex_t *mutex, char
 }
 
 #define DIR_DESC "directory"
-#define DIR_USAGE "<profile_name> <domain_name>"
+#define DIR_USAGE "<profile_name> <domain_name> [<context_name>]"
 
 static void free_profile(dir_profile_t *profile)
 {
@@ -833,6 +833,7 @@ SWITCH_STANDARD_APP(directory_function)
        char *mydata = NULL;
        const char *profile_name = NULL;
        const char *domain_name = NULL;
+       const char *context_name = NULL;
        dir_profile_t *profile = NULL;
        int x = 0;
        char *sql = NULL;
@@ -846,7 +847,10 @@ SWITCH_STANDARD_APP(directory_function)
        }
 
        mydata = switch_core_session_strdup(session, data);
-       argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+       if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not enough args [%s]\n", data);
+               return;
+       }
 
        if (argv[x]) {
                profile_name = argv[x++];
@@ -856,11 +860,19 @@ SWITCH_STANDARD_APP(directory_function)
                domain_name = argv[x++];
        }
 
+       if (argv[x]) {
+               context_name = argv[x++];
+       }
+
        if (!(profile = get_profile(profile_name))) {
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name);
                return;
        }
 
+       if (!context_name) {
+               context_name = domain_name;
+       }
+
        populate_database(session, profile, domain_name);
 
        memset(&s_param, 0, sizeof(s_param));
@@ -895,7 +907,7 @@ SWITCH_STANDARD_APP(directory_function)
 
        if (!zstr(s_param.transfer_to)) {
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Directory transfering call to : %s\n", s_param.transfer_to);
-               switch_ivr_session_transfer(session, s_param.transfer_to, "XML", domain_name);
+               switch_ivr_session_transfer(session, s_param.transfer_to, "XML", context_name);
        }
 
        /* Delete all sql entry for this call */