add hunt_caller_profile

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

diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h
index 1d5e3372c27d2c2e5cc8b2744557c17f472f5db8..43a3df89c852ec2426f990ba25ed75f6f1ddbd0e 100644 (file)
--- a/src/include/switch_caller.h
+++ b/src/include/switch_caller.h
@@ -99,6 +99,7 @@ SWITCH_BEGIN_EXTERN_C
        switch_caller_profile_flag_t flags;
        struct switch_caller_profile *originator_caller_profile;
        struct switch_caller_profile *originatee_caller_profile;
+       struct switch_caller_profile *hunt_caller_profile;
        struct switch_channel_timetable *times;
        struct switch_caller_extension *caller_extension;
        switch_memory_pool_t *pool;

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index e6fbe25f85c2eb7d973483065caea512751a6a95..1764c7b17e582d0d2493d02faf2b6ceba3392419 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -189,6 +189,8 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_caller_profile(swit
 */
 SWITCH_DECLARE(void) switch_channel_set_originator_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile);
 
+SWITCH_DECLARE(void) switch_channel_set_hunt_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile);
+
 /*!
   \brief Retrive the given channel's originator caller profile
   \param channel channel to retrive the profile from

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 000632e9e63434ca781a54e24a54c729cc15a254..ff706c85116f36e7b633a18c6ba8e01c55e7546b 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1483,6 +1483,19 @@ SWITCH_DECLARE(void) switch_channel_set_originator_caller_profile(switch_channel
        switch_mutex_unlock(channel->profile_mutex);
 }
 
+SWITCH_DECLARE(void) switch_channel_set_hunt_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile)
+{
+       switch_assert(channel != NULL);
+       switch_assert(channel->caller_profile != NULL);
+
+       switch_mutex_lock(channel->profile_mutex);
+       channel->caller_profile->hunt_caller_profile = NULL;
+       if (channel->caller_profile && caller_profile) {
+               channel->caller_profile->hunt_caller_profile = caller_profile;
+       }
+       switch_mutex_unlock(channel->profile_mutex);
+}
+
 SWITCH_DECLARE(void) switch_channel_set_originatee_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile)
 {
        switch_assert(channel != NULL);

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index a9a95470a639c8a5c7102d1db410e2c20ff785fe..c226164a276163eea8e23f32103056348a7a7b30 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -1526,6 +1526,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
 
        dpstr = switch_core_session_strdup(session, new_profile->dialplan);
 
+       switch_channel_set_hunt_caller_profile(channel, new_profile);
        argc = switch_separate_string(dpstr, ',', dp, (sizeof(dp) / sizeof(dp[0])));
        for (x = 0; x < argc; x++) {
                char *dpname = dp[x];
@@ -1581,6 +1582,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
        }
 
   done:
+       switch_channel_set_hunt_caller_profile(channel, NULL);
+
        session->stack_count--;
        return status;
 }