November 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r6435 - freeswitch/trunk/libs/js/nsprpub/config
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: cypromis Date: Thu Nov 29 12:33:50 2007 New Revision: 6435 Modified: freeswitch/trunk/libs/js/nsprpub/config/rules.mk Log: fixed nsprlib install path Modified: freeswitch/trunk/libs/js/nsprpub/config/rules.mk ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/config/rules.mk (original) +++ freeswitch/trunk/libs/js/nsprpub/config/rules.mk Thu Nov 29 12:33:50 2007 @@ -232,7 +232,7 @@ # $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir) #endif ifdef RELEASE_LIBS - $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(prefix)/$(lib_subdir) endif +$(LOOP_OVER_DIRS)

1 0

[Freeswitch-svn] [commit] r6434 - freeswitch/trunk/src
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: mikej Date: Thu Nov 29 10:38:00 2007 New Revision: 6434 Modified: freeswitch/trunk/src/switch_console.c Log: handle result of fwrite Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu Nov 29 10:38:00 2007 @@ -36,10 +36,14 @@ SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { + switch_size_t nwrite; FILE *out = switch_core_get_console(); if (out) { - fwrite(data, datalen, 1, out); + nwrite = fwrite(data, datalen, 1, out); + if (nwrite != datalen) { + return SWITCH_STATUS_FALSE; + } return SWITCH_STATUS_SUCCESS; }

1 0

[Freeswitch-svn] [commit] r6433 - freeswitch/trunk/w32/Library
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: mikej Date: Wed Nov 28 23:10:17 2007 New Revision: 6433 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: install htdocs files Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Nov 28 23:10:17 2007 @@ -105,7 +105,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" + CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"
if not exist "$(SolutionDir)$(OutDir)\htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(SolutionDir)$(OutDir)\htdocs\" /C /D /Y /S

" /> </Configuration> <Configuration @@ -194,7 +194,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" + CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"
if not exist "$(SolutionDir)$(OutDir)\htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(SolutionDir)$(OutDir)\htdocs\" /C /D /Y /S

" /> </Configuration> </Configurations> @@ -505,11 +505,11 @@ > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File

1 0

[Freeswitch-svn] [commit] r6432 - in freeswitch/trunk: . htdocs
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 23:07:41 2007 New Revision: 6432 Added: freeswitch/trunk/htdocs/ freeswitch/trunk/htdocs/license.txt freeswitch/trunk/htdocs/slim.swf (contents, props changed) Modified: freeswitch/trunk/Makefile.am Log: install htdocs files Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Wed Nov 28 23:07:41 2007 @@ -166,6 +166,12 @@ test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ done ; + for htdocsfile in `find htdocs -name \* | grep -v .svn` ; do \ + dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \ + filename=`echo $$htdocsfile | sed -e 's|^.*/||'`; \ + test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ + test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + done ; .version: touch .version Added: freeswitch/trunk/htdocs/license.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/htdocs/license.txt Wed Nov 28 23:07:41 2007 @@ -0,0 +1,10 @@ +Copyright (c) 2005, Fabricio Zuardi +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Added: freeswitch/trunk/htdocs/slim.swf ============================================================================== Binary file. No diff available.

1 0

[Freeswitch-svn] [commit] r6431 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: mikej Date: Wed Nov 28 22:00:18 2007 New Revision: 6431 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: uninitialized var. 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 Wed Nov 28 22:00:18 2007 @@ -43,7 +43,7 @@ SWITCH_STANDARD_API(find_user_function) { - switch_xml_t x_domain, x_user, xml = NULL; + switch_xml_t x_domain = NULL, x_user = NULL, xml = NULL; int argc; char *mydata = NULL, *argv[3]; char *key, *user, *domain; @@ -81,7 +81,7 @@ end: - if (xml) { + if (xml && x_user) { xmlstr = switch_xml_toxml(x_user); assert(xmlstr); if ((xs = strstr(xmlstr, "?>"))) {

1 0

[Freeswitch-svn] [commit] r6430 - in freeswitch/trunk: libs/js src src/include src/mod/applications/mod_commands src/mod/applications/mod_dptools src/mod/applications/mod_voicemail src/mod/endpoints/mod_sofia src/mod/languages/mod_spidermonkey src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 21:48:44 2007 New Revision: 6430 Modified: freeswitch/trunk/libs/js/.update freeswitch/trunk/libs/js/configure.ac freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch_xml.cpp Log: add some stuff Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Wed Nov 28 21:48:44 2007 @@ -1 +1 @@ -Mon Apr 23 14:11:42 EDT 2007 +Wed Nov 28 21:37:06 EST 2007 Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Wed Nov 28 21:48:44 2007 @@ -141,6 +141,15 @@ CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi +dnl # configure option --without-xml +AC_ARG_WITH([xml], + AS_HELP_STRING([--without-xml], [build without XML object]), + [ac_cv_with_xml=$withval], [ac_cv_with_xml=yes]) +AC_CACHE_CHECK([whether to build with the XML object], [ac_cv_with_xml], [ac_cv_with_xml=yes]) +if test ".$ac_cv_with_xml" = ".yes"; then + CPPFLAGS="$CPPFLAGS -DJS_HAS_XML_SUPPORT=1" +fi + dnl # configure option --with-dso AC_ARG_WITH([dso], AS_HELP_STRING([--with-dso], [build without DSO object (allows run-time process extending)]), Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Wed Nov 28 21:48:44 2007 @@ -319,7 +319,9 @@ const char *params); SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name, char *params, switch_xml_t *root, switch_xml_t *domain); -SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *user_name, const char *domain_name, +SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key, + const char *user_name, + const char *domain_name, const char *ip, switch_xml_t *root, switch_xml_t *domain, 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 Wed Nov 28 21:48:44 2007 @@ -41,6 +41,66 @@ SWITCH_MODULE_DEFINITION(mod_commands, mod_commands_load, NULL, NULL); +SWITCH_STANDARD_API(find_user_function) +{ + switch_xml_t x_domain, x_user, xml = NULL; + int argc; + char *mydata = NULL, *argv[3]; + char *key, *user, *domain; + char *xmlstr, *xs; + + 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 < 3) { + stream->write_function(stream, "bad args\n"); + goto end; + } + + key = argv[0]; + user = argv[1]; + domain = argv[2]; + + if (!(key && user && domain)) { + stream->write_function(stream, "bad args\n"); + goto end; + } + + if (switch_xml_locate_user(key, user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "can't find user [%s@%s]\n", user, domain); + goto end; + } + + + end: + + if (xml) { + xmlstr = switch_xml_toxml(x_user); + assert(xmlstr); + if ((xs = strstr(xmlstr, "?>"))) { + xs += 2; + } else { + xs = xmlstr; + } + stream->write_function(stream, "%s", xs); + free(xmlstr); + switch_xml_free(xml); + + } + + free(mydata); + return SWITCH_STATUS_SUCCESS; + +} + + SWITCH_STANDARD_API(regex_function) { switch_regex_t *re = NULL; @@ -1782,6 +1842,7 @@ 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>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Nov 28 21:48:44 2007 @@ -109,7 +109,7 @@ *domain++ = '\0'; - if (switch_xml_locate_user(user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain); goto done; } 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 Wed Nov 28 21:48:44 2007 @@ -1570,7 +1570,7 @@ assert(xtra); - if (switch_xml_locate_user(myid, domain_name, switch_channel_get_variable(channel, "network_addr"), + if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, xtra) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", myid, domain_name); ok = 0; @@ -1753,7 +1753,7 @@ assert(xtra); x_user = x_domain = x_domain_root = NULL; - if (switch_xml_locate_user(id, domain_name, switch_channel_get_variable(channel, "network_addr"), + if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, xtra) == SWITCH_STATUS_SUCCESS) { if ((x_params = switch_xml_child(x_user, "params"))) { for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { 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 Wed Nov 28 21:48:44 2007 @@ -893,7 +893,7 @@ domain_name = realm; } - if (switch_xml_locate_user(username, domain_name, ip, &xml, &domain, &user, pbuf) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user("id", username, domain_name, ip, &xml, &domain, &user, pbuf) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", username, domain_name); ret = AUTH_FORBIDDEN; goto end; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Wed Nov 28 21:48:44 2007 @@ -2,7 +2,7 @@ JS_DIR=$(switch_srcdir)/libs/js JSLA=$(JS_DIR)/libjs.la -LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 +LOCAL_CFLAGS+=-I$(JS_DIR)/src -I$(JS_DIR)/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1 -DJS_HAS_XML_SUPPORT=1 LOCAL_LDFLAGS+=-L$(JS_DIR)/nsprpub/pr/src -L$(JS_DIR)/nsprpub/dist/lib -lnspr4 LOCAL_LIBADD+=$(JSLA) Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Nov 28 21:48:44 2007 @@ -172,7 +172,7 @@ *pass++ = '\0'; } - if (switch_xml_locate_user(user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, "mailbox=check") != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user("id", user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, "mailbox=check") != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain_name); goto fail; } Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 28 21:48:44 2007 @@ -1296,7 +1296,8 @@ } -SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *user_name, +SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key, + const char *user_name, const char *domain_name, const char *ip, switch_xml_t *root, @@ -1311,10 +1312,10 @@ *domain = NULL; if (!switch_strlen_zero(xtra_params)) { - snprintf(params, sizeof(params), "user=%s&domain=%s&ip=%s&%s", + snprintf(params, sizeof(params), "key=%s&user=%s&domain=%s&ip=%s&%s", key, switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip), xtra_params); } else { - snprintf(params, sizeof(params), "user=%s&domain=%s&ip=%s", + snprintf(params, sizeof(params), "key=%s&user=%s&domain=%s&ip=%s", key, switch_str_nil(user_name), switch_str_nil(domain_name), switch_str_nil(ip)); xtra_params = ""; } @@ -1336,7 +1337,7 @@ } } - if ((*user = switch_xml_find_child(*domain, "user", "id", user_name))) { + if ((*user = switch_xml_find_child(*domain, "user", key, user_name))) { return SWITCH_STATUS_SUCCESS; }

1 0

[Freeswitch-svn] [commit] r6429 - freeswitch/trunk/conf
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 20:53:42 2007 New Revision: 6429 Modified: freeswitch/trunk/conf/voicemail.tpl Log: basic framework for built-in web stuff on voicemail Modified: freeswitch/trunk/conf/voicemail.tpl ============================================================================== --- freeswitch/trunk/conf/voicemail.tpl (original) +++ freeswitch/trunk/conf/voicemail.tpl Wed Nov 28 20:53:42 2007 @@ -1,6 +1,6 @@ From: FreeSWITCH mod_voicemail <${voicemail_account}@${voicemail_domain}> To: <${voicemail_email}> -Subject: ${voicemail_message_len} sec Voicemail from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +Subject: Voicemail from ${voicemail_caller_id_name} ${voicemail_caller_id_number} ${voicemail_message_len} X-Priority: ${voicemail_priority} X-Mailer: FreeSWITCH

1 0

[Freeswitch-svn] [commit] r6428 - freeswitch/trunk/conf
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 20:28:08 2007 New Revision: 6428 Modified: freeswitch/trunk/conf/voicemail.tpl Log: basic framework for built-in web stuff on voicemail Modified: freeswitch/trunk/conf/voicemail.tpl ============================================================================== --- freeswitch/trunk/conf/voicemail.tpl (original) +++ freeswitch/trunk/conf/voicemail.tpl Wed Nov 28 20:28:08 2007 @@ -9,18 +9,24 @@ --000XXX000 Content-Type: text/plain; charset=ISO-8859-1; Format=Flowed -Content-Disposition: attachment +Content-Disposition: inline Content-Transfer-Encoding: 7bit -At ${voicemail_time} you were left a ${voicemail_message_len} second message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} -to your account ${voicemail_account}@${voicemail_domain} +Created: ${voicemail_time} +From: ${voicemail_caller_id_name} ${voicemail_caller_id_number} +Duration: ${voicemail_message_len} +Account: ${voicemail_account}@${voicemail_domain} --000XXX000 Content-Type: text/html; charset=ISO-8859-1 -Content-Disposition: attachment +Content-Disposition: inline Content-Transfer-Encoding: 7bit -At ${voicemail_time} you were left a ${voicemail_message_len} second message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} -to your account ${voicemail_account} @ ${voicemail_domain} <a href=tel:${voicemail_caller_id_number}>Click to call</a> + +Message From ${voicemail_caller_id_name} ${voicemail_caller_id_number} +<hr noshade size=1> +Created: ${voicemail_time} +Duration: ${voicemail_message_len} +Account: ${voicemail_account}@${voicemail_domain} --000XXX000--

1 0

[Freeswitch-svn] [commit] r6427 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 20:27:48 2007 New Revision: 6427 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: basic framework for built-in web stuff on voicemail 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 Wed Nov 28 20:27:48 2007 @@ -1128,7 +1128,10 @@ int total_saved_urgent_messages = 0; int32_t message_len = 0; char *p; - + long l_duration = 0; + switch_core_time_duration_t duration; + char duration_str[80]; + if (!strcasecmp(cbt->read_flags, URGENT_FLAG_STRING)) { priority = 1; } @@ -1159,7 +1162,19 @@ snprintf(tmp,sizeof(tmp), "%d", priority); switch_channel_set_variable(channel, "voicemail_priority", tmp); message_len = atoi(cbt->message_len); - switch_channel_set_variable(channel, "voicemail_message_len", cbt->message_len); + + l_duration = atol(cbt->message_len) * 1000000; + switch_core_measure_time(l_duration, &duration); + duration.day += duration.yr * 365; + duration.hr += duration.day * 24; + + snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", + duration.hr, + duration.min, + duration.sec + ); + + switch_channel_set_variable(channel, "voicemail_message_len", duration_str); switch_channel_set_variable(channel, "voicemail_email", cbt->email); if(switch_strlen_zero(profile->email_headers)) { @@ -1922,7 +1937,10 @@ int total_new_urgent_messages = 0; int total_saved_urgent_messages = 0; char *p; - + long l_duration = 0; + switch_core_time_duration_t duration; + char duration_str[80]; + message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); @@ -1949,8 +1967,21 @@ switch_channel_set_variable(channel, "voicemail_priority", tmp); switch_channel_set_variable(channel, "voicemail_email", email_vm); - snprintf(tmp,sizeof(tmp), "%"SWITCH_SIZE_T_FMT, message_len); - switch_channel_set_variable(channel, "voicemail_message_len", tmp); + + + l_duration = (long)message_len * 1000000; + switch_core_measure_time(l_duration, &duration); + duration.day += duration.yr * 365; + duration.hr += duration.day * 24; + snprintf(duration_str, sizeof(duration_str), "%.2u:%.2u:%.2u", + duration.hr, + duration.min, + duration.sec + ); + + + + switch_channel_set_variable(channel, "voicemail_message_len", duration_str); if (switch_strlen_zero(profile->email_from)) { from = switch_core_session_sprintf(session, "%s@%s", id, domain_name); @@ -2378,8 +2409,8 @@ "type=\"application/x-shockwave-flash\" \n" "data=\"http://%s:%s/pub/slim.swf?song_url=%s&player_title=%s\">\n" "<param name=movie value=\"http://%s:%s/pub/slim.swf?song_url=%s&player_title=%s\"></object> \n" - "[<a href=%s>delete</a>] [<a href=%s>download</a>] \n", - holder->host, holder->port, get, title_aft, holder->host, holder->port, get, title_aft, del, get); + "[<a href=%s>delete</a>] [<a href=%s>download</a>] [<a href=tel:%s>call</a>] \n", + holder->host, holder->port, get, title_aft, holder->host, holder->port, get, title_aft, del, get, argv[6]); free(get); free(del);

1 0

[Freeswitch-svn] [commit] r6426 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 20:06:03 2007 New Revision: 6426 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Log: basic framework for built-in web stuff on voicemail Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Wed Nov 28 20:06:03 2007 @@ -31,6 +31,7 @@ <param name="rew-key" value="4"/> <param name="record-silence-threshold" value="200"/> <param name="record-silence-hits" value="2"/> + <param name="web-template-file" value="web-vm.tpl"/>   <!-- the next two both must be set for this to be enabled

1 0