December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

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

01 Dec '07

Author: cypromis Date: Sat Dec 1 12:48:38 2007 New Revision: 6460 Modified: freeswitch/trunk/freeswitch.spec Log: typos typos and doing description tags wrong tsk tsk tsk Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Dec 1 12:48:38 2007 @@ -112,42 +112,48 @@ Group: System/Libraries Requires: %{name} = %{version}-%{release} -%description English language phrases module and directory structure for say module and voicemail +%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 Italian language phrases module and directory structure for say module and voicemail +%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 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. Group: System/Libraries Requires: %{name} = %{version}-%{release} -%description German language phrases module and directory structure for say module and voicemail +%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} -%description 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. Group: System/Libraries Requires: %{name} = %{version}-%{release} -%description French language phrases module and directory structure for say module and voicemail +%description lang-fr +French language phrases module and directory structure for say module and voicemail %prep %setup -q

1 0

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

01 Dec '07

Author: cypromis Date: Sat Dec 1 12:42:11 2007 New Revision: 6459 Modified: freeswitch/trunk/freeswitch.spec Log: Forgot the descriptions of the lang modules, sorry Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Dec 1 12:42:11 2007 @@ -112,31 +112,42 @@ Group: System/Libraries Requires: %{name} = %{version}-%{release} +%description 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 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 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. Group: System/Libraries Requires: %{name} = %{version}-%{release} +%description 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} +%description 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. Group: System/Libraries Requires: %{name} = %{version}-%{release} +%description French language phrases module and directory structure for say module and voicemail %prep %setup -q

1 0

[commit] r6458 - in freeswitch/trunk: . build
by Freeswitch SVN 01 Dec '07

01 Dec '07

Author: cypromis Date: Sat Dec 1 12:24:45 2007 New Revision: 6458 Added: freeswitch/trunk/build/freeswitch.init.redhat freeswitch/trunk/build/freeswitch.init.suse - copied unchanged from r6449, /freeswitch/trunk/build/freeswitch.init Removed: freeswitch/trunk/build/freeswitch.init Modified: freeswitch/trunk/freeswitch.spec Log: Split init files into redhat ne and suse one (both need a bit of more care) SPlit packages into language dependant ones Added: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- (empty file) +++ freeswitch/trunk/build/freeswitch.init.redhat Sat Dec 1 12:24:45 2007 @@ -0,0 +1,95 @@ +#!/bin/bash +# +# /etc/rc.d/init.d/freeswitch +# +# The FreeSwitch Open Source Voice Platform +# +# chkconfig: - 89 14 +# processname: freeswitch +# config: /opt/freeswitch/conf/freeswitch.conf +# pidfile: /opt/freeswitch/log/freeswitch/pid +# + + +# Source function library. +. /etc/init.d/functions + +# Source options file +if [ -f /etc/sysconfig/freeswitch ]; then + . /etc/sysconfig/freeswitch +fi + +prog=freeswitch +pidfile=/opt/freeswitch/log/freeswitch.pid +FS_USER=freeswitch +lockfile=/var/lock/subsys/freeswitch +RETVAL=0 + +# <define any local shell functions used by the code that follows> + +start() { + echo -n "Starting $prog: " + if [ -e $lockfile ]; then + if [ -e $pidfile && [ -e /proc/`$pidfile` ]; then + echo -n $"cannot start freeswitch: freeswitch is already running."; + failure $"cannot start freeswitch: freeswitch already running."; + echo + return 1 + fi + fi + + daemon --user $FS_USER --pidfile $pidfile $prog $FREESWITCH_ARGS + RETVAL=$? + [ $RETVAL -eq 0 ] && touch $lockfile; + return $RETVAL +} + +stop() { + echo -n "Shutting down $prog: " + if [ ! -e $lockfile ]; then + echo -n $"cannot stop $prog: $prog is not running." + failure $"cannot stop $prog: $prog is not running." + echo + return 1; + fi + /opt/freeswitch/bin/freeswitch -stop + killproc freeswitch + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile; + return $RETVAL +} + +rhstatus() { + status $prog; +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $prog + RETVAL=$? + ;; + restart) + stop + start + ;; + reload) +# <cause the service configuration to be reread, either with +# kill -HUP or by restarting the daemons, in a manner similar +# to restart above> + ;; + condrestart) + [ -f $pidfile ] && restart || : + ;; + *) + echo "Usage: $prog {start|stop|status|reload|restart" + exit 1 + ;; +esac +exit $RETVAL Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Dec 1 12:24:45 2007 @@ -107,6 +107,37 @@ %description spidermonkey +%package lang-en +Summary: Provides english 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} + +%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-de +Summary: Provides german 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} + +%package lang-fr +Summary: Provides french language dependand modules and sounds for the FreeSwitch Open Source telephone platform. +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + + %prep %setup -q @@ -173,11 +204,19 @@ cp build/freeswitch.ld.so.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/ # Install init files -install -D -m 744 build/freeswitch.init $RPM_BUILD_ROOT/etc/init.d/freeswitch +# On SuSE: +%if 0%{suse_version} > 100 +install -D -m 744 build/freeswitch.init.suse $RPM_BUILD_ROOT/etc/init.d/freeswitch +%else +# On RedHat like +install -D -m 744 build/freeswitch.init.redhat $RPM_BUILD_ROOT/etc/init.d/freeswitch +%endif -# Make /usr/sbin/rcfreeswitch a link to /etc/init,d/freeswitch +# On SuSE make /usr/sbin/rcfreeswitch a link to /etc/init.d/freeswitch +%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 # Add the sysconfiguration file install -D -m 744 build/freeswitch.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/freeswitch @@ -208,15 +247,6 @@ %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/dialplan %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/directory %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en/vm -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de/vm -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/demo -%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/vm %dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/sip_profiles %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/mime.types %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/*.tpl @@ -225,22 +255,15 @@ %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/autoload_configs/*.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/dialplan/*.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/directory/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/vm/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/vm/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/demo/*.xml -%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/vm/*.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/sip_profiles/*.xml %config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/htdocs/* /etc/ld.so.conf.d/* /opt/freeswitch/bin/freeswitch /etc/init.d/freeswitch /etc/sysconfig/freeswitch +%if 0%{suse_version} > 100 /usr/sbin/rcfreeswitch +%endif /opt/freeswitch/lib/libfreeswitch*.so* /opt/freeswitch/mod/mod_console.so* /opt/freeswitch/mod/mod_logfile.so* @@ -282,12 +305,6 @@ /opt/freeswitch/mod/mod_xml_rpc.so* /opt/freeswitch/mod/mod_xml_curl.so* /opt/freeswitch/mod/mod_xml_cdr.so* -/opt/freeswitch/mod/mod_say_en.so* -/opt/freeswitch/mod/mod_say_fr.so* -/opt/freeswitch/mod/mod_say_de.so* -/opt/freeswitch/mod/mod_say_es.so* -/opt/freeswitch/mod/mod_say_it.so* -/opt/freeswitch/mod/mod_say_nl.so* %files codec-passthru-amr %defattr(-,freeswitch,daemon) @@ -317,6 +334,61 @@ /opt/freeswitch/mod/*.la /opt/freeswitch/include/*.h +%files lang-en +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en/demo +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/en/vm +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/*.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/en/demo/*.xml +%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-de +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de/demo +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/de/vm +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/*.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/de/demo/*.xml +%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-fr +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/demo +%dir %attr(750,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/vm +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/*.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/demo/*.xml +%config(noreplace) %attr(640,freeswitch,daemon) /opt/freeswitch/conf/lang/fr/vm/*.xml +/opt/freeswitch/mod/mod_say_fr.so* + %changelog * Thu Nov 29 2007 - michal.bielicki+rpmspam(a)voiceworks.pl - Added ifdefs for susealities @@ -332,6 +404,8 @@ - fixed locationof nspr and js libs - fixed odbc requirements - added all buildable modules +- added redhat style init file +- splitted off language dependant stuff into separate language files * Tue Apr 24 2007 - peter+rpmspam(a)suntel.com.tr - Added a debug package - Split the passthrough codecs into separate packages

1 0

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

01 Dec '07

Author: mikej Date: Fri Nov 30 23:51:06 2007 New Revision: 6457 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: fix build Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Nov 30 23:51:06 2007 @@ -535,7 +535,7 @@ if (switch_buffer_inuse(ep.buffer) >= len) { switch_buffer_lock(ep.buffer); - write_frame.datalen = switch_buffer_read(ep.buffer, buf, len); + write_frame.datalen = (uint32_t)switch_buffer_read(ep.buffer, buf, len); write_frame.samples = write_frame.datalen / 2; if (switch_core_session_write_frame(session, &write_frame, 1000, 0) != SWITCH_STATUS_SUCCESS) { goto end;

1 0

[commit] r6456 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 01 Dec '07

01 Dec '07

Author: anthm Date: Fri Nov 30 19:01:56 2007 New Revision: 6456 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add func Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Nov 30 19:01:56 2007 @@ -97,6 +97,69 @@ } +SWITCH_STANDARD_API(xml_locate_function) +{ + switch_xml_t xml = NULL, obj = NULL; + int argc; + char *mydata = NULL, *argv[4]; + char *section, *tag, *tag_attr_name, *tag_attr_val, *params = NULL; + char *xmlstr; + + if (!cmd) { + stream->write_function(stream, "bad args\n"); + goto end; + } + + mydata = strdup(cmd); + assert(mydata); + + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc == 1 && !strcasecmp(argv[0], "root")) { + const char *err; + xml = switch_xml_open_root(0, &err); + obj = xml; + goto end; + } + + if (argc < 4) { + stream->write_function(stream, "bad args\n"); + goto end; + } + + section = argv[0]; + tag = argv[1]; + tag_attr_name = argv[2]; + tag_attr_val = argv[3]; + + params = switch_mprintf("section=%s&tag=%s&tag_attr_name=%s&tag_attr_val=%s", section, tag, tag_attr_name, tag_attr_val); + assert(params); + if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "can't find anything\n"); + goto end; + } + + + end: + + switch_safe_free(params); + + if (xml && obj) { + xmlstr = switch_xml_toxml(obj, SWITCH_FALSE); + assert(xmlstr); + + stream->write_function(stream, "%s", xmlstr); + free(xmlstr); + switch_xml_free(xml); + + } + + free(mydata); + return SWITCH_STATUS_SUCCESS; + +} + + SWITCH_STANDARD_API(regex_function) { switch_regex_t *re = NULL; @@ -1838,7 +1901,8 @@ SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); SWITCH_ADD_API(commands_api_interface, "regex", "Eval a regex", regex_function, "<data>|<pattern>[|<subst string>]"); SWITCH_ADD_API(commands_api_interface, "uuid_chat", "Send a chat message", uuid_chat, UUID_CHAT_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a usere", find_user_function, "<key> <user>@<domain>"); + SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a user", find_user_function, "<key> <user>@<domain>"); + SWITCH_ADD_API(commands_api_interface, "xml_locate", "find some xml", xml_locate_function, "[root | <section> <tag> <tag_attr_name> <tag_attr_val>]"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD;

1 0