- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[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

[commit] r6425 - freeswitch/trunk/debian
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: cypromis Date: Wed Nov 28 20:05:33 2007 New Revision: 6425 Modified: freeswitch/trunk/debian/freeswitch.postinst Log: typo :( Modified: freeswitch/trunk/debian/freeswitch.postinst ============================================================================== --- freeswitch/trunk/debian/freeswitch.postinst (original) +++ freeswitch/trunk/debian/freeswitch.postinst Wed Nov 28 20:05:33 2007 @@ -21,7 +21,7 @@ case "$1" in configure) - if ! getent passwd openfire >/dev/null; then + if ! getent passwd freeswitch >/dev/null; then adduser --disabled-password --quiet --system \ --home /opt/freeswitch \ --gecos "FreeSwitch Voice Platform" --group daemon

1 0

[commit] r6424 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: anthm Date: Wed Nov 28 20:05:05 2007 New Revision: 6424 Added: freeswitch/trunk/conf/web-vm.tpl Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: basic framework for built-in web stuff on voicemail Added: freeswitch/trunk/conf/web-vm.tpl ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/web-vm.tpl Wed Nov 28 20:05:05 2007 @@ -0,0 +1,13 @@ +<title>FreeSWITCH Voicemail</title> +<body bgcolor=eeeeee> + +<table bgcolor=ffffff width=75% align=center style="border-style:inset;border-width:2px"> +<tr><td bgcolor=1010ff align=center valign=center style="border-style:inset;border-width:2px"> +Voicemail Messages +</td></tr> +<tr><td> + +<!break> + +</td></tr> +</table> 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:05:05 2007 @@ -87,6 +87,8 @@ char *callback_context; char *email_body; char *email_headers; + char *web_head; + char *web_tail; char *email_from; char *date_fmt; uint32_t digit_timeout; @@ -301,6 +303,8 @@ char *email_headers = NULL; char *email_from = ""; char *date_fmt = "%A, %B %d %Y, %I %M %p"; + char *web_head = NULL; + char *web_tail = NULL; uint32_t record_threshold = 200; uint32_t record_silence_hits = 2; uint32_t record_sample_rate = 0; @@ -376,6 +380,39 @@ if (!strcasecmp(var, "terminator-key") && !switch_strlen_zero(val)) { terminator_key = val; + } else if (!strcasecmp(var, "web-template-file") && !switch_strlen_zero(val)) { + switch_stream_handle_t stream = { 0 }; + int fd; + char *dpath = NULL; + char *path; + + if (switch_is_file_path(val)) { + path = val; + } else { + dpath = switch_mprintf("%s%s%s", + SWITCH_GLOBAL_dirs.conf_dir, + SWITCH_PATH_SEPARATOR, + val); + path = dpath; + } + + if ((fd = open(path, O_RDONLY)) > -1) { + char buf[2048]; + SWITCH_STANDARD_STREAM(stream); + while(switch_fd_read_line(fd, buf, sizeof(buf))) { + stream.write_function(&stream, "%s", buf); + } + close(fd); + web_head = stream.data; + if ((web_tail = strstr(web_head, "<!break>\n"))) { + *web_tail = '\0'; + web_tail += 9; + } else if ((web_tail = strstr(web_head, "<!break>\r\n"))) { + *web_tail = '\0'; + web_tail += 10; + } + } + switch_safe_free(dpath); } else if (!strcasecmp(var, "play-new-messages-key") && !switch_strlen_zero(val)) { play_new_messages_key = val; } else if (!strcasecmp(var, "play-saved-messages-key") && !switch_strlen_zero(val)) { @@ -549,6 +586,10 @@ #ifdef SWITCH_HAVE_ODBC } #endif + + profile->web_head = web_head; + profile->web_tail = web_tail; + profile->email_body = email_body; profile->email_headers = email_headers; profile->email_from = email_from; @@ -2218,14 +2259,16 @@ { char *sql; struct holder holder; - char *uri, *host, *port; - - host = port = uri = NULL; + //char *uri, *host, *port; + char *ref = NULL; + + //host = port = uri = NULL; if (stream->event) { - host = switch_event_get_header(stream->event, "http-host"); - port = switch_event_get_header(stream->event, "http-port"); - uri = switch_event_get_header(stream->event, "http-uri"); + //host = switch_event_get_header(stream->event, "http-host"); + //port = switch_event_get_header(stream->event, "http-port"); + //uri = switch_event_get_header(stream->event, "http-uri"); + ref = switch_event_get_header(stream->event, "http-referer"); } sql = switch_mprintf("select * from voicemail_data where user='%s' and domain='%s' and file_path like '%%%s'", user, domain, file); @@ -2239,13 +2282,111 @@ vm_execute_sql(profile, sql, profile->mutex); free(sql); - if (host && port && uri) { + if (ref) { stream->write_function(stream,"Content-type: text/html\n\n<h2>Message Deleted</h2>\n" - "<META http-equiv=\"refresh\" content=\"1;URL=http://%s:%s%s/rss\">", host, port, uri); + "<META http-equiv=\"refresh\" content=\"1;URL=%s\">", ref); } } + + +static int web_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + struct holder *holder = (struct holder *) pArg; + char *del, *get, *fname, *ext; + switch_time_exp_t tm; + char create_date[80] = ""; + char read_date[80] = ""; + char rss_date[80] = ""; + switch_size_t retsize; + long l_created = 0; + long l_read = 0; + long l_duration = 0; + switch_core_time_duration_t duration; + char duration_str[80]; + const char *fmt = "%a, %e %b %Y %T %z"; + char heard[80]; + char title_b4[128] = ""; + char title_aft[128*3] = ""; + + if (argc > 0) { + l_created = atol(argv[0]) * 1000000; + } + + if (argc > 1) { + l_read = atol(argv[1]) * 1000000; + } + + if (argc > 9) { + l_duration = atol(argv[9]) * 1000000; + } + + + if ((fname = strrchr(argv[8], '/'))) { + fname++; + } else { + fname = argv[8]; + } + + if ((ext = strrchr(fname, '.'))) { + ext++; + } + + 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 + ); + + if (l_created) { + switch_time_exp_lt(&tm, l_created); + switch_strftime(create_date, &retsize, sizeof(create_date), fmt, &tm); + switch_strftime(rss_date, &retsize, sizeof(create_date), "%D %T", &tm); + } + + if (l_read) { + switch_time_exp_lt(&tm, l_read); + switch_strftime(read_date, &retsize, sizeof(read_date), fmt, &tm); + } + + snprintf(heard, sizeof(heard), switch_strlen_zero(read_date) ? "never" : read_date); + + get = switch_mprintf("http://%s:%s%s/get/%s", holder->host, holder->port, holder->uri, fname); + del = switch_mprintf("http://%s:%s%s/del/%s", holder->host, holder->port, holder->uri, fname); + + holder->stream->write_function(holder->stream, "<div class=title>Message from %s %s</div><hr noshade size=1>\n", + argv[5], argv[6]); + holder->stream->write_function(holder->stream, "Priority: %s \n" + "Created: %s \n" + "Last Heard: %s \n" + "Duration: %s \n", + //"<a href=%s>Delete This Message</a> <hr noshade size=1>", + strcmp(argv[10], URGENT_FLAG_STRING) ? "normal" : "urgent", create_date, heard, duration_str); + + snprintf(title_b4, sizeof(title_b4), "%s <%s> %s", argv[5], argv[6], rss_date); + switch_url_encode(title_b4, title_aft, sizeof(title_aft)-1); + + + + holder->stream->write_function(holder->stream, + " <object width=550 height=15 \n" + "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); + + free(get); + free(del); + + return 0; +} + static int rss_callback(void *pArg, int argc, char **argv, char **columnNames) { struct holder *holder = (struct holder *) pArg; @@ -2324,7 +2465,7 @@ x_link = switch_xml_add_child_d(holder->x_item, "fsvm:rmlink", 0); switch_xml_set_txt_d(x_link, del); - + tmp = switch_mprintf("<![CDATA[Priority: %s " "Last Heard: %s Duration: %s " @@ -2433,6 +2574,50 @@ switch_core_destroy_memory_pool(&holder.pool); } + +static void do_web(vm_profile_t *profile, char *user, char *domain, char *host, char *port, char *uri, switch_stream_handle_t *stream) +{ + char buf[80] = ""; + struct holder holder; + char *sql; + callback_t cbt = { 0 }; + int ttl = 0; + + stream->write_function(stream, "Content-type: text/html\n\n"); + memset(&holder, 0, sizeof(holder)); + holder.profile = profile; + holder.stream = stream; + holder.user = user; + holder.domain = domain; + holder.host = host; + holder.port = port; + holder.uri = uri; + + + if (profile->web_head) { + stream->raw_write_function(stream, (uint8_t *)profile->web_head, strlen(profile->web_head)); + } + + cbt.buf = buf; + cbt.len = sizeof(buf); + + sql = switch_mprintf("select * from voicemail_data where user='%s' and domain='%s' order by read_flags", user, domain); + vm_execute_sql_callback(profile, profile->mutex, sql, web_callback, &holder); + switch_safe_free(sql); + + sql = switch_mprintf("select count(*) from voicemail_data where user='%s' and domain='%s' order by read_flags", user, domain); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + switch_safe_free(sql); + + ttl = atoi(buf); + stream->write_function(stream, "%d message%s ", ttl, ttl == 1 ? "" : "s"); + + if (profile->web_tail) { + stream->raw_write_function(stream, (uint8_t *)profile->web_tail, strlen(profile->web_tail)); + } + +} + SWITCH_STANDARD_API(voicemail_api_function) { int argc = 0; @@ -2505,12 +2690,13 @@ goto error; } - if (path_info) { if (!strncasecmp(path_info, "get/", 4)) { do_play(profile, user, domain, path_info + 4, stream); } else if (!strncasecmp(path_info, "del/", 4)) { do_del(profile, user, domain, path_info + 4, stream); + } else if (!strncasecmp(path_info, "web", 3)) { + do_web(profile, user, domain, host, port, uri, stream); } }

1 0

[commit] r6423 - freeswitch/trunk/debian
by Freeswitch SVN 29 Nov '07

29 Nov '07

Author: cypromis Date: Wed Nov 28 19:38:58 2007 New Revision: 6423 Added: freeswitch/trunk/debian/freeswitch.postinst (contents, props changed) freeswitch/trunk/debian/freeswitch.postrm (contents, props changed) Removed: freeswitch/trunk/debian/postinst freeswitch/trunk/debian/postrm freeswitch/trunk/debian/preinst Modified: freeswitch/trunk/debian/control freeswitch/trunk/debian/rules Log: fixes to make it more debianish. also fixed to create and remove the pacakge Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Wed Nov 28 19:38:58 2007 @@ -2,12 +2,12 @@ Maintainer: Michael Jerris <mike(a)jerris.com> Section: net Priority: extra -Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev, libssl-dev +Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev, libssl-dev, ncurses-dev Standards-Version: 3.7.2 Package: freeswitch Architecture: any -Depends: ${shlibs:Depends}, unixodbc, libasound2, libcurl3, openssl +Depends: ${shlibs:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5 Suggests: monit Description: A telephony platform that really kicks some ass... FreeSWITCH is an open source telephony platform designed to facilitate the Added: freeswitch/trunk/debian/freeswitch.postinst ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.postinst Wed Nov 28 19:38:58 2007 @@ -0,0 +1,51 @@ +#! /bin/sh +# set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + if ! getent passwd openfire >/dev/null; then + adduser --disabled-password --quiet --system \ + --home /opt/freeswitch \ + --gecos "FreeSwitch Voice Platform" --group daemon + fi + + mkdir -p /opt/freeswitch + chown -R freeswitch:daemon /opt/freeswitch + chmod -R o-rwx /opt/freeswitch + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: freeswitch/trunk/debian/freeswitch.postrm ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.postrm Wed Nov 28 19:38:58 2007 @@ -0,0 +1,44 @@ +#!/bin/sh +# postrm script for openfire +# +# see: dh_installdeb(1) + +# set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + rm -Rf /etc/opt/freeswitch + rm -Rf /opt/freeswitch + userdel freeswitch + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Wed Nov 28 19:38:58 2007 @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -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_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 +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) @@ -56,9 +56,10 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess build/config/config.guess endif - - - dh_clean + rm -f config.status + rm -f */*/config.status + rm -f */*/*/config.status + dh_clean install: build dh_testdir @@ -111,4 +112,3 @@ binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install -# vim:set ai et sts=2 sw=2 tw=0:

1 0

[commit] r6422 - in freeswitch/trunk: conf src
by Freeswitch SVN 28 Nov '07

28 Nov '07

Author: anthm Date: Wed Nov 28 18:12:13 2007 New Revision: 6422 Modified: freeswitch/trunk/conf/voicemail.tpl freeswitch/trunk/src/switch_utils.c Log: update template for multipart/alternative Modified: freeswitch/trunk/conf/voicemail.tpl ============================================================================== --- freeswitch/trunk/conf/voicemail.tpl (original) +++ freeswitch/trunk/conf/voicemail.tpl Wed Nov 28 18:12:13 2007 @@ -4,8 +4,23 @@ X-Priority: ${voicemail_priority} X-Mailer: FreeSWITCH +Content-Type: multipart/alternative; + boundary=000XXX000 + +--000XXX000 +Content-Type: text/plain; charset=ISO-8859-1; Format=Flowed +Content-Disposition: attachment +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} +--000XXX000 +Content-Type: text/html; charset=ISO-8859-1 +Content-Disposition: attachment +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> +--000XXX000-- Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Nov 28 18:12:13 2007 @@ -205,6 +205,7 @@ snprintf(buf, B64BUFFLEN, "\n\n--%s\nContent-Type: %s; name=\"%s\"\n" + "Content-ID: <ATTACHED(a)freeswitch.org>\n" "Content-Transfer-Encoding: base64\n" "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n",

1 0

[commit] r6421 - in freeswitch/trunk/src: . include mod/applications/mod_voicemail mod/xml_int/mod_xml_rpc
by Freeswitch SVN 28 Nov '07

28 Nov '07

Author: mikej Date: Wed Nov 28 17:27:33 2007 New Revision: 6421 Modified: freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_utils.c Log: fix windows build Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Wed Nov 28 17:27:33 2007 @@ -64,12 +64,13 @@ SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, const char *file, const char *func, int line, const char *fmt, ...) PRINTF_FUNCTION(5, 6); -SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen); +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen); /*! \brief A method akin to printf for dealing with api streams */ -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2, 3); + SWITCH_END_EXTERN_C #endif /* For Emacs: Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Nov 28 17:27:33 2007 @@ -70,7 +70,7 @@ return SWITCH_TRUE; } -switch_size_t switch_fd_read_line(int fd, char *buf, switch_size_t len); +SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len); /*! \brief Evaluate the truthfullness of a string expression 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 17:27:33 2007 @@ -2494,7 +2494,9 @@ for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); profile = (vm_profile_t *) val; - break; + if (profile) { + break; + } } } 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 17:27:33 2007 @@ -552,9 +552,9 @@ for (i=0;i<r->response_headers.size;i++) { ti=&r->response_headers.item[i]; - ConnWrite(r->conn,ti->name,strlen(ti->name)); + ConnWrite(r->conn, ti->name, (uint32_t)strlen(ti->name)); ConnWrite(r->conn,": ",2); - ConnWrite(r->conn,ti->value,strlen(ti->value)); + ConnWrite(r->conn, ti->value, (uint32_t)strlen(ti->value)); ConnWrite(r->conn,CRLF,2); } Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Wed Nov 28 17:27:33 2007 @@ -34,7 +34,7 @@ #include <switch_version.h> #define CMD_BUFLEN 1024; -SWITCH_DECLARE(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) { FILE *out = switch_core_get_console(); @@ -46,7 +46,7 @@ return SWITCH_STATUS_FALSE; } -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) +SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { va_list ap; char *buf = handle->data; Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Nov 28 17:27:33 2007 @@ -36,7 +36,7 @@ #include "private/switch_core_pvt.h" -switch_size_t switch_fd_read_line(int fd, char *buf, switch_size_t len) +SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len) { char c, *p; int cur; @@ -104,7 +104,7 @@ } for (i=0; i<64; i++) { - l64[(int)switch_b64_table[i]] = i; + l64[(int)switch_b64_table[i]] = (char)i; } for (ip = in; ip && *ip; ip++) { @@ -117,7 +117,7 @@ l += 6; while (l >= 8) { - op[ol++] = (b >> (l -= 8)) % 256; + op[ol++] = (char)((b >> (l -= 8)) % 256); if (ol >= olen -2) { goto end; }

1 0

[commit] r6420 - freeswitch/trunk/src/mod/loggers/mod_logfile
by Freeswitch SVN 28 Nov '07

28 Nov '07

Author: mikej Date: Wed Nov 28 16:42:12 2007 New Revision: 6420 Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: line endings. Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Nov 28 16:42:12 2007 @@ -1,344 +1,344 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * Anthony Minessale II <anthmct(a)yahoo.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Anthony LaMantia <anthony(a)petabit.net> - * Michael Jerris <mike(a)jerris.com> - * - * - * mod_logfile.c -- Filesystem Logging - * - */ - -#include <switch.h> - +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony LaMantia <anthony(a)petabit.net> + * Michael Jerris <mike(a)jerris.com> + * + * + * mod_logfile.c -- Filesystem Logging + * + */ + +#include <switch.h> + SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown); SWITCH_MODULE_DEFINITION(mod_logfile, mod_logfile_load, mod_logfile_shutdown, NULL); - -#define DEFAULT_FORMAT "${data}" -#define DEFAULT_LIMIT 0x7FFFFFFF -#define WARM_FUZZY_OFFSET 64 -#define MAX_ROT 4096 /* why not */ -static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; - -static switch_status_t load_config(void); -static switch_status_t mod_logfile_check(void); -static switch_memory_pool_t *module_pool = NULL; - -static struct { - unsigned int log_fd; - switch_size_t log_size; /* keep the log size in check for rotation */ - switch_size_t roll_size; /* the size that we want to rotate the file at */ - char *logfile; - char *format; - switch_file_t *log_afd; -} globals; - -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, globals.logfile); -SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format); - -/* i know this is strange but it's the fastest way i could think of managing log levels. */ -/* i'd rather not try to search something each time we get a message to log */ -struct level_set { - int level; - int on; -} static levels[] = { - {SWITCH_LOG_CONSOLE, 0}, /* 0 */ - {SWITCH_LOG_ALERT, 0}, /* 1 */ - {SWITCH_LOG_CRIT, 0}, /* 2 */ - {SWITCH_LOG_ERROR, 0}, /* 3 */ - {SWITCH_LOG_WARNING, 0}, /* 4 */ - {SWITCH_LOG_NOTICE, 0}, /* 5 */ - {SWITCH_LOG_INFO, 0}, /* 6 */ - {SWITCH_LOG_DEBUG, 0}, /* 7 */ -}; - -void process_levels(char *p) -{ + +#define DEFAULT_FORMAT "${data}" +#define DEFAULT_LIMIT 0x7FFFFFFF +#define WARM_FUZZY_OFFSET 64 +#define MAX_ROT 4096 /* why not */ +static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; + +static switch_status_t load_config(void); +static switch_status_t mod_logfile_check(void); +static switch_memory_pool_t *module_pool = NULL; + +static struct { + unsigned int log_fd; + switch_size_t log_size; /* keep the log size in check for rotation */ + switch_size_t roll_size; /* the size that we want to rotate the file at */ + char *logfile; + char *format; + switch_file_t *log_afd; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, globals.logfile); +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format); + +/* i know this is strange but it's the fastest way i could think of managing log levels. */ +/* i'd rather not try to search something each time we get a message to log */ +struct level_set { + int level; + int on; +} static levels[] = { + {SWITCH_LOG_CONSOLE, 0}, /* 0 */ + {SWITCH_LOG_ALERT, 0}, /* 1 */ + {SWITCH_LOG_CRIT, 0}, /* 2 */ + {SWITCH_LOG_ERROR, 0}, /* 3 */ + {SWITCH_LOG_WARNING, 0}, /* 4 */ + {SWITCH_LOG_NOTICE, 0}, /* 5 */ + {SWITCH_LOG_INFO, 0}, /* 6 */ + {SWITCH_LOG_DEBUG, 0}, /* 7 */ +}; + +void process_levels(char *p) +{ int x, argc = 0; - char *argv[10] = { 0 }; + char *argv[10] = { 0 }; if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { for (x = 0; x < argc; x++) { - if (!strncasecmp(argv[x], "alert", strlen(argv[x]))) { - levels[SWITCH_LOG_ALERT].on = 1; - } else if (!strncasecmp(argv[x], "crit", strlen(argv[x]))) { - levels[SWITCH_LOG_CRIT].on = 1; - } else if (!strncasecmp(argv[x], "error", strlen(argv[x]))) { - levels[SWITCH_LOG_ERROR].on = 1; - } else if (!strncasecmp(argv[x], "warn", strlen(argv[x]))) { - levels[SWITCH_LOG_WARNING].on = 1; - } else if (!strncasecmp(argv[x], "notice", strlen(argv[x]))) { - levels[SWITCH_LOG_NOTICE].on = 1; - } else if (!strncasecmp(argv[x], "info", strlen(argv[x]))) { - levels[SWITCH_LOG_INFO].on = 1; - } else if (!strncasecmp(argv[x], "debug", strlen(argv[x]))) { - levels[SWITCH_LOG_DEBUG].on = 1; - } else if (!strncasecmp(argv[x], "console", strlen(argv[x]))) { - levels[SWITCH_LOG_CONSOLE].on = 1; - } else if (!strncasecmp(argv[x], "all", strlen(argv[x]))) { - int i; - for (i=0; i < (sizeof(levels) / sizeof(struct level_set)); i++) { - levels[i].on = 1; - } - } + if (!strncasecmp(argv[x], "alert", strlen(argv[x]))) { + levels[SWITCH_LOG_ALERT].on = 1; + } else if (!strncasecmp(argv[x], "crit", strlen(argv[x]))) { + levels[SWITCH_LOG_CRIT].on = 1; + } else if (!strncasecmp(argv[x], "error", strlen(argv[x]))) { + levels[SWITCH_LOG_ERROR].on = 1; + } else if (!strncasecmp(argv[x], "warn", strlen(argv[x]))) { + levels[SWITCH_LOG_WARNING].on = 1; + } else if (!strncasecmp(argv[x], "notice", strlen(argv[x]))) { + levels[SWITCH_LOG_NOTICE].on = 1; + } else if (!strncasecmp(argv[x], "info", strlen(argv[x]))) { + levels[SWITCH_LOG_INFO].on = 1; + } else if (!strncasecmp(argv[x], "debug", strlen(argv[x]))) { + levels[SWITCH_LOG_DEBUG].on = 1; + } else if (!strncasecmp(argv[x], "console", strlen(argv[x]))) { + levels[SWITCH_LOG_CONSOLE].on = 1; + } else if (!strncasecmp(argv[x], "all", strlen(argv[x]))) { + int i; + for (i=0; i < (sizeof(levels) / sizeof(struct level_set)); i++) { + levels[i].on = 1; + } + } } } - return; -} - -/* rotate the log file */ -static switch_status_t mod_logfile_rotate(void) -{ - unsigned int i = 0; - unsigned int flags = 0; - char *p = NULL; - char *q = NULL; - switch_status_t stat = 0; - switch_size_t nbytes = 1024; - switch_file_t *l_afd = NULL; - switch_memory_pool_t *pool = NULL; - int64_t offset = 0; - - globals.log_size = 0; - switch_core_new_memory_pool(&pool); - - stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset); - - if (stat != SWITCH_STATUS_SUCCESS) - return SWITCH_STATUS_FALSE; - - p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET); - if (!p) { - return SWITCH_STATUS_FALSE; - } - - q = malloc(1024); - if (!q) { - free(p); - return SWITCH_STATUS_FALSE; - } - - memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET); - - for (i=1; i < MAX_ROT; i++) { - sprintf((char *)p, "%s.%i", globals.logfile, i); - - stat = switch_file_open(&l_afd, p, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD, pool); - - if (stat == SWITCH_STATUS_SUCCESS) { - switch_file_close(l_afd); - continue; - } - flags |= SWITCH_FOPEN_READ; - flags |= SWITCH_FOPEN_WRITE; - flags |= SWITCH_FOPEN_CREATE; - - stat = switch_file_open(&l_afd, p, flags , SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE ,pool); - if (stat == SWITCH_STATUS_SUCCESS) - break; - } - - while ((stat = switch_file_read(globals.log_afd, q, &nbytes)) == SWITCH_STATUS_SUCCESS) { - switch_file_write(l_afd, q, &nbytes); - memset(q, '\0', 1024); - nbytes = 1024; - } - - offset = 0; - stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset); - free(p); - free(q); - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t mod_logfile_openlogfile(void) -{ - unsigned int flags = 0; - switch_file_t *afd; - switch_status_t stat; - switch_memory_pool_t *pool; - - flags |= SWITCH_FOPEN_CREATE; - flags |= SWITCH_FOPEN_READ; - flags |= SWITCH_FOPEN_WRITE; - flags |= SWITCH_FOPEN_APPEND; - - switch_core_new_memory_pool(&pool); - stat = switch_file_open(&afd, globals.logfile,flags,SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, pool); - if (stat != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - - globals.log_afd = afd; - - globals.log_size = switch_file_get_size(globals.log_afd); - - if (globals.log_size >= globals.roll_size) { - mod_logfile_rotate(); - } - - return SWITCH_STATUS_SUCCESS; -} - -/* write to the actual logfile */ -static switch_status_t mod_logfile_write(char *fmt, ...) -{ - char *log_data; - switch_status_t stat; - switch_size_t len; - va_list args; - va_start(args, fmt); - - len = switch_vasprintf(&log_data, fmt, args); - - if (len <= 0) - return SWITCH_STATUS_FALSE; - - stat = switch_file_write(globals.log_afd, log_data, &len); - - globals.log_size += len; - - /* we may want to hold back on this for preformance reasons */ - if (globals.log_size >= globals.roll_size) { - mod_logfile_rotate(); - } - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level) -{ - char line_no[sizeof(int)*8+1]; - char date[80] = ""; - switch_time_exp_t time; - switch_size_t retsize; - char *message = NULL; - - if (!levels[node->level].on) { - return SWITCH_STATUS_SUCCESS; - } - - message = (char *)malloc(strlen(globals.format)+2); - switch_copy_string(message, globals.format, strlen(globals.format)+1); - - message = switch_string_replace(message, "${message}", node->content); - - if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; - } - - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &time); - - message = switch_string_replace(message, "${time}", date); - message = switch_string_replace(message, "${file}", node->file); - message = switch_string_replace(message, "${func}", node->func); - - snprintf(line_no, sizeof(line_no), "%d", node->line); - message = switch_string_replace(message, "${line}", line_no); - - if (!switch_strlen_zero(message)) { - mod_logfile_write("%s", message); - } - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t load_config(void) -{ - char *cf = "logfile.conf"; - switch_xml_t cfg, xml, settings, param; - - if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); - } else { - if ((settings = switch_xml_child(cfg, "settings"))) { - for (param = switch_xml_child(settings, "param"); param; param = param->next) { - char *var = (char *) switch_xml_attr_soft(param, "name"); - char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcmp(var, "logfile")) { - set_global_logfile(val); - } else if (!strcmp(var, "format")) { - set_global_format(val); - } else if (!strcmp(var, "level")) { - process_levels(val); - } else if (!strcmp(var, "rollover")) { - globals.roll_size = atoi(val); - } - } - } - switch_xml_free(xml); - } - if (globals.roll_size == 0) { - globals.roll_size = DEFAULT_LIMIT; - } - if (switch_strlen_zero(globals.logfile)) { + return; +} + +/* rotate the log file */ +static switch_status_t mod_logfile_rotate(void) +{ + unsigned int i = 0; + unsigned int flags = 0; + char *p = NULL; + char *q = NULL; + switch_status_t stat = 0; + switch_size_t nbytes = 1024; + switch_file_t *l_afd = NULL; + switch_memory_pool_t *pool = NULL; + int64_t offset = 0; + + globals.log_size = 0; + switch_core_new_memory_pool(&pool); + + stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset); + + if (stat != SWITCH_STATUS_SUCCESS) + return SWITCH_STATUS_FALSE; + + p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET); + if (!p) { + return SWITCH_STATUS_FALSE; + } + + q = malloc(1024); + if (!q) { + free(p); + return SWITCH_STATUS_FALSE; + } + + memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET); + + for (i=1; i < MAX_ROT; i++) { + sprintf((char *)p, "%s.%i", globals.logfile, i); + + stat = switch_file_open(&l_afd, p, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD, pool); + + if (stat == SWITCH_STATUS_SUCCESS) { + switch_file_close(l_afd); + continue; + } + flags |= SWITCH_FOPEN_READ; + flags |= SWITCH_FOPEN_WRITE; + flags |= SWITCH_FOPEN_CREATE; + + stat = switch_file_open(&l_afd, p, flags , SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE ,pool); + if (stat == SWITCH_STATUS_SUCCESS) + break; + } + + while ((stat = switch_file_read(globals.log_afd, q, &nbytes)) == SWITCH_STATUS_SUCCESS) { + switch_file_write(l_afd, q, &nbytes); + memset(q, '\0', 1024); + nbytes = 1024; + } + + offset = 0; + stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset); + free(p); + free(q); + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t mod_logfile_openlogfile(void) +{ + unsigned int flags = 0; + switch_file_t *afd; + switch_status_t stat; + switch_memory_pool_t *pool; + + flags |= SWITCH_FOPEN_CREATE; + flags |= SWITCH_FOPEN_READ; + flags |= SWITCH_FOPEN_WRITE; + flags |= SWITCH_FOPEN_APPEND; + + switch_core_new_memory_pool(&pool); + stat = switch_file_open(&afd, globals.logfile,flags,SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, pool); + if (stat != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + + globals.log_afd = afd; + + globals.log_size = switch_file_get_size(globals.log_afd); + + if (globals.log_size >= globals.roll_size) { + mod_logfile_rotate(); + } + + return SWITCH_STATUS_SUCCESS; +} + +/* write to the actual logfile */ +static switch_status_t mod_logfile_write(char *fmt, ...) +{ + char *log_data; + switch_status_t stat; + switch_size_t len; + va_list args; + va_start(args, fmt); + + len = switch_vasprintf(&log_data, fmt, args); + + if (len <= 0) + return SWITCH_STATUS_FALSE; + + stat = switch_file_write(globals.log_afd, log_data, &len); + + globals.log_size += len; + + /* we may want to hold back on this for preformance reasons */ + if (globals.log_size >= globals.roll_size) { + mod_logfile_rotate(); + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level) +{ + char line_no[sizeof(int)*8+1]; + char date[80] = ""; + switch_time_exp_t time; + switch_size_t retsize; + char *message = NULL; + + if (!levels[node->level].on) { + return SWITCH_STATUS_SUCCESS; + } + + message = (char *)malloc(strlen(globals.format)+2); + switch_copy_string(message, globals.format, strlen(globals.format)+1); + + message = switch_string_replace(message, "${message}", node->content); + + if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + + switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &time); + + message = switch_string_replace(message, "${time}", date); + message = switch_string_replace(message, "${file}", node->file); + message = switch_string_replace(message, "${func}", node->func); + + snprintf(line_no, sizeof(line_no), "%d", node->line); + message = switch_string_replace(message, "${line}", line_no); + + if (!switch_strlen_zero(message)) { + mod_logfile_write("%s", message); + } + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t load_config(void) +{ + char *cf = "logfile.conf"; + switch_xml_t cfg, xml, settings, param; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + } else { + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + if (!strcmp(var, "logfile")) { + set_global_logfile(val); + } else if (!strcmp(var, "format")) { + set_global_format(val); + } else if (!strcmp(var, "level")) { + process_levels(val); + } else if (!strcmp(var, "rollover")) { + globals.roll_size = atoi(val); + } + } + } + switch_xml_free(xml); + } + if (globals.roll_size == 0) { + globals.roll_size = DEFAULT_LIMIT; + } + if (switch_strlen_zero(globals.logfile)) { char logfile[512]; - snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log"); - set_global_logfile(logfile); - } - if (switch_strlen_zero(globals.format)) { - set_global_format(DEFAULT_FORMAT); - } - return 0; -} - + snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log"); + set_global_logfile(logfile); + } + if (switch_strlen_zero(globals.format)) { + set_global_format(DEFAULT_FORMAT); + } + return 0; +} + SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load) -{ - switch_status_t status; - +{ + switch_status_t status; + module_pool = pool; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - - if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { - return status; - } - - mod_logfile_openlogfile(); - - switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG); - - return SWITCH_STATUS_SUCCESS; -} - + + if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { + return status; + } + + mod_logfile_openlogfile(); + + switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown) -{ - /* TODO: Need to finish processing pending log messages before we close the file handle */ - - //switch_file_close(globals.log_afd); - return SWITCH_STATUS_SUCCESS; -} - -/* For Emacs: -* Local Variables: -* mode:c -* indent-tabs-mode:nil -* tab-width:4 -* c-basic-offset:4 -* End: -* For VIM: -* vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: -*/ +{ + /* TODO: Need to finish processing pending log messages before we close the file handle */ + + //switch_file_close(globals.log_afd); + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: +* Local Variables: +* mode:c +* indent-tabs-mode:nil +* tab-width:4 +* c-basic-offset:4 +* End: +* For VIM: +* vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: +*/

1 0

[commit] r6419 - freeswitch/trunk/src
by Freeswitch SVN 28 Nov '07

28 Nov '07

Author: anthm Date: Wed Nov 28 15:51:25 2007 New Revision: 6419 Modified: freeswitch/trunk/src/switch_utils.c Log: allow templates to contain mime encoded messages Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Nov 28 15:51:25 2007 @@ -176,7 +176,11 @@ return SWITCH_FALSE; if (file) { - snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); + if (body && switch_stristr("content-type", body)) { + snprintf(buf, B64BUFFLEN, "--%s\n", bound); + } else { + snprintf(buf, B64BUFFLEN, "--%s\nContent-Type: text/plain\n\n", bound); + } if (!write_buf(fd, buf)) return SWITCH_FALSE; }

1 0

[commit] r6418 - in freeswitch/trunk/src: . include mod/applications/mod_voicemail mod/xml_int/mod_xml_rpc
by Freeswitch SVN 28 Nov '07

28 Nov '07

Author: anthm Date: Wed Nov 28 15:44:18 2007 New Revision: 6418 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch_core.c Log: add mime types to webserver Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Nov 28 15:44:18 2007 @@ -1493,7 +1493,7 @@ */ SWITCH_DECLARE(uint8_t) switch_core_session_compare(switch_core_session_t *a, switch_core_session_t *b); - +SWITCH_DECLARE(switch_hash_index_t *) switch_core_mime_index(void); SWITCH_DECLARE(const char *) switch_core_mime_ext2type(const char *ext); SWITCH_DECLARE(switch_status_t) switch_core_mime_add_type(const char *type, const char *ext); 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 15:44:18 2007 @@ -2250,7 +2250,7 @@ { struct holder *holder = (struct holder *) pArg; switch_xml_t x_tmp, x_link; - char *tmp, *del; + char *tmp, *del, *get; switch_time_exp_t tm; char create_date[80] = ""; char read_date[80] = ""; @@ -2319,19 +2319,24 @@ fname = argv[8]; } + get = switch_mprintf("http://%s:%s%s/get/%s", holder->host, holder->port, holder->uri, fname); del = switch_mprintf("http://%s:%s%s/del/%s", holder->host, holder->port, holder->uri, fname); x_link = switch_xml_add_child_d(holder->x_item, "fsvm:rmlink", 0); switch_xml_set_txt_d(x_link, del); - tmp = switch_mprintf("<![CDATA[Priority: %s Last Heard: %s Duration: %s <a href=%s>Delete This Message</a>]]>", - strcmp(argv[10], URGENT_FLAG_STRING) ? "normal" : "urgent", heard, duration_str, del); + tmp = switch_mprintf("<![CDATA[Priority: %s " + "Last Heard: %s Duration: %s " + "<a href=%s>Delete This Message</a> " + "]]>", + strcmp(argv[10], URGENT_FLAG_STRING) ? "normal" : "urgent", heard, duration_str, del); switch_xml_set_txt_d(x_tmp, tmp); free(tmp); free(del); + x_tmp = switch_xml_add_child_d(holder->x_item, "pubDate", 0); switch_xml_set_txt_d(x_tmp, rss_date); @@ -2339,17 +2344,17 @@ switch_xml_set_txt_d(x_tmp, duration_str); - tmp = switch_mprintf("http://%s:%s%s/get/%s", holder->host, holder->port, holder->uri, fname); + x_tmp = switch_xml_add_child_d(holder->x_item, "guid", 0); - switch_xml_set_txt_d(x_tmp, tmp); + switch_xml_set_txt_d(x_tmp, get); x_link = switch_xml_add_child_d(holder->x_item, "link", 0); - switch_xml_set_txt_d(x_link, tmp); + switch_xml_set_txt_d(x_link, get); x_tmp = switch_xml_add_child_d(holder->x_item, "enclosure", 0); - switch_xml_set_attr_d(x_tmp, "url", tmp); - free(tmp); + switch_xml_set_attr_d(x_tmp, "url", get); + free(get); 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 15:44:18 2007 @@ -665,6 +665,9 @@ xmlrpc_registry *registryP; xmlrpc_env env; char logfile[512]; + switch_hash_index_t *hi; + const void *var; + void *val; globals.running = 1; @@ -679,6 +682,12 @@ MIMETypeInit(); MIMETypeAdd("text/html", "html"); + for(hi = switch_core_mime_index(); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + if (var && val) { + MIMETypeAdd((char *) val, (char *) var); + } + } snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch_http.log"); ServerCreate(&abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Nov 28 15:44:18 2007 @@ -557,6 +557,12 @@ return (const char *) switch_core_hash_find(runtime.mime_types, ext); } + +SWITCH_DECLARE(switch_hash_index_t *) switch_core_mime_index(void) +{ + return switch_hash_first(NULL, runtime.mime_types); +} + SWITCH_DECLARE(switch_status_t) switch_core_mime_add_type(const char *type, const char *ext) { const char *check = (const char *) switch_core_hash_find(runtime.mime_types, ext);

1 0