- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7282 - in freeswitch/trunk/conf: dialplan sip_profiles
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: brian Date: Fri Jan 18 10:09:34 2008 New Revision: 7282 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/sip_profiles/default.xml Log: offer srtp on outbound if we have it on inbound Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 18 10:09:34 2008 @@ -54,6 +54,8 @@ </condition> <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$" break="never"> <action application="set" data="sip_secure_media=true"/> +  + <action application="export" data="sip_secure_media=true"/> </condition> <condition> <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Jan 18 10:09:34 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="false"/> + <param name="tls" value="true"/>  <param name="tls-bind-params" value="transport=tls"/>

1 0

[commit] r7281 - freeswitch/trunk/debian
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: cypromis Date: Thu Jan 17 20:06:10 2008 New Revision: 7281 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/debian/dirs freeswitch/trunk/debian/files freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.init freeswitch/trunk/debian/freeswitch.install Log: Alll those config and module files for rc1 ... get in package .. An yes bkw_ it was you !! Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Thu Jan 17 20:06:10 2008 @@ -1,3 +1,10 @@ +freeswitch (1.0~rc1-1) unstable; urgency=low + * loads of fixes + new cdr-csv module + new spidermonkey-curl module + + -- Michal Bielicki <michal.bielicki(a)voiceworks.pl> Mon, 14 Jan 2008 23:37:04 +0100 + freeswitch (1.0~beta3-1) unstable; urgency=low * Additional scripts for changing the user to freeswitch Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Thu Jan 17 20:06:10 2008 @@ -62,5 +62,5 @@ Package: freeswitch-lang-fr Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: Frencch language files for the FreeSWITCH open source telephony platform +Description: French language files for the FreeSWITCH open source telephony platform Homepage: http://www.freeswitch.org/ Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Thu Jan 17 20:06:10 2008 @@ -1,6 +1,8 @@ opt/freeswitch opt/freeswitch/log opt/freeswitch/db +opt/freeswitch/bin +opt/freeswitch/bin/scripts etc/opt etc/monit etc/default Modified: freeswitch/trunk/debian/files ============================================================================== --- freeswitch/trunk/debian/files (original) +++ freeswitch/trunk/debian/files Thu Jan 17 20:06:10 2008 @@ -1 +1,9 @@ -freeswitch_1.0~beta1-1_i386.deb net optional +freeswitch_1.0~rc1-1_i386.deb net extra +freeswitch-spidermonkey_1.0~rc1-1_i386.deb net extra +freeswitch-dev_1.0~rc1-1_i386.deb net extra +freeswitch-codec-passthru-g7231_1.0~rc1-1_i386.deb net extra +freeswitch-codec-passthru-amr_1.0~rc1-1_i386.deb net extra +freeswitch-codec-passthru-g729_1.0~rc1-1_i386.deb net extra +freeswitch-lang-en_1.0~rc1-1_i386.deb net extra +freeswitch-lang-de_1.0~rc1-1_i386.deb net extra +freeswitch-lang-fr_1.0~rc1-1_i386.deb net extra Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Thu Jan 17 20:06:10 2008 @@ -1,39 +1,85 @@ -/opt/freeswitch/conf/extensions.conf -/opt/freeswitch/conf/freeswitch.xml -/opt/freeswitch/conf/mime.types +/opt/freeswitch/conf +/opt/freeswitch/conf/dialplan +/opt/freeswitch/conf/dialplan/extensions +/opt/freeswitch/conf/dialplan/public.xml +/opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/vars.xml +/opt/freeswitch/conf/mime.types +/opt/freeswitch/conf/web-vm.tpl +/opt/freeswitch/conf/tetris.ttml +/opt/freeswitch/conf/sip_profiles +/opt/freeswitch/conf/sip_profiles/outbound.xml +/opt/freeswitch/conf/sip_profiles/nat.xml +/opt/freeswitch/conf/sip_profiles/nat +/opt/freeswitch/conf/sip_profiles/nat/example.xml +/opt/freeswitch/conf/sip_profiles/default +/opt/freeswitch/conf/sip_profiles/default/example.xml +/opt/freeswitch/conf/sip_profiles/default.xml +/opt/freeswitch/conf/sip_profiles/outbound +/opt/freeswitch/conf/sip_profiles/outbound/example.xml +/opt/freeswitch/conf/directory +/opt/freeswitch/conf/directory/default +/opt/freeswitch/conf/directory/default/1007.xml +/opt/freeswitch/conf/directory/default/1001.xml +/opt/freeswitch/conf/directory/default/1008.xml +/opt/freeswitch/conf/directory/default/1019.xml +/opt/freeswitch/conf/directory/default/1002.xml +/opt/freeswitch/conf/directory/default/1011.xml +/opt/freeswitch/conf/directory/default/1014.xml +/opt/freeswitch/conf/directory/default/1003.xml +/opt/freeswitch/conf/directory/default/brian.xml +/opt/freeswitch/conf/directory/default/1013.xml +/opt/freeswitch/conf/directory/default/1000.xml +/opt/freeswitch/conf/directory/default/1009.xml +/opt/freeswitch/conf/directory/default/1005.xml +/opt/freeswitch/conf/directory/default/1010.xml +/opt/freeswitch/conf/directory/default/1015.xml +/opt/freeswitch/conf/directory/default/1004.xml +/opt/freeswitch/conf/directory/default/1017.xml +/opt/freeswitch/conf/directory/default/default.xml +/opt/freeswitch/conf/directory/default/1018.xml +/opt/freeswitch/conf/directory/default/1006.xml +/opt/freeswitch/conf/directory/default/1016.xml +/opt/freeswitch/conf/directory/default/1012.xml +/opt/freeswitch/conf/directory/default.xml +/opt/freeswitch/conf/fur_elise.ttml +/opt/freeswitch/conf/voicemail.tpl +/opt/freeswitch/conf/freeswitch.xml +/opt/freeswitch/conf/extensions.conf +/opt/freeswitch/conf/autoload_configs +/opt/freeswitch/conf/autoload_configs/ivr.conf.xml +/opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +/opt/freeswitch/conf/autoload_configs/switch.conf.xml +/opt/freeswitch/conf/autoload_configs/syslog.conf.xml +/opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml /opt/freeswitch/conf/autoload_configs/alsa.conf.xml -/opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml -/opt/freeswitch/conf/autoload_configs/conference.conf.xml -/opt/freeswitch/conf/autoload_configs/console.conf.xml -/opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -/opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +/opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +/opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml /opt/freeswitch/conf/autoload_configs/enum.conf.xml -/opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml -/opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -/opt/freeswitch/conf/autoload_configs/iax.conf.xml -/opt/freeswitch/conf/autoload_configs/ivr.conf.xml -/opt/freeswitch/conf/autoload_configs/java.conf.xml +/opt/freeswitch/conf/autoload_configs/logfile.conf.xml /opt/freeswitch/conf/autoload_configs/limit.conf.xml +/opt/freeswitch/conf/autoload_configs/java.conf.xml +/opt/freeswitch/conf/autoload_configs/sofia.conf.xml +/opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +/opt/freeswitch/conf/autoload_configs/rss.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml /opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -/opt/freeswitch/conf/autoload_configs/modules.conf.xml +/opt/freeswitch/conf/autoload_configs/conference.conf.xml +/opt/freeswitch/conf/autoload_configs/event_socket.conf.xml /opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml -/opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -/opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -/opt/freeswitch/conf/autoload_configs/rss.conf.xml -/opt/freeswitch/conf/autoload_configs/sofia.conf.xml -/opt/freeswitch/conf/autoload_configs/switch.conf.xml -/opt/freeswitch/conf/autoload_configs/syslog.conf.xml -/opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -/opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml +/opt/freeswitch/conf/autoload_configs/modules.conf.xml +/opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +/opt/freeswitch/conf/autoload_configs/iax.conf.xml /opt/freeswitch/conf/autoload_configs/woomera.conf.xml +/opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml /opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -/opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -/opt/freeswitch/conf/dialplan/default.xml -/opt/freeswitch/conf/directory/default.xml -/opt/freeswitch/conf/sip_profiles/default.xml -/opt/freeswitch/conf/sip_profiles/nat.xml -/opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml +/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/jingle_profiles +/opt/freeswitch/conf/jingle_profiles/server.xml +/opt/freeswitch/conf/jingle_profiles/client.xml +/opt/freeswitch/conf/mrcp_profiles /opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml +/opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Thu Jan 17 20:06:10 2008 @@ -19,7 +19,7 @@ DESC="FreeSwitch Voice Switching System" NAME=freeswitch DAEMON=/opt/freeswitch/bin/$NAME -DAEMON_ARGS="--options -nc" +DAEMON_ARGS="-nc" USER=freeswitch PIDFILE=/opt/freeswitch/log/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Thu Jan 17 20:06:10 2008 @@ -1,7 +1,18 @@ opt/freeswitch/htdocs/* opt/freeswitch/bin/freeswitch +opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* opt/freeswitch/mod/mod_console.so* +opt/freeswitch/mod/mod_expr.so* +opt/freeswitch/mod/mod_rss.so* +opt/freeswitch/mod/mod_gsm.so* +opt/freeswitch/mod/mod_h26x.so* +opt/freeswitch/mod/mod_voicemail.so* +opt/freeswitch/mod/mod_limit.so* +opt/freeswitch/mod/mod_ilbc.so* +opt/freeswitch/mod/mod_speex.so* +opt/freeswitch/mod/mod_l16.so* +opt/freeswitch/mod/mod_esf.so* opt/freeswitch/mod/mod_logfile.so* opt/freeswitch/mod/mod_syslog.so* opt/freeswitch/mod/mod_commands.so* @@ -26,42 +37,88 @@ opt/freeswitch/mod/mod_sndfile.so* opt/freeswitch/mod/mod_local_stream.so* opt/freeswitch/mod/mod_xml_*.so* -opt/freeswitch/conf/extensions.conf -opt/freeswitch/conf/freeswitch.xml -opt/freeswitch/conf/mime.types +opt/freeswitch/conf +opt/freeswitch/conf/dialplan +opt/freeswitch/conf/dialplan/public.xml +opt/freeswitch/conf/dialplan/default.xml +opt/freeswitch/conf/dialplan/extensions opt/freeswitch/conf/vars.xml +opt/freeswitch/conf/mime.types +opt/freeswitch/conf/web-vm.tpl +opt/freeswitch/conf/tetris.ttml +opt/freeswitch/conf/sip_profiles +opt/freeswitch/conf/sip_profiles/outbound.xml +opt/freeswitch/conf/sip_profiles/nat.xml +opt/freeswitch/conf/sip_profiles/nat +opt/freeswitch/conf/sip_profiles/nat/example.xml +opt/freeswitch/conf/sip_profiles/default +opt/freeswitch/conf/sip_profiles/default/example.xml +opt/freeswitch/conf/sip_profiles/default.xml +opt/freeswitch/conf/sip_profiles/outbound +opt/freeswitch/conf/sip_profiles/outbound/example.xml +opt/freeswitch/conf/directory +opt/freeswitch/conf/directory/default +opt/freeswitch/conf/directory/default/1007.xml +opt/freeswitch/conf/directory/default/1001.xml +opt/freeswitch/conf/directory/default/1008.xml +opt/freeswitch/conf/directory/default/1019.xml +opt/freeswitch/conf/directory/default/1002.xml +opt/freeswitch/conf/directory/default/1011.xml +opt/freeswitch/conf/directory/default/1014.xml +opt/freeswitch/conf/directory/default/1003.xml +opt/freeswitch/conf/directory/default/brian.xml +opt/freeswitch/conf/directory/default/1013.xml +opt/freeswitch/conf/directory/default/1000.xml +opt/freeswitch/conf/directory/default/1009.xml +opt/freeswitch/conf/directory/default/1005.xml +opt/freeswitch/conf/directory/default/1010.xml +opt/freeswitch/conf/directory/default/1015.xml +opt/freeswitch/conf/directory/default/1004.xml +opt/freeswitch/conf/directory/default/1017.xml +opt/freeswitch/conf/directory/default/default.xml +opt/freeswitch/conf/directory/default/1018.xml +opt/freeswitch/conf/directory/default/1006.xml +opt/freeswitch/conf/directory/default/1016.xml +opt/freeswitch/conf/directory/default/1012.xml +opt/freeswitch/conf/directory/default.xml +opt/freeswitch/conf/fur_elise.ttml +opt/freeswitch/conf/voicemail.tpl +opt/freeswitch/conf/freeswitch.xml +opt/freeswitch/conf/extensions.conf +opt/freeswitch/conf/autoload_configs +opt/freeswitch/conf/autoload_configs/ivr.conf.xml +opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +opt/freeswitch/conf/autoload_configs/switch.conf.xml +opt/freeswitch/conf/autoload_configs/syslog.conf.xml +opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml opt/freeswitch/conf/autoload_configs/alsa.conf.xml -opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml -opt/freeswitch/conf/autoload_configs/conference.conf.xml -opt/freeswitch/conf/autoload_configs/console.conf.xml -opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml opt/freeswitch/conf/autoload_configs/enum.conf.xml -opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml -opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -opt/freeswitch/conf/autoload_configs/iax.conf.xml -opt/freeswitch/conf/autoload_configs/ivr.conf.xml -opt/freeswitch/conf/autoload_configs/java.conf.xml +opt/freeswitch/conf/autoload_configs/logfile.conf.xml opt/freeswitch/conf/autoload_configs/limit.conf.xml +opt/freeswitch/conf/autoload_configs/java.conf.xml +opt/freeswitch/conf/autoload_configs/sofia.conf.xml +opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +opt/freeswitch/conf/autoload_configs/rss.conf.xml +opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -opt/freeswitch/conf/autoload_configs/modules.conf.xml +opt/freeswitch/conf/autoload_configs/conference.conf.xml +opt/freeswitch/conf/autoload_configs/event_socket.conf.xml opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml -opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -opt/freeswitch/conf/autoload_configs/rss.conf.xml -opt/freeswitch/conf/autoload_configs/sofia.conf.xml -opt/freeswitch/conf/autoload_configs/switch.conf.xml -opt/freeswitch/conf/autoload_configs/syslog.conf.xml -opt/freeswitch/conf/autoload_configs/logfile.conf.xml -opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml +opt/freeswitch/conf/autoload_configs/modules.conf.xml +opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +opt/freeswitch/conf/autoload_configs/iax.conf.xml opt/freeswitch/conf/autoload_configs/woomera.conf.xml +opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -opt/freeswitch/conf/dialplan/default.xml -opt/freeswitch/conf/directory/default.xml -opt/freeswitch/conf/mrcp_profiles/* -opt/freeswitch/conf/sip_profiles/default.xml -opt/freeswitch/conf/sip_profiles/nat.xml +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/jingle_profiles +opt/freeswitch/conf/jingle_profiles/server.xml +opt/freeswitch/conf/jingle_profiles/client.xml +opt/freeswitch/conf/mrcp_profiles +opt/freeswitch/conf/mrcp_profiles/openmrcp-v2.xml +opt/freeswitch/conf/mrcp_profiles/openmrcp-v1.xml

1 0

[commit] r7280 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: mikej Date: Thu Jan 17 19:42:34 2008 New Revision: 7280 Added: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.noload - copied unchanged from r7279, /freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml Removed: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml Log: don't load this by default (breaking the packaging which needs all this added, and we are already testing for rc1)

1 0

[commit] r7279 - freeswitch/trunk
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: anthm Date: Thu Jan 17 19:35:09 2008 New Revision: 7279 Modified: freeswitch/trunk/Makefile.am Log: allways create /conf/dialplan/extensions on install Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Jan 17 19:35:09 2008 @@ -170,6 +170,7 @@ samples-conf: test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf + test -d $(DESTDIR)$(prefix)/conf/dialplan/extensions || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/dialplan/extensions for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name \*.ttml && find conf -name mime.types` ; do \ dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ filename=`echo $$conffile | sed -e 's|^.*/||'`; \

1 0

[commit] r7278 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: anthm Date: Thu Jan 17 19:17:42 2008 New Revision: 7278 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: update 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 Jan 17 19:17:42 2008 @@ -867,7 +867,8 @@ } msg_type_t; -static switch_status_t create_file(switch_core_session_t *session, vm_profile_t *profile, char *macro_name, char *file_path, switch_size_t *message_len) +static switch_status_t create_file(switch_core_session_t *session, vm_profile_t *profile, + char *macro_name, char *file_path, switch_size_t *message_len, switch_bool_t limit) { switch_channel_t *channel; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -900,7 +901,7 @@ fh.silence_hits = profile->record_silence_hits; fh.samplerate = profile->record_sample_rate; switch_ivr_record_file(session, &fh, file_path, &args, profile->max_record_len); - if ((*message_len = fh.sample_count / read_codec->implementation->actual_samples_per_second) < profile->min_record_len) { + if (limit && (*message_len = fh.sample_count / read_codec->implementation->actual_samples_per_second) < profile->min_record_len) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Message is less than minimum record length: %d, discarding it.\n", profile->min_record_len); if (unlink(file_path) != 0) { @@ -1484,7 +1485,7 @@ TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); } else { file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); - TRY_CODE(create_file(session, profile, VM_RECORD_GREETING_MACRO, file_path, &message_len)); + TRY_CODE(create_file(session, profile, VM_RECORD_GREETING_MACRO, file_path, &message_len, SWITCH_TRUE)); sql = switch_mprintf("update voicemail_prefs set greeting_path='%s' where user='%s' and domain='%s'", file_path, myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); switch_safe_free(sql); @@ -1493,7 +1494,7 @@ } else if (!strcmp(input, profile->record_name_key)) { file_path = switch_mprintf("%s%srecorded_name.%s", dir_path, SWITCH_PATH_SEPARATOR, profile->file_ext); - TRY_CODE(create_file(session, profile, VM_RECORD_NAME_MACRO, file_path, &message_len)); + TRY_CODE(create_file(session, profile, VM_RECORD_NAME_MACRO, file_path, &message_len, SWITCH_FALSE)); sql = switch_mprintf("update voicemail_prefs set name_path='%s' where user='%s' and domain='%s'", file_path, myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); switch_safe_free(file_path); @@ -1863,7 +1864,7 @@ switch_channel_set_variable(channel, "RECORD_COMMENT", profile->record_comment); switch_channel_set_variable(channel, "RECORD_COPYRIGHT", profile->record_copyright); - status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path, &message_len); + status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path, &message_len, SWITCH_TRUE); if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) { char input[10] = "", key_buf[80] = "", term = 0;

1 0

[commit] r7277 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: anthm Date: Thu Jan 17 19:10:23 2008 New Revision: 7277 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_rtp.c Log: refactor 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 Thu Jan 17 19:10:23 2008 @@ -2453,7 +2453,7 @@ } else { const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; - if (strchr(url, '>')) { + if (url && strchr(url, '>')) { tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); } else { tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Jan 17 19:10:23 2008 @@ -770,6 +770,7 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session) { void *pop; + switch_socket_t *sock; if (!switch_rtp_ready(*rtp_session)) { return; @@ -792,8 +793,10 @@ } switch_rtp_kill_socket(*rtp_session); - switch_socket_close((*rtp_session)->sock); + sock = (*rtp_session)->sock; (*rtp_session)->sock = NULL; + switch_socket_close(sock); + if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) { @@ -1088,7 +1091,9 @@ switch_frame_flag_t frame_flags = SFF_NONE; data[0] = 65; rtp_session->cn++; + switch_mutex_lock(rtp_session->flag_mutex); rtp_common_write(rtp_session, NULL, (void *) data, 2, rtp_session->cng_pt, 0, &frame_flags); + switch_mutex_unlock(rtp_session->flag_mutex); } } @@ -1601,7 +1606,7 @@ this_ts = ntohl(send_msg->header.ts); - if (rtp_session->sending_dtmf || !this_ts) { + if (!switch_rtp_ready(rtp_session) || rtp_session->sending_dtmf || !this_ts) { send = 0; }

1 0

[commit] r7276 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: silik0n Date: Thu Jan 17 18:50:10 2008 New Revision: 7276 Modified: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml Log: ooops fix that Modified: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml (original) +++ freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml Thu Jan 17 18:50:10 2008 @@ -1,5 +1,5 @@ <include> - <extension name="pulver.com"> + <extension name="tollfreegateway.com"> <condition field="destination_number" expression="^1?(8(00|55|66|77|88)[2-9]\d{6})$"> <action application="bridge" data="sofia/gateway/sip.tollfreegateway.com/9313371$1"/> </condition>

1 0

[commit] r7275 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: silik0n Date: Thu Jan 17 18:48:15 2008 New Revision: 7275 Added: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml Log: Open TollFree Route Added: freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/extensions/tollfreegateway.com.xml Thu Jan 17 18:48:15 2008 @@ -0,0 +1,7 @@ +<include> + <extension name="pulver.com"> + <condition field="destination_number" expression="^1?(8(00|55|66|77|88)[2-9]\d{6})$"> + <action application="bridge" data="sofia/gateway/sip.tollfreegateway.com/9313371$1"/> + </condition> + </extension> +</include>

1 0

[commit] r7274 - freeswitch/trunk/conf
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: brian Date: Thu Jan 17 18:41:45 2008 New Revision: 7274 Modified: freeswitch/trunk/conf/vars.xml Log: more tweaks Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Jan 17 18:41:45 2008 @@ -33,14 +33,14 @@ If unspecified, the bind_server_ip value is used. Used by: sofia.conf.xml dingaling.conf.xml --> - <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.fwdnet.net"/> + <X-PRE-PROCESS cmd="set" data="external_rtp_ip=stun:stun.freeswitch.org"/>  - <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.fwdnet.net"/> + <X-PRE-PROCESS cmd="set" data="external_sip_ip=stun:stun.freeswitch.org"/>

1 0

[commit] r7273 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: brian Date: Thu Jan 17 18:13:37 2008 New Revision: 7273 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: tweak Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Thu Jan 17 18:13:37 2008 @@ -95,7 +95,7 @@ <match> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$1" method="pronounced" type="name_spelled"/> - <action function="play-file" data="voicemail/vm-record_greeting.wav"/> + <action function="play-file" data="voicemail/vm-record_greeting_DUPLICATE.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-choose_greeting.wav"/> @@ -172,7 +172,7 @@ <macro name="voicemail_choose_greeting"> <input pattern="^(.*)$"> <match> - <action function="play-file" data="voicemail/vm-choose_greeting.wav"/> + <action function="play-file" data="voicemail/vm-choose_greeting_DUPLICATE.wav"/> </match> </input> </macro>

1 0