April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13043 - in freeswitch/trunk/conf: autoload_configs lang/en/demo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 14:58:45 2009 New Revision: 13043 Log: Update sample IVR to include ClueCon reg option :) Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Wed Apr 15 14:58:45 2009 @@ -15,8 +15,9 @@ <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  <entry action="menu-exec-app" digits="3" param="transfer 9999 XML default"/>  - <entry action="menu-sub" digits="4" param="demo_ivr_submenu"/>  + <entry action="menu-exec-app" digits="4" param="bridge sofia/$${domain}/brian(a)bkw.org"/>  <entry action="menu-exec-app" digits="5" param="transfer 1234*256 enum"/>  + <entry action="menu-sub" digits="6" param="demo_ivr_submenu"/>  <entry action="menu-exec-app" digits="/^(10[01][0-9])$/" param="transfer $1 XML features"/> <entry action="menu-top" digits="9"/>  </menu> Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Wed Apr 15 14:58:45 2009 @@ -41,19 +41,22 @@ <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/3.wav"/> -  - <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> - <action function="play-file" data="ivr/ivr-please.wav"/> - <action function="play-file" data="voicemail/vm-press.wav"/> +  + <action function="play-file" data="ivr/ivr-register_for_cluecon.wav"/> <action function="play-file" data="digits/4.wav"/>  <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/> - <action function="play-file" data="ivr/ivr-please.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="play-file" data="digits/5.wav"/> +  + <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/> + <action function="play-file" data="ivr/ivr-please.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="play-file" data="digits/6.wav"/> +  <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/> <action function="play-file" data="ivr/ivr-please.wav"/>

1 0

[commit] r13042 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 14:36:33 2009 New Revision: 13042 Log: setting the moh_sound from a variable Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Apr 15 14:36:33 2009 @@ -4746,6 +4746,11 @@ switch_channel_set_variable(channel, "conference_name", conference->name); + /* Set MOH from variable if not set */ + if(switch_strlen_zero(conference->moh_sound)) { + conference->moh_sound = switch_core_strdup(conference->pool, switch_channel_get_variable(channel, "conference_moh_sound")); + } + /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 1;

1 0

[commit] r13041 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: mcollins Date: Wed Apr 15 13:48:33 2009 New Revision: 13041 Log: Update phrase_en.xml to include v1.0.8 sound prompts Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Wed Apr 15 13:48:33 2009 @@ -217,6 +217,7 @@ <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> <prompt phrase="to return the call now" filename="vm-return_call.wav"/> <prompt phrase="urgent" filename="vm-urgent.wav"/> + <prompt phrase="That mailbox is full. Please try your call again later." filename="vm-mailbox_full.wav"/> </voicemail> <conference> <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/> @@ -281,6 +282,21 @@ <prompt phrase="Customer service" filename="ivr-customer_service.wav"/> <prompt phrase="Technical support" filename="ivr-technical_support.wav"/> <prompt phrase="Operator" filename="ivr-operator.wav"/> + <prompt phrase="You have dialed an invalid extension." filename="ivr-you_have_dialed_an_invalid_extension.wav"/> + <prompt phrase="Please enter your extension, followed by the pound sign." filename="ivr-please_enter_extension_followed_by_pound.wav"/> + <prompt phrase="Please enter your pin number, followed by the pound sign." filename="ivr-please_enter_pin_followed_by_pound.wav"/> + <prompt phrase="Your pin number or extension is invalid." filename="ivr-pin_or_extension_is-invalid.wav"/> + <prompt phrase="You are about to provision this phone to your account..." filename="ivr-you_are_about_to_provision_this_phone.wav"/> + <prompt phrase="Please re-enter your pin number to confirm." filename="ivr-please_reenter_your_pin.wav"/> + <prompt phrase="To register for ClueCon, please press..." filename="ivr-register_for_cluecon.wav"/> + <prompt phrase="to log in" filename="ivr-to_log_in.wav"/> + <prompt phrase="to log out" filename="ivr-to_log_out.wav"/> + <prompt phrase="You are now logged in" filename="ivr-you_are_now_logged_in.wav"/> + <prompt phrase="You are now logged out" filename="ivr-you_are_now_logged_out.wav"/> + <prompt phrase="Please try again." filename="ivr-please_try_again.wav"/> + <prompt phrase="You are about to provision this phone permanently to your extension." filename="ivr-provision_phone_permanently_to_extension.wav"/> + <prompt phrase="Please enter the extension number to which you would like to provision this phone, followed by the pound sign." filename="ivr-extension_to_provision_this_phone.wav"/> + <prompt phrase="Thank you, this phone will now reboot." filename="ivr-this_phone_will_now_reboot.wav"/> </ivr> <misc> <prompt phrase="This call has been secured" filename="call_secured.wav"/> @@ -292,6 +308,8 @@ <prompt phrase="Transfer" filename="transfer2.wav"/> <prompt phrase="We are trying to reach" filename="we_are_trying_to_reach.wav"/> <prompt phrase="An error has occurred please contact the administrator" filename="error.wav"/> + <prompt phrase="Your call will be terminated in..." filename="misc-your_call_will_be_terminated_in.wav"/> + <prompt phrase="Your call has been terminated." filename="misc-your_call_has_been_terminated.wav"/> </misc> </en> </language>

1 0

[commit] r13040 - freeswitch/trunk/build
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 13:42:08 2009 New Revision: 13040 Log: bump sounds version Modified: freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Wed Apr 15 13:42:08 2009 @@ -1 +1 @@ -1.0.7 +1.0.8

1 0

[commit] r13038 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 12:55:30 2009 New Revision: 13038 Log: MODAPP-189 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c 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 Apr 15 12:55:30 2009 @@ -184,6 +184,8 @@ time_t orbit_timeout; int do_orbit; char *orbit_exten; + char *orbit_dialplan; + char *orbit_context; }; typedef struct fifo_chime_data fifo_chime_data_t; @@ -794,16 +796,19 @@ fifo_chime_data_t cd = { {0} }; const char *chime_list = switch_channel_get_variable(channel, "fifo_chime_list"); const char *chime_freq = switch_channel_get_variable(channel, "fifo_chime_freq"); - const char *orbit_var = switch_channel_get_variable(channel, "fifo_orbit_exten"); + const char *orbit_exten = switch_channel_get_variable(channel, "fifo_orbit_exten"); + const char *orbit_dialplan = switch_channel_get_variable(channel, "fifo_orbit_dialplan"); + const char *orbit_context = switch_channel_get_variable(channel, "fifo_orbit_context"); + const char *orbit_ann = switch_channel_get_variable(channel, "fifo_orbit_announce"); const char *caller_exit_key = switch_channel_get_variable(channel, "fifo_caller_exit_key"); int freq = 30; int ftmp = 0; int to = 60; - if (orbit_var) { + if (orbit_exten) { char *ot; - if ((cd.orbit_exten = switch_core_session_strdup(session, orbit_var))) { + if ((cd.orbit_exten = switch_core_session_strdup(session, orbit_exten))) { if ((ot = strchr(cd.orbit_exten, ':'))) { *ot++ = '\0'; if ((to = atoi(ot)) < 0) { @@ -812,6 +817,8 @@ } cd.orbit_timeout = switch_epoch_time_now(NULL) + to; } + cd.orbit_dialplan = switch_core_session_strdup(session, orbit_dialplan); + cd.orbit_context = switch_core_session_strdup(session, orbit_context); } if (chime_freq) { @@ -969,7 +976,7 @@ if (orbit_ann) { switch_ivr_play_file(session, NULL, orbit_ann, NULL); } - switch_ivr_session_transfer(session, cd.orbit_exten, NULL, NULL); + switch_ivr_session_transfer(session, cd.orbit_exten, cd.orbit_dialplan, cd.orbit_context); } goto done;

1 0

[commit] r13037 - freeswitch/trunk/build
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: brian Date: Wed Apr 15 12:05:36 2009 New Revision: 13037 Log: add mod_say_ru to modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed Apr 15 12:05:36 2009 @@ -77,4 +77,5 @@ #say/mod_say_fr #say/mod_say_it #say/mod_say_nl +#say/mod_say_ru #say/mod_say_zh

1 0

[commit] r13036 - freeswitch/trunk/src/mod/applications/mod_spy
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: anthm Date: Wed Apr 15 11:55:18 2009 New Revision: 13036 Log: MODAPP-260 Added: freeswitch/trunk/src/mod/applications/mod_spy/ freeswitch/trunk/src/mod/applications/mod_spy/Makefile freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c Added: freeswitch/trunk/src/mod/applications/mod_spy/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_spy/Makefile Wed Apr 15 11:55:18 2009 @@ -0,0 +1,2 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules Added: freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_spy/mod_spy.c Wed Apr 15 11:55:18 2009 @@ -0,0 +1,288 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005-2009, Anthony Minessale II <anthm(a)freeswitch.org> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Csaba Zelei <csaba.zelei(a)eworldcom.net> + * + * Thanks for eWorld Com Ltd. for funding the module. + * + * mod_spy.c -- UserSpy Module + * + */ + +#include <switch.h> + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spy_shutdown); +SWITCH_MODULE_LOAD_FUNCTION(mod_spy_load); + +SWITCH_MODULE_DEFINITION(mod_spy, mod_spy_load, mod_spy_shutdown, NULL); + +struct mod_spy_globals { + switch_memory_pool_t* pool; + switch_event_node_t* node; + switch_hash_t* spy_hash; + switch_thread_rwlock_t* spy_hash_lock; + uint32_t spy_count; +} globals; + +static switch_status_t spy_on_hangup(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + + char* data = switch_channel_get_private(channel,"_userspy_"); + switch_thread_rwlock_wrlock(globals.spy_hash_lock); + + if ((switch_core_hash_delete(globals.spy_hash,data) != SWITCH_STATUS_SUCCESS)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"No such key in userspy: %s \n",data); + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"Userspy deactivated on %s\n",data); + globals.spy_count--; + } + + switch_thread_rwlock_unlock(globals.spy_hash_lock); + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t spy_on_exchange_media(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + const char* spy_uuid = switch_channel_get_variable(channel,"spy_uuid"); + + if (spy_uuid) { + if (switch_ivr_eavesdrop_session(session,spy_uuid,NULL,ED_DTMF) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Can't eavesdrop on uuid %s\n",spy_uuid); + } + } + + switch_channel_set_state(channel,CS_PARK); + return SWITCH_STATUS_FALSE; +} + +static switch_status_t spy_on_park(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *moh = switch_channel_get_variable(channel, "hold_music"); + + while(switch_channel_ready(channel) && switch_channel_get_state(channel) == CS_PARK) { + if (moh) { + switch_status_t status = switch_ivr_play_file(session, NULL, moh, NULL); + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + } + } + return SWITCH_STATUS_FALSE; +} + + +static const switch_state_handler_table_t spy_state_handlers = { + /*.on_init */ NULL, + /*.on_routing */ NULL, + /*.on_execute */ NULL, + /*.on_hangup */ spy_on_hangup, + /*.on_exchange_media */ spy_on_exchange_media, + /*.on_soft_execute */ NULL, + /*.on_consume_media */ NULL, + /* on_hibernate */ NULL, + /* on reset */ NULL, + /* on_park */ spy_on_park, +}; + +SWITCH_STANDARD_API(dump_hash) +{ + switch_hash_index_t *hi; + const void* key; + void* val; + + switch_thread_rwlock_rdlock(globals.spy_hash_lock); + + for (hi = switch_hash_first(NULL,globals.spy_hash);hi; hi = switch_hash_next(hi)){ + switch_hash_this(hi,&key,NULL,&val); + stream->write_function(stream,"%s : %s\n",(char*)key,(const char*)val); + } + + stream->write_function(stream,"\n%d total spy\n",globals.spy_count); + switch_thread_rwlock_unlock(globals.spy_hash_lock); + return SWITCH_STATUS_SUCCESS; +} + +static void event_handler(switch_event_t* event) +{ + switch_core_session_t *session; + switch_channel_t *channel; + char *username[2] = {0}; + char* domain[2] = {0}; + char key[512]; + char* uuid = NULL, *my_uuid = NULL; + int i; + + switch_thread_rwlock_rdlock(globals.spy_hash_lock); + + if (!globals.spy_count) { + goto done; + } + + username[0] = switch_event_get_header(event,"Caller-Username"); + domain[0] = switch_event_get_header(event,"variable_domain_name"); + domain[1] = switch_event_get_header(event,"variable_dialed_domain"); + username[1] = switch_event_get_header(event,"variable_dialed_user"); + + for (i = 0; i < 2; i++) { + if (username[i] && domain[i]) { + switch_snprintf(key,sizeof(key),"%s@%s",username[i],domain[i]); + + if ((uuid = switch_core_hash_find(globals.spy_hash,key))) { + break; + } + } + } + + done: + switch_thread_rwlock_unlock(globals.spy_hash_lock); + + if (!uuid) { + return; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"UserSpy retrieved uuid %s for key %s, activating eavesdrop \n",uuid,key); + my_uuid = switch_event_get_header(event,"Unique-ID"); + + session = switch_core_session_locate(uuid); + channel = switch_core_session_get_channel(session); + + switch_channel_set_variable(channel,"spy_uuid",my_uuid); + + switch_channel_set_state(channel,CS_EXCHANGE_MEDIA); + switch_channel_set_flag(channel,CF_BREAK); + + switch_core_session_rwunlock(session); + +} + +#define USERSPY_SYNTAX "<user@domain> [uuid]" +SWITCH_STANDARD_APP(userspy_function) +{ + int argc = 0; + char* argv[2] = {0}; + char* params = NULL; + + if (!switch_strlen_zero(data) && (params = switch_core_session_strdup(session,data))) { + if ((argc = switch_separate_string(params, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { + + switch_channel_t *channel = switch_core_session_get_channel(session); + char* uuid = switch_core_session_get_uuid(session); + switch_status_t status; + + switch_thread_rwlock_wrlock(globals.spy_hash_lock); + if (switch_core_hash_find(globals.spy_hash,argv[0])) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Spy already exists for %s\n",argv[0]); + switch_channel_hangup(channel,SWITCH_CAUSE_NORMAL_CLEARING); + switch_thread_rwlock_unlock(globals.spy_hash_lock); + return; + } + + status = switch_core_hash_insert(globals.spy_hash,argv[0],(void*) uuid); + + if ((status != SWITCH_STATUS_SUCCESS)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Cant insert to spy hash\n"); + switch_channel_hangup(channel,SWITCH_CAUSE_SERVICE_NOT_IMPLEMENTED); + switch_thread_rwlock_unlock(globals.spy_hash_lock); + return; + } + + globals.spy_count++; + switch_thread_rwlock_unlock(globals.spy_hash_lock); + + switch_channel_set_private(channel,"_userspy_",(void*) argv[0]); + switch_channel_add_state_handler(channel,&spy_state_handlers); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"UserSpy activated on %s \n",argv[0]); + + if (argv[1]) { + switch_channel_set_variable(channel,"spy_uuid",argv[1]); + switch_channel_set_state(channel,CS_EXCHANGE_MEDIA); + return; + } + + switch_channel_set_state(channel,CS_PARK); + return; + } + return; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", USERSPY_SYNTAX); +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_spy_load) +{ + switch_application_interface_t *app_interface; + switch_api_interface_t *api_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + globals.pool = pool; + + switch_core_hash_init(&globals.spy_hash,pool); + switch_thread_rwlock_create(&globals.spy_hash_lock,pool); + globals.spy_count = 0; + + switch_event_bind_removable(modname, SWITCH_EVENT_CHANNEL_BRIDGE, NULL, event_handler, NULL, &globals.node); + + SWITCH_ADD_APP(app_interface,"userspy","Spy on a user constantly","Spy on a user constantly",userspy_function,USERSPY_SYNTAX,SAF_NONE); + SWITCH_ADD_API(api_interface,"userspy_show","Show current spies",dump_hash,"userspy_show"); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spy_shutdown) +{ + int sanity = 0; + + while (globals.spy_count) { + switch_cond_next(); + if (++sanity >= 60000) { + break; + } + } + + switch_event_unbind(&globals.node); + switch_core_hash_destroy(&globals.spy_hash); + switch_thread_rwlock_destroy(globals.spy_hash_lock); + + return SWITCH_STATUS_SUCCESS; +} + + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r13035 - in freeswitch/trunk: build conf/autoload_configs
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: anthm Date: Wed Apr 15 11:54:54 2009 New Revision: 13035 Log: MODAPP-260 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed Apr 15 11:54:54 2009 @@ -20,6 +20,7 @@ #applications/mod_snom #applications/mod_vmd #applications/mod_memcache +#applications/mod_spy #asr_tts/mod_flite #asr_tts/mod_pocketsphinx #asr_tts/mod_cepstral Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed Apr 15 11:54:54 2009 @@ -49,6 +49,7 @@ <load module="mod_limit"/> <load module="mod_esf"/> <load module="mod_fsv"/> +

1 0

[commit] r13034 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: anthm Date: Wed Apr 15 11:45:40 2009 New Revision: 13034 Log: prevent endless loop (just in case) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Apr 15 11:45:40 2009 @@ -1259,6 +1259,9 @@ */ while(!GetPatch()) { + if (!m_fsChannel || !switch_channel_up(m_fsChannel)) { + return SWITCH_STATUS_FALSE; + } switch_cond_next(); } if (CheckPatchAndLock()) {

1 0

[commit] r13033 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 15 Apr '09

15 Apr '09

Author: anthm Date: Wed Apr 15 11:08:42 2009 New Revision: 13033 Log: remove unused var from last patch Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Apr 15 11:08:42 2009 @@ -3728,7 +3728,7 @@ if ((a_session = switch_core_session_locate(br_a))) { const char *port = NULL; - char *param_string = "", *headers = ""; + char *param_string = ""; int count = 0, bytes = 0; if (refer_to && refer_to->r_url && refer_to->r_url->url_port) {

1 0