- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7855 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: brian Date: Tue Mar 11 00:03:23 2008 New Revision: 7855 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add send_display examples Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Mar 11 00:03:23 2008 @@ -140,6 +140,7 @@ <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/> <anti-action application="answer"/> + <anti-action application="send_display" data="Voicemail for ${dialed_ext}"/> <anti-action application="sleep" data="1000"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> @@ -157,18 +158,24 @@ --> <extension name="nb_conferences"> <condition field="destination_number" expression="^(30\d{2})$"> + <action application="answer"/> + <action application="send_display" data="8k Conference $1"/> <action application="conference" data="$1@default"/> </condition> </extension> <extension name="wb_conferences"> <condition field="destination_number" expression="^(31\d{2})$"> + <action application="answer"/> + <action application="send_display" data="16k Conference $1"/> <action application="conference" data="$1@wideband"/> </condition> </extension> <extension name="uwb_conferences"> <condition field="destination_number" expression="^(32\d{2})$"> + <action application="answer"/> + <action application="send_display" data="32k Conference $1"/> <action application="conference" data="$1@ultrawideband"/> </condition> </extension> @@ -189,6 +196,8 @@ <extension name="rtp_multicast_page"> <condition field="destination_number" expression="^pagegroup$|^7243"> + <action application="answer"/> + <action application="send_display" data="Multicast Page"/> <action application="esf_page_group"/> </condition> </extension> @@ -255,6 +264,7 @@ <extension name="delay_echo"> <condition field="destination_number" expression="^9995$"> <action application="answer"/> + <action application="send_display" data="Delay Echo Test (5 sec)"/> <action application="delay_echo" data="5000"/> </condition> </extension> @@ -262,6 +272,7 @@ <extension name="echo"> <condition field="destination_number" expression="^9996$"> <action application="answer"/> + <action application="send_display" data="Echo Test"/> <action application="echo"/> </condition> </extension> @@ -269,6 +280,7 @@ <extension name="milliwatt"> <condition field="destination_number" expression="^9997$"> <action application="answer"/> + <action application="send_display" data="Milliwatt Test"/> <action application="playback" data="tone_stream://%(10000,0,1004);loops=-1"/> </condition> </extension> @@ -287,6 +299,7 @@ <action application="execute_extension" data="is_secure XML default"/> <action application="playback" data="$${moh_uri}"/> <anti-action application="answer"/> + <anti-action application="send_display" data="Insecure Music On Hold"/> <anti-action application="playback" data="$${moh_uri}"/> </condition> </extension> @@ -334,6 +347,7 @@ <extension name="is_secure"> <condition field="${sip_secure_media_confirmed}" expression="^true$"> <action application="sleep" data="1000"/> + <action application="send_display" data="Secure Music On Hold "/> <action application="gentones" data="${bong-ring}"/> </condition> </extension>

1 0

[commit] r7854 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_dptools mod/applications/mod_enum mod/dialplans/mod_dialplan_asterisk mod/dialplans/mod_dialplan_directory mod/dialplans/mod_dialplan_xml mod/endpoints/mod_sofia
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Mon Mar 10 23:45:16 2008 New Revision: 7854 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_time.c Log: fix a bunch of stuff Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon Mar 10 23:45:16 2008 @@ -459,9 +459,10 @@ /*! \brief Signal the session with a protocol specific hold message. \param uuid the uuid of the session to hold + \param message optional message \return SWITCH_STATUS_SUCCESS if all is well */ -SWITCH_DECLARE(switch_status_t) switch_ivr_hold_uuid(const char *uuid); +SWITCH_DECLARE(switch_status_t) switch_ivr_hold_uuid(const char *uuid, const char *message); /*! \brief Signal the session with a protocol specific unhold message. @@ -473,9 +474,10 @@ /*! \brief Signal the session with a protocol specific hold message. \param session the session to hold + \param message optional message \return SWITCH_STATUS_SUCCESS if all is well */ -SWITCH_DECLARE(switch_status_t) switch_ivr_hold(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_ivr_hold(switch_core_session_t *session, const char *message); /*! \brief Signal the session with a protocol specific unhold message. Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Mar 10 23:45:16 2008 @@ -35,6 +35,7 @@ #define SWITCH_PLATFORM_H SWITCH_BEGIN_EXTERN_C +#define SWITCH_USE_CLOCK_FUNCS #ifdef __ICC #pragma warning (disable:810 869 981 279 1469 188) #endif Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Mar 10 23:45:16 2008 @@ -504,7 +504,8 @@ SWITCH_MESSAGE_INDICATE_BROADCAST, SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT, SWITCH_MESSAGE_INDICATE_DEFLECT, - SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ + SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ, + SWITCH_MESSAGE_INDICATE_DISPLAY } switch_core_session_message_types_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Mar 10 23:45:16 2008 @@ -1081,7 +1081,7 @@ return SWITCH_STATUS_SUCCESS; } -#define HOLD_SYNTAX "<uuid>" +#define HOLD_SYNTAX "<uuid> [<display>]" SWITCH_STANDARD_API(uuid_hold_function) { char *mycmd = NULL, *argv[4] = { 0 }; @@ -1102,7 +1102,49 @@ if (!strcasecmp(argv[0], "off")) { status = switch_ivr_unhold_uuid(argv[1]); } else { - status = switch_ivr_hold_uuid(argv[0]); + status = switch_ivr_hold_uuid(argv[0], argv[1]); + } + } + + if (status == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK Success\n"); + } else { + stream->write_function(stream, "-ERR Operation Failed\n"); + } + + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + + +#define DISPLAY_SYNTAX "<uuid> <display>" +SWITCH_STANDARD_API(uuid_display_function) +{ + char *mycmd = NULL, *argv[2] = { 0 }; + int argc = 0; + switch_status_t status = SWITCH_STATUS_FALSE; + + if (session) { + return status; + } + + if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (switch_strlen_zero(cmd) || argc < 2 || switch_strlen_zero(argv[0]) || switch_strlen_zero(argv[1])) { + stream->write_function(stream, "-USAGE: %s\n", HOLD_SYNTAX); + } else { + switch_core_session_message_t msg = { 0 }; + switch_core_session_t *lsession = NULL; + + msg.message_id = SWITCH_MESSAGE_INDICATE_DISPLAY; + msg.string_arg = argv[1]; + msg.from = __FILE__; + + if ((lsession = switch_core_session_locate(argv[0]))) { + status = switch_core_session_receive_message(lsession, &msg); + switch_core_session_rwunlock(lsession); } } @@ -2152,6 +2194,7 @@ SWITCH_ADD_API(commands_api_interface, "uuid_broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); SWITCH_ADD_API(commands_api_interface, "hold", "hold (depricated)", uuid_hold_function, HOLD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_display", "change display", uuid_display_function, DISPLAY_SYNTAX); SWITCH_ADD_API(commands_api_interface, "media", "media (depricated)", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX); 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 Mar 10 23:45:16 2008 @@ -374,6 +374,17 @@ switch_core_session_receive_message(session, &msg); } +SWITCH_STANDARD_APP(display_function) +{ + switch_core_session_message_t msg = { 0 }; + + /* Tell the channel to redirect */ + msg.from = __FILE__; + msg.string_arg = data; + msg.message_id = SWITCH_MESSAGE_INDICATE_DISPLAY; + switch_core_session_receive_message(session, &msg); +} + SWITCH_STANDARD_APP(respond_function) { switch_core_session_message_t msg = { 0 }; @@ -1588,6 +1599,7 @@ SWITCH_ADD_APP(app_interface, "detect_speech", "Detect speech", "Detect speech on a channel.", detect_speech_function, DETECT_SPEECH_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "ivr", "Run an ivr menu", "Run an ivr menu.", ivr_application_function, "<menu_name>", SAF_NONE); SWITCH_ADD_APP(app_interface, "redirect", "Send session redirect", "Send a redirect message to a session.", redirect_function, "<redirect_data>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "send_display", "Send session a new display", "Send session a new display.", display_function, "<text>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "respond", "Send session respond", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "deflect", "Send call deflect", "Send a call deflect.", deflect_function, "<deflect_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "reject", "Send session reject (depricated)", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Mar 10 23:45:16 2008 @@ -572,10 +572,6 @@ free_results(&results); } - if (extension) { - switch_channel_set_state(channel, CS_EXECUTE); - } - return extension; } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Mon Mar 10 23:45:16 2008 @@ -284,10 +284,6 @@ switch_config_close_file(&cfg); - if (extension) { - switch_channel_set_state(channel, CS_EXECUTE); - } - return extension; } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Mar 10 23:45:16 2008 @@ -138,11 +138,6 @@ switch_core_directory_close(&dh); - - if (extension) { - switch_channel_set_state(channel, CS_EXECUTE); - } - return extension; } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Mon Mar 10 23:45:16 2008 @@ -274,10 +274,6 @@ switch_xml_free(xml); xml = NULL; - if (extension) { - switch_channel_set_state(channel, CS_EXECUTE); - } - done: switch_xml_free(xml); return extension; 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 Mar 10 23:45:16 2008 @@ -100,12 +100,14 @@ if (sofia_glue_do_invite(session) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + assert( switch_channel_get_state(channel) != CS_INIT); return SWITCH_STATUS_FALSE; } } /* Move Channel's State Machine to RING */ switch_channel_set_state(channel, CS_RING); + assert( switch_channel_get_state(channel) != CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -538,6 +540,7 @@ tech_pvt->read_frame.flags = SFF_NONE; status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame); + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { if (status == SWITCH_STATUS_TIMEOUT) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); @@ -552,7 +555,7 @@ switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, &dtmf); switch_channel_queue_dtmf(channel, &dtmf); } - + if (tech_pvt->read_frame.datalen > 0) { size_t bytes = 0; int frames = 1; @@ -844,10 +847,25 @@ } break; + case SWITCH_MESSAGE_INDICATE_DISPLAY: + { + if (!switch_strlen_zero(msg->string_arg)) { + char message[256] = ""; + snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + } + } + break; + case SWITCH_MESSAGE_INDICATE_HOLD: { switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); sofia_glue_do_invite(session); + if (!switch_strlen_zero(msg->string_arg)) { + char message[256] = ""; + snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + } } break; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Mar 10 23:45:16 2008 @@ -1083,20 +1083,20 @@ } x = 0; /* Index Variables */ - for (hi = channel->variables->headers; hi; hi = hi->next) { - char buf[1024]; - char *vvar = NULL, *vval = NULL; - - vvar = (char *) hi->name; - vval = (char *) hi->value; - x++; - - switch_assert(vvar && vval); - switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, buf, "%s", vval); - + if (channel->variables) { + for (hi = channel->variables->headers; hi; hi = hi->next) { + char buf[1024]; + char *vvar = NULL, *vval = NULL; + + vvar = (char *) hi->name; + vval = (char *) hi->value; + x++; + + switch_assert(vvar && vval); + switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, buf, "%s", vval); + } } - switch_mutex_unlock(channel->profile_mutex); } 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 Mar 10 23:45:16 2008 @@ -93,6 +93,7 @@ if ((extension = dialplan_interface->hunt_function(session, dparg, NULL)) != 0) { switch_channel_set_caller_extension(session->channel, extension); + switch_channel_set_state(session->channel, CS_EXECUTE); goto end; } } @@ -112,12 +113,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Route, Aborting\n"); switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); } + end: if (expanded && dpstr && expanded != dpstr) { free(expanded); } + } static void switch_core_standard_on_execute(switch_core_session_t *session) @@ -294,7 +297,7 @@ #define STATE_MACRO(__STATE, __STATE_STR) do { \ midstate = state; \ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR); \ - if (!driver_state_handler->on_##__STATE || (driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ + if (!driver_state_handler->on_##__STATE || ( driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \ && midstate == switch_channel_get_state(session->channel))) { \ while (do_extra_handlers && (application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) { \ if (!application_state_handler || !application_state_handler->on_##__STATE \ @@ -325,6 +328,7 @@ switch_core_standard_on_##__STATE(session); \ } \ } \ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State end %s %s %s\n", switch_channel_get_name(session->channel), __STATE_STR, switch_channel_state_name(midstate), switch_channel_state_name(switch_channel_get_state(session->channel))); \ } while (silly) SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session) @@ -430,9 +434,14 @@ } goto done; case CS_INIT: /* Basic setup tasks */ - switch_core_session_signal_lock(session); - STATE_MACRO(init, "INIT"); - switch_core_session_signal_unlock(session); + assert(driver_state_handler->on_init); + //switch_core_session_signal_lock(session); + if (0) STATE_MACRO(init, "INIT"); + //switch_core_session_signal_unlock(session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT\n", switch_channel_get_name(session->channel)); + driver_state_handler->on_init(session); + assert( switch_channel_get_state(session->channel) != CS_INIT); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT-END\n", switch_channel_get_name(session->channel)); break; case CS_RING: /* Look for a dialplan and find something to do */ switch_core_session_signal_lock(session); @@ -480,6 +489,8 @@ if (endstate == CS_NEW) { switch_yield(1000); } else { + assert( switch_channel_get_state(session->channel) != CS_INIT); + assert( switch_channel_get_running_state(session->channel) != CS_INIT); switch_thread_cond_wait(session->cond, session->mutex); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Mar 10 23:45:16 2008 @@ -678,7 +678,7 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_ivr_hold(switch_core_session_t *session) +SWITCH_DECLARE(switch_status_t) switch_ivr_hold(switch_core_session_t *session, const char *message) { switch_core_session_message_t msg = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); @@ -686,6 +686,7 @@ const char *other_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_HOLD; + msg.string_arg = message; msg.from = __FILE__; switch_channel_set_flag(channel, CF_HOLD); @@ -693,7 +694,6 @@ switch_core_session_receive_message(session, &msg); - if ((stream = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE))) { if ((other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_ivr_broadcast(other_uuid, stream, SMF_ECHO_ALEG | SMF_LOOP); @@ -704,12 +704,12 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_ivr_hold_uuid(const char *uuid) +SWITCH_DECLARE(switch_status_t) switch_ivr_hold_uuid(const char *uuid, const char *message) { switch_core_session_t *session; if ((session = switch_core_session_locate(uuid))) { - switch_ivr_hold(session); + switch_ivr_hold(session, message); switch_core_session_rwunlock(session); } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Mar 10 23:45:16 2008 @@ -34,7 +34,7 @@ static const switch_state_handler_table_t originate_state_handlers; -static switch_status_t originate_on_hold(switch_core_session_t *session) +static switch_status_t originate_on_hold_transmit(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); @@ -42,7 +42,6 @@ switch_ivr_sleep(session, 10); } - /* clear this handler so it only works once (next time (a.k.a. Transfer) we will do the real ring and hold states) */ switch_channel_clear_state_handler(channel, &originate_state_handlers); return SWITCH_STATUS_FALSE; @@ -64,8 +63,8 @@ /*.on_execute */ NULL, /*.on_hangup */ NULL, /*.on_loopback */ NULL, - /*.on_transmit */ NULL, - /*.on_hold */ originate_on_hold + /*.on_transmit */ originate_on_hold_transmit, + /*.on_hold */ originate_on_hold_transmit }; typedef enum { @@ -113,6 +112,7 @@ goto wbreak; } + switch_channel_set_state(channel, CS_TRANSMIT); switch_core_session_exec(collect->session, application_interface, app_data); if (switch_channel_get_state(channel) < CS_HANGUP) { Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Mar 10 23:45:16 2008 @@ -1057,8 +1057,9 @@ while (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_HOLD)) { switch_yield(10000); } + tstatus = switch_core_session_read_frame(session, &read_frame, -1, 0); - + if (!SWITCH_READ_ACCEPTABLE(tstatus)) { break; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 10 23:45:16 2008 @@ -879,14 +879,12 @@ void *pop; switch_socket_t *sock; - - switch_mutex_lock((*rtp_session)->flag_mutex); - if (!rtp_session || !*rtp_session || !(*rtp_session)->ready) { - switch_mutex_unlock((*rtp_session)->flag_mutex); return; } + switch_mutex_lock((*rtp_session)->flag_mutex); + READ_INC((*rtp_session)); WRITE_INC((*rtp_session)); @@ -1122,7 +1120,7 @@ bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *) &rtp_session->recv_msg, &bytes); - + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); bytes = 0; @@ -1293,7 +1291,7 @@ if (rtp_session->timer.interval) { check = (uint8_t) (switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); - + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) { uint8_t data[10] = { 0 }; Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 10 23:45:16 2008 @@ -58,7 +58,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime); SWITCH_MODULE_DEFINITION(CORE_SOFTTIMER_MODULE, softtimer_load, softtimer_shutdown, softtimer_runtime); -#define MAX_ELEMENTS 360 +#define MAX_ELEMENTS 3600 #define IDLE_SPEED 100 #define STEP_MS 1 #define STEP_MIC 1000 @@ -202,7 +202,7 @@ } timer->samplecount = (uint32_t) samples; - private_info->reference++; + private_info->reference = TIMER_MATRIX[timer->interval].tick + 1; return SWITCH_STATUS_SUCCESS; } @@ -217,7 +217,7 @@ check_roll(); switch_yield(1000); } - + if (globals.RUNNING == 1) { return SWITCH_STATUS_SUCCESS; } @@ -230,7 +230,6 @@ timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; - if (globals.RUNNING != 1 || !private_info->ready) { return SWITCH_STATUS_SUCCESS; } @@ -340,20 +339,25 @@ tick = 0; } - - for (x = 1; x <= MAX_ELEMENTS; x++) { - int i = x * 10; - int index = (current_ms % i == 0) ? i : 0; + + for (x = 0; x <= MAX_ELEMENTS; x++) { + int i = x, index; + + if (i == 0) { + i = 1; + } + index = (current_ms % i == 0) ? i : 0; + if (TIMER_MATRIX[index].count) { TIMER_MATRIX[index].tick++; - if (TIMER_MATRIX[index].tick == MAX_TICK) { - TIMER_MATRIX[index].tick = 0; - TIMER_MATRIX[index].roll++; + if (TIMER_MATRIX[x].tick == MAX_TICK) { + TIMER_MATRIX[x].tick = 0; + TIMER_MATRIX[x].roll++; } } } - + if (current_ms == MAX_ELEMENTS) { current_ms = 0; }

1 0

[commit] r7853 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 10 Mar '08

10 Mar '08

Author: anthm Date: Mon Mar 10 15:04:01 2008 New Revision: 7853 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_io.c Log: update 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 Mar 10 15:04:01 2008 @@ -636,7 +636,9 @@ { private_object_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); + if (!tech_pvt) { + return SWITCH_STATUS_FALSE; + } switch (sig) { case SWITCH_SIG_BREAK: Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Mar 10 15:04:01 2008 @@ -40,6 +40,11 @@ switch_io_event_hook_video_write_frame_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; switch_io_flag_t flags = 0; + + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + if (session->endpoint_interface->io_routines->write_video_frame) { if ((status = session->endpoint_interface->io_routines->write_video_frame(session, frame, timeout, flags, stream_id)) == SWITCH_STATUS_SUCCESS) { for (ptr = session->event_hooks.video_write_frame; ptr; ptr = ptr->next) { @@ -57,6 +62,10 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_io_event_hook_video_read_frame_t *ptr; + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + if (session->endpoint_interface->io_routines->read_video_frame) { if ((status = session->endpoint_interface->io_routines->read_video_frame(session, frame, timeout, SWITCH_IO_FLAG_NOOP, stream_id)) == SWITCH_STATUS_SUCCESS) { @@ -97,6 +106,11 @@ unsigned int flag = 0; top: + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + + status = SWITCH_STATUS_FALSE; need_codec = perfect = 0; @@ -466,6 +480,9 @@ switch_assert(session != NULL); switch_assert(frame != NULL); + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } if (switch_channel_test_flag(session->channel, CF_HOLD)) { return SWITCH_STATUS_SUCCESS; @@ -917,6 +934,10 @@ switch_status_t status; switch_dtmf_t new_dtmf; + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + switch_assert(dtmf); new_dtmf = *dtmf; @@ -943,6 +964,10 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_dtmf_t new_dtmf; + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + switch_assert(dtmf); new_dtmf = *dtmf; @@ -983,9 +1008,13 @@ int i, argc; char *argv[256]; - switch_assert(session != NULL); + + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + if (switch_strlen_zero(dtmf_string)) { return SWITCH_STATUS_FALSE; }

1 0

[commit] r7852 - freeswitch/trunk/src
by Freeswitch SVN 10 Mar '08

10 Mar '08

Author: anthm Date: Mon Mar 10 14:38:01 2008 New Revision: 7852 Modified: freeswitch/trunk/src/switch_core_session.c Log: fix issue Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Mar 10 14:38:01 2008 @@ -1000,7 +1000,7 @@ char *dpstr; int argc, x, count = 0; char *expanded = NULL; - switch_caller_profile_t *profile, *new_profile, *pp; + switch_caller_profile_t *profile, *new_profile, *pp = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); switch_dialplan_interface_t *dialplan_interface = NULL; switch_caller_extension_t *extension = NULL; @@ -1062,12 +1062,14 @@ new_profile->caller_extension = extension; - for(pp = profile->caller_extension->children; pp && pp->next; pp = pp->next); - - if (pp) { - pp->next = new_profile; - } else { - profile->caller_extension->children = new_profile; + if (profile->caller_extension) { + for(pp = profile->caller_extension->children; pp && pp->next; pp = pp->next); + + if (pp) { + pp->next = new_profile; + } else { + profile->caller_extension->children = new_profile; + } } while (switch_channel_ready(channel) && extension->current_application) {

1 0

[commit] r7851 - freeswitch/trunk/src
by Freeswitch SVN 10 Mar '08

10 Mar '08

Author: anthm Date: Mon Mar 10 12:19:55 2008 New Revision: 7851 Modified: freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Mar 10 12:19:55 2008 @@ -682,6 +682,8 @@ { switch_core_session_message_t msg = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); + const char *stream; + const char *other_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_HOLD; msg.from = __FILE__; @@ -691,6 +693,14 @@ switch_core_session_receive_message(session, &msg); + + if ((stream = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE))) { + if ((other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + switch_ivr_broadcast(other_uuid, stream, SMF_ECHO_ALEG | SMF_LOOP); + } + } + + return SWITCH_STATUS_SUCCESS; } @@ -710,6 +720,8 @@ { switch_core_session_message_t msg = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); + const char *other_uuid; + switch_core_session_t *b_session; msg.message_id = SWITCH_MESSAGE_INDICATE_UNHOLD; msg.from = __FILE__; @@ -719,6 +731,15 @@ switch_core_session_receive_message(session, &msg); + + if ((other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (b_session = switch_core_session_locate(other_uuid))) { + switch_channel_t *b_channel = switch_core_session_get_channel(b_session); + switch_channel_stop_broadcast(b_channel); + switch_channel_wait_for_flag(b_channel, CF_BROADCAST, SWITCH_FALSE, 5000); + switch_core_session_rwunlock(b_session); + } + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7850 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Mar '08

10 Mar '08

Author: anthm Date: Mon Mar 10 12:13:12 2008 New Revision: 7850 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 Mar 10 12:13:12 2008 @@ -223,13 +223,6 @@ switch_call_cause_t cause = switch_channel_get_cause(channel); int sip_cause = hangup_cause_to_sip(cause); - if (tech_pvt->profile->rtpip) { - if (tech_pvt->local_sdp_audio_port) { - switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); - } else if (tech_pvt->local_sdp_video_port) { - switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); - } - } if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { const char *buuid; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon Mar 10 12:13:12 2008 @@ -223,7 +223,9 @@ } if (switch_test_flag(tech_pvt, TFLAG_VIDEO)) { - sofia_glue_tech_choose_video_port(tech_pvt); + if (!tech_pvt->local_sdp_video_port) { + sofia_glue_tech_choose_video_port(tech_pvt); + } if ((v_port = tech_pvt->adv_sdp_video_port)) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=video %d RTP/AVP", v_port); @@ -523,7 +525,7 @@ char *ip = tech_pvt->profile->rtpip; switch_port_t sdp_port; char tmp[50]; - + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) || tech_pvt->adv_sdp_video_port) { return SWITCH_STATUS_SUCCESS; } @@ -1174,10 +1176,14 @@ if (tech_pvt->rtp_session) { switch_rtp_destroy(&tech_pvt->rtp_session); + } else if (tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } if (tech_pvt->video_rtp_session) { switch_rtp_destroy(&tech_pvt->video_rtp_session); + } else if (tech_pvt->local_sdp_video_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); } }

1 0

[commit] r7849 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 09 Mar '08

09 Mar '08

Author: brian Date: Sun Mar 9 18:28:28 2008 New Revision: 7849 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: tweak Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Sun Mar 9 18:28:28 2008 @@ -178,7 +178,7 @@ <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> <prompt phrase="goodbye" filename="vm-goodbye.wav"/> <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> - <prompt phrase="choose a greeting between 1 and 3" filename="vm-choose_greeting.wav"/> + <prompt phrase="choose a greeting between 1 and 9" filename="vm-choose_greeting_choose.wav"/> <prompt phrase="invalid value" filename="vm-choose_greeting_fail.wav"/> <prompt phrase="too many failed attempts" filename="vm-abort.wav"/> <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/>

1 0

[commit] r7848 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: anthm Date: Sat Mar 8 16:37:17 2008 New Revision: 7848 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update 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 Sat Mar 8 16:37:17 2008 @@ -223,8 +223,12 @@ switch_call_cause_t cause = switch_channel_get_cause(channel); int sip_cause = hangup_cause_to_sip(cause); - if (tech_pvt->profile->rtpip && tech_pvt->local_sdp_audio_port) { - switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); + if (tech_pvt->profile->rtpip) { + if (tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); + } else if (tech_pvt->local_sdp_video_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); + } } if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Mar 8 16:37:17 2008 @@ -488,8 +488,9 @@ return SWITCH_STATUS_SUCCESS; } } - if (tech_pvt->adv_sdp_audio_port) { - switch_rtp_release_port(tech_pvt->adv_sdp_audio_ip, tech_pvt->adv_sdp_audio_port); + + if (tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } @@ -527,6 +528,10 @@ return SWITCH_STATUS_SUCCESS; } + if (tech_pvt->local_sdp_video_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_video_port); + } + if (!(tech_pvt->local_sdp_video_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP ports available!\n"); return SWITCH_STATUS_FALSE; @@ -1634,11 +1639,11 @@ sofia_glue_check_video_codecs(tech_pvt); - if (!tech_pvt->local_sdp_video_port) { - sofia_glue_tech_choose_video_port(tech_pvt); - } - if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { + if (!tech_pvt->local_sdp_video_port) { + sofia_glue_tech_choose_video_port(tech_pvt); + } + flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE); sofia_glue_tech_set_video_codec(tech_pvt, 0);

1 0

[commit] r7847 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Sat Mar 8 16:15:02 2008 New Revision: 7847 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: silly rabbit, leaks are for kids. Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Sat Mar 8 16:15:02 2008 @@ -176,6 +176,7 @@ curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); curl_easy_cleanup(curl_handle); curl_slist_free_all(headers); + curl_slist_free_all(slist); close(config_data.fd); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n");

1 0

[commit] r7846 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Sat Mar 8 16:08:00 2008 New Revision: 7846 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: silly rabbit, leaks are for kids. 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 Sat Mar 8 16:08:00 2008 @@ -73,6 +73,8 @@ uint32_t cur_try; long httpRes; CURL *curl_handle = NULL; + struct curl_slist *headers = NULL; + struct curl_slist *slist = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; @@ -121,8 +123,6 @@ /* try to post it to the web server */ if (!switch_strlen_zero(globals.url)) { - struct curl_slist *headers = NULL; - struct curl_slist *slist = NULL; curl_handle = curl_easy_init(); if (globals.encode) { @@ -189,6 +189,9 @@ } curl_easy_cleanup(curl_handle); curl_slist_free_all(headers); + curl_slist_free_all(slist); + slist = NULL; + headers = NULL; curl_handle = NULL; /* if we are here the web post failed for some reason */ @@ -222,6 +225,12 @@ if (curl_handle) { curl_easy_cleanup(curl_handle); } + if (headers) { + curl_slist_free_all(headers); + } + if (slist) { + curl_slist_free_all(slist); + } switch_safe_free(curl_xml_text); switch_safe_free(xml_text); switch_safe_free(path);

1 0