- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8266 - in freeswitch/trunk/scripts/contrib: trixter verifier/EventSocket/trunk/EventWatcher verifier/EventSocket/trunk/FreeSwitchEventSocket verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents
by Freeswitch SVN 05 May '08

05 May '08

Author: mikej Date: Mon May 5 17:27:11 2008 New Revision: 8266 Modified: freeswitch/trunk/scripts/contrib/trixter/call-progress.pl freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs Log: fix in tree scripts to match changed state names. (FSCORE-119) Modified: freeswitch/trunk/scripts/contrib/trixter/call-progress.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/call-progress.pl (original) +++ freeswitch/trunk/scripts/contrib/trixter/call-progress.pl Mon May 5 17:27:11 2008 @@ -138,7 +138,7 @@ } elsif (watchedChannel($myhash->{'channel-name'})) { if ($myhash->{'event-name'} eq "CHANNEL_ANSWER") { ## deal with answers do_answer($myhash); - } elsif ($myhash->{'event-name'} eq "CHANNEL_STATE" && $myhash->{'channel-state'} eq "CS_RING") { + } elsif ($myhash->{'event-name'} eq "CHANNEL_STATE" && $myhash->{'channel-state'} eq "CS_ROUTING") { do_ring($myhash); } elsif ($myhash->{'event-name'} eq "CHANNEL_HANGUP") { ## last thing done on a channel do_hangup($myhash); Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs Mon May 5 17:27:11 2008 @@ -60,7 +60,7 @@ if (theEvent is EventPresenceIn) { EventPresenceIn ep = (EventPresenceIn) theEvent; - //Channel-State: CS_RING + //Channel-State: CS_ROUTING //Channel-Name: sofia/default/jonas%40192.168.1.102%3A5070 //Unique-ID: 2f87ba27-2f71-d64d-8c64-9966ee894eac //Call-Direction: inbound @@ -68,7 +68,7 @@ //Event-Name: PRESENCE_IN CallState state = CallState.Unknown; string destination = string.Empty; - if (ep.ChannelState.ChannelInfo.State == ChannelState.Ring) + if (ep.ChannelState.ChannelInfo.State == ChannelState.Routing) { if (IsInbound(ep)) { Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Mon May 5 17:27:11 2008 @@ -3,16 +3,16 @@ #region enum ChannelState public enum ChannelState { - New, // Channel is newly created - Init, // Channel has been initilized - Ring, // Channel is looking for a dialplan - Transmit, // Channel is in a passive transmit state - Execute, // Channel is executing it's dialplan - Loopback, // Channel is in loopback - Hold, // Channel is on hold - Hibernate, // Channel is in a sleep state - Hangup, // Channel is flagged for hangup and ready to end - Done, // Channel is ready to be destroyed and out of the state machine + New, // Channel is newly created + Init, // Channel has been initilized + Routing, // Channel is looking for a dialplan + SoftExecute // Channel is in a passive transmit state + Execute, // Channel is executing it's dialplan + ExchangeMedia, // Channel is exchanging media + ConsumeMedia, // Channel is consuming media + Hibernate, // Channel is in a sleep state + Hangup, // Channel is flagged for hangup and ready to end + Done, // Channel is ready to be destroyed and out of the state machine Unknown } #endregion @@ -205,11 +205,11 @@ { case "CS_NEW": return ChannelState.New; case "CS_INIT": return ChannelState.Init; - case "CS_RING": return ChannelState.Ring; - case "CS_TRANSMIT": return ChannelState.Transmit; + case "CS_ROUTING": return ChannelState.Routing; + case "CS_SOFT_EXECUTE": return ChannelState.SoftExecute; case "CS_EXECUTE": return ChannelState.Execute; - case "CS_LOOPBACK": return ChannelState.Loopback; - case "CS_HOLD": return ChannelState.Hold; + case "CS_EXCHANGE_MEDIA": return ChannelState.ExchangeMedia; + case "CS_CONSUME_MEDIA": return ChannelState.ConsumeMedia; case "CS_HIBERNATE": return ChannelState.Hibernate; case "CS_HANGUP": return ChannelState.Hangup; case "CS_DONE": return ChannelState.Done; Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs Mon May 5 17:27:11 2008 @@ -34,7 +34,7 @@ } /// <summary> - /// Caller is only specified on state CS_RING + /// Caller is only specified on state CS_ROUTING /// and not on CS_HANGUP /// </summary> public PartyInfo Caller

1 0

[commit] r8265 - freeswitch/trunk/src/mod/languages/mod_perl
by Freeswitch SVN 05 May '08

05 May '08

Author: stkn Date: Mon May 5 12:11:39 2008 New Revision: 8265 Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile Log: Add missing DESTDIR variable Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/Makefile Mon May 5 12:11:39 2008 @@ -34,6 +34,6 @@ rm -fr *~ .perlok freeswitch.$(DYNAMIC_LIB_EXTEN) depend_install: - mkdir -p $(PREFIX)/perl - $(LTINSTALL) freeswitch.$(DYNAMIC_LIB_EXTEN) freeswitch.pm $(PREFIX)/perl - if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(PREFIX)/perl ; fi + mkdir -p $(DESTDIR)$(PREFIX)/perl + $(LTINSTALL) freeswitch.$(DYNAMIC_LIB_EXTEN) freeswitch.pm $(DESTDIR)$(PREFIX)/perl + if [ ! -f $(DESTDIR)$(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(DESTDIR)$(PREFIX)/perl ; fi

1 0

[commit] r8264 - freeswitch/trunk/src/include
by Freeswitch SVN 05 May '08

05 May '08

Author: anthm Date: Mon May 5 11:56:53 2008 New Revision: 8264 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h Log: change names to protect the innocent Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon May 5 11:56:53 2008 @@ -62,17 +62,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 */ + /*! executed when the state changes to routing */ 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 */ + /*! executed when the state changes to exchange_media */ switch_state_handler_t on_exchange_media; - /*! executed when the state changes to transmit */ + /*! executed when the state changes to soft_execute */ switch_state_handler_t on_soft_execute; - /*! executed when the state changes to hold */ + /*! executed when the state changes to consume_media */ switch_state_handler_t on_consume_media; /*! executed when the state changes to hibernate */ switch_state_handler_t on_hibernate;

1 0

[commit] r8263 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_dptools mod/applications/mod_fifo mod/applications/mod_limit mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_reference mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe mod/endpoints/mod_wanpipe/libsangoma mod/endpoints/mod_woomera mod/event_handlers/mod_cdr_csv mod/event_handlers/mod_radius_cdr mod/languages/mod_lua
by Freeswitch SVN 05 May '08

05 May '08

Author: anthm Date: Mon May 5 11:30:55 2008 New Revision: 8263 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_cpp.cpp freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Log: change names to protect the innocent Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon May 5 11:30:55 2008 @@ -63,17 +63,17 @@ /*! 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 */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon May 5 11:30:55 2008 @@ -628,16 +628,16 @@ /*! \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 @@ 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, Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon May 5 11:30:55 2008 @@ -348,7 +348,7 @@ 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 @@ 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 @@ 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 @@ } /* 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 @@ 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 @@ 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); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon May 5 11:30:55 2008 @@ -1341,7 +1341,7 @@ 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 @@ } } - 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; Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon May 5 11:30:55 2008 @@ -294,7 +294,7 @@ 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"); Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon May 5 11:30:55 2008 @@ -281,7 +281,7 @@ 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';", Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Mon May 5 11:30:55 2008 @@ -143,9 +143,9 @@ 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 @@ 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 @@ 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_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 = { Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon May 5 11:30:55 2008 @@ -205,9 +205,9 @@ 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 @@ 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 @@ 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 @@ 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 = { Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon May 5 11:30:55 2008 @@ -416,9 +416,9 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 = { Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon May 5 11:30:55 2008 @@ -140,9 +140,9 @@ 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 @@ 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 @@ 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 @@ 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 = { Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon May 5 11:30:55 2008 @@ -100,9 +100,9 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 = { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon May 5 11:30:55 2008 @@ -50,8 +50,8 @@ 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 @@ } /* 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 @@ 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_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 }; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon May 5 11:30:55 2008 @@ -701,7 +701,7 @@ 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); Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c Mon May 5 11:30:55 2008 @@ -52,7 +52,7 @@ {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"}, Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Mon May 5 11:30:55 2008 @@ -464,8 +464,8 @@ 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 @@ 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 @@ 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 @@ 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_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_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_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 @@ 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); Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Mon May 5 11:30:55 2008 @@ -170,9 +170,9 @@ 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 @@ 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 @@ 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_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 @@ } /* 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) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Mon May 5 11:30:55 2008 @@ -255,11 +255,11 @@ 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 }; Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Mon May 5 11:30:55 2008 @@ -130,7 +130,7 @@ 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 @@ 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 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) Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Mon May 5 11:30:55 2008 @@ -71,7 +71,7 @@ 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++; } } Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Mon May 5 11:30:55 2008 @@ -67,7 +67,7 @@ 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++; } } Modified: freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c Mon May 5 11:30:55 2008 @@ -2924,19 +2924,19 @@ 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))); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon May 5 11:30:55 2008 @@ -1560,7 +1560,7 @@ 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 @@ 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"); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Mon May 5 11:30:55 2008 @@ -241,11 +241,11 @@ 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) Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon May 5 11:30:55 2008 @@ -721,7 +721,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ } 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 @@ } 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 @@ 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 @@ 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 @@ } 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 @@ 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++; Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Mon May 5 11:30:55 2008 @@ -287,7 +287,7 @@ 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"), Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Mon May 5 11:30:55 2008 @@ -54,7 +54,7 @@ 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 @@ 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_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 @@ 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 @@ 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 @@ 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"); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon May 5 11:30:55 2008 @@ -352,7 +352,7 @@ 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 @@ 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; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 5 11:30:55 2008 @@ -1023,7 +1023,7 @@ 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__; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon May 5 11:30:55 2008 @@ -354,7 +354,7 @@ 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 @@ 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 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 @@ 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 @@ } 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 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 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 @@ 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 @@ 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_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 @@ 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 @@ /* 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 */ Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon May 5 11:30:55 2008 @@ -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 @@ 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 @@ 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 @@ 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 @@ continue; } - if (state >= CS_RING) { + if (state >= CS_ROUTING) { goto endfor1; }

1 0

[commit] r8262 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 05 May '08

05 May '08

Author: brian Date: Mon May 5 05:43:17 2008 New Revision: 8262 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Log: take out confirm macro till we have proper files to demo this Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Mon May 5 05:43:17 2008 @@ -10,11 +10,7 @@ timeout ="10000" inter-digit-timeout="2000" max-failures="3" - confirm-macro="demo_ivr_count" - confirm-key="1" - confirm-attempts="3" - digit-len="4" - > + digit-len="4"> <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>

1 0

[commit] r8260 - freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands
by Freeswitch SVN 04 May '08

04 May '08

Author: verifier Date: Sun May 4 11:16:29 2008 New Revision: 8260 Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/CmdBase.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs Log: bugfixes Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/CmdBase.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/CmdBase.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/CmdBase.cs Sun May 4 11:16:29 2008 @@ -8,6 +8,10 @@ public abstract class CmdBase { + /// <summary> + /// Node that the reply handler is removed after it have been invoked. + /// This is to make sure that the command can be garbage collected when it's done. + /// </summary> public event ReplyHandler ReplyReceived; private object _contextData; Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs Sun May 4 11:16:29 2008 @@ -20,10 +20,5 @@ { get { return (_activate ? string.Empty : "off ") + _sessionId; } } - - public override CommandReply CreateReply(string dataToParse) - { - return base.CreateReply(dataToParse); - } } }

1 0

[commit] r8259 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 03 May '08

03 May '08

Author: anthm Date: Sat May 3 12:36:12 2008 New Revision: 8259 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sat May 3 12:36:12 2008 @@ -21,10 +21,16 @@ static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup); Session::~Session() { + + if (hangup_func_str) { + if (session) { + switch_core_event_hook_remove_state_change(session, lua_hanguphook); + } + free(hangup_func_str); + } + switch_safe_free(cb_function); switch_safe_free(cb_arg); - switch_safe_free(hangup_func_str); - switch_core_event_hook_remove_state_change(session, lua_hanguphook); } bool Session::begin_allow_threads()

1 0

[commit] r8258 - in freeswitch/trunk: . src/mod/languages/mod_python
by Freeswitch SVN 02 May '08

02 May '08

Author: stkn Date: Fri May 2 19:40:37 2008 New Revision: 8258 Added: freeswitch/trunk/src/mod/languages/mod_python/Makefile.in Removed: freeswitch/trunk/src/mod/languages/mod_python/Makefile Modified: freeswitch/trunk/configure.in Log: Try to use python provided by the system instead of a bundled version, adds --with-python and --with-python-config to configure Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 2 19:40:37 2008 @@ -424,12 +424,120 @@ AM_CONDITIONAL([ADD_LIBEDIT],[test "x$enable_core_libedit_support" != "xno"]) AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"]) +# +# Python checks for mod_python +# +AC_ARG_WITH( + [python], + [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])], + [with_python="$withval"], + [with_python="try"] +) + +AC_ARG_WITH( + [python-config], + [AS_HELP_STRING([--with-python-config=PATH], [Location of python-config])], + [with_python_config="$withval"], + [with_python_config="no"] +) + + +if test "$with_python" != "no" +then + if test "$with_python" != "yes" -a "$with_python" != "try" ; then + AC_MSG_CHECKING([for python]) + if test ! -x "$with_python" ; then + AC_MSG_ERROR([Specified python does not exist or is not executable: $with_python]) + fi + AC_MSG_RESULT([$with_python]) + AC_SUBST([PYTHON], ["$with_python"]) + else + AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) + fi + + if test "$PYTHON" != "no" ; then + AC_MSG_CHECKING([python version]) + PYTHON_VER="`$PYTHON -V 2>&1 | cut -d' ' -f2`" + + if test -z "$PYTHON_VER" ; then + AC_MSG_ERROR([Unable to detect python version]) + fi + AC_MSG_RESULT([$PYTHON_VER]) + + AC_MSG_CHECKING([location of site-packages]) + + # NOTE: this assumes our desired location is always the last one in the list + # (= system package location is searched last) + # + # needs double brackets because m4 removes one pair + PYTHON_SITE_DIR="`$PYTHON -c 'import sys; print sys.path[[-1]];'`" + + if test -z "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Unable to detect python site-packages path]) + elif test ! -d "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!]) + fi + AC_MSG_RESULT([$PYTHON_SITE_DIR]) + AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) + + if test "$with_python_config" != "no" ; then + AC_MSG_CHECKING([for python-config]) + if test ! -x "$with_python_config" ; then + AC_MSG_ERROR([Specified python-config does not exist or is not executable: $with_python_config]) + fi + AC_MSG_RESULT([$with_python_config]) + AC_SUBST([PYTHON_CONFIG], ["$with_python_config"]) + else + AC_PATH_PROG([PYTHON_CONFIG], ["python-config"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) + fi + + # this one is fatal if with_python != try + if test "$PYTHON_CONFIG" != "no" ; then + PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags`" + PYTHON_LDFLAGS="`$PYTHON_CONFIG --ldflags`" + + # check whether system libpython is usable and has threads support + save_LIBS="$LIBS" + LIBS="$PYTHON_LDFLAGS" + AC_CHECK_FUNC([PyThread_init_thread], [python_has_threads="yes"], [python_has_threads="no"]) + LIBS="$save_LIBS" + + if test "$python_has_threads" = "no" ; then + if test "$with_python" = "try" ; then + AC_MSG_ERROR([Your python lacks threads support, can not build mod_python]) + fi + + AC_MSG_WARN([Your python lacks threads support, can not build mod_python]) + else + AC_MSG_NOTICE([Your python seems OK, do not forget to enable mod_python in modules.conf]) + AC_SUBST([PYTHON_CFLAGS], [$PYTHON_CFLAGS]) + AC_SUBST([PYTHON_LDFLAGS], [$PYTHON_LDFLAGS]) + fi + else + if test "$with_python" != "try" ; then + AC_MSG_ERROR([python-config could not be found, use --with-python-config to specify the location]) + fi + + AC_MSG_WARN([python-config could not be found, mod_python will not build, use --with-python-config to specify the location]) + fi + else + if test "$with_python" != "try" ; then + AC_MSG_ERROR([Could not find python, use --with-python to specify the location]) + fi + + AC_MSG_WARN([Could not find python, mod_python will not build, use --with-python to specify the location]) + fi +else + AC_MSG_WARN([python support disabled, building mod_python will fail!]) +fi + AC_CONFIG_FILES([Makefile src/Makefile src/mod/Makefile src/mod/endpoints/mod_sofia/Makefile src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/languages/mod_java/Makefile + src/mod/languages/mod_python/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh Added: freeswitch/trunk/src/mod/languages/mod_python/Makefile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile.in Fri May 2 19:40:37 2008 @@ -0,0 +1,29 @@ +# define these targets in your makefile if you wish +# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: + +# and define these variables to impact your build + +LOCAL_CFLAGS = @PYTHON_CFLAGS@ +LOCAL_LDFLAGS= @PYTHON_LDFLAGS@ -lstdc++ +LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o +include ../../../../build/modmake.rules + +PYMOD=freeswitch +PYTHON_SITE_DIR=@PYTHON_SITE_DIR@ + +SWIGCFILE=../../../switch_swig.c +SWIGIFILE=../../../switch_swig.i + +reswig: + swig -python -shadow -c++ -I../../../../src/include -o mod_python_wrap.cpp mod_python.i + +switch_swig_wrap.o: switch_swig_wrap.c Makefile + $(CC) -w $(CFLAGS) -c $< -o $@ + +switch_swig.o: $(SWIGCFILE) Makefile + $(CC) -w $(CFLAGS) -c $< -o $@ + +local_install: + mkdir -m755 -p $(DESTDIR)$(PYTHON_SITE_DIR) + cp -f freeswitch.py $(DESTDIR)$(PYTHON_SITE_DIR) +

1 0

[commit] r8257 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 02 May '08

02 May '08

Author: brian Date: Fri May 2 18:21:18 2008 New Revision: 8257 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: update Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri May 2 18:21:18 2008 @@ -143,7 +143,7 @@ <anti-action application="set" data="call_timeout=30"/>  <anti-action application="set" data="hangup_after_bridge=true"/> -  +  <anti-action application="set" data="continue_on_fail=true"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/>

1 0

[commit] r8256 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 02 May '08

02 May '08

Author: greenlizard Date: Fri May 2 17:20:14 2008 New Revision: 8256 Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Log: reswig after updating to 8254. check that it compiles and do some light testing. seems that playAndGetDigits now returns a single value instead of a list of values, update scripts accordingly. also execute_extension is causing seg faults, at least in certain cases. Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py Fri May 2 17:20:14 2008 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org) -# Version 1.3.35 +# Version 1.3.31 # # Don't modify this file, modify the SWIG interface instead. # This file is compatible with both classic and new-style classes. @@ -169,7 +169,7 @@ __setattr__ = lambda self, name, value: _swig_setattr(self, CoreSession, name, value) __swig_getmethods__ = {} __getattr__ = lambda self, name: _swig_getattr(self, CoreSession, name) - def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined" + def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr __swig_destroy__ = _freeswitch.delete_CoreSession __del__ = lambda self : None; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Fri May 2 17:20:14 2008 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org) - * Version 1.3.35 + * Version 1.3.31 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -12,7 +12,7 @@ #define SWIG_PYTHON_DIRECTOR_NO_VTABLE #ifdef __cplusplus -template<typename T> class SwigValueWrapper { +template<class T> class SwigValueWrapper { T *tt; public: SwigValueWrapper() : tt(0) { } @@ -25,10 +25,6 @@ private: SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs); }; - -template <typename T> T SwigValueInit() { - return T(); -} #endif /* ----------------------------------------------------------------------------- @@ -38,14 +34,14 @@ /* template workaround for compilers that cannot correctly implement the C++ standard */ #ifndef SWIGTEMPLATEDISAMBIGUATOR -# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560) -# define SWIGTEMPLATEDISAMBIGUATOR template -# elif defined(__HP_aCC) -/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */ -/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */ -# define SWIGTEMPLATEDISAMBIGUATOR template +# if defined(__SUNPRO_CC) +# if (__SUNPRO_CC <= 0x560) +# define SWIGTEMPLATEDISAMBIGUATOR template +# else +# define SWIGTEMPLATEDISAMBIGUATOR +# endif # else -# define SWIGTEMPLATEDISAMBIGUATOR +# define SWIGTEMPLATEDISAMBIGUATOR # endif #endif @@ -128,12 +124,6 @@ # define _CRT_SECURE_NO_DEPRECATE #endif -/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ -#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) -# define _SCL_SECURE_NO_DEPRECATE -#endif - - /* Python.h has to appear first */ #include <Python.h> @@ -147,7 +137,7 @@ /* This should only be incremented when either the layout of swig_type_info changes, or for whatever reason, the runtime changes incompatibly */ -#define SWIG_RUNTIME_VERSION "4" +#define SWIG_RUNTIME_VERSION "3" /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ #ifdef SWIG_TYPE_TABLE @@ -182,7 +172,6 @@ /* Flags for pointer conversions */ #define SWIG_POINTER_DISOWN 0x1 -#define SWIG_CAST_NEW_MEMORY 0x2 /* Flags for new pointer objects */ #define SWIG_POINTER_OWN 0x1 @@ -323,10 +312,10 @@ extern "C" { #endif -typedef void *(*swig_converter_func)(void *, int *); +typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); -/* Structure to store information on one type */ +/* Structure to store inforomation on one type */ typedef struct swig_type_info { const char *name; /* mangled name of this type */ const char *str; /* human readable name of this type */ @@ -371,7 +360,7 @@ while ((*f2 == ' ') && (f2 != l2)) ++f2; if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1; } - return (int)((l1 - f1) - (l2 - f2)); + return (l1 - f1) - (l2 - f2); } /* @@ -453,8 +442,8 @@ Cast a pointer up an inheritance hierarchy */ SWIGRUNTIMEINLINE void * -SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) { - return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory); +SWIG_TypeCast(swig_cast_info *ty, void *ptr) { + return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr); } /* @@ -878,7 +867,7 @@ Py_DECREF(old_str); Py_DECREF(value); } else { - PyErr_SetString(PyExc_RuntimeError, mesg); + PyErr_Format(PyExc_RuntimeError, mesg); } } @@ -1118,14 +1107,14 @@ /* Unpack the argument tuple */ SWIGINTERN int -SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs) +SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs) { if (!args) { if (!min && !max) { return 1; } else { PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", - name, (min == max ? "" : "at least "), (int)min); + name, (min == max ? "" : "at least "), min); return 0; } } @@ -1133,14 +1122,14 @@ PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple"); return 0; } else { - register Py_ssize_t l = PyTuple_GET_SIZE(args); + register int l = PyTuple_GET_SIZE(args); if (l < min) { PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", - name, (min == max ? "" : "at least "), (int)min, (int)l); + name, (min == max ? "" : "at least "), min, l); return 0; } else if (l > max) { PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", - name, (min == max ? "" : "at most "), (int)max, (int)l); + name, (min == max ? "" : "at most "), max, l); return 0; } else { register int i; @@ -1438,7 +1427,7 @@ { PySwigObject *sobj = (PySwigObject *) v; PyObject *next = sobj->next; - if (sobj->own == SWIG_POINTER_OWN) { + if (sobj->own) { swig_type_info *ty = sobj->ty; PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0; PyObject *destroy = data ? data->destroy : 0; @@ -1456,13 +1445,12 @@ res = ((*meth)(mself, v)); } Py_XDECREF(res); - } -#if !defined(SWIG_PYTHON_SILENT_MEMLEAK) - else { + } else { const char *name = SWIG_TypePrettyName(ty); - printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown")); - } +#if !defined(SWIG_PYTHON_SILENT_MEMLEAK) + printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name); #endif + } } Py_XDECREF(next); PyObject_DEL(v); @@ -1620,11 +1608,9 @@ (unaryfunc)0, /*nb_float*/ (unaryfunc)PySwigObject_oct, /*nb_oct*/ (unaryfunc)PySwigObject_hex, /*nb_hex*/ -#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */ -#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ -#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */ +#if PY_VERSION_HEX >= 0x02020000 + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ +#elif PY_VERSION_HEX >= 0x02000000 0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */ #endif }; @@ -1967,7 +1953,7 @@ SWIGRUNTIME int SWIG_Python_AcquirePtr(PyObject *obj, int own) { - if (own == SWIG_POINTER_OWN) { + if (own) { PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); if (sobj) { int oldown = sobj->own; @@ -1988,8 +1974,6 @@ return SWIG_OK; } else { PySwigObject *sobj = SWIG_Python_GetSwigThis(obj); - if (own) - *own = 0; while (sobj) { void *vptr = sobj->ptr; if (ty) { @@ -2003,15 +1987,7 @@ if (!tc) { sobj = (PySwigObject *)sobj->next; } else { - if (ptr) { - int newmemory = 0; - *ptr = SWIG_TypeCast(tc,vptr,&newmemory); - if (newmemory == SWIG_CAST_NEW_MEMORY) { - assert(own); - if (own) - *own = *own | SWIG_CAST_NEW_MEMORY; - } - } + if (ptr) *ptr = SWIG_TypeCast(tc,vptr); break; } } @@ -2021,8 +1997,7 @@ } } if (sobj) { - if (own) - *own = *own | sobj->own; + if (own) *own = sobj->own; if (flags & SWIG_POINTER_DISOWN) { sobj->own = 0; } @@ -2087,13 +2062,8 @@ } if (ty) { swig_cast_info *tc = SWIG_TypeCheck(desc,ty); - if (tc) { - int newmemory = 0; - *ptr = SWIG_TypeCast(tc,vptr,&newmemory); - assert(!newmemory); /* newmemory handling not yet implemented */ - } else { - return SWIG_ERROR; - } + if (!tc) return SWIG_ERROR; + *ptr = SWIG_TypeCast(tc,vptr); } else { *ptr = vptr; } @@ -2535,7 +2505,7 @@ #define SWIG_name "_freeswitch" -#define SWIGVERSION 0x010335 +#define SWIGVERSION 0x010331 #define SWIG_VERSION SWIGVERSION @@ -2563,9 +2533,7 @@ PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj) { - if (initial_ref) { - Py_XINCREF(_obj); - } + if (initial_ref) Py_XINCREF(_obj); } PyObject_ptr & operator=(const PyObject_ptr& item) @@ -2681,12 +2649,14 @@ #include <limits.h> -#if !defined(SWIG_NO_LLONG_MAX) -# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__) -# define LLONG_MAX __LONG_LONG_MAX__ -# define LLONG_MIN (-LLONG_MAX - 1LL) -# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL) -# endif +#ifndef LLONG_MIN +# define LLONG_MIN LONG_LONG_MIN +#endif +#ifndef LLONG_MAX +# define LLONG_MAX LONG_LONG_MAX +#endif +#ifndef ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX #endif @@ -2944,11 +2914,18 @@ SWIGINTERN int SWIG_AsVal_bool (PyObject *obj, bool *val) { - int r = PyObject_IsTrue(obj); - if (r == -1) - return SWIG_ERROR; - if (val) *val = r ? true : false; - return SWIG_OK; + if (obj == Py_True) { + if (val) *val = true; + return SWIG_OK; + } else if (obj == Py_False) { + if (val) *val = false; + return SWIG_OK; + } else { + long v = 0; + int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0)); + if (SWIG_IsOK(res) && val) *val = v ? true : false; + return res; + } } #ifdef __cplusplus @@ -3288,7 +3265,7 @@ SWIGINTERN PyObject *IVRMenu_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_IVRMenu, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -3410,7 +3387,7 @@ SWIGINTERN PyObject *API_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_API, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -3666,7 +3643,7 @@ SWIGINTERN PyObject *input_callback_state_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_input_callback_state, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -3712,7 +3689,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 1); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -3730,10 +3707,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stream'.\n" - " Possible C/C++ prototypes are:\n" - " Stream()\n" - " Stream(switch_stream_handle_t *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stream'.\n Possible C/C++ prototypes are:\n Stream()\n Stream(switch_stream_handle_t *)\n"); return NULL; } @@ -3817,7 +3791,7 @@ SWIGINTERN PyObject *Stream_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_Stream, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -4110,7 +4084,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 2); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -4160,12 +4134,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Event'.\n" - " Possible C/C++ prototypes are:\n" - " Event(char const *,char const *)\n" - " Event(char const *)\n" - " Event(switch_event_t *,int)\n" - " Event(switch_event_t *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Event'.\n Possible C/C++ prototypes are:\n Event(char const *,char const *)\n Event(char const *)\n Event(switch_event_t *,int)\n Event(switch_event_t *)\n"); return NULL; } @@ -4254,7 +4223,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 2); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -4282,10 +4251,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Event_serialize'.\n" - " Possible C/C++ prototypes are:\n" - " serialize(Event *,char const *)\n" - " serialize(Event *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Event_serialize'.\n Possible C/C++ prototypes are:\n serialize(char const *)\n serialize()\n"); return NULL; } @@ -4357,7 +4323,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 2); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -4385,10 +4351,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Event_setPriority'.\n" - " Possible C/C++ prototypes are:\n" - " setPriority(Event *,switch_priority_t)\n" - " setPriority(Event *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Event_setPriority'.\n Possible C/C++ prototypes are:\n setPriority(switch_priority_t)\n setPriority()\n"); return NULL; } @@ -4609,7 +4572,7 @@ SWIGINTERN PyObject *Event_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_Event, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -5066,7 +5029,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 2); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -5094,10 +5057,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_hangup'.\n" - " Possible C/C++ prototypes are:\n" - " hangup(CoreSession *,char *)\n" - " hangup(CoreSession *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_hangup'.\n Possible C/C++ prototypes are:\n hangup(char *)\n hangup()\n"); return NULL; } @@ -5451,7 +5411,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 5); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -5545,12 +5505,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_recordFile'.\n" - " Possible C/C++ prototypes are:\n" - " recordFile(CoreSession *,char *,int,int,int)\n" - " recordFile(CoreSession *,char *,int,int)\n" - " recordFile(CoreSession *,char *,int)\n" - " recordFile(CoreSession *,char *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_recordFile'.\n Possible C/C++ prototypes are:\n recordFile(char *,int,int,int)\n recordFile(char *,int,int)\n recordFile(char *,int)\n recordFile(char *)\n"); return NULL; } @@ -5701,7 +5656,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 4); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -5749,10 +5704,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_originate'.\n" - " Possible C/C++ prototypes are:\n" - " originate(CoreSession *,CoreSession *,char *,int)\n" - " originate(CoreSession *,CoreSession *,char *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_originate'.\n Possible C/C++ prototypes are:\n originate(CoreSession *,char *,int)\n originate(CoreSession *,char *)\n"); return NULL; } @@ -6279,7 +6231,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 3); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -6317,10 +6269,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_streamFile'.\n" - " Possible C/C++ prototypes are:\n" - " streamFile(CoreSession *,char *,int)\n" - " streamFile(CoreSession *,char *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'CoreSession_streamFile'.\n Possible C/C++ prototypes are:\n streamFile(char *,int)\n streamFile(char *)\n"); return NULL; } @@ -6685,7 +6634,7 @@ SWIGINTERN PyObject *CoreSession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_CoreSession, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -6936,7 +6885,7 @@ int ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = (int)PyObject_Length(args); + argc = PyObject_Length(args); for (ii = 0; (ii < argc) && (ii < 1); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -6962,11 +6911,7 @@ } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_PySession'.\n" - " Possible C/C++ prototypes are:\n" - " PySession()\n" - " PySession(char *)\n" - " PySession(switch_core_session_t *)\n"); + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_PySession'.\n Possible C/C++ prototypes are:\n PySession()\n PySession(char *)\n PySession(switch_core_session_t *)\n"); return NULL; } @@ -7199,7 +7144,7 @@ SWIGINTERN PyObject *PySession_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL; + if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL; SWIG_TypeNewClientData(SWIGTYPE_p_PySession, SWIG_NewClientData(obj)); return SWIG_Py_Void(); } @@ -7318,7 +7263,7 @@ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ -static void *_p_PySessionTo_p_CoreSession(void *x, int *newmemory) { +static void *_p_PySessionTo_p_CoreSession(void *x) { return (void *)((CoreSession *) ((PySession *) x)); } static swig_type_info _swigt__p_API = {"_p_API", "API *", 0, 0, (void*)0, 0}; @@ -7328,7 +7273,7 @@ static swig_type_info _swigt__p_PySession = {"_p_PySession", "PySession *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_Stream = {"_p_Stream", "Stream *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_input_callback_state = {"_p_input_callback_state", "input_callback_state_t *|input_callback_state *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_input_callback_state = {"_p_input_callback_state", "input_callback_state *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_session_flag_t = {"_p_session_flag_t", "enum session_flag_t *|session_flag_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_swap_state_t = {"_p_swap_state_t", "enum swap_state_t *|swap_state_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_switch_channel_state_t = {"_p_switch_channel_state_t", "switch_channel_state_t *", 0, 0, (void*)0, 0}; @@ -7475,7 +7420,7 @@ SWIG_InitializeModule(void *clientdata) { size_t i; swig_module_info *module_head, *iter; - int found, init; + int found; clientdata = clientdata; @@ -7485,9 +7430,6 @@ swig_module.type_initial = swig_type_initial; swig_module.cast_initial = swig_cast_initial; swig_module.next = &swig_module; - init = 1; - } else { - init = 0; } /* Try and load any already created modules */ @@ -7516,12 +7458,6 @@ module_head->next = &swig_module; } - /* When multiple interpeters are used, a module could have already been initialized in - a different interpreter, but not yet have a pointer in this interpreter. - In this case, we do not want to continue adding types... everything should be - set up already */ - if (init == 0) return; - /* Now work on filling in swig_module.types */ #ifdef SWIGRUNTIME_DEBUG printf("SWIG_InitializeModule: size %d\n", swig_module.size);

1 0