May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8309 - freeswitch/trunk/debian
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 14:50:45 2008 New Revision: 8309 Modified: freeswitch/trunk/debian/rules Log: this is hardcoded now Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Thu May 8 14:50:45 2008 @@ -53,10 +53,7 @@ touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done - ./configure --prefix=/opt/freeswitch \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - CFLAGS="-D__VIA_HACK__" ${FEATURES} + ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} configure: bootstrap.sh AUTOCONF=${AUTOCONF} ./bootstrap.sh

1 0

[commit] r8308 - freeswitch/trunk/debian
by Freeswitch SVN 08 May '08

08 May '08

Author: mikej Date: Thu May 8 13:32:28 2008 New Revision: 8308 Modified: freeswitch/trunk/debian/freeswitch-lang-it.install Log: typo Modified: freeswitch/trunk/debian/freeswitch-lang-it.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-it.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-it.install Thu May 8 13:32:28 2008 @@ -1 +1 @@ -opt/iteeswitch/mod/mod_say_it.so* +opt/freeswitch/mod/mod_say_it.so*

1 0

[commit] r8307 - freeswitch/trunk/debian
by Freeswitch SVN 08 May '08

08 May '08

Author: brian Date: Thu May 8 13:03:54 2008 New Revision: 8307 Added: freeswitch/trunk/debian/freeswitch-lang-it.install Log: add missing Added: freeswitch/trunk/debian/freeswitch-lang-it.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-it.install Thu May 8 13:03:54 2008 @@ -0,0 +1 @@ +opt/iteeswitch/mod/mod_say_it.so*

1 0

[commit] r8306 - in freeswitch/trunk: debian scripts/lua scripts/perl
by Freeswitch SVN 08 May '08

08 May '08

Author: brian Date: Thu May 8 12:44:33 2008 New Revision: 8306 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/debian/files freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules freeswitch/trunk/scripts/lua/mwi_event.lua freeswitch/trunk/scripts/perl/mwi_event.pl Log: thanks CtRiX Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Thu May 8 12:44:33 2008 @@ -1,3 +1,9 @@ +freeswitch (1.0~8303) unstable; urgency=low + + * pacchetto + + -- root <root(a)fs.navynet.it> Tue, 6 May 2008 09:46:26 +0000 + freeswitch (1.0~rc4-1) unstable; urgency=low * Add tab completion in cli Add "inline" dialplan Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Thu May 8 12:44:33 2008 @@ -2,7 +2,7 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev, libssl-dev, ncurses-dev +Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb4.4-dev, libgnutls-dev Standards-Version: 3.7.2 Package: freeswitch @@ -64,3 +64,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: French language files for the FreeSWITCH open source telephony platform Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-it +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Italian language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ Modified: freeswitch/trunk/debian/files ============================================================================== --- freeswitch/trunk/debian/files (original) +++ freeswitch/trunk/debian/files Thu May 8 12:44:33 2008 @@ -1,9 +1,49 @@ -freeswitch_1.0~rc4-1_i386.deb net extra -freeswitch-spidermonkey_1.0~rc4-1_i386.deb net extra -freeswitch-dev_1.0~rc4-1_i386.deb net extra -freeswitch-codec-passthru-g7231_1.0~rc4-1_i386.deb net extra -freeswitch-codec-passthru-amr_1.0~rc4-1_i386.deb net extra -freeswitch-codec-passthru-g729_1.0~rc4-1_i386.deb net extra -freeswitch-lang-en_1.0~rc4-1_i386.deb net extra -freeswitch-lang-de_1.0~rc4-1_i386.deb net extra -freeswitch-lang-fr_1.0~rc4-1_i386.deb net extra +freeswitch_1.0~8283_i386.deb net extra +freeswitch-spidermonkey_1.0~8283_i386.deb net extra +freeswitch-dev_1.0~8283_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~8283_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~8283_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~8283_i386.deb net extra +freeswitch-lang-en_1.0~8283_i386.deb net extra +freeswitch-lang-de_1.0~8283_i386.deb net extra +freeswitch-lang-fr_1.0~8283_i386.deb net extra +freeswitch-lang-it_1.0~8283_i386.deb net extra +freeswitch_1.0~8289_i386.deb net extra +freeswitch-spidermonkey_1.0~8289_i386.deb net extra +freeswitch-dev_1.0~8289_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~8289_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~8289_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~8289_i386.deb net extra +freeswitch-lang-en_1.0~8289_i386.deb net extra +freeswitch-lang-de_1.0~8289_i386.deb net extra +freeswitch-lang-fr_1.0~8289_i386.deb net extra +freeswitch-lang-it_1.0~8289_i386.deb net extra +freeswitch_1.0~8289_i386.deb net extra +freeswitch-spidermonkey_1.0~8289_i386.deb net extra +freeswitch-dev_1.0~8289_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~8289_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~8289_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~8289_i386.deb net extra +freeswitch-lang-en_1.0~8289_i386.deb net extra +freeswitch-lang-de_1.0~8289_i386.deb net extra +freeswitch-lang-fr_1.0~8289_i386.deb net extra +freeswitch_1.0~8296_i386.deb net extra +freeswitch-spidermonkey_1.0~8296_i386.deb net extra +freeswitch-dev_1.0~8296_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~8296_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~8296_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~8296_i386.deb net extra +freeswitch-lang-en_1.0~8296_i386.deb net extra +freeswitch-lang-de_1.0~8296_i386.deb net extra +freeswitch-lang-fr_1.0~8296_i386.deb net extra +freeswitch-lang-it_1.0~8296_i386.deb net extra +freeswitch_1.0~8303_i386.deb net extra +freeswitch-spidermonkey_1.0~8303_i386.deb net extra +freeswitch-dev_1.0~8303_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~8303_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~8303_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~8303_i386.deb net extra +freeswitch-lang-en_1.0~8303_i386.deb net extra +freeswitch-lang-de_1.0~8303_i386.deb net extra +freeswitch-lang-fr_1.0~8303_i386.deb net extra +freeswitch-lang-it_1.0~8303_i386.deb net extra Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Thu May 8 12:44:33 2008 @@ -4,12 +4,12 @@ /opt/freeswitch/conf/mime.types /opt/freeswitch/conf/web-vm.tpl /opt/freeswitch/conf/tetris.ttml -/opt/freeswitch/conf/sip_profiles/outbound.xml +/opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml /opt/freeswitch/conf/sip_profiles/nat/example.xml -/opt/freeswitch/conf/sip_profiles/default/example.xml -/opt/freeswitch/conf/sip_profiles/default.xml -/opt/freeswitch/conf/sip_profiles/outbound/example.xml +/opt/freeswitch/conf/sip_profiles/internal/example.xml +/opt/freeswitch/conf/sip_profiles/internal.xml +/opt/freeswitch/conf/sip_profiles/external/example.xml /opt/freeswitch/conf/directory/default/1007.xml /opt/freeswitch/conf/directory/default/1001.xml /opt/freeswitch/conf/directory/default/1008.xml @@ -67,6 +67,7 @@ /opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml /opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml /opt/freeswitch/conf/autoload_configs/console.conf.xml +/opt/freeswitch/conf/autoload_configs/perl.conf.xml /opt/freeswitch/conf/jingle_profiles/server.xml /opt/freeswitch/conf/jingle_profiles/client.xml /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Thu May 8 12:44:33 2008 @@ -2,6 +2,9 @@ opt/freeswitch/bin/freeswitch opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* +opt/freeswitch/perl/* +opt/freeswitch/mod/mod_perl* +opt/freeswitch/mod/mod_shout* opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_expr.so* opt/freeswitch/mod/mod_rss.so* @@ -42,12 +45,12 @@ opt/freeswitch/conf/mime.types opt/freeswitch/conf/web-vm.tpl opt/freeswitch/conf/tetris.ttml -opt/freeswitch/conf/sip_profiles/outbound.xml +opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml -opt/freeswitch/conf/sip_profiles/default/example.xml -opt/freeswitch/conf/sip_profiles/default.xml -opt/freeswitch/conf/sip_profiles/outbound/example.xml +opt/freeswitch/conf/sip_profiles/internal/example.xml +opt/freeswitch/conf/sip_profiles/internal.xml +opt/freeswitch/conf/sip_profiles/external/example.xml opt/freeswitch/conf/directory/default/1007.xml opt/freeswitch/conf/directory/default/1001.xml opt/freeswitch/conf/directory/default/1008.xml @@ -75,6 +78,7 @@ opt/freeswitch/conf/voicemail.tpl opt/freeswitch/conf/freeswitch.xml opt/freeswitch/conf/extensions.conf +opt/freeswitch/conf/autoload_configs/perl.conf.xml opt/freeswitch/conf/autoload_configs/ivr.conf.xml opt/freeswitch/conf/autoload_configs/voicemail.conf.xml opt/freeswitch/conf/autoload_configs/switch.conf.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Thu May 8 12:44:33 2008 @@ -17,12 +17,12 @@ export DOTNET_MODULES= export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket -export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream -export LANGUAGES_MODULES= +export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout +export LANGUAGES_MODULES=languages/mod_perl export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog -export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr +export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr say/mod_say_it export TIMERS_MODULES= -export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl +export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf say/mod_say_es say/mod_say_nl export XML_INT_MODULES=xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES) export MODULES=$(MYMODULES) Modified: freeswitch/trunk/scripts/lua/mwi_event.lua ============================================================================== --- freeswitch/trunk/scripts/lua/mwi_event.lua (original) +++ freeswitch/trunk/scripts/lua/mwi_event.lua Thu May 8 12:44:33 2008 @@ -5,4 +5,5 @@ local event = freeswitch.Event("message_waiting"); event:addHeader("MWI-Messages-Waiting", "no"); event:addHeader("MWI-Message-Account", "sip:1000@10.0.1.100"); +-- event:addHeader("Sofia-Profile", "internal"); event:fire(); Modified: freeswitch/trunk/scripts/perl/mwi_event.pl ============================================================================== --- freeswitch/trunk/scripts/perl/mwi_event.pl (original) +++ freeswitch/trunk/scripts/perl/mwi_event.pl Thu May 8 12:44:33 2008 @@ -3,6 +3,9 @@ freeswitch::console_log("info", "Perl in da house!!!\n"); $event = new freeswitch::Event("message_waiting"); -$event->add_header("MWI-Messages-Waiting", "yes"); -$event->add_header("MWI-Message-Account", 'sip:1002@10.0.1.100'); +$event->addHeader("MWI-Messages-Waiting", "yes"); +$event->addHeader("MWI-Message-Account", 'sip:1002@10.0.1.100'); + +#$event->addHeader("Sofia-Profile", 'internal'); + $event->fire();

1 0

[commit] r8305 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 12:20:15 2008 New Revision: 8305 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Log: ok this has to fix the issue with crappy sound cards 100% soft timer Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Thu May 8 12:20:15 2008 @@ -70,7 +70,7 @@ * PaUtil_WriteMemoryBarrier() * ****************/ - +#define __VIA_HACK__ #if defined(__VIA_HACK__) #define NO_BARRIER #endif Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Thu May 8 12:20:15 2008 @@ -145,36 +145,35 @@ { long bytesRead = 0; char *p = (char *) data; - long avail, readBytes = 0, numBytes = aStream->bytesPerFrame * numFrames; + long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; - while (numBytes > 0) { + for(;;) { avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); - - if (avail >= numBytes * 10) { + + if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { + break; + } + + if (avail >= neededBytes * 6) { PaUtil_FlushRingBuffer(&aStream->inFIFO); avail = 0; } - if (avail >= numBytes * 2) { - bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, numBytes); - numBytes -= bytesRead; - readBytes += bytesRead; + bytesRead = 0; + + if (totalBytes < neededBytes && avail >= neededBytes) { + bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); + totalBytes += bytesRead; } - if (numBytes > 0) { - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - break; - } - switch_yield(1000); + if (bytesRead) { p += bytesRead; + } else { + switch_yield(1000); } } - if (readBytes) { - switch_core_timer_sync(timer); - } - - return readBytes / aStream->bytesPerFrame; + return totalBytes / aStream->bytesPerFrame; } /************************************************************

1 0

[commit] r8304 - freeswitch/trunk
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 12:15:49 2008 New Revision: 8304 Modified: freeswitch/trunk/freeswitch.spec Log: this will bite us Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu May 8 12:15:49 2008 @@ -250,7 +250,6 @@ %postun %{?run_ldconfig:%run_ldconfig} -%{__rm} -rf %{prefix} userdel freeswitch %clean

1 0

[commit] r8303 - in freeswitch/trunk/src/mod: applications/mod_voicemail endpoints/mod_sofia
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 12:09:49 2008 New Revision: 8303 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: test 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 Thu May 8 12:09:49 2008 @@ -2156,7 +2156,7 @@ static void message_query_handler(switch_event_t *event) { char *account = switch_event_get_header(event, "message-account"); - int sent = 0; + int created = 0; switch_event_t *new_event = NULL; if (account) { @@ -2194,8 +2194,7 @@ switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", account); switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); - switch_event_fire(&new_event); - sent++; + created++; } } } @@ -2205,13 +2204,26 @@ } - if (!sent) { + if (!created) { if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "no"); switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", account); - switch_event_fire(&new_event); } } + + if (new_event) { + switch_event_header_t *hp; + + for (hp = event->headers; hp; hp = hp->next) { + if (!strncasecmp(hp->name, "vm-", 3)) { + switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, hp->name + 3, hp->value); + } + } + + switch_event_fire(&new_event); + } + + } #define VOICEMAIL_SYNTAX "rss [<host> <port> <uri> <user> <domain>]" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu May 8 12:09:49 2008 @@ -188,6 +188,11 @@ return r; } +struct mwi_helper { + sofia_profile_t *profile; + int total; +}; + static void actual_sofia_presence_mwi_event_handler(switch_event_t *event) { char *account, *dup_account, *yn, *host, *user; @@ -195,8 +200,9 @@ sofia_profile_t *profile = NULL; switch_stream_handle_t stream = { 0 }; switch_event_header_t *hp; - int count = 0; - + struct mwi_helper h = { 0 }; + char *pname = NULL; + switch_assert(event != NULL); if (!(account = switch_event_get_header(event, "mwi-message-account"))) { @@ -213,11 +219,31 @@ switch_assert(dup_account != NULL); sofia_glue_get_user_host(dup_account, &user, &host); - if (!host || !(profile = sofia_glue_find_profile(host))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", switch_str_nil(host)); - return; + + if ((pname = switch_event_get_header(event, "sofia-profile"))) { + if ((profile = sofia_glue_find_profile(pname))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using profile %s\n", pname); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no profile %s\n", pname); + } + } + + if (!profile) { + if (!host || !(profile = sofia_glue_find_profile(host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile %s\n", switch_str_nil(host)); + switch_safe_free(dup_account); + return; + } } + if (profile->domain_name && profile->domain_name != host) { + host = profile->domain_name; + } + + h.profile = profile; + h.total = 0; + + SWITCH_STANDARD_STREAM(stream); for (hp = event->headers; hp; hp = hp->next) { @@ -239,19 +265,18 @@ stream.data, user, host); - switch_assert (sql != NULL); sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, sofia_presence_mwi_callback, - &count); + &h); switch_safe_free(sql); - if (!count) { + if (h.total) { sql = switch_mprintf("select sip_user,sip_host,contact,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", stream.data, user, host); @@ -263,7 +288,7 @@ profile->ireg_mutex, sql, sofia_presence_mwi_callback2, - profile); + &h); switch_safe_free(sql); } @@ -640,6 +665,7 @@ if (!strcasecmp(event_name, "message-summary")) { if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", user, host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", "%s", profile->name); switch_event_fire(&event); } return 0; @@ -1073,18 +1099,15 @@ char *expires = argv[10]; char *body = argv[13]; char *exp; - sofia_profile_t *profile = NULL; + //sofia_profile_t *profile = NULL; char *id = NULL; nua_handle_t *nh; int expire_sec = atoi(expires); - int *total = (int *) pArg; + //int *total = (int *) pArg; + struct mwi_helper *h = (struct mwi_helper *) pArg; - if (!(profile = sofia_glue_find_profile(sub_to_host))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); - return 0; - } - if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { + if (!(nh = nua_handle_by_call_id(h->profile->nua, call_id))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); return 0; } @@ -1103,8 +1126,7 @@ switch_safe_free(id); switch_safe_free(exp); - sofia_glue_release_profile(profile); - (*total)++; + h->total++; return 0; } @@ -1118,25 +1140,20 @@ char *event = "message-summary"; char *contact = argv[2]; char *body = argv[3]; - sofia_profile_t *profile = NULL; char *id = NULL; nua_handle_t *nh; - + struct mwi_helper *h = (struct mwi_helper *) pArg; + - if (!(profile = sofia_glue_find_profile(sub_to_host))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); - return 0; - } - id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); contact = sofia_glue_get_url_from_contact(contact, 0); - nh = nua_handle(profile->nua, NULL, + nh = nua_handle(h->profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), - SIPTAG_CONTACT_STR(profile->url), + SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); nua_notify(nh, @@ -1145,8 +1162,6 @@ switch_safe_free(id); - sofia_glue_release_profile(profile); - return 0; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu May 8 12:09:49 2008 @@ -688,12 +688,14 @@ if (regtype == REG_REGISTER) { char *new_contact = NULL; + if (exptime) { new_contact = switch_mprintf("%s;expires=%ld", contact_str, (long)exptime); nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END()); switch_safe_free(new_contact); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", to_user, to_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "VM-Sofia-Profile", "%s", profile->name); switch_event_fire(&event); } } else {

1 0

[commit] r8302 - in freeswitch/trunk/src: . mod/endpoints/mod_alsa mod/endpoints/mod_portaudio mod/formats/mod_local_stream
by Freeswitch SVN 08 May '08

08 May '08

Author: anthm Date: Thu May 8 11:50:28 2008 New Revision: 8302 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c Log: use individual pools in open file handles to avoid flooding the pool Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Thu May 8 11:50:28 2008 @@ -584,7 +584,7 @@ globals.read_codec.implementation->number_of_channels, globals.read_codec.implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + NULL) != SWITCH_STATUS_SUCCESS) { switch_core_codec_destroy(&tech_pvt->write_codec); tech_pvt->hold_file = NULL; goto cng; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu May 8 11:50:28 2008 @@ -496,7 +496,7 @@ globals.read_codec.implementation->number_of_channels, globals.read_codec.implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { + NULL) != SWITCH_STATUS_SUCCESS) { tech_pvt->hold_file = NULL; goto cng; } Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu May 8 11:50:28 2008 @@ -170,7 +170,7 @@ (char *)fname, source->channels, source->rate, - SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, source->pool) != SWITCH_STATUS_SUCCESS) { + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open %s\n", fname); switch_yield(1000000); continue; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu May 8 11:50:28 2008 @@ -308,7 +308,7 @@ read_codec->implementation->number_of_channels, read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + NULL) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_core_session_reset(session, SWITCH_TRUE); return SWITCH_STATUS_GENERR; @@ -755,7 +755,7 @@ file, channels, read_codec->implementation->actual_samples_per_second, - SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", file); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_core_session_reset(session, SWITCH_TRUE); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu May 8 11:50:28 2008 @@ -341,7 +341,7 @@ read_codec->implementation->number_of_channels, read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing File\n"); switch_safe_free(tmp_data); goto done; @@ -994,7 +994,7 @@ read_codec->implementation->number_of_channels, read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing File\n"); switch_safe_free(tmp_data); goto notready; Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu May 8 11:50:28 2008 @@ -373,7 +373,7 @@ file, fh->channels, read_codec->implementation->actual_samples_per_second, - SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_core_session_reset(session, SWITCH_TRUE); return SWITCH_STATUS_GENERR; @@ -789,7 +789,7 @@ file, read_codec->implementation->number_of_channels, read_codec->implementation->actual_samples_per_second, - SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) { switch_core_session_reset(session, SWITCH_TRUE); status = SWITCH_STATUS_NOTFOUND; goto end;

1 0

[commit] r8301 - in freeswitch/trunk/conf/sip_profiles: . default internal
by Freeswitch SVN 08 May '08

08 May '08

Author: brian Date: Thu May 8 10:48:16 2008 New Revision: 8301 Added: freeswitch/trunk/conf/sip_profiles/internal/ - copied from r8300, /freeswitch/trunk/conf/sip_profiles/default/ freeswitch/trunk/conf/sip_profiles/internal.xml - copied unchanged from r8300, /freeswitch/trunk/conf/sip_profiles/default.xml Removed: freeswitch/trunk/conf/sip_profiles/default/ freeswitch/trunk/conf/sip_profiles/default.xml Log: finish last commit

1 0

[commit] r8300 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 08 May '08

08 May '08

Author: brian Date: Thu May 8 10:45:34 2008 New Revision: 8300 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: move default to interal with alias for default. Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Thu May 8 10:45:34 2008 @@ -1,9 +1,9 @@  -<profile name="default" domain="$${domain}"> +<profile name="internal" domain="$${domain}">  <aliases> <alias name="$${domain}"/> - <alias name="internal"/> + <alias name="default"/> </aliases>  <gateways>

1 0