change names to protect the innocent

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

diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index 2dc0e8c3b226bb7d5ee8042d02ee78766ffe28f6..f101e356ef4789f1925ada95d0cfe8b49592dc3f 100644 (file)
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -63,17 +63,17 @@ struct switch_state_handler_table {
        /*! executed when the state changes to init */
        switch_state_handler_t on_init;
        /*! executed when the state changes to ring */
-       switch_state_handler_t on_ring;
+       switch_state_handler_t on_routing;
        /*! executed when the state changes to execute */
        switch_state_handler_t on_execute;
        /*! executed when the state changes to hangup */
        switch_state_handler_t on_hangup;
        /*! executed when the state changes to loopback */
-       switch_state_handler_t on_loopback;
+       switch_state_handler_t on_exchange_media;
        /*! executed when the state changes to transmit */
-       switch_state_handler_t on_transmit;
+       switch_state_handler_t on_soft_execute;
        /*! executed when the state changes to hold */
-       switch_state_handler_t on_hold;
+       switch_state_handler_t on_consume_media;
        /*! executed when the state changes to hibernate */
        switch_state_handler_t on_hibernate;
        /*! executed when the state changes to reset */

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 6fb5a39c848fc0aeaa0708de4e7baf107ef118e6..2d543a8c7ff39314c5ceb0ae6f3da7060a3e5db9 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -628,16 +628,16 @@ typedef enum {
 
 /*!
   \enum switch_channel_state_t
-  \brief Channel States
+  \brief Channel States (these are the defaults, CS_SOFT_EXECUTE, CS_EXCHANGE_MEDIA, and CS_CONSUME_MEDIA are often overridden by specific apps)
 <pre>
 CS_NEW       - Channel is newly created 
 CS_INIT      - Channel has been initilized
-CS_RING      - Channel is looking for a dialplan
-CS_TRANSMIT  - Channel is in a passive transmit state
+CS_ROUTING   - Channel is looking for an extension to execute
+CS_SOFT_EXECUTE  - Channel is ready to execute from 3rd party control
 CS_EXECUTE   - Channel is executing it's dialplan 
-CS_LOOPBACK  - Channel is in loopback
-CS_PARK      - Channel is parked
-CS_HOLD                 - Channel is on hold
+CS_EXCHANGE_MEDIA  - Channel is exchanging media with another channel.
+CS_PARK      - Channel is accepting media awaiting commands.
+CS_CONSUME_MEDIA                - Channel is consuming all media and dropping it.
 CS_HIBERNATE - Channel is in a sleep state
 CS_RESET        - Channel is in a reset state
 CS_HANGUP    - Channel is flagged for hangup and ready to end
@@ -647,12 +647,12 @@ CS_DONE      - Channel is ready to be destroyed and out of the state machine
 typedef enum {
        CS_NEW,
        CS_INIT,
-       CS_RING,
-       CS_TRANSMIT,
+       CS_ROUTING,
+       CS_SOFT_EXECUTE,
        CS_EXECUTE,
-       CS_LOOPBACK,
+       CS_EXCHANGE_MEDIA,
        CS_PARK,
-       CS_HOLD,
+       CS_CONSUME_MEDIA,
        CS_HIBERNATE,
        CS_RESET,
        CS_HANGUP,

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index c64b0b681b0fe1a930b2085f32825e80c4f94254..fb009adbef70bfc27ad4ac3bc64f3d73a888a072 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -348,7 +348,7 @@ static switch_status_t conference_play_file(conference_obj_t * conference, char
 static switch_status_t conference_say(conference_obj_t * conference, const char *text, uint32_t leadin);
 static void conference_list(conference_obj_t * conference, switch_stream_handle_t *stream, char *delim);
 SWITCH_STANDARD_API(conf_api_main);
-static switch_status_t audio_bridge_on_ring(switch_core_session_t *session);
+static switch_status_t audio_bridge_on_routing(switch_core_session_t *session);
 static switch_status_t conference_outcall(conference_obj_t * conference,
                                                                                  char *conference_name,
                                                                                  switch_core_session_t *session,
@@ -581,7 +581,7 @@ static switch_status_t conference_add_member(conference_obj_t * conference, conf
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING");
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_ROUTING");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", conference->count == 1 ? "early" : "confirmed");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", conference->count == 1 ? "outbound" : "inbound");
                        switch_event_fire(&event);
@@ -723,7 +723,7 @@ static switch_status_t conference_del_member(conference_obj_t * conference, conf
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING");
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_ROUTING");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", conference->count == 1 ? "early" : "confirmed");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", conference->count == 1 ? "outbound" : "inbound");
                        switch_event_fire(&event);
@@ -3726,7 +3726,7 @@ SWITCH_STANDARD_API(conf_api_main)
 }
 
 /* outbound call bridge progress call state callback handler */
-static switch_status_t audio_bridge_on_ring(switch_core_session_t *session)
+static switch_status_t audio_bridge_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
 
@@ -3735,18 +3735,18 @@ static switch_status_t audio_bridge_on_ring(switch_core_session_t *session)
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CUSTOM RING\n");
 
        /* put the channel in a passive state so we can loop audio to it */
-       switch_channel_set_state(channel, CS_TRANSMIT);
+       switch_channel_set_state(channel, CS_SOFT_EXECUTE);
        return SWITCH_STATUS_FALSE;
 }
 
 static switch_state_handler_table_t audio_bridge_peer_state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ audio_bridge_on_ring,
+       /*.on_routing */ audio_bridge_on_routing,
        /*.on_execute */ NULL,
        /*.on_hangup */ NULL,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ NULL,
-       /*.on_hold */ NULL,
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ NULL,
+       /*.on_consume_media */ NULL,
 };
 
 
@@ -5124,7 +5124,7 @@ static void pres_event_handler(switch_event_t *event)
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conf_name);
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING");
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_ROUTING");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", conference->count == 1 ? "early" : "confirmed");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", conference->count == 1 ? "outbound" : "inbound");
                        switch_event_fire(&event);

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index 2574191275ab40c77ff9fde12b03165b0268b0a2..171b6c75af7f3a872ee6a5a9b0999a7b4b18cb2b 100644 (file)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -1341,7 +1341,7 @@ static switch_status_t hanguphook(switch_core_session_t *session)
        switch_channel_state_t state = switch_channel_get_state(channel);
        const char *id = NULL;
 
-       if (state == CS_HANGUP || state == CS_RING) {
+       if (state == CS_HANGUP || state == CS_ROUTING) {
                if ((id = switch_channel_get_variable(channel, "xfer_uuids"))) {
                        switch_stream_handle_t stream = { 0 };
                        SWITCH_STANDARD_STREAM(stream);
@@ -1703,7 +1703,7 @@ SWITCH_STANDARD_APP(audio_bridge_function)
                        }
 
                }
-               if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && switch_channel_get_state(caller_channel) != CS_RING) {
+               if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && switch_channel_get_state(caller_channel) != CS_ROUTING) {
                        switch_channel_hangup(caller_channel, cause);
                }
                return;

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 461a1dcaea96227e954cbf3e724f7631051f6964..de7645b128846e428800b282f18334aa2b12e8f4 100644 (file)
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -294,7 +294,7 @@ static void send_presence(fifo_node_t *node)
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
                switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0);
 
-        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", wait_count > 0 ? "CS_RING" : "CS_HANGUP");
+        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", wait_count > 0 ? "CS_ROUTING" : "CS_HANGUP");
         switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name);
         switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", wait_count > 0 ? "early" : "terminated");
         switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound");

diff --git a/src/mod/applications/mod_limit/mod_limit.c b/src/mod/applications/mod_limit/mod_limit.c
index 174bfb58d3b571324e9bc2912376029266bf850d..e631ba4b728c3b70889b9450fed72494fc9c497f 100644 (file)
--- a/src/mod/applications/mod_limit/mod_limit.c
+++ b/src/mod/applications/mod_limit/mod_limit.c
@@ -281,7 +281,7 @@ static switch_status_t hanguphook(switch_core_session_t *session)
        const char *id = NULL;
        char *sql = NULL;
 
-       if (state == CS_HANGUP || state == CS_RING) {
+       if (state == CS_HANGUP || state == CS_ROUTING) {
                id = switch_channel_get_variable(channel, "limit_id");
                realm = switch_channel_get_variable(channel, "limit_realm");
                sql = switch_mprintf("delete from limit_data where uuid='%q' and hostname='%q' and realm='%q'and id='%q';", 

diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c
index df661b805a2f70426fc5d33d75416e05b8a3b1dc..e464367e2a40997fafcb267dac7a1eca8fba9044 100644 (file)
--- a/src/mod/endpoints/mod_alsa/mod_alsa.c
+++ b/src/mod/endpoints/mod_alsa/mod_alsa.c
@@ -143,9 +143,9 @@ static void add_pvt(private_t * tech_pvt, int master);
 static void remove_pvt(private_t * tech_pvt);
 static switch_status_t channel_on_init(switch_core_session_t *session);
 static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_ring(switch_core_session_t *session);
-static switch_status_t channel_on_loopback(switch_core_session_t *session);
-static switch_status_t channel_on_transmit(switch_core_session_t *session);
+static switch_status_t channel_on_routing(switch_core_session_t *session);
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
                                                                                                        switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -294,13 +294,13 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        switch_set_flag_locked(tech_pvt, TFLAG_IO);
 
        /* Move Channel's State Machine to RING */
-       switch_channel_set_state(channel, CS_RING);
+       switch_channel_set_state(channel, CS_ROUTING);
 
        return SWITCH_STATUS_SUCCESS;
 
 }
 
-static switch_status_t channel_on_ring(switch_core_session_t *session)
+static switch_status_t channel_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
        private_t *tech_pvt = NULL;
@@ -478,13 +478,13 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_transmit(switch_core_session_t *session)
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_loopback(switch_core_session_t *session)
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
        private_t *tech_pvt = NULL;
@@ -737,11 +737,11 @@ static switch_api_interface_t channel_api_interface = {
 
 static switch_state_handler_table_t channel_event_handlers = {
        /*.on_init */ channel_on_init,
-       /*.on_ring */ channel_on_ring,
+       /*.on_routing */ channel_on_routing,
        /*.on_execute */ channel_on_execute,
        /*.on_hangup */ channel_on_hangup,
-       /*.on_loopback */ channel_on_loopback,
-       /*.on_transmit */ channel_on_transmit
+       /*.on_exchange_media */ channel_on_exchange_media,
+       /*.on_soft_execute */ channel_on_soft_execute
 };
 
 static switch_io_routines_t channel_io_routines = {

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index bb95732f0a2998eb39370a4d8af56740980ec65c..301de3d76761ae37f0c9a7430d0bf85a0301c5bf 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -205,9 +205,9 @@ SWITCH_STANDARD_API(dl_pres);
 SWITCH_STANDARD_API(dl_debug);
 static switch_status_t channel_on_init(switch_core_session_t *session);
 static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_ring(switch_core_session_t *session);
-static switch_status_t channel_on_loopback(switch_core_session_t *session);
-static switch_status_t channel_on_transmit(switch_core_session_t *session);
+static switch_status_t channel_on_routing(switch_core_session_t *session);
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
                                                                                                        switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -1166,13 +1166,13 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
 
        if (negotiate_media(session) == SWITCH_STATUS_SUCCESS) {
                /* Move Channel's State Machine to RING */
-               switch_channel_set_state(channel, CS_RING);
+               switch_channel_set_state(channel, CS_ROUTING);
        }
 
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_ring(switch_core_session_t *session)
+static switch_status_t channel_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        struct private_object *tech_pvt = NULL;
@@ -1294,13 +1294,13 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_loopback(switch_core_session_t *session)
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_transmit(switch_core_session_t *session)
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
@@ -1564,11 +1564,11 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
 
 switch_state_handler_table_t dingaling_event_handlers = {
        /*.on_init */ channel_on_init,
-       /*.on_ring */ channel_on_ring,
+       /*.on_routing */ channel_on_routing,
        /*.on_execute */ channel_on_execute,
        /*.on_hangup */ channel_on_hangup,
-       /*.on_loopback */ channel_on_loopback,
-       /*.on_transmit */ channel_on_transmit
+       /*.on_exchange_media */ channel_on_exchange_media,
+       /*.on_soft_execute */ channel_on_soft_execute
 };
 
 switch_io_routines_t dingaling_io_routines = {

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index a8950d2228e8114f7f5d1400f9f9d32942f62f93..b5a1b318e723903053a3825b3c52e77cf40db0a1 100644 (file)
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -416,9 +416,9 @@ static switch_status_t iax_set_codec(private_t * tech_pvt, struct iax_session *i
 
 static switch_status_t channel_on_init(switch_core_session_t *session);
 static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_ring(switch_core_session_t *session);
-static switch_status_t channel_on_loopback(switch_core_session_t *session);
-static switch_status_t channel_on_transmit(switch_core_session_t *session);
+static switch_status_t channel_on_routing(switch_core_session_t *session);
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
                                                                                                        switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -468,7 +468,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        switch_set_flag_locked(tech_pvt, TFLAG_IO);
 
        /* Move Channel's State Machine to RING */
-       switch_channel_set_state(switch_core_session_get_channel(session), CS_RING);
+       switch_channel_set_state(switch_core_session_get_channel(session), CS_ROUTING);
        switch_mutex_lock(globals.mutex);
        globals.calls++;
        switch_mutex_unlock(globals.mutex);
@@ -476,7 +476,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_ring(switch_core_session_t *session)
+static switch_status_t channel_on_routing(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL RING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
        return SWITCH_STATUS_SUCCESS;
@@ -545,13 +545,13 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_loopback(switch_core_session_t *session)
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_transmit(switch_core_session_t *session)
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
@@ -800,11 +800,11 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
 
 switch_state_handler_table_t iax_state_handlers = {
        /*.on_init */ channel_on_init,
-       /*.on_ring */ channel_on_ring,
+       /*.on_routing */ channel_on_routing,
        /*.on_execute */ channel_on_execute,
        /*.on_hangup */ channel_on_hangup,
-       /*.on_loopback */ channel_on_loopback,
-       /*.on_transmit */ channel_on_transmit
+       /*.on_exchange_media */ channel_on_exchange_media,
+       /*.on_soft_execute */ channel_on_soft_execute
 };
 
 switch_io_routines_t iax_io_routines = {

diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 21c5d3b69a28934822d7b7af0c45810b9108320f..756818d79b4dec77b669a5a215dae201f5ee2717 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -140,9 +140,9 @@ static void add_pvt(private_t * tech_pvt, int master);
 static void remove_pvt(private_t * tech_pvt);
 static switch_status_t channel_on_init(switch_core_session_t *session);
 static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_ring(switch_core_session_t *session);
-static switch_status_t channel_on_loopback(switch_core_session_t *session);
-static switch_status_t channel_on_transmit(switch_core_session_t *session);
+static switch_status_t channel_on_routing(switch_core_session_t *session);
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
                                                                                                        switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -284,12 +284,12 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        switch_set_flag_locked(tech_pvt, TFLAG_IO);
 
        /* Move Channel's State Machine to RING */
-       switch_channel_set_state(channel, CS_RING);
+       switch_channel_set_state(channel, CS_ROUTING);
 
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_ring(switch_core_session_t *session)
+static switch_status_t channel_on_routing(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL RING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
        return SWITCH_STATUS_SUCCESS;
@@ -435,13 +435,13 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_transmit(switch_core_session_t *session)
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_loopback(switch_core_session_t *session)
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
@@ -622,11 +622,11 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 
 switch_state_handler_table_t portaudio_event_handlers = {
        /*.on_init */ channel_on_init,
-       /*.on_ring */ channel_on_ring,
+       /*.on_routing */ channel_on_routing,
        /*.on_execute */ channel_on_execute,
        /*.on_hangup */ channel_on_hangup,
-       /*.on_loopback */ channel_on_loopback,
-       /*.on_transmit */ channel_on_transmit
+       /*.on_exchange_media */ channel_on_exchange_media,
+       /*.on_soft_execute */ channel_on_soft_execute
 };
 
 switch_io_routines_t portaudio_io_routines = {

diff --git a/src/mod/endpoints/mod_reference/mod_reference.c b/src/mod/endpoints/mod_reference/mod_reference.c
index 1a045e736eb34aae761cb55526bda1e5e10bb9ba..81713e3492019f4530b60b189758e6040e872ab0 100644 (file)
--- a/src/mod/endpoints/mod_reference/mod_reference.c
+++ b/src/mod/endpoints/mod_reference/mod_reference.c
@@ -100,9 +100,9 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip);
 
 static switch_status_t channel_on_init(switch_core_session_t *session);
 static switch_status_t channel_on_hangup(switch_core_session_t *session);
-static switch_status_t channel_on_ring(switch_core_session_t *session);
-static switch_status_t channel_on_loopback(switch_core_session_t *session);
-static switch_status_t channel_on_transmit(switch_core_session_t *session);
+static switch_status_t channel_on_routing(switch_core_session_t *session);
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session);
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
                                                                                                        switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -140,7 +140,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        switch_set_flag_locked(tech_pvt, TFLAG_IO);
 
        /* Move Channel's State Machine to RING */
-       switch_channel_set_state(channel, CS_RING);
+       switch_channel_set_state(channel, CS_ROUTING);
        switch_mutex_lock(globals.mutex);
        globals.calls++;
        switch_mutex_unlock(globals.mutex);
@@ -148,7 +148,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_ring(switch_core_session_t *session)
+static switch_status_t channel_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
        private_t *tech_pvt = NULL;
@@ -245,13 +245,13 @@ static switch_status_t channel_kill_channel(switch_core_session_t *session, int
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_loopback(switch_core_session_t *session)
+static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t channel_on_transmit(switch_core_session_t *session)
+static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
@@ -479,11 +479,11 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
 
 switch_state_handler_table_t reference_state_handlers = {
        /*.on_init */ channel_on_init,
-       /*.on_ring */ channel_on_ring,
+       /*.on_routing */ channel_on_routing,
        /*.on_execute */ channel_on_execute,
        /*.on_hangup */ channel_on_hangup,
-       /*.on_loopback */ channel_on_loopback,
-       /*.on_transmit */ channel_on_transmit
+       /*.on_exchange_media */ channel_on_exchange_media,
+       /*.on_soft_execute */ channel_on_soft_execute
 };
 
 switch_io_routines_t reference_io_routines = {

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 2df05a09b821228779f0c84c456d44e5e78601ba..63deae71ad049b05d5b93184fdf0b1f9999ad73d 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -50,8 +50,8 @@ static char silence_data[13] = "";
 
 static switch_status_t sofia_on_init(switch_core_session_t *session);
 
-static switch_status_t sofia_on_loopback(switch_core_session_t *session);
-static switch_status_t sofia_on_transmit(switch_core_session_t *session);
+static switch_status_t sofia_on_exchange_media(switch_core_session_t *session);
+static switch_status_t sofia_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session,
                                                                                                  switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session,
                                                                                                  switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -104,12 +104,12 @@ static switch_status_t sofia_on_init(switch_core_session_t *session)
        }
 
        /* Move Channel's State Machine to RING */
-       switch_channel_set_state(channel, CS_RING);
+       switch_channel_set_state(channel, CS_ROUTING);
        assert( switch_channel_get_state(channel) != CS_INIT);
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t sofia_on_ring(switch_core_session_t *session)
+static switch_status_t sofia_on_routing(switch_core_session_t *session)
 {
        private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session);
        switch_assert(tech_pvt != NULL);
@@ -316,13 +316,13 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t sofia_on_loopback(switch_core_session_t *session)
+static switch_status_t sofia_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t sofia_on_transmit(switch_core_session_t *session)
+static switch_status_t sofia_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
@@ -1635,12 +1635,12 @@ switch_io_routines_t sofia_io_routines = {
 
 switch_state_handler_table_t sofia_event_handlers = {
        /*.on_init */ sofia_on_init,
-       /*.on_ring */ sofia_on_ring,
+       /*.on_routing */ sofia_on_routing,
        /*.on_execute */ sofia_on_execute,
        /*.on_hangup */ sofia_on_hangup,
-       /*.on_loopback */ sofia_on_loopback,
-       /*.on_transmit */ sofia_on_transmit,
-       /*.on_hold */ NULL,
+       /*.on_exchange_media */ sofia_on_exchange_media,
+       /*.on_soft_execute */ sofia_on_soft_execute,
+       /*.on_consume_media */ NULL,
        /*.on_hibernate*/ sofia_on_hibernate,
        /*.on_reset*/ sofia_on_reset
 };

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index fe022bbc2a38060d130fea3c1f18cceef0ad7203..773c36d2995c9cb3b2a1cf05ae90727b7b9ff3e2 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -701,7 +701,7 @@ static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_HANGUP");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "resubscribe");
                } else {
-                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING");
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_ROUTING");
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", uuid);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", state);
                        switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", state);

diff --git a/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c b/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c
index c5dcb2cd6306e11fe127cef01c91c5dd6909145b..e07b87824894c0987d4e4d8bab92409f7b68ada6 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c
+++ b/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c
@@ -52,7 +52,7 @@ static struct sangoma_pri_event_list SANGOMA_PRI_EVENT_LIST[] = {
        {2, SANGOMA_PRI_EVENT_DCHAN_DOWN, "DCHAN_DOWN"},
        {3, SANGOMA_PRI_EVENT_RESTART, "RESTART"},
        {4, SANGOMA_PRI_EVENT_CONFIG_ERR, "CONFIG_ERR"},
-       {5, SANGOMA_PRI_EVENT_RING, "RING"},
+       {5, SANGOMA_PRI_EVENT_RING, "ROUTING"},
        {6, SANGOMA_PRI_EVENT_HANGUP, "HANGUP"},
        {7, SANGOMA_PRI_EVENT_RINGING, "RINGING"},
        {8, SANGOMA_PRI_EVENT_ANSWER, "ANSWER"},

diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index 635bbcb151431be89aedb54b402aa5a2be9f5a3a..af716c4cc4daa2a1d26be1a25fc1ae73b1dc3f8d 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -464,8 +464,8 @@ static int str2node(char *node);
 static int str2switch(char *swtype);
 static switch_status_t wanpipe_on_init(switch_core_session_t *session);
 static switch_status_t wanpipe_on_hangup(switch_core_session_t *session);
-static switch_status_t wanpipe_on_loopback(switch_core_session_t *session);
-static switch_status_t wanpipe_on_transmit(switch_core_session_t *session);
+static switch_status_t wanpipe_on_exchange_media(switch_core_session_t *session);
+static switch_status_t wanpipe_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t wanpipe_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
 static switch_status_t wanpipe_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout,
@@ -474,7 +474,7 @@ static switch_status_t wanpipe_write_frame(switch_core_session_t *session, switc
                                                                                 switch_io_flag_t flags, int stream_id);
 static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent);
 static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent);
-static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent);
+static int on_routing(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent);
 static int check_flags(struct sangoma_pri *spri);
 static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent);
 static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent);
@@ -614,11 +614,11 @@ static switch_status_t wanpipe_on_init(switch_core_session_t *session)
  done:
 
        /* Move Channel's State Machine to RING */
-       switch_channel_set_state(channel, CS_RING);
+       switch_channel_set_state(channel, CS_ROUTING);
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t wanpipe_on_ring(switch_core_session_t *session)
+static switch_status_t wanpipe_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = NULL;
        private_object_t *tech_pvt = NULL;
@@ -694,13 +694,13 @@ static switch_status_t wanpipe_on_hangup(switch_core_session_t *session)
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t wanpipe_on_loopback(switch_core_session_t *session)
+static switch_status_t wanpipe_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WANPIPE LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t wanpipe_on_transmit(switch_core_session_t *session)
+static switch_status_t wanpipe_on_soft_execute(switch_core_session_t *session)
 {
        private_object_t *tech_pvt;
        switch_channel_t *channel;
@@ -1001,11 +1001,11 @@ switch_io_routines_t wanpipe_io_routines = {
 
 switch_state_handler_table_t wanpipe_state_handlers = {
        /*.on_init */ wanpipe_on_init,
-       /*.on_ring */ wanpipe_on_ring,
+       /*.on_routing */ wanpipe_on_routing,
        /*.on_execute */ NULL,
        /*.on_hangup */ wanpipe_on_hangup,
-       /*.on_loopback */ wanpipe_on_loopback,
-       /*.on_transmit */ wanpipe_on_transmit
+       /*.on_exchange_media */ wanpipe_on_exchange_media,
+       /*.on_soft_execute */ wanpipe_on_soft_execute
 };
 
 static switch_call_cause_t wanpipe_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile,
@@ -1463,7 +1463,7 @@ static int on_proceed(struct sangoma_pri *spri, sangoma_pri_event_t event_type,
 }
 
 
-static int on_ringing(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent)
+static int on_routinging(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent)
 {
        switch_core_session_t *session;
        switch_channel_t *channel;
@@ -1489,7 +1489,7 @@ static int on_ringing(struct sangoma_pri *spri, sangoma_pri_event_t event_type,
 }
 
 
-static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent)
+static int on_routing(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent)
 {
        char name[128];
        switch_core_session_t *session = NULL;
@@ -1671,8 +1671,8 @@ static void *SWITCH_THREAD_FUNC pri_thread_run(switch_thread_t *thread, void *ob
 
        switch_mutex_init(&chanmap.mutex, SWITCH_MUTEX_NESTED, module_pool);
        SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANY, on_anything);
-       SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RING, on_ring);
-       SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_ringing);
+       SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RING, on_routing);
+       SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_routinging);
        //SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_SETUP_ACK, on_proceed);
        SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_PROCEEDING, on_proceed);
        SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANSWER, on_answer);

diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.c b/src/mod/endpoints/mod_woomera/mod_woomera.c
index f02a6b304f671dbfcba438e3c6504ad0bfa4119b..5fce2ba7d649fa8e8d1d5d97485a35de29bdd665 100644 (file)
--- a/src/mod/endpoints/mod_woomera/mod_woomera.c
+++ b/src/mod/endpoints/mod_woomera/mod_woomera.c
@@ -170,9 +170,9 @@ static woomera_profile default_profile;
 
 static switch_status_t woomera_on_init(switch_core_session_t *session);
 static switch_status_t woomera_on_hangup(switch_core_session_t *session);
-static switch_status_t woomera_on_ring(switch_core_session_t *session);
-static switch_status_t woomera_on_loopback(switch_core_session_t *session);
-static switch_status_t woomera_on_transmit(switch_core_session_t *session);
+static switch_status_t woomera_on_routing(switch_core_session_t *session);
+static switch_status_t woomera_on_exchange_media(switch_core_session_t *session);
+static switch_status_t woomera_on_soft_execute(switch_core_session_t *session);
 static switch_call_cause_t woomera_outgoing_channel(switch_core_session_t *session,
                                                                                                        switch_caller_profile_t *outbound_profile,
                                                                                                        switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
@@ -238,7 +238,7 @@ static switch_status_t woomera_on_init(switch_core_session_t *session)
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t woomera_on_ring(switch_core_session_t *session)
+static switch_status_t woomera_on_routing(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s WOOMERA RING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
        return SWITCH_STATUS_SUCCESS;
@@ -310,13 +310,13 @@ static switch_status_t woomera_kill_channel(switch_core_session_t *session, int
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t woomera_on_loopback(switch_core_session_t *session)
+static switch_status_t woomera_on_exchange_media(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERA LOOPBACK\n");
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t woomera_on_transmit(switch_core_session_t *session)
+static switch_status_t woomera_on_soft_execute(switch_core_session_t *session)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "WOOMERA TRANSMIT\n");
        return SWITCH_STATUS_SUCCESS;
@@ -405,11 +405,11 @@ static switch_status_t woomera_write_frame(switch_core_session_t *session, switc
 
 static switch_state_handler_table_t woomera_event_handlers = {
        /*.on_init */ woomera_on_init,
-       /*.on_ring */ woomera_on_ring,
+       /*.on_routing */ woomera_on_routing,
        /*.on_execute */ woomera_on_execute,
        /*.on_hangup */ woomera_on_hangup,
-       /*.on_loopback */ woomera_on_loopback,
-       /*.on_transmit */ woomera_on_transmit
+       /*.on_exchange_media */ woomera_on_exchange_media,
+       /*.on_soft_execute */ woomera_on_soft_execute
 };
 
 static switch_io_routines_t woomera_io_routines = {
@@ -1044,7 +1044,7 @@ static void *woomera_channel_thread_run(switch_thread_t * thread, void *obj)
                                        }
                                        /* Move Channel's State Machine to RING */
                                        switch_channel_answer(channel);
-                                       switch_channel_set_state(channel, CS_RING);
+                                       switch_channel_set_state(channel, CS_ROUTING);
 
                                        if (switch_sockaddr_info_get(&tech_pvt->udpwrite,
                                                                                                 ip, SWITCH_UNSPEC, port, 0, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {

diff --git a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
index 8c7ed7ca39e4289955cef68eb5dcc6fb988777ef..f57d6d995e6e9d1bfda8a4b511dca74c2cb9d06f 100644 (file)
--- a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
+++ b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c
@@ -255,11 +255,11 @@ static void event_handler(switch_event_t *event)
 
 static switch_state_handler_table_t state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ NULL,
+       /*.on_routing */ NULL,
        /*.on_execute */ NULL,
        /*.on_hangup */ my_on_hangup,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ NULL
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ NULL
 };
 
 

diff --git a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
index 7dad3ebbacb42496d71a55defb8fe08e268d074b..1beccb2ba24685757a2dde30d1d4e0ba13af5ca5 100644 (file)
--- a/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
+++ b/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
@@ -130,7 +130,7 @@ static rc_handle *  my_radius_init(void)
        return rad_config;
 }
 
-static switch_status_t my_on_ring(switch_core_session_t *session)
+static switch_status_t my_on_routing(switch_core_session_t *session)
 {
        switch_xml_t    cdr;
        switch_channel_t *channel = switch_core_session_get_channel(session);
@@ -149,7 +149,7 @@ static switch_status_t my_on_ring(switch_core_session_t *session)
        switch_time_exp_t tm;
        char buffer[32];
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_ring\n");
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_routing\n");
 
        rad_config = my_radius_init();
 
@@ -716,11 +716,11 @@ static switch_status_t load_config(void)
 
 static const switch_state_handler_table_t state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ my_on_ring,
+       /*.on_routing */ my_on_routing,
        /*.on_execute */ NULL,
        /*.on_hangup */ my_on_hangup,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ NULL
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ NULL
 };
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_radius_cdr_load)

diff --git a/src/mod/languages/mod_lua/freeswitch_lua.cpp b/src/mod/languages/mod_lua/freeswitch_lua.cpp
index d4b9c4388223a27340fb69eeca5f4ee4e9090e94..f6d0f3353bb8c6d2918d4839e29ac2bfed88eb02 100644 (file)
--- a/src/mod/languages/mod_lua/freeswitch_lua.cpp
+++ b/src/mod/languages/mod_lua/freeswitch_lua.cpp
@@ -71,7 +71,7 @@ bool Session::ready() {
 
 void Session::check_hangup_hook() 
 {
-       if (hangup_func_str && (hook_state == CS_HANGUP || hook_state == CS_RING)) {
+       if (hangup_func_str && (hook_state == CS_HANGUP || hook_state == CS_ROUTING)) {
                hh++;
        }
 }

diff --git a/src/mod/languages/mod_perl/freeswitch_perl.cpp b/src/mod/languages/mod_perl/freeswitch_perl.cpp
index e1d24bb8d909fb3a6f5e9965933b0a174d1f920f..e817d55327450dae4437874e819b1f447da03d27 100644 (file)
--- a/src/mod/languages/mod_perl/freeswitch_perl.cpp
+++ b/src/mod/languages/mod_perl/freeswitch_perl.cpp
@@ -67,7 +67,7 @@ bool Session::ready() {
 
 void Session::check_hangup_hook() 
 {
-       if (hangup_func_str && (hook_state == CS_HANGUP || hook_state == CS_RING)) {
+       if (hangup_func_str && (hook_state == CS_HANGUP || hook_state == CS_ROUTING)) {
                hh++;
        }
 }

diff --git a/src/mod/languages/mod_python/switch_swig_wrap.c b/src/mod/languages/mod_python/switch_swig_wrap.c
index fcd39b44ed478f4fe3d9d1436dafb5caad245fea..036dd92689fd978310566d57217d9cabd5175e1f 100644 (file)
--- a/src/mod/languages/mod_python/switch_swig_wrap.c
+++ b/src/mod/languages/mod_python/switch_swig_wrap.c
@@ -2924,19 +2924,19 @@ extern "C"
                PyDict_SetItemString(d, "CS_INIT", SWIG_From_int((int) (CS_INIT)));
        }
        {
-               PyDict_SetItemString(d, "CS_RING", SWIG_From_int((int) (CS_RING)));
+               PyDict_SetItemString(d, "CS_ROUTING", SWIG_From_int((int) (CS_ROUTING)));
        }
        {
-               PyDict_SetItemString(d, "CS_TRANSMIT", SWIG_From_int((int) (CS_TRANSMIT)));
+               PyDict_SetItemString(d, "CS_SOFT_EXECUTE", SWIG_From_int((int) (CS_SOFT_EXECUTE)));
        }
        {
                PyDict_SetItemString(d, "CS_EXECUTE", SWIG_From_int((int) (CS_EXECUTE)));
        }
        {
-               PyDict_SetItemString(d, "CS_LOOPBACK", SWIG_From_int((int) (CS_LOOPBACK)));
+               PyDict_SetItemString(d, "CS_EXCHANGE_MEDIA", SWIG_From_int((int) (CS_EXCHANGE_MEDIA)));
        }
        {
-               PyDict_SetItemString(d, "CS_HOLD", SWIG_From_int((int) (CS_HOLD)));
+               PyDict_SetItemString(d, "CS_CONSUME_MEDIA", SWIG_From_int((int) (CS_CONSUME_MEDIA)));
        }
        {
                PyDict_SetItemString(d, "CS_HIBERNATE", SWIG_From_int((int) (CS_HIBERNATE)));

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index 480cfb7f4f8901bc1fb648c61da8ae50bf9ee861..e302125bd3d08a937d2c893837a53103e1fa5c21 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -1560,7 +1560,7 @@ static void check_hangup_hook(struct js_session *jss)
        int argc = 0;
        jsval ret;
 
-       if (jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_RING)) {
+       if (jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_ROUTING)) {
                argv[argc++] = OBJECT_TO_JSVAL(jss->obj);
                if (jss->hook_state == CS_HANGUP) {
                        argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(jss->cx, "hangup"));
@@ -2754,7 +2754,7 @@ static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsva
                jss->session = peer_session;
                switch_set_flag(jss, S_HUP);
                *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-               switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_TRANSMIT);
+               switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_SOFT_EXECUTE);
 
        } else {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing Args\n");

diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
index 29e2076075d53f4ff1922f2e3c65965ec23f9e4c..39a48dab4fde7b86d7cb28f901d33fab5552f546 100644 (file)
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
@@ -241,11 +241,11 @@ error:
 
 static switch_state_handler_table_t state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ NULL,
+       /*.on_routing */ NULL,
        /*.on_execute */ NULL,
        /*.on_hangup */ my_on_hangup,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ NULL
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ NULL
 };
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 977f58a0fe53d4fd7936887226aebe682f97236e..f122ac0828a5680c326e864cc857aa5e47d56301 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -721,7 +721,7 @@ SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel)
 
        switch_assert(channel != NULL);
 
-       if (!channel->hangup_cause && channel->state > CS_RING && channel->state < CS_HANGUP && channel->state != CS_RESET && 
+       if (!channel->hangup_cause && channel->state > CS_ROUTING && channel->state < CS_HANGUP && channel->state != CS_RESET && 
                !switch_test_flag(channel, CF_TRANSFER)) {
                        ret++;
        }
@@ -732,12 +732,12 @@ SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel)
 static const char *state_names[] = {
        "CS_NEW",
        "CS_INIT",
-       "CS_RING",
-       "CS_TRANSMIT",
+       "CS_ROUTING",
+       "CS_SOFT_EXECUTE",
        "CS_EXECUTE",
-       "CS_LOOPBACK",
+       "CS_EXCHANGE_MEDIA",
        "CS_PARK",
-       "CS_HOLD",
+       "CS_CONSUME_MEDIA",
        "CS_HIBERNATE",
        "CS_RESET",
        "CS_HANGUP",
@@ -776,7 +776,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(
                channel->state_flags = 0;
        }
 
-       if (channel->state >= CS_RING) {
+       if (channel->state >= CS_ROUTING) {
                switch_clear_flag(channel, CF_TRANSFER);
                switch_channel_presence(channel, "unknown", (char *) state_names[state]);
        }
@@ -784,7 +784,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(
        if (state < CS_HANGUP) {
                switch_event_t *event;
                if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_STATE) == SWITCH_STATUS_SUCCESS) {
-                       if (state == CS_RING) {
+                       if (state == CS_ROUTING) {
                                switch_channel_event_set_data(channel, event);
                        } else {
                                char state_num[25];
@@ -838,9 +838,9 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
 
        case CS_NEW:
        case CS_INIT:
-       case CS_LOOPBACK:
-       case CS_TRANSMIT:
-       case CS_RING:
+       case CS_EXCHANGE_MEDIA:
+       case CS_SOFT_EXECUTE:
+       case CS_ROUTING:
        case CS_EXECUTE:
        case CS_HANGUP:
        case CS_DONE:
@@ -863,12 +863,12 @@ default:
 
 case CS_INIT:
        switch (state) {
-case CS_LOOPBACK:
-case CS_TRANSMIT:
-case CS_RING:
+case CS_EXCHANGE_MEDIA:
+case CS_SOFT_EXECUTE:
+case CS_ROUTING:
 case CS_EXECUTE:
 case CS_PARK:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
 case CS_HIBERNATE:
 case CS_RESET:
        ok++;
@@ -877,13 +877,13 @@ default:
        }
        break;
 
-case CS_LOOPBACK:
+case CS_EXCHANGE_MEDIA:
        switch (state) {
-case CS_TRANSMIT:
-case CS_RING:
+case CS_SOFT_EXECUTE:
+case CS_ROUTING:
 case CS_EXECUTE:
 case CS_PARK:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
 case CS_HIBERNATE:
 case CS_RESET:
        ok++;
@@ -892,13 +892,13 @@ default:
        }
        break;
 
-case CS_TRANSMIT:
+case CS_SOFT_EXECUTE:
        switch (state) {
-case CS_LOOPBACK:
-case CS_RING:
+case CS_EXCHANGE_MEDIA:
+case CS_ROUTING:
 case CS_EXECUTE:
 case CS_PARK:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
 case CS_HIBERNATE:
 case CS_RESET:
        ok++;
@@ -909,25 +909,25 @@ default:
 
 case CS_PARK:
        switch (state) {
-case CS_LOOPBACK:
-case CS_RING:
+case CS_EXCHANGE_MEDIA:
+case CS_ROUTING:
 case CS_EXECUTE:
-case CS_TRANSMIT:
+case CS_SOFT_EXECUTE:
 case CS_HIBERNATE:
 case CS_RESET:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
        ok++;
 default:
        break;
        }
        break;
 
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
        switch (state) {
-case CS_LOOPBACK:
-case CS_RING:
+case CS_EXCHANGE_MEDIA:
+case CS_ROUTING:
 case CS_EXECUTE:
-case CS_TRANSMIT:
+case CS_SOFT_EXECUTE:
 case CS_HIBERNATE:
 case CS_RESET:
 case CS_PARK:
@@ -938,13 +938,13 @@ default:
        break;
 case CS_HIBERNATE:
        switch (state) {
-case CS_LOOPBACK:
+case CS_EXCHANGE_MEDIA:
 case CS_INIT:
-case CS_RING:
+case CS_ROUTING:
 case CS_EXECUTE:
-case CS_TRANSMIT:
+case CS_SOFT_EXECUTE:
 case CS_PARK:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
 case CS_RESET:
        ok++;
 default:
@@ -952,13 +952,13 @@ default:
        }
        break;
 
-case CS_RING:
+case CS_ROUTING:
        switch (state) {
-case CS_LOOPBACK:
+case CS_EXCHANGE_MEDIA:
 case CS_EXECUTE:
-case CS_TRANSMIT:
+case CS_SOFT_EXECUTE:
 case CS_PARK:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
 case CS_HIBERNATE:
 case CS_RESET:
        ok++;
@@ -969,11 +969,11 @@ default:
 
 case CS_EXECUTE:
        switch (state) {
-case CS_LOOPBACK:
-case CS_TRANSMIT:
-case CS_RING:
+case CS_EXCHANGE_MEDIA:
+case CS_SOFT_EXECUTE:
+case CS_ROUTING:
 case CS_PARK:
-case CS_HOLD:
+case CS_CONSUME_MEDIA:
 case CS_HIBERNATE:
 case CS_RESET:
        ok++;

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 7fd40e0e9d4946d18e5aa624d0a6984f606c3e85..eb0c6029d383e63e63c5ac9f6bc10b5ac6b4eb90 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -287,7 +287,7 @@ static void core_event_handler(switch_event_t *event)
                        case CS_HANGUP:
                        case CS_DONE:
                                break;
-                       case CS_RING:
+                       case CS_ROUTING:
                                sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q' "
                                                                         "where uuid='%s'",
                                                                         switch_event_get_header(event, "channel-state"),

diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 86e9563b468d1e27e51853af3ae5df92c1da7d36..0101bdab974c8a40e6bb91b8028bdafb7af4e552 100644 (file)
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -54,7 +54,7 @@ static void switch_core_standard_on_reset(switch_core_session_t *session)
                                          switch_channel_get_name(session->channel));   
 }
 
-static void switch_core_standard_on_ring(switch_core_session_t *session)
+static void switch_core_standard_on_routing(switch_core_session_t *session)
 {
        switch_dialplan_interface_t *dialplan_interface = NULL;
        switch_caller_profile_t *caller_profile;
@@ -103,7 +103,7 @@ static void switch_core_standard_on_ring(switch_core_session_t *session)
                if (!count) {
                        if (switch_channel_test_flag(session->channel, CF_OUTBOUND)) {
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Dialplan, changing state to HOLD\n");
-                               switch_channel_set_state(session->channel, CS_HOLD);
+                               switch_channel_set_state(session->channel, CS_CONSUME_MEDIA);
                                goto end;
                        }
                }
@@ -157,14 +157,14 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
        }
 }
 
-static void switch_core_standard_on_loopback(switch_core_session_t *session)
+static void switch_core_standard_on_exchange_media(switch_core_session_t *session)
 {
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard LOOPBACK\n");
        switch_ivr_session_echo(session);
 }
 
-static void switch_core_standard_on_transmit(switch_core_session_t *session)
+static void switch_core_standard_on_soft_execute(switch_core_session_t *session)
 {
        switch_assert(session != NULL);
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard TRANSMIT\n");
@@ -179,7 +179,7 @@ static void switch_core_standard_on_park(switch_core_session_t *session)
        switch_ivr_park(session, NULL);
 }
 
-static void switch_core_standard_on_hold(switch_core_session_t *session)
+static void switch_core_standard_on_consume_media(switch_core_session_t *session)
 {
        switch_assert(session != NULL);
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HOLD\n");
@@ -413,9 +413,9 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                                STATE_MACRO(init, "INIT");
                                switch_core_session_signal_unlock(session);
                                break;
-                       case CS_RING: /* Look for a dialplan and find something to do */
+                       case CS_ROUTING: /* Look for a dialplan and find something to do */
                                switch_core_session_signal_lock(session);
-                               STATE_MACRO(ring, "RING");
+                               STATE_MACRO(routing, "ROUTING");
                                switch_core_session_signal_unlock(session);
                                break;
                        case CS_RESET: /* Reset */
@@ -427,17 +427,17 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                        case CS_EXECUTE: /* Execute an Operation */
                                STATE_MACRO(execute, "EXECUTE");
                                break;
-                       case CS_LOOPBACK: /* loop all data back to source */
-                               STATE_MACRO(loopback, "LOOPBACK");
+                       case CS_EXCHANGE_MEDIA: /* loop all data back to source */
+                               STATE_MACRO(exchange_media, "EXCHANGE_MEDIA");
                                break;
-                       case CS_TRANSMIT: /* send/recieve data to/from another channel */
-                               STATE_MACRO(transmit, "TRANSMIT");
+                       case CS_SOFT_EXECUTE: /* send/recieve data to/from another channel */
+                               STATE_MACRO(soft_execute, "SOFT_EXECUTE");
                                break;
                        case CS_PARK: /* wait in limbo */
                                STATE_MACRO(park, "PARK");
                                break;
-                       case CS_HOLD: /* wait in limbo */
-                               STATE_MACRO(hold, "HOLD");
+                       case CS_CONSUME_MEDIA: /* wait in limbo */
+                               STATE_MACRO(consume_media, "CONSUME_MEDIA");
                                break;
                        case CS_HIBERNATE: /* sleep */
                                STATE_MACRO(hibernate, "HIBERNATE");

diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index fa33341c48880a67b2b61a3c6f93dd54baf9836d..ea4972ea328fd3045f6d959bf155bc0f95297cfe 100644 (file)
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -352,7 +352,7 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(char *nuuid)
                        allocated = 1;
                        switch_set_flag(this, S_HUP);
                        uuid = strdup(switch_core_session_get_uuid(session));
-                       switch_channel_set_state(switch_core_session_get_channel(session), CS_TRANSMIT);
+                       switch_channel_set_state(switch_core_session_get_channel(session), CS_SOFT_EXECUTE);
                }
        }
 }
@@ -694,7 +694,7 @@ SWITCH_DECLARE(int) CoreSession::originate(CoreSession *a_leg_session, char *des
     if (a_leg_session) a_leg_session->end_allow_threads();
        channel = switch_core_session_get_channel(session);
        allocated = 1;
-       switch_channel_set_state(switch_core_session_get_channel(session), CS_TRANSMIT);
+       switch_channel_set_state(switch_core_session_get_channel(session), CS_SOFT_EXECUTE);
 
        return SWITCH_STATUS_SUCCESS;
 

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 4601bb114b7c4f0437b075782a6b81e16ff174b0..a4967e12c6e40a13031707893760b7304b692de5 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -1023,7 +1023,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_transfer(switch_core_session_
                switch_channel_set_caller_profile(channel, new_profile);
                switch_channel_set_flag(channel, CF_TRANSFER);
 
-               switch_channel_set_state(channel, CS_RING);
+               switch_channel_set_state(channel, CS_ROUTING);
                
                msg.message_id = SWITCH_MESSAGE_INDICATE_TRANSFER;
                msg.from = __FILE__;

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 948e544be1a172bb112ae25ee288bbe212eb113d..ae58104f242f9d5e43246af51a156a09eee995e5 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -354,7 +354,7 @@ static void *audio_bridge_thread(switch_thread_t * thread, void *obj)
        return NULL;
 }
 
-static switch_status_t audio_bridge_on_loopback(switch_core_session_t *session)
+static switch_status_t audio_bridge_on_exchange_media(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        switch_ivr_bridge_data_t *bd = switch_channel_get_private(channel, "_bridge_");
@@ -374,25 +374,25 @@ static switch_status_t audio_bridge_on_loopback(switch_core_session_t *session)
 
        state = switch_channel_get_state(channel);
 
-       if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_RING) {
+       if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_ROUTING) {
                switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
        }
 
        return SWITCH_STATUS_FALSE;
 }
 
-static switch_status_t audio_bridge_on_ring(switch_core_session_t *session)
+static switch_status_t audio_bridge_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM RING\n", switch_channel_get_name(channel));
 
        /* put the channel in a passive state so we can loop audio to it */
-       switch_channel_set_state(channel, CS_HOLD);
+       switch_channel_set_state(channel, CS_CONSUME_MEDIA);
        return SWITCH_STATUS_FALSE;
 }
 
-static switch_status_t audio_bridge_on_hold(switch_core_session_t *session)
+static switch_status_t audio_bridge_on_consume_media(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
@@ -404,12 +404,12 @@ static switch_status_t audio_bridge_on_hold(switch_core_session_t *session)
 
 static const switch_state_handler_table_t audio_bridge_peer_state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ audio_bridge_on_ring,
+       /*.on_routing */ audio_bridge_on_routing,
        /*.on_execute */ NULL,
        /*.on_hangup */ NULL,
-       /*.on_loopback */ audio_bridge_on_loopback,
-       /*.on_transmit */ NULL,
-       /*.on_hold */ audio_bridge_on_hold,
+       /*.on_exchange_media */ audio_bridge_on_exchange_media,
+       /*.on_soft_execute */ NULL,
+       /*.on_consume_media */ audio_bridge_on_consume_media,
 };
 
 static switch_status_t uuid_bridge_on_reset(switch_core_session_t *session)
@@ -421,13 +421,13 @@ static switch_status_t uuid_bridge_on_reset(switch_core_session_t *session)
        switch_channel_clear_flag(channel, CF_TRANSFER);
 
        if (switch_channel_test_flag(channel, CF_ORIGINATOR)) {
-               switch_channel_set_state(channel, CS_TRANSMIT);
+               switch_channel_set_state(channel, CS_SOFT_EXECUTE);
        }
 
        return SWITCH_STATUS_SUCCESS;
 }
 
-static switch_status_t uuid_bridge_on_transmit(switch_core_session_t *session)
+static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        switch_core_session_t *other_session;
@@ -459,10 +459,10 @@ static switch_status_t uuid_bridge_on_transmit(switch_core_session_t *session)
                }
 
                if (switch_channel_get_state(other_channel) == CS_RESET) {
-                       switch_channel_set_state(other_channel, CS_TRANSMIT);
+                       switch_channel_set_state(other_channel, CS_SOFT_EXECUTE);
                }
 
-               switch_channel_wait_for_state(channel, other_channel, CS_TRANSMIT);
+               switch_channel_wait_for_state(channel, other_channel, CS_SOFT_EXECUTE);
 
                switch_channel_clear_flag(channel, CF_TRANSFER);
                switch_channel_clear_flag(other_channel, CF_TRANSFER);
@@ -512,12 +512,12 @@ static switch_status_t uuid_bridge_on_transmit(switch_core_session_t *session)
 
 static const switch_state_handler_table_t uuid_bridge_state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ NULL,
+       /*.on_routing */ NULL,
        /*.on_execute */ NULL,
        /*.on_hangup */ NULL,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ uuid_bridge_on_transmit,
-       /*.on_hold */ NULL,
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ uuid_bridge_on_soft_execute,
+       /*.on_consume_media */ NULL,
        /*.on_hibernate*/ NULL,
        /*.on_reset*/ uuid_bridge_on_reset
 };
@@ -572,12 +572,12 @@ static switch_status_t signal_bridge_on_hangup(switch_core_session_t *session)
 
 static const switch_state_handler_table_t signal_bridge_state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ NULL,
+       /*.on_routing */ NULL,
        /*.on_execute */ NULL,
        /*.on_hangup */ signal_bridge_on_hangup,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ NULL,
-       /*.on_hold */ NULL,
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ NULL,
+       /*.on_consume_media */ NULL,
        /*.on_hibernate */ signal_bridge_on_hibernate
 };
 
@@ -681,7 +681,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                const switch_application_interface_t *application_interface;
                const char *app, *data;
 
-               switch_channel_set_state(peer_channel, CS_HOLD);
+               switch_channel_set_state(peer_channel, CS_CONSUME_MEDIA);
 
                if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_BRIDGE) == SWITCH_STATUS_SUCCESS) {
                        switch_channel_event_set_data(caller_channel, event);
@@ -697,7 +697,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                                if ((status = switch_ivr_wait_for_answer(session, peer_session)) != SWITCH_STATUS_SUCCESS) {
                                        switch_channel_state_t w_state = switch_channel_get_state(caller_channel);
                                        switch_channel_hangup(peer_channel, SWITCH_CAUSE_ALLOTTED_TIMEOUT);
-                                       if (w_state < CS_HANGUP && w_state != CS_RING && w_state != CS_PARK && !switch_channel_test_flag(caller_channel, CF_TRANSFER) &&
+                                       if (w_state < CS_HANGUP && w_state != CS_ROUTING && w_state != CS_PARK && !switch_channel_test_flag(caller_channel, CF_TRANSFER) &&
                                                w_state != CS_EXECUTE) {
                                                const char *ext = switch_channel_get_variable(peer_channel, "original_destination_number");
                                                if (!ext) {
@@ -757,17 +757,17 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
                        }
 
                        switch_channel_set_private(peer_channel, "_bridge_", b_leg);
-                       switch_channel_set_state(peer_channel, CS_LOOPBACK);
+                       switch_channel_set_state(peer_channel, CS_EXCHANGE_MEDIA);
                        audio_bridge_thread(NULL, (void *) a_leg);
 
                        switch_channel_clear_flag(caller_channel, CF_ORIGINATOR);
                        //make sure this doesnt break anything
 
-                       if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_LOOPBACK) {
+                       if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) {
                                switch_channel_set_state(peer_channel, CS_RESET);
                        }
 
-                       while (switch_channel_get_state(peer_channel) == CS_LOOPBACK) {
+                       while (switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) {
                                switch_yield(1000);
                        }
 
@@ -800,7 +800,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
        state = switch_channel_get_state(caller_channel);
        
        if (!switch_channel_test_flag(caller_channel, CF_TRANSFER)) {
-               if ((state != CS_EXECUTE && state != CS_PARK && state != CS_RING) || 
+               if ((state != CS_EXECUTE && state != CS_PARK && state != CS_ROUTING) || 
                        (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && 
                         switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) {
                        switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel));
@@ -849,7 +849,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
 
                        /* override transmit state for originator_channel to bridge to originatee_channel 
                         * install pointer to originatee_session into originator_channel
-                        * set CF_TRANSFER on both channels and change state to CS_TRANSMIT to
+                        * set CF_TRANSFER on both channels and change state to CS_SOFT_EXECUTE to
                         * inturrupt anything they are already doing.
                         * originatee_session will fall asleep and originator_session will bridge to it
                         */

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 374198c4d79c54ec824eca5f87115c4cb680829a..553f635be41ca5c464a7839da4a0e555c6a32fdc 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -34,11 +34,11 @@
 
 static const switch_state_handler_table_t originate_state_handlers;
 
-static switch_status_t originate_on_hold_transmit(switch_core_session_t *session)
+static switch_status_t originate_on_consume_media_transmit(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
        
-       while(switch_channel_get_state(channel) == CS_HOLD) {
+       while(switch_channel_get_state(channel) == CS_CONSUME_MEDIA) {
                switch_ivr_sleep(session, 10);
        }
        
@@ -47,24 +47,24 @@ static switch_status_t originate_on_hold_transmit(switch_core_session_t *session
        return SWITCH_STATUS_FALSE;
 }
 
-static switch_status_t originate_on_ring(switch_core_session_t *session)
+static switch_status_t originate_on_routing(switch_core_session_t *session)
 {
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
        /* put the channel in a passive state until it is answered */
-       switch_channel_set_state(channel, CS_HOLD);
+       switch_channel_set_state(channel, CS_CONSUME_MEDIA);
 
        return SWITCH_STATUS_FALSE;
 }
 
 static const switch_state_handler_table_t originate_state_handlers = {
        /*.on_init */ NULL,
-       /*.on_ring */ originate_on_ring,
+       /*.on_routing */ originate_on_routing,
        /*.on_execute */ NULL,
        /*.on_hangup */ NULL,
-       /*.on_loopback */ NULL,
-       /*.on_transmit */ originate_on_hold_transmit,
-       /*.on_hold */ originate_on_hold_transmit
+       /*.on_exchange_media */ NULL,
+       /*.on_soft_execute */ originate_on_consume_media_transmit,
+       /*.on_consume_media */ originate_on_consume_media_transmit
 };
 
 typedef enum {
@@ -113,7 +113,7 @@ static void *SWITCH_THREAD_FUNC collect_thread_run(switch_thread_t * thread, voi
                        goto wbreak;
                }
 
-               switch_channel_set_state(channel, CS_TRANSMIT);
+               switch_channel_set_state(channel, CS_SOFT_EXECUTE);
                switch_core_session_exec(collect->session, application_interface, app_data);
                
                if (switch_channel_get_state(channel) < CS_HANGUP) {
@@ -884,7 +884,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                
                                if (!switch_core_session_running(peer_sessions[i])) {
                                        //if (!(flags & SOF_NOBLOCK)) {
-                    //switch_channel_set_state(peer_channels[i], CS_RING);
+                    //switch_channel_set_state(peer_channels[i], CS_ROUTING);
                                        //}
                     //} else {
                                        switch_core_session_thread_launch(peer_sessions[i]);
@@ -910,7 +910,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                                continue;
                                        }
 
-                                       if (state >= CS_RING) {
+                                       if (state >= CS_ROUTING) {
                                                goto endfor1;
                                        }