- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7947 - freeswitch/trunk/build
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: brian Date: Thu Mar 20 09:42:42 2008 New Revision: 7947 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: tweak, Thanks you Andrew Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Thu Mar 20 09:42:42 2008 @@ -94,7 +94,7 @@ [ -f $PID_FILE ] && restart || : ;; *) - echo "Usage: $PROG_NAME {start|stop|status|reload|restart" + echo "Usage: $PROG_NAME {start|stop|status|reload|restart}" exit 1 ;; esac

1 0

[commit] r7944 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 23:36:30 2008 New Revision: 7944 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: return mistakenly removed code. 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 Wed Mar 19 23:36:30 2008 @@ -285,6 +285,7 @@ char *service = NULL; char *regex = NULL; char *replace = NULL; + char *ptr; int argc = 0; char *argv[4] = { 0 }; int n; @@ -333,6 +334,12 @@ goto xperr; } + for (ptr = replace; ptr && *ptr; ptr++) { + if (*ptr == '\\') { + *ptr = '$'; + } + } + if (flags && service && regex && replace) { switch_regex_t *re = NULL; int proceed = 0, ovector[30];

1 0

[commit] r7943 - freeswitch/trunk/src
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 22:05:34 2008 New Revision: 7943 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_time.c Log: fix shutdown race destroying memory pools. Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Mar 19 22:05:34 2008 @@ -1049,6 +1049,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); switch_core_session_hupall(SWITCH_CAUSE_SYSTEM_SHUTDOWN); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); + switch_core_memory_stop(); switch_loadable_module_shutdown(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); @@ -1061,7 +1062,6 @@ switch_rtp_shutdown(); switch_xml_destroy(); - switch_core_memory_stop(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n"); switch_log_shutdown(); Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Wed Mar 19 22:05:34 2008 @@ -312,16 +312,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_destroy_memory_pool(switch_memory_pool_t **pool, const char *file, const char *func, int line) { - //char tmp[128] = ""; - - switch_assert(pool != NULL); #ifdef DEBUG_ALLOC2 switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Free Pool\n"); #endif - if (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS) { + if ((memory_manager.pool_thread_running != 1) || (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS)) { apr_pool_destroy(*pool); } *pool = NULL; Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Wed Mar 19 22:05:34 2008 @@ -421,7 +421,6 @@ switch_yield(10000); } } - switch_core_destroy_memory_pool(&module_pool); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7942 - in freeswitch/trunk/src/mod: applications/mod_fsv languages/mod_spidermonkey_curl
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 20:47:30 2008 New Revision: 7942 Modified: freeswitch/trunk/src/mod/applications/mod_fsv/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/ (props changed) Log: svn:ignore

1 0

[commit] r7941 - freeswitch/trunk/conf
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: brian Date: Wed Mar 19 20:44:35 2008 New Revision: 7941 Modified: freeswitch/trunk/conf/vars.xml Log: tweak this Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Mar 19 20:44:35 2008 @@ -55,7 +55,7 @@ H264 - H.264 Video --> - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM,H263"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>

1 0

[commit] r7940 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: anthm Date: Wed Mar 19 20:32:28 2008 New Revision: 7940 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: signal_lock sux on gtalk 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 Wed Mar 19 20:32:28 2008 @@ -2538,8 +2538,6 @@ if ((session = ldl_session_get_private(dlsession))) { - - switch_core_session_signal_lock(session); tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); @@ -2561,7 +2559,6 @@ } if ((session = switch_core_session_request(dingaling_endpoint_interface, NULL)) != 0) { switch_core_session_add_stream(session, NULL); - switch_core_session_signal_lock(session); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { char *exten; @@ -2946,11 +2943,9 @@ break; } + done: - if (session) { - switch_core_session_signal_unlock(session); - } return status; }

1 0

[commit] r7939 - in freeswitch/trunk/src/mod: applications/mod_fifo endpoints/mod_iax endpoints/mod_sofia
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 20:27:04 2008 New Revision: 7939 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: build tweaks. 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 Wed Mar 19 20:27:04 2008 @@ -326,7 +326,7 @@ return; } else if (!strcasecmp(argv[1], "out")) { - void *pop; + void *pop = NULL; switch_frame_t *read_frame; switch_status_t status; char *uuid; 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 Wed Mar 19 20:27:04 2008 @@ -559,16 +559,14 @@ static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id) { - private_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); + assert(switch_core_session_get_private(session)); return SWITCH_STATUS_SUCCESS; } static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id) { - private_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); + assert(switch_core_session_get_private(session)); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Wed Mar 19 20:27:04 2008 @@ -105,6 +105,7 @@ /> <Tool Name="VCCLCompilerTool" + Optimization="0" AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip\win32";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf";"$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport"" PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" UsePrecompiledHeader="0" 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 Mar 19 20:27:04 2008 @@ -2288,11 +2288,9 @@ if (session) { /* Get the channel */ switch_channel_t *channel = switch_core_session_get_channel(session); - /* make sure we have our privates */ - struct private_object *tech_pvt = switch_core_session_get_private(session); - - /* Barf if we didn't get it */ - switch_assert(tech_pvt != NULL); + + /* Barf if we didn't get our private */ + assert(switch_core_session_get_private(session)); if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype && sip->sip_payload && sip->sip_payload->pl_data) {

1 0

[commit] r7938 - freeswitch/trunk/src
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 18:52:16 2008 New Revision: 7938 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: running out of bugs to fix Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Mar 19 18:52:16 2008 @@ -157,10 +157,15 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; switch_core_session_receive_message(session_a, &msg); switch_channel_clear_flag(chan_b, CF_SUSPEND); + switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); } - + if (!nosuspend && (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND))) { - switch_yield(10000); + status = switch_core_session_read_frame(session_a, &read_frame, -1, stream_id); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + goto end_of_bridge_loop; + } continue; }

1 0

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

19 Mar '08

Author: mikej Date: Wed Mar 19 17:43:13 2008 New Revision: 7937 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: allow hold timeout when regular rtp timeout is not set 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 Wed Mar 19 17:43:13 2008 @@ -1822,7 +1822,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_channel_presence(tech_pvt->channel, "unknown", "hold"); - if (tech_pvt->max_missed_packets) { + if (tech_pvt->max_missed_hold_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_hold_packets); }

1 0

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

19 Mar '08

Author: anthm Date: Wed Mar 19 15:02:26 2008 New Revision: 7936 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak 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 Wed Mar 19 15:02:26 2008 @@ -325,11 +325,11 @@ const char *ocodec = NULL; if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { - goto end; + return; } if (tech_pvt->num_codecs) { - goto end; + return; } switch_assert(tech_pvt->session != NULL); @@ -365,8 +365,8 @@ tech_pvt->num_codecs = switch_loadable_module_get_codecs(tech_pvt->codecs, sizeof(tech_pvt->codecs) / sizeof(tech_pvt->codecs[0])); } - end: - sofia_glue_check_video_codecs(tech_pvt); + + } void sofia_glue_check_video_codecs(private_object_t *tech_pvt) @@ -882,6 +882,7 @@ cid_name = caller_profile->caller_id_name; cid_num = caller_profile->caller_id_number; sofia_glue_tech_prepare_codecs(tech_pvt); + sofia_glue_check_video_codecs(tech_pvt); check_decode(cid_name, session); check_decode(cid_num, session); @@ -2156,6 +2157,7 @@ switch_channel_set_variable(tech_pvt->channel, "sip_video_fmtp", tech_pvt->video_rm_fmtp); switch_snprintf(tmp, sizeof(tmp), "%d", tech_pvt->video_agreed_pt); switch_channel_set_variable(tech_pvt->channel, "sip_video_pt", tmp); + sofia_glue_check_video_codecs(tech_pvt); break; } else { vmatch = 0;

1 0