January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7064 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Wed Jan 2 13:20:28 2008 New Revision: 7064 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Log: make echo work from event socket (MODEVENT-10) 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 Wed Jan 2 13:20:28 2008 @@ -1018,13 +1018,6 @@ SWITCH_STANDARD_APP(echo_function) { - switch_channel_t *channel; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - switch_channel_pre_answer(channel); - switch_ivr_session_echo(session); } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jan 2 13:20:28 2008 @@ -68,7 +68,6 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; - switch_channel_pre_answer(channel); @@ -80,7 +79,7 @@ switch_thread_create(&thread, thd_attr, echo_video_thread, &eh, switch_core_session_get_pool(session)); } - while(switch_channel_ready(channel) && switch_channel_get_state(channel) == CS_LOOPBACK) { + while(switch_channel_ready(channel)) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { break;

1 0

[commit] r7063 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Wed Jan 2 13:16:32 2008 New Revision: 7063 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: make echo work from event socket (MODEVENT-10) 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 Wed Jan 2 13:16:32 2008 @@ -1023,9 +1023,9 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_channel_answer(channel); + switch_channel_pre_answer(channel); - switch_channel_set_state(channel, CS_LOOPBACK); + switch_ivr_session_echo(session); } SWITCH_STANDARD_APP(park_function)

1 0

[commit] r7062 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: brian Date: Wed Jan 2 12:06:47 2008 New Revision: 7062 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: remove my testing vars commited by accident Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Jan 2 12:06:47 2008 @@ -2381,14 +2381,6 @@ switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); } - if (!switch_strlen_zero(sip->sip_to->a_tag)) { - switch_channel_set_variable(channel, "sip_to_tag", sip->sip_to->a_tag); - } - - if (!switch_strlen_zero(sip->sip_from->a_tag)) { - switch_channel_set_variable(channel, "sip_from_tag", sip->sip_from->a_tag); - } - if (sip->sip_subject && sip->sip_subject->g_string) { switch_channel_set_variable(channel, "sip_subject", sip->sip_subject->g_string); }

1 0

[commit] r7061 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: brian Date: Wed Jan 2 12:06:07 2008 New Revision: 7061 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: MODENDP-65 sip info frag to update display after attended transfer Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Jan 2 12:06:07 2008 @@ -50,6 +50,8 @@ extern su_log_t stun_log[]; +static void sofia_info_send_sipfrag(switch_core_session_t *aleg, switch_core_session_t *bleg); + static void sofia_handle_sip_i_state(switch_core_session_t *session, int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]); @@ -1803,6 +1805,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Attended Transfer [%s][%s]\n", switch_str_nil(br_a), switch_str_nil(br_b)); if (br_a && br_b) { + switch_core_session_t *new_b_session = NULL, *a_session = NULL; + switch_ivr_uuid_bridge(br_b, br_a); switch_channel_set_variable(channel_b, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), @@ -1810,6 +1814,15 @@ switch_clear_flag_locked(b_tech_pvt, TFLAG_SIP_HOLD); switch_ivr_park_session(b_session); + new_b_session = switch_core_session_locate(br_b); + a_session = switch_core_session_locate(br_a); + sofia_info_send_sipfrag(a_session, new_b_session); + if(new_b_session) { + switch_core_session_rwunlock(new_b_session); + } + if(a_session) { + switch_core_session_rwunlock(a_session); + } //switch_channel_hangup(channel_b, SWITCH_CAUSE_ATTENDED_TRANSFER); } else { if (!br_a && !br_b) { @@ -2368,6 +2381,14 @@ switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); } + if (!switch_strlen_zero(sip->sip_to->a_tag)) { + switch_channel_set_variable(channel, "sip_to_tag", sip->sip_to->a_tag); + } + + if (!switch_strlen_zero(sip->sip_from->a_tag)) { + switch_channel_set_variable(channel, "sip_from_tag", sip->sip_from->a_tag); + } + if (sip->sip_subject && sip->sip_subject->g_string) { switch_channel_set_variable(channel, "sip_subject", sip->sip_subject->g_string); } @@ -2604,3 +2625,25 @@ TAG_END()); nua_handle_destroy(nh); } + +static void sofia_info_send_sipfrag(switch_core_session_t *aleg, switch_core_session_t *bleg) +{ + private_object_t *b_tech_pvt = NULL, *a_tech_pvt = NULL; + char message[256] = ""; + + if (aleg && bleg) { + a_tech_pvt = (private_object_t *) switch_core_session_get_private(aleg); + b_tech_pvt = (private_object_t *) switch_core_session_get_private(bleg); + + if (b_tech_pvt && a_tech_pvt && a_tech_pvt->caller_profile) { + switch_caller_profile_t *acp = a_tech_pvt->caller_profile; + + if(switch_strlen_zero(acp->caller_id_name)) { + snprintf(message, sizeof(message), "From:\r\nTo: %s\r\n", acp->caller_id_number); + } else { + snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", acp->caller_id_name, acp->caller_id_number); + } + nua_info(b_tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + } + } +}

1 0

[commit] r7060 - freeswitch/trunk/src
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Wed Jan 2 10:59:00 2008 New Revision: 7060 Modified: freeswitch/trunk/src/switch_core_sqldb.c Log: fix show calls (FSCORE-81) Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Wed Jan 2 10:59:00 2008 @@ -309,10 +309,10 @@ switch_event_get_header(event, "caller-destination-number"), switch_event_get_header(event, "caller-channel-name"), switch_event_get_header(event, "caller-unique-id"), - switch_event_get_header(event, "originatee-caller-id-name"), - switch_event_get_header(event, "originatee-caller-id-number"), - switch_event_get_header(event, "originatee-destination-number"), - switch_event_get_header(event, "originatee-channel-name"), switch_event_get_header(event, "originatee-unique-id") + switch_event_get_header(event, "Other-Leg-caller-id-name"), + switch_event_get_header(event, "Other-Leg-caller-id-number"), + switch_event_get_header(event, "Other-Leg-destination-number"), + switch_event_get_header(event, "Other-Leg-channel-name"), switch_event_get_header(event, "Other-Leg-unique-id") ); break; case SWITCH_EVENT_CHANNEL_UNBRIDGE:

1 0

[commit] r7059 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Wed Jan 2 02:00:24 2008 New Revision: 7059 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Log: initialize Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Wed Jan 2 02:00:24 2008 @@ -210,7 +210,7 @@ unsigned char *fdata[1024]; switch_frame_t *read_frame; int stream_id; - switch_core_thread_session_t thread_session; + switch_core_thread_session_t thread_session = { 0 }; switch_channel_t *channel; if (argc > 1) {

1 0

[commit] r7058 - freeswitch/trunk/src/include
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: mikej Date: Wed Jan 2 02:00:07 2008 New Revision: 7058 Modified: freeswitch/trunk/src/include/switch_core.h Log: correct param requirements Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Jan 2 02:00:07 2008 @@ -716,7 +716,7 @@ \paeam flags flags to use \return the cause code of the attempted call */ -SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(_In_ switch_core_session_t *session, +SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(_In_opt_ switch_core_session_t *session, _In_z_ const char *endpoint_name, _In_ switch_caller_profile_t *caller_profile, _Inout_ switch_core_session_t **new_session,

1 0

[commit] r7057 - freeswitch/trunk/conf
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: brian Date: Tue Jan 1 23:52:00 2008 New Revision: 7057 Added: freeswitch/trunk/conf/fur_elise.ttml Log: being a bit creative Added: freeswitch/trunk/conf/fur_elise.ttml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/fur_elise.ttml Tue Jan 1 23:52:00 2008 @@ -0,0 +1,83 @@ +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 494) +%(167, 0, 554) +%(167, 0, 523) +%(333, 0, 440) +%(167, 0, 0) +%(167, 0, 262) +%(167, 0, 330) +%(167, 0, 440) +%(333, 0, 494) +%(167, 0, 0) +%(167, 0, 330) +%(167, 0, 415) +%(167, 0, 494) +%(333, 0, 523) +%(167, 0, 0) +%(167, 0, 330) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 494) +%(167, 0, 554) +%(167, 0, 523) +%(333, 0, 440) +%(167, 0, 0) +%(167, 0, 262) +%(167, 0, 330) +%(167, 0, 440) +%(333, 0, 494) +%(167, 0, 0) +%(167, 0, 330) +%(167, 0, 523) +%(167, 0, 494) +%(167, 0, 440) +%(167, 0, 0) +%(167, 0, 494) +%(167, 0, 523) +%(167, 0, 587) +%(333, 0, 659) +%(167, 0, 0) +%(167, 0, 392) +%(167, 0, 698) +%(167, 0, 784) +%(333, 0, 587) +%(167, 0, 0) +%(167, 0, 349) +%(167, 0, 659) +%(167, 0, 587) +%(333, 0, 523) +%(167, 0, 0) +%(167, 0, 330) +%(167, 0, 587) +%(167, 0, 523) +%(333, 0, 494) +%(167, 0, 0) +%(167, 0, 330) +%(167, 0, 659) +%(167, 0, 330) +%(167, 0, 659) +%(167, 0, 659) +%(167, 0, 1319) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 622) +%(167, 0, 659) +%(167, 0, 494) +%(167, 0, 554) +%(167, 0, 523) +%(333, 0, 440)

1 0

[commit] r7056 - in freeswitch/trunk/conf: . dialplan
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: brian Date: Tue Jan 1 23:30:30 2008 New Revision: 7056 Added: freeswitch/trunk/conf/tetris.ttml Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tone stream example Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 1 23:30:30 2008 @@ -209,6 +209,13 @@ </condition> </extension> + <extension name="tone_stream"> + <condition field="destination_number" expression="^9998$"> + <action application="answer"/> + <action application="playback" data="tone_stream://path=${base_dir}/conf/tetris.ttml;loops=10"/> + </condition> + </extension> + <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/> Added: freeswitch/trunk/conf/tetris.ttml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/tetris.ttml Tue Jan 1 23:30:30 2008 @@ -0,0 +1,69 @@ +%(428,0,659,494) +%(214,0,494,415) +%(214,0,523,440) +%(214,0,587,494) +%(107,0,659,494) +%(107,0,587,494) +%(214,0,523,440) +%(214,0,494,415) +%(428,0,330,440) +%(214,0,330,440) +%(214,0,523,440) +%(428,0,659,523) +%(214,0,587,494) +%(214,0,523,440) +%(214,0,494,415) +%(214,0,494,440) +%(214,0,494,415) +%(214,0,523,440) +%(428,0,587,494) +%(428,0,659,523) +%(428,0,523,440) +%(428,0,330,440) +%(857,0,330,440) +%(214,0,0,0) +%(428,0,587,349) +%(214,0,698,440) +%(214,0,880,523) +%(107,0,880,523) +%(107,0,880,523) +%(214,0,784,494) +%(214,0,698,440) +%(642,0,659,392) +%(214,0,523,330) +%(214,0,659,392) +%(107,0,659,440) +%(107,0,659,392) +%(214,0,587,349) +%(214,0,523,330) +%(214,0,494,415) +%(214,0,494,330) +%(214,0,494,415) +%(214,0,523,440) +%(214,0,587,494) +%(214,0,587,415) +%(214,0,659,523) +%(214,0,659,415) +%(214,0,523,440) +%(214,0,523,330) +%(428,0,440,330) +%(428,0,440,330) +%(428,0,0,0) +%(857,0,330,262) +%(857,0,262,220) +%(857,0,294,247) +%(857,0,247,208) +%(857,0,262,220) +%(857,0,220,165) +%(857,0,208,165) +%(428,0,247,208) +%(428,0,0,0) +%(857,0,330,262) +%(857,0,262,220) +%(857,0,294,247) +%(857,0,208,165) +%(428,0,262,220) +%(428,0,330,262) +%(857,0,440,330) +%(857,0,415,294) +%(857,0,0,0)

1 0

[commit] r7055 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 02 Jan '08

02 Jan '08

Author: brian Date: Tue Jan 1 23:04:25 2008 New Revision: 7055 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: more fun stuff tested and working Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 1 23:04:25 2008 @@ -164,8 +164,7 @@ <action application="ivr" data="demo"/> </condition> </extension> - - +  @@ -178,36 +177,38 @@  - <extension name="park"> + <extension name="unpark"> <condition field="destination_number" expression="^5901$"> - <action application="fifo" data="5900@$${domain} out undef"/> + <action application="fifo" data="5900@$${domain} out nowait"/> </condition> </extension>  -  <extension name="unpark"> <condition field="source" expression="mod_sofia" continue="on-true"/> <condition field="destination_number" expression="^parking$" continue="on-true"/> <condition field="${sip_to_params}" expression="fifo\=(\d+)"> <action application="answer"/> - <action application="gentones" data="%(1000, 0, 320)"/> - <action application="fifo" data="$1(a)10.0.1.250 out nowait"/> - <action application="hangup"/> + <action application="fifo" data="$1@$${domain} out undef"/> </condition> </extension> - --> + <extension name="hold_music"> <condition field="destination_number" expression="^9999$"> <action application="answer"/>

1 0