December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6474 - freeswitch/trunk/debian
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: cypromis Date: Sun Dec 2 18:50:45 2007 New Revision: 6474 Added: freeswitch/trunk/debian/freeswitch-codec-passthru-g7231.install - copied unchanged from r6467, /freeswitch/trunk/debian/freeswitch-codec-passthru-g723_1.install freeswitch/trunk/debian/freeswitch-lang-de.conffiles freeswitch/trunk/debian/freeswitch-lang-de.install freeswitch/trunk/debian/freeswitch-lang-en.conffiles freeswitch/trunk/debian/freeswitch-lang-en.install freeswitch/trunk/debian/freeswitch-lang-fr.conffiles freeswitch/trunk/debian/freeswitch-lang-fr.install freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles freeswitch/trunk/debian/postinst - copied unchanged from r6447, /freeswitch/trunk/debian/freeswitch.postinst freeswitch/trunk/debian/postrm - copied unchanged from r6447, /freeswitch/trunk/debian/freeswitch.postrm Removed: freeswitch/trunk/debian/freeswitch-codec-passthru-g723_1.install freeswitch/trunk/debian/freeswitch.postinst freeswitch/trunk/debian/freeswitch.postrm Modified: freeswitch/trunk/debian/compat freeswitch/trunk/debian/control freeswitch/trunk/debian/freeswitch-spidermonkey.install freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Log: Looks like a pretty complete debian packaging done :) Modified: freeswitch/trunk/debian/compat ============================================================================== --- freeswitch/trunk/debian/compat (original) +++ freeswitch/trunk/debian/compat Sun Dec 2 18:50:45 2007 @@ -1 +1 @@ -5 +4 Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Sun Dec 2 18:50:45 2007 @@ -1,5 +1,5 @@ Source: freeswitch -Maintainer: Michael Jerris <mike(a)jerris.com> +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 @@ -15,7 +15,6 @@ a soft-switch. It can be used as a simple switching engine, a media gateway or a media server to host IVR applications using simple scripts or XML to control the callflow. - . Homepage: http://www.freeswitch.org/ Package: freeswitch-spidermonkey @@ -26,11 +25,11 @@ Package: freeswitch-dev Architecture: any -Depends: ${shlibs:Depends} freswitch +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Development Package for the FreeSwitch open source telephony platform Homepage: http://www.freeswitch.org/ -Package: freeswitch-codec-passthru-g723_1 +Package: freeswitch-codec-passthru-g7231 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through g723.1 Codec support for the FreeSWITCH open source telephony platform @@ -47,3 +46,21 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through g729 Codec support for the FreeSWITCH open source telephony platform Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-en +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-de +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: German language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-fr +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Frencch language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ Added: freeswitch/trunk/debian/freeswitch-lang-de.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-de.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1,3 @@ +/opt/freeswitch/conf/lang/de/de.xml +/opt/freeswitch/conf/lang/de/demo/demo.xml +/opt/freeswitch/conf/lang/de/vm/tts.xml Added: freeswitch/trunk/debian/freeswitch-lang-de.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-de.install Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +opt/freeswitch/conf/lang/de/*.xml +opt/freeswitch/conf/lang/de/demo/*.xml +opt/freeswitch/conf/lang/de/vm/*.xml +opt/freeswitch/mod/mod_say_de.so* Added: freeswitch/trunk/debian/freeswitch-lang-en.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-en.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +/opt/freeswitch/conf/lang/en/en.xml +/opt/freeswitch/conf/lang/en/demo/demo.xml +/opt/freeswitch/conf/lang/en/vm/sounds.xml +/opt/freeswitch/conf/lang/en/vm/tts.xml Added: freeswitch/trunk/debian/freeswitch-lang-en.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-en.install Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +opt/freeswitch/conf/lang/en/*.xml +opt/freeswitch/conf/lang/en/demo/*.xml +opt/freeswitch/conf/lang/en/vm/*.xml +opt/freeswitch/mod/mod_say_en.so* Added: freeswitch/trunk/debian/freeswitch-lang-fr.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-fr.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1,3 @@ +/opt/freeswitch/conf/lang/fr/fr.xml +/opt/freeswitch/conf/lang/fr/demo/demo.xml +/opt/freeswitch/conf/lang/fr/vm/sounds.xml Added: freeswitch/trunk/debian/freeswitch-lang-fr.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-fr.install Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +opt/freeswitch/conf/lang/fr/*.xml +opt/freeswitch/conf/lang/fr/demo/*.xml +opt/freeswitch/conf/lang/fr/vm/*.xml +opt/freeswitch/mod/mod_say_fr.so* Added: freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1 @@ +/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch-spidermonkey.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-spidermonkey.install (original) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.install Sun Dec 2 18:50:45 2007 @@ -3,3 +3,4 @@ opt/freeswitch/lib/libjs.so* opt/freeswitch/lib/libplds4.so* opt/freeswitch/lib/libplc4.so* +opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Sun Dec 2 18:50:45 2007 @@ -23,7 +23,6 @@ /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/spidermonkey.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 @@ -36,15 +35,5 @@ /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/US.conf.xml /opt/freeswitch/conf/directory/default.xml -/opt/freeswitch/conf/lang/de/de.xml -/opt/freeswitch/conf/lang/de/demo/demo.xml -/opt/freeswitch/conf/lang/de/vm/tts.xml -/opt/freeswitch/conf/lang/en/en.xml -/opt/freeswitch/conf/lang/en/demo/demo.xml -/opt/freeswitch/conf/lang/en/vm/sounds.xml -/opt/freeswitch/conf/lang/en/vm/tts.xml -/opt/freeswitch/conf/lang/fr/fr.xml -/opt/freeswitch/conf/lang/fr/demo/demo.xml -/opt/freeswitch/conf/lang/fr/vm/sounds.xml /opt/freeswitch/conf/sip_profiles/default.xml /opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sun Dec 2 18:50:45 2007 @@ -1,10 +1,6 @@ opt/freeswitch/htdocs/* opt/freeswitch/bin/freeswitch opt/freeswitch/lib/libfreeswitch*.so* -etc/init.d/freeswitch -etc/monit/freeswitch.monitrc -etc/default/freeswitch -opt/freeswitch/man/man1/freeswitch.1 opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_syslog.so* opt/freeswitch/mod/mod_commands.so* @@ -13,24 +9,58 @@ opt/freeswitch/mod/mod_enum.so* opt/freeswitch/mod/mod_fifo.so* opt/freeswitch/mod/mod_openmrcp.so* -# Codecs opt/freeswitch/mod/mod_g711.so* opt/freeswitch/mod/mod_g722.so* opt/freeswitch/mod/mod_g726.so* opt/freeswutch/mod/mod_speex.so* -# Dialplan opt/freeswitch/mod/mod_dialplan*.so* -# Endpoints opt/freeswitch/mod/mod_dingaling.so* opt/freeswitch/mod/mod_iax.so* opt/freeswitch/mod/mod_portaudio.so* opt/freeswitch/mod/mod_sofia.so* opt/freeswitch/mod/mod_woomera.so* opt/freeswitch/mod/mod_openzap.so -# event engines opt/freeswitch/mod/mod_event_*.so* opt/freeswitch/mod/mod_native_file.so* opt/freeswitch/mod/mod_sndfile.so* opt/freeswitch/mod/mod_local_stream.so* opt/freeswitch/mod/mod_xml_*.so* -opt/freeswitch/mod/mod_say_*.so* +opt/freeswitch/conf/default_context_old.xml +opt/freeswitch/conf/extensions.conf +opt/freeswitch/conf/freeswitch.xml +opt/freeswitch/conf/mime.types +opt/freeswitch/conf/vars.xml +opt/freeswitch/conf/autoload_configs/alsa.conf.xml +opt/freeswitch/conf/autoload_configs/cdr.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/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/limit.conf.xml +opt/freeswitch/conf/autoload_configs/local_stream.conf.xml +opt/freeswitch/conf/autoload_configs/modules.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/woomera.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/dialplan/US.conf.xml +opt/freeswitch/conf/directory/default.xml +opt/freeswitch/conf/sip_profiles/default.xml +opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Sun Dec 2 18:50:45 2007 @@ -3,9 +3,30 @@ # This file is public domain software, originally written by Joey Hess. # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export DH_OPTIONS +export DH_COMPAT=4 +export DEB_DH_INSTALL_SOURCEDIR=debian/tmp +export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr +export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone +export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail +export ASR_TTS_MODULES=asr_tts/mod_openmrcp +export CODECS_MODULES=codecs/mod_g711 codecs/mod_g722 codecs/mod_g726 codecs/mod_gsm codecs/mod_ilbc codecs/mod_h26x codecs/mod_l16 codecs/mod_speex +export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml +export DIRECTORIES_MODULES= +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 +export LANGUAGES_MODULES= +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 TIMERS_MODULES= +export DISABLED_MODULES=applications/mod_sountouch 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 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) -export MODULES ?= mod_console mod_syslog mod_commands mod_conference mod_dptools mod_enum mod_fifo mod_openmrcp mod_amr mod_g711 mod_g722 mod_g723_1 mod_g726 mod_g729 mod_gsm mod_ilbc mod_l16 mod_speex mod_dialplan_directory mod_dialplan_xml mod_dialplan_asterisk mod_dingaling mod_iax mod_portaudio mod_sofia mod_woomera mod_openzap mod_event_multicast mod_event_socket mod_native_file mod_sndfile mod_local_stream mod_spidermonkey mod_spidermonkey_teletone mod_spidermonkey_core_db mod_spidermonkey_odbc mod_xml_rpc mod_xml_curl mod_xml_cdr mod_say_en mod_say_fr mod_say_de ifndef AUTOCONF AUTOCONFS := $(wildcard /usr/bin/autoconf*) AUTOCONF = $(shell which autoconf) @@ -28,6 +49,10 @@ config.status: configure dh_testdir + rm modules.conf + 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) \ @@ -65,7 +90,7 @@ dh_testdir dh_testroot dh_clean -k - dh_installdirs + dh_installdirs -A --sourcedir=debian/tmp $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install @@ -89,15 +114,13 @@ # dh_installcatalogs # dh_installpam # dh_installmime - dh_installinit + dh_installinit --sourcedir=debian/tmp # dh_installcron # dh_installinfo # dh_undocumented # dh_installman - dh_install --sourcedir=debian/tmp --autodest debian/monit/freeswitch.monitrc - dh_install --sourcedir=debian/tmp --autodest debian/default/freeswitch - dh_install --sourcedir=/debian/tmp --autodest debian/man/man1/freeswitch.1 - dh_link --sourcedir=debian/tmp opt/freeswitch/conf etc/opt/freeswitch + cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freswitch.monitrc + cp debian/default/freeswitch debian/freeswitch/etc/default dh_install --sourcedir=debian/tmp dh_strip dh_compress

1 0

[commit] r6473 - in freeswitch/trunk/src: include mod/formats/mod_local_stream mod/formats/mod_shout
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: anthm Date: Sun Dec 2 11:01:56 2007 New Revision: 6473 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: add interval to file handles for streams Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Sun Dec 2 11:01:56 2007 @@ -279,6 +279,7 @@ /*! pre-buffer x bytes for streams */ uint32_t prebuf; /*! private data for the format module to store handle specific info */ + uint32_t interval; void *private_info; char *handler; int64_t pos; 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 Sun Dec 2 11:01:56 2007 @@ -174,13 +174,14 @@ handle->seekable = 0; handle->speed = 0; handle->private_info = context; + handle->interval = source->interval; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening Stream [%s] %dhz\n", path, handle->samplerate); switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool); if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); return SWITCH_STATUS_MEMERR; - } + } context->source = source; Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sun Dec 2 11:01:56 2007 @@ -1123,6 +1123,7 @@ uint8_t buf[1024]; int rlen; int is_local = 0; + uint32_t interval = 20000; if (strstr(path_info + 7, "://")) { file = strdup(path_info + 7); @@ -1171,14 +1172,17 @@ path_info + 7); - + if (fh.interval) { + interval = fh.interval; + } + for(;;) { switch_size_t samples = sizeof(buf) / 2; switch_core_file_read(&fh, buf, &samples); if (is_local) { - switch_yield(20000); + switch_yield(interval); } if (!samples) {

1 0

[commit] r6472 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: brian Date: Sat Dec 1 22:48:17 2007 New Revision: 6472 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: one more fix Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 1 22:48:17 2007 @@ -1,7 +1,7 @@ <profile name="default">  <aliases> - <alias name="$${domain}"/> --> + <alias name="$${domain}"/> </aliases>  <gateways>

1 0

[commit] r6471 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: brian Date: Sat Dec 1 22:36:12 2007 New Revision: 6471 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: one more fix Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 1 22:36:12 2007 @@ -1,8 +1,8 @@ <profile name="default">  -  -  -  + <aliases> + <alias name="$${domain}"/> --> + </aliases>  <gateways>

1 0

[commit] r6470 - freeswitch/trunk/src/mod/endpoints/mod_alsa
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: brian Date: Sat Dec 1 22:01:41 2007 New Revision: 6470 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Log: update mod_alsa like mod_portaduio to fill in local ip 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 Sat Dec 1 22:01:41 2007 @@ -1457,6 +1457,8 @@ char *dialplan = globals.dialplan; char *cid_name = globals.cid_name; char *cid_num = globals.cid_num; + char ip[25] = "0.0.0.0"; + switch_core_session_add_stream(session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { @@ -1492,9 +1494,12 @@ tech_pvt->codec_ms = atoi(argv[5]); } + switch_find_local_ip(ip, sizeof(ip), AF_INET); + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), NULL, - dialplan, cid_name, cid_num, NULL, NULL, NULL, NULL, (char *) modname, NULL, + dialplan, cid_name, cid_num, + ip, NULL, NULL, NULL, (char *) modname, NULL, dest)) != 0) { char name[128]; snprintf(name, sizeof(name), "Alsa/%s",

1 0

[commit] r6469 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: brian Date: Sat Dec 1 21:55:51 2007 New Revision: 6469 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: thanks trixter Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 1 21:55:51 2007 @@ -1,7 +1,8 @@ <context name="default"> <extension name="global" continue="true"> - <condition> - <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <condition field="${network_addr}" condition="^$"> + <action application="set" data="use_profile=${cond(${is_lan_addr($${local_ip_v4})} == yes ? nat : default)}"/> + <anti-action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> <!-- This will setup some variables if the user isn't authenticated. numbering_plan is required for the demo to function properly.

1 0

[commit] r6467 - freeswitch/trunk
by Freeswitch SVN 01 Dec '07

01 Dec '07

Author: cypromis Date: Sat Dec 1 14:56:21 2007 New Revision: 6467 Modified: freeswitch/trunk/freeswitch.spec Log: disable build of not finished modules Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Dec 1 14:56:21 2007 @@ -177,9 +177,9 @@ FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile" LANGUAGES_MODULES= LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" -SAY_MODULES="say/mod_say_de say/mod_say_en say/mod_say_fr say/mod_say_es say/mod_say_it say/mod_say_nl" +SAY_MODULES="say/mod_say_de say/mod_say_en say/mod_say_fr" TIMERS_MODULES= -DISABLED_MODULES="applications/mod_sountouch 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" +DISABLED_MODULES="applications/mod_sountouch 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" XML_INT_MODULES="xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr" 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"

1 0

[commit] r6466 - freeswitch/trunk
by Freeswitch SVN 01 Dec '07

01 Dec '07

Author: cypromis Date: Sat Dec 1 14:09:45 2007 New Revision: 6466 Modified: freeswitch/trunk/freeswitch.spec Log: Hmm another typo .. *sigh* now lets go on and test it on all rpm platforms :) Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Dec 1 14:09:45 2007 @@ -128,8 +128,8 @@ #Group: System/Libraries #Requires: %{name} = %{version}-%{release} -%description lang-es -Spanish language phrases module and directory structure for say module and voicemail +#%description lang-es +#Spanish language phrases module and directory structure for say module and voicemail %package lang-de Summary: Provides german language dependand modules and sounds for the FreeSwitch Open Source telephone platform.

1 0

[commit] r6465 - freeswitch/trunk
by Freeswitch SVN 01 Dec '07

01 Dec '07

Author: cypromis Date: Sat Dec 1 14:00:03 2007 New Revision: 6465 Modified: freeswitch/trunk/freeswitch.spec Log: Disabled non ready language modules for es, it and nl Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Dec 1 14:00:03 2007 @@ -115,18 +115,18 @@ %description lang-en English language phrases module and directory structure for say module and voicemail -%package lang-it -Summary: Provides italian language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description lang-it -Italian language phrases module and directory structure for say module and voicemail - -%package lang-es -Summary: Provides spanish language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} +#%package lang-it +#Summary: Provides italian language dependand modules and sounds for the FreeSwitch Open Source telephone platform. +#Group: System/Libraries +#Requires: %{name} = %{version}-%{release} + +#%description lang-it +#Italian language phrases module and directory structure for say module and voicemail + +#%package lang-es +#Summary: Provides spanish language dependand modules and sounds for the FreeSwitch Open Source telephone platform. +#Group: System/Libraries +#Requires: %{name} = %{version}-%{release} %description lang-es Spanish language phrases module and directory structure for say module and voicemail @@ -139,13 +139,13 @@ %description lang-de German language phrases module and directory structure for say module and voicemail -%package lang-nl -Summary: Provides dutch language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} +#%package lang-nl +#Summary: Provides dutch language dependand modules and sounds for the FreeSwitch Open Source telephone platform. +#Group: System/Libraries +#Requires: %{name} = %{version}-%{release} -%description lang-nl -Dutch language phrases module and directory structure for say module and voicemail +#%description lang-nl +#Dutch language phrases module and directory structure for say module and voicemail %package lang-fr Summary: Provides french language dependand modules and sounds for the FreeSwitch Open Source telephone platform. @@ -222,7 +222,7 @@ # Install init files # On SuSE: -%if 0%{suse_version} > 100 +%if 0%{?suse_version} > 100 install -D -m 744 build/freeswitch.init.suse $RPM_BUILD_ROOT/etc/init.d/freeswitch %else # On RedHat like @@ -230,7 +230,7 @@ %endif # On SuSE make /usr/sbin/rcfreeswitch a link to /etc/init.d/freeswitch -%if 0%{suse_version} > 100 +%if 0%{?suse_version} > 100 mkdir -p $RPM_BUILD_ROOT/usr/sbin ln -sf /etc/init.d/freeswitch $RPM_BUILD_ROOT/usr/sbin/rcfreeswitch %endif @@ -278,7 +278,7 @@ /opt/freeswitch/bin/freeswitch /etc/init.d/freeswitch /etc/sysconfig/freeswitch -%if 0%{suse_version} > 100 +%if 0%{?suse_version} > 100 /usr/sbin/rcfreeswitch %endif /opt/freeswitch/lib/libfreeswitch*.so* @@ -360,23 +360,23 @@ %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/vm/*.xml /opt/freeswitch/mod/mod_say_en.so* -%files lang-it -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/it -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/it/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/it/vm -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/it/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/it/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/it/vm/*.xml -/opt/freeswitch/mod/mod_say_it.so* - -%files lang-es -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/es -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/es/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/es/vm -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/es/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/es/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/es/vm/*.xml -/opt/freeswitch/mod/mod_say_es.so* +#%files lang-it +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/it +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/it/demo +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/it/vm +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/it/*.xml +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/it/demo/*.xml +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/it/vm/*.xml +#/opt/freeswitch/mod/mod_say_it.so* + +#%files lang-es +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/es +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/es/demo +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/es/vm +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/es/*.xml +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/es/demo/*.xml +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/es/vm/*.xml +#/opt/freeswitch/mod/mod_say_es.so* %files lang-de @@ -388,14 +388,14 @@ %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/vm/*.xml /opt/freeswitch/mod/mod_say_de.so* -%files lang-nl -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/nl -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/vm -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/vm/*.xml -/opt/freeswitch/mod/mod_say_nl.so* +#%files lang-nl +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/nl +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/demo +#%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/vm +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/*.xml +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/demo/*.xml +#%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/nl/vm/*.xml +#/opt/freeswitch/mod/mod_say_nl.so* %files lang-fr %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr @@ -423,6 +423,7 @@ - added all buildable modules - added redhat style init file - splitted off language dependant stuff into separate language files +- disable non complete language modules * Tue Apr 24 2007 - peter+rpmspam(a)suntel.com.tr - Added a debug package - Split the passthrough codecs into separate packages

1 0

[commit] r6461 - freeswitch/trunk/build
by Freeswitch SVN 01 Dec '07

01 Dec '07

Author: cypromis Date: Sat Dec 1 13:35:51 2007 New Revision: 6461 Modified: freeswitch/trunk/build/freeswitch.init.suse Log: Cleaning leftovers from peters init file mistakes hehe Modified: freeswitch/trunk/build/freeswitch.init.suse ============================================================================== --- freeswitch/trunk/build/freeswitch.init.suse (original) +++ freeswitch/trunk/build/freeswitch.init.suse Sat Dec 1 13:35:51 2007 @@ -42,84 +42,13 @@ # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: FREESWITCH XYZ daemon providing ZYX -# Description: Start FREESWITCH to allow XY and provide YZ -# continued on second line by '#<TAB>' -# should contain enough info for the runlevel editor -# to give admin some idea what this service does and -# what it's needed for ... -# (The Short-Description should already be a good hint.) +# Description: Start FREESWITCH the Open Source +# Voice Platform ### END INIT INFO # -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -# and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according to LSB (1.1): -# $local_fs all local file systems are mounted -# (most services should need this!) -# $remote_fs all remote file systems are mounted -# (note that /usr may be remote, so -# many services should Require this!) -# $syslog system logging facility up -# $network low level networking (eth card, ...) -# $named hostname resolution available -# $netdaemons all network daemons are running -# The $netdaemons pseudo service has been removed in LSB 1.2. -# For now, we still offer it for backward compatibility. -# These are new (LSB 1.2): -# $time the system time has been set correctly -# $portmap SunRPC portmapping service available -# UnitedLinux extensions: -# $ALL indicates that a script should be inserted -# at the end -# * The services specified in the stop tags -# (Required-Stop/Should-Stop) -# specify which services need to be still running when this service -# is shut down. Often the entries there are just copies or a subset -# from the respective start tag. -# * Should-Start/Stop are now part of LSB as of 2.0, -# formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. -# insserv does support both variants. -# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time -# (%fillup_and_insserv macro in %post of many RPMs) to specify whether -# a startup script should default to be enabled after installation. -# It's not used by insserv. -# -# Note on runlevels: -# 0 - halt/poweroff 6 - reboot -# 1 - single user 2 - multiuser without network exported -# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) -# -# Note on script names: -# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html -# A registry has been set up to manage the init script namespace. -# http://www.lanana.org/ -# Please use the names already registered or register one or use a -# vendor prefix. - - # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance -FREESWITCH_BIN=/usr/bin/freeswitch +FREESWITCH_BIN=/opt/freeswitch/bin/freeswitch test -x $FREESWITCH_BIN || { echo "$FREESWITCH_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; }

1 0