- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9897 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: brian Date: Wed Oct 8 14:33:57 2008 New Revision: 9897 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: various examples of how to override the ringback on a call Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Oct 8 14:33:57 2008 @@ -413,6 +413,72 @@ </condition> </extension> +  + +  + <extension name="wait"> + <condition field="destination_number" expression="^wait$"> + <action application="pre_answer"/> + <action application="sleep" data="20000"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="playback" data="voicemail/vm-goodbye.wav"/> + <action application="hangup"/> + </condition> + </extension> + +  + <extension name="ringback_180"> + <condition field="destination_number" expression="^9980$"> + <action application="ring_ready"/> + <action application="sleep" data="20000"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="playback" data="voicemail/vm-goodbye.wav"/> + <action application="hangup"/> + </condition> + </extension> + +  + <extension name="ringback_183_uk_ring"> + <condition field="destination_number" expression="^9981$"> + <action application="set" data="ringback=$${uk-ring}"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_183_music_ring"> + <condition field="destination_number" expression="^9982$"> + <action application="set" data="ringback=$${hold_music}"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_post_answer_uk_ring"> + <condition field="destination_number" expression="^9983$"> + <action application="set" data="transfer_ringback=$${uk-ring}"/> + <action application="answer"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_post_answer_music"> + <condition field="destination_number" expression="^9984$"> + <action application="set" data="transfer_ringback=$${hold_music}"/> + <action application="answer"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + <extension name="show_info"> <condition field="destination_number" expression="^9992$"> <action application="answer"/>

1 0

[commit] r9896 - in freeswitch/trunk/src: . mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 14:15:00 2008 New Revision: 9896 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/switch_ivr_originate.c Log: allow endpoints to realize the originator is ignoring early media and use that feature in mod_loopback to avoid obscure situation Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 14:15:00 2008 @@ -51,7 +51,8 @@ TFLAG_WRITE = (1 << 2), TFLAG_CNG = (1 << 3), TFLAG_BRIDGE = (1 << 4), - TFLAG_BOWOUT = (1 << 5) + TFLAG_BOWOUT = (1 << 5), + TFLAG_NO_EARLY = (1 << 6) } TFLAGS; struct private_object { @@ -241,6 +242,11 @@ switch_set_flag_locked(b_tech_pvt, TFLAG_LINKED); switch_set_flag_locked(b_tech_pvt, TFLAG_OUTBOUND); + if (switch_test_flag(tech_pvt, TFLAG_NO_EARLY)) { + switch_set_flag_locked(b_tech_pvt, TFLAG_NO_EARLY); + switch_clear_flag_locked(tech_pvt, TFLAG_NO_EARLY); + } + switch_channel_set_flag(channel, CF_ACCEPT_CNG); switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); @@ -328,13 +334,17 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel)); switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); + if (tech_pvt->other_tech_pvt) { switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); + tech_pvt->other_tech_pvt = NULL; } if (tech_pvt->other_session) { switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); switch_core_session_rwunlock(tech_pvt->other_session); + tech_pvt->other_channel = NULL; + tech_pvt->other_session = NULL; } return SWITCH_STATUS_SUCCESS; @@ -467,6 +477,10 @@ if (!switch_test_flag(tech_pvt, TFLAG_LINKED)) { goto end; } + + if (switch_test_flag(tech_pvt, TFLAG_NO_EARLY)) { + switch_set_flag(tech_pvt, TFLAG_CNG); + } *frame = NULL; @@ -582,13 +596,18 @@ switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER: - if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - switch_channel_answer(tech_pvt->other_channel); + if (tech_pvt->other_channel) { + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + switch_channel_answer(tech_pvt->other_channel); + switch_clear_flag(tech_pvt, TFLAG_NO_EARLY); + } } break; case SWITCH_MESSAGE_INDICATE_PROGRESS: - if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - switch_channel_pre_answer(tech_pvt->other_channel); + if (tech_pvt->other_channel) { + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + switch_channel_pre_answer(tech_pvt->other_channel); + } } break; case SWITCH_MESSAGE_INDICATE_BRIDGE: @@ -623,12 +642,13 @@ private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; - + const char *var; + switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { channel = switch_core_session_get_channel(*new_session); - switch_snprintf(name, sizeof(name), "Loopback/%s-a", outbound_profile->destination_number); + switch_snprintf(name, sizeof(name), "loopback/%s-a", outbound_profile->destination_number); switch_channel_set_name(channel, name); if (tech_init(tech_pvt, *new_session, session ? switch_core_session_get_read_codec(session) : NULL) != SWITCH_STATUS_SUCCESS) { switch_core_session_destroy(new_session); @@ -640,6 +660,10 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } + if ((var = switch_event_get_header(var_event, "originate_early_media")) && !switch_true(var)) { + switch_set_flag(tech_pvt, TFLAG_NO_EARLY); + } + if (outbound_profile) { char *dialplan = NULL, *context = NULL; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 8 14:15:00 2008 @@ -685,6 +685,14 @@ } switch_channel_set_variable(caller_channel, "originate_disposition", "failure"); + + if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) || switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)) { + ringback_data = NULL; + } + } + + if (ringback_data) { + early_ok = 0; } if ((var = switch_event_get_header(var_event, "group_confirm_key"))) { @@ -957,6 +965,8 @@ myflags |= SOF_NO_EFFECTIVE_CID_NAME; } + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", early_ok ? "true" : "false"); + if ((reason = switch_core_session_outgoing_channel(session, var_event, chan_type, new_profile, &new_session, &pool,

1 0

[commit] r9895 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 14:12:11 2008 New Revision: 9895 Modified: freeswitch/trunk/src/switch_channel.c Log: s/Pre-Answer/Ring-Ready/ Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 8 14:12:11 2008 @@ -1458,7 +1458,7 @@ switch_event_t *event; if (!switch_channel_test_flag(channel, CF_RING_READY)) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_channel_set_flag(channel, CF_RING_READY); if (channel->caller_profile && channel->caller_profile->times) { switch_mutex_lock(channel->profile_mutex);

1 0

[commit] r9894 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 12:39:43 2008 New Revision: 9894 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: fix cng frame issue Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 12:39:43 2008 @@ -468,6 +468,8 @@ goto end; } + *frame = NULL; + while(switch_test_flag(tech_pvt, TFLAG_LINKED) && tech_pvt->other_tech_pvt && !switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { if (!switch_channel_ready(channel)) { goto end; @@ -478,17 +480,23 @@ switch_yield(1000); } - if (switch_test_flag(tech_pvt, TFLAG_CNG)) { - *frame = &tech_pvt->cng_frame; - switch_clear_flag_locked(tech_pvt, TFLAG_CNG); - } else if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { - *frame = &tech_pvt->other_tech_pvt->write_frame; - switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { + if (switch_test_flag(tech_pvt, TFLAG_CNG)) { + *frame = &tech_pvt->cng_frame; + tech_pvt->cng_frame.codec = &tech_pvt->read_codec; + switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); + switch_clear_flag_locked(tech_pvt, TFLAG_CNG); + } else if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { + *frame = &tech_pvt->other_tech_pvt->write_frame; + switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + } } - //printf("READ %s %d\n", switch_channel_get_name(channel), (*frame)->datalen); - status = SWITCH_STATUS_SUCCESS; - + if (*frame) { + status = SWITCH_STATUS_SUCCESS; + } else { + status = SWITCH_STATUS_FALSE; + } end:

1 0

[commit] r9893 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 12:04:39 2008 New Revision: 9893 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 12:04:39 2008 @@ -332,8 +332,10 @@ switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); } - switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); - switch_core_session_rwunlock(tech_pvt->other_session); + if (tech_pvt->other_session) { + switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); + switch_core_session_rwunlock(tech_pvt->other_session); + } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9892 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 10:53:31 2008 New Revision: 9892 Modified: freeswitch/trunk/src/switch_core.c Log: fix restart + -u issue FSCORE-199 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Oct 8 10:53:31 2008 @@ -564,6 +564,11 @@ runas_gid = gr->gr_gid; } + if (runas_uid && getuid() == runas_uid && (!runas_gid || runas_gid == getgid())) { + /* already running as the right user and group, nothing to do! */ + return 0; + } + if (runas_uid) { #ifdef HAVE_SETGROUPS /*

1 0

[commit] r9891 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 10:22:55 2008 New Revision: 9891 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c Log: tweak evnts Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 8 10:22:55 2008 @@ -1128,6 +1128,27 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", switch_str_nil(codec->implementation->iananame)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", codec->implementation->actual_samples_per_second); } + + /* Index Caller's Profile */ + if (caller_profile) { + switch_caller_profile_event_set_data(caller_profile, "Caller", event); + } + + if (originator_caller_profile && originatee_caller_profile) { + /* Index Originator's Profile */ + switch_caller_profile_event_set_data(originator_caller_profile, "Originator", event); + + /* Index Originatee's Profile */ + switch_caller_profile_event_set_data(originatee_caller_profile, "Originatee", event); + } else { + /* Index Originator's Profile */ + if (originator_caller_profile) { + switch_caller_profile_event_set_data(originator_caller_profile, "Other-Leg", event); + } else if (originatee_caller_profile) { /* Index Originatee's Profile */ + switch_caller_profile_event_set_data(originatee_caller_profile, "Other-Leg", event); + } + } + if (switch_test_flag(channel, CF_VERBOSE_EVENTS) || event->event_id == SWITCH_EVENT_CHANNEL_ORIGINATE || @@ -1137,28 +1158,10 @@ event->event_id == SWITCH_EVENT_CHANNEL_HANGUP || event->event_id == SWITCH_EVENT_REQUEST_PARAMS || event->event_id == SWITCH_EVENT_CHANNEL_DATA || + event->event_id == SWITCH_EVENT_SESSION_HEARTBEAT || event->event_id == SWITCH_EVENT_CUSTOM ) { - /* Index Caller's Profile */ - if (caller_profile) { - switch_caller_profile_event_set_data(caller_profile, "Caller", event); - } - - if (originator_caller_profile && originatee_caller_profile) { - /* Index Originator's Profile */ - switch_caller_profile_event_set_data(originator_caller_profile, "Originator", event); - - /* Index Originatee's Profile */ - switch_caller_profile_event_set_data(originatee_caller_profile, "Originatee", event); - } else { - /* Index Originator's Profile */ - if (originator_caller_profile) { - switch_caller_profile_event_set_data(originator_caller_profile, "Other-Leg", event); - } else if (originatee_caller_profile) { /* Index Originatee's Profile */ - switch_caller_profile_event_set_data(originatee_caller_profile, "Other-Leg", event); - } - } x = 0; /* Index Variables */ if (channel->variables) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Oct 8 10:22:55 2008 @@ -106,7 +106,6 @@ switch_status_t status; int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; - switch_event_header_t *hi; switch_assert(session != NULL); @@ -131,26 +130,6 @@ switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); switch_channel_event_set_data(session->channel, event); - if (!switch_channel_test_flag(session->channel, CF_VERBOSE_EVENTS)) { - if ((hi = switch_channel_variable_first(session->channel))) { - for (; hi; hi = hi->next) { - char buf[1024] = ""; - char *vvar = NULL, *vval = NULL; - - if (strncasecmp(hi->name, "hb_", 3)) { - continue; - } - - vvar = (char *) hi->name; - vval = (char *) hi->value; - - switch_assert(vvar && vval); - switch_snprintf(buf, sizeof(buf), "variable_%s", vvar); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, buf, vval); - } - switch_channel_variable_last(session->channel); - } - } switch_event_fire(&event); } else { session->read_frame_count--;

1 0

[commit] r9890 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Tue Oct 7 21:25:42 2008 New Revision: 9890 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak 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 Tue Oct 7 21:25:42 2008 @@ -232,7 +232,7 @@ switch_core_session_rwunlock(session); } } - printf("WTF [%s\n", input); + expanded = switch_event_expand_headers(event, input); stream->write_function(stream, "%s", expanded);

1 0

[commit] r9889 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Tue Oct 7 21:25:30 2008 New Revision: 9889 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_io.c Log: tweak 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 Tue Oct 7 21:25:30 2008 @@ -232,7 +232,7 @@ switch_core_session_rwunlock(session); } } - + printf("WTF [%s\n", input); expanded = switch_event_expand_headers(event, input); stream->write_function(stream, "%s", expanded); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 7 21:25:30 2008 @@ -126,7 +126,7 @@ if (session->read_codec && session->track_duration) { if (session->read_frame_count == 0) { switch_event_t *event; - session->read_frame_count = (session->read_codec->implementation->samples_per_second / + session->read_frame_count = (session->read_codec->implementation->actual_samples_per_second / session->read_codec->implementation->samples_per_frame) * session->track_duration; switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT);

1 0

[commit] r9888 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Oct '08

07 Oct '08

Author: anthm Date: Tue Oct 7 18:58:24 2008 New Revision: 9888 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: zigged where we should have zagged Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Oct 7 18:58:24 2008 @@ -1994,7 +1994,7 @@ } if (!auth) { - if (switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) { + if (!switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) { auth++; } else if (!thepass) { auth++;

1 0