- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10332 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: mikej Date: Tue Nov 11 10:30:52 2008 New Revision: 10332 Log: disable new sleep on windows Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Nov 11 10:30:52 2008 @@ -408,8 +408,10 @@ switch_mutex_init(&TIMER_MATRIX[1].mutex, SWITCH_MUTEX_NESTED, module_pool); switch_thread_cond_create(&TIMER_MATRIX[1].cond, module_pool); +#ifndef WIN32 globals.use_cond_yield = globals.RUNNING == 1; - +#endif + while (globals.RUNNING == 1) { runtime.reference += STEP_MIC;

1 0

[commit] r10331 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: mikej Date: Tue Nov 11 10:29:35 2008 New Revision: 10331 Log: (MODENDP-148) Move "a=sendrecv" from session to media section of SDP Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Tue Nov 11 10:29:35 2008 @@ -91,10 +91,10 @@ "o=FreeSWITCH %010u %010u IN %s %s\n" "s=FreeSWITCH\n" "c=IN %s %s\n" "t=0 0\n" - "a=%s\n" - "m=audio %d RTP/%sAVP", tech_pvt->owner_id, tech_pvt->session_id, family, ip, family, ip, sr, port, - (!switch_strlen_zero(tech_pvt->local_crypto_key) && switch_test_flag(tech_pvt, TFLAG_SECURE)) ? "S" : ""); - + "m=audio %d RTP/%sAVP", + tech_pvt->owner_id, tech_pvt->session_id, family, ip, family, ip, port, + (!switch_strlen_zero(tech_pvt->local_crypto_key) + && switch_test_flag(tech_pvt,TFLAG_SECURE)) ? "S" : ""); if (tech_pvt->rm_encoding) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->pt); @@ -187,6 +187,9 @@ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); } + if (sr) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=%s\n", sr); + } if (!switch_strlen_zero(tech_pvt->local_crypto_key) && switch_test_flag(tech_pvt, TFLAG_SECURE)) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=crypto:%s\n", tech_pvt->local_crypto_key);

1 0

[commit] r10330 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 10:25:45 2008 New Revision: 10330 Log: fix err Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Nov 11 10:25:45 2008 @@ -1159,8 +1159,9 @@ switch_channel_pre_answer(channel); if ((buuid = switch_channel_get_variable(rchannel, SWITCH_SIGNAL_BOND_VARIABLE))) { - bsession = switch_core_session_locate(buuid); - bchannel = switch_core_session_get_channel(bsession); + if ((bsession = switch_core_session_locate(buuid))) { + bchannel = switch_core_session_get_channel(bsession); + } } if (!switch_channel_test_flag(rchannel, CF_ANSWERED)) {

1 0

[commit] r10329 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 10:03:09 2008 New Revision: 10329 Log: let b legs use park_after_bridge too Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Nov 11 10:03:09 2008 @@ -463,6 +463,10 @@ state = switch_channel_get_state(channel); + if (state < CS_HANGUP && switch_true(switch_channel_get_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) { + switch_ivr_park_session(session); + } + if (!switch_channel_test_flag(channel, CF_TRANSFER) && bd && !bd->clean_exit && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);

1 0

[commit] r10328 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 09:26:21 2008 New Revision: 10328 Log: allow calls to be stolen from originate Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Nov 11 09:26:21 2008 @@ -1638,16 +1638,21 @@ } for (i = 0; i < and_argc; i++) { + switch_channel_state_t state; + if (!peer_channels[i]) { continue; } + switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING); if (status == SWITCH_STATUS_SUCCESS) { if (bleg && *bleg && *bleg == peer_sessions[i]) { continue; } - } else if (switch_channel_get_state(switch_core_session_get_channel(peer_sessions[i])) < CS_HANGUP) { - switch_channel_hangup(switch_core_session_get_channel(peer_sessions[i]), *cause); + } else if ((state=switch_channel_get_state(peer_channels[i])) < CS_HANGUP) { + if (!(state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER))) { + switch_channel_hangup(peer_channels[i], *cause); + } } switch_core_session_rwunlock(peer_sessions[i]);

1 0

[commit] r10327 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: anthm Date: Tue Nov 11 08:32:11 2008 New Revision: 10327 Log: update Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Nov 11 08:32:11 2008 @@ -414,12 +414,15 @@ if (switch_test_flag(listener, LFLAG_ASYNC)) { launch_listener_thread(listener); switch_ivr_park(session, NULL); + return; } else { listener_run(NULL, (void *) listener); } - while (switch_test_flag(listener, LFLAG_SESSION)) { - switch_yield(100000); + if (switch_channel_get_state(channel) >= CS_HANGUP) { + while (switch_test_flag(listener, LFLAG_SESSION)) { + switch_yield(100000); + } } } @@ -1602,8 +1605,13 @@ switch_mutex_lock(globals.listener_mutex); prefs.threads++; switch_mutex_unlock(globals.listener_mutex); - + switch_assert(listener != NULL); + + if ((session = listener->session)) { + channel = switch_core_session_get_channel(session); + switch_core_session_read_lock(session); + } if (prefs.acl_count && listener->sa && !switch_strlen_zero(listener->remote_ip)) { uint32_t x = 0; @@ -1624,13 +1632,7 @@ } } } - - - if ((session = listener->session)) { - channel = switch_core_session_get_channel(session); - switch_core_session_read_lock(session); - } - + if (switch_strlen_zero(listener->remote_ip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open\n"); } else {

1 0

[commit] r10326 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: mikej Date: Tue Nov 11 07:27:31 2008 New Revision: 10326 Log: add switch_dso Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Tue Nov 11 07:27:31 2008 @@ -407,6 +407,10 @@ </FileConfiguration> </File> <File + RelativePath="..\..\src\switch_dso.c" + > + </File> + <File RelativePath="..\..\src\switch_event.c" > </File> @@ -553,11 +557,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File @@ -573,6 +577,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_dso.h" + > + </File> + <File RelativePath="..\..\src\include\switch_event.h" > </File>

1 0

[commit] r10325 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: mikej Date: Tue Nov 11 06:26:37 2008 New Revision: 10325 Log: update Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Nov 11 06:26:37 2008 @@ -162,7 +162,7 @@ { if (globals.use_cond_yield == 1) { - switch_cond_yield((t) / 1000); + switch_cond_yield((uint32_t)(t / 1000)); return; }

1 0

[commit] r10324 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 11 Nov '08

11 Nov '08

Author: brian Date: Tue Nov 11 04:32:28 2008 New Revision: 10324 Log: hrm Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Nov 11 04:32:28 2008 @@ -223,7 +223,7 @@ <anti-action application="db" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/> <anti-action application="db" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/> <anti-action application="set" data="called_party_callgroup=${user_data(${dialed_extension}@${domain_name} var callgroup)}"/> - <anti-action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/> +  <anti-action application="db" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_extension}@${domain_name}"/> <anti-action application="answer"/>

1 0

[commit] r10323 - freeswitch/trunk/src/include
by FreeSWITCH SVN 10 Nov '08

10 Nov '08

Author: brian Date: Mon Nov 10 17:58:30 2008 New Revision: 10323 Log: spelling Modified: freeswitch/trunk/src/include/g711.h Modified: freeswitch/trunk/src/include/g711.h ============================================================================== --- freeswitch/trunk/src/include/g711.h (original) +++ freeswitch/trunk/src/include/g711.h Mon Nov 10 17:58:30 2008 @@ -32,7 +32,7 @@ seem so bad :( Feel free to submit patches to add fast "find the first 1" support for your own -favourite processor. +favorite processor. Look up tables are used for transcoding between A-law and u-law, since it is difficult to achieve the precise transcoding procedure laid down in the G.711

1 0