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

[Freeswitch-svn] [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

[Freeswitch-svn] [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"> +<font face=arial size=+2 color=ffffff>Voicemail Messages</font> +</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, "<font face=tahoma><div class=title><b>Message from %s %s</b></div><hr noshade size=1>\n", + argv[5], argv[6]); + holder->stream->write_function(holder->stream, "Priority: %s<br>\n" + "Created: %s<br>\n" + "Last Heard: %s<br>\n" + "Duration: %s<br>\n", + //"<a href=%s>Delete This Message</a><br><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, + "<br><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><br><br>\n" + "[<a href=%s>delete</a>] [<a href=%s>download</a>] <br><br><br></font>\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<br>" "Last Heard: %s<br>Duration: %s<br>" @@ -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<br>", 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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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

[Freeswitch-svn] [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<br>Last Heard: %s<br>Duration: %s<br><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<br>" + "Last Heard: %s<br>Duration: %s<br>" + "<a href=%s>Delete This Message</a><br>" + "]]>", + 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

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

28 Nov '07

Author: anthm Date: Wed Nov 28 14:56:25 2007 New Revision: 6417 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_xml.cpp Log: rss feeds of your voicemail Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Wed Nov 28 14:56:25 2007 @@ -763,6 +763,8 @@ SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_directory_exists(const char *dirname, switch_memory_pool_t *pool); + SWITCH_DECLARE(switch_status_t) switch_dir_make(const char *path, switch_fileperms_t perm, switch_memory_pool_t *pool); SWITCH_DECLARE(switch_status_t) switch_dir_make_recursive(const char *path, switch_fileperms_t perm, 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 14:56:25 2007 @@ -49,6 +49,7 @@ s.end = s.data; \ s.data_size = SWITCH_CMD_CHUNK_LEN; \ s.write_function = switch_console_stream_write; \ + s.raw_write_function = switch_console_stream_raw_write; \ s.alloc_len = SWITCH_CMD_CHUNK_LEN; \ s.alloc_chunk = SWITCH_CMD_CHUNK_LEN @@ -63,6 +64,8 @@ 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); + /*! \brief A method akin to printf for dealing with api streams */ Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Wed Nov 28 14:56:25 2007 @@ -81,6 +81,7 @@ struct switch_stream_handle { switch_stream_handle_write_function_t write_function; + switch_stream_handle_raw_write_function_t raw_write_function; void *data; void *end; switch_size_t data_size; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Nov 28 14:56:25 2007 @@ -1090,6 +1090,7 @@ typedef switch_status_t (*switch_state_handler_t) (switch_core_session_t *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t) (switch_stream_handle_t *handle, const char *fmt, ...); +typedef switch_status_t (*switch_stream_handle_raw_write_function_t) (switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen); typedef switch_status_t (*switch_api_function_t) (const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream); 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 14:56:25 2007 @@ -132,7 +132,7 @@ */ #define is_dtmf(key) ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119) - +#define end_of(_s) *(_s + strlen(_s) - 1) /*! \brief Test for the existance of a flag on an arbitary object \param obj the object to test 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 14:56:25 2007 @@ -2119,9 +2119,423 @@ } +#define VOICEMAIL_SYNTAX "rss [<host> <port> <uri> <user> <domain>]" + +struct holder { + vm_profile_t *profile; + switch_memory_pool_t *pool; + switch_stream_handle_t *stream; + switch_xml_t xml; + switch_xml_t x_item; + switch_xml_t x_channel; + int items; + char *user; + char *domain; + char *host; + char *port; + char *uri; +}; + + +static int del_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + if (argc > 8) { + unlink(argv[8]); + } + return 0; +} + +static int play_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + switch_file_t *fd; + struct holder *holder = (struct holder *) pArg; + char *fname, *ext; + switch_size_t flen; + uint8_t chunk[1024]; + const char *mime_type = "audio/inline", *new_type; + + if ((fname = strrchr(argv[8], '/'))) { + fname++; + } else { + fname = argv[8]; + } + + if ((ext = strrchr(fname, '.'))) { + ext++; + if ((new_type = switch_core_mime_ext2type(ext))) { + mime_type = new_type; + } + } + + if (switch_file_open(&fd, argv[8], SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, holder->pool) == SWITCH_STATUS_SUCCESS) { + flen = switch_file_get_size(fd); + holder->stream->write_function(holder->stream, "Content-type: %s\n", mime_type); + holder->stream->write_function(holder->stream, "Content-length: %ld\n\n", (long)flen); + for(;;) { + switch_status_t status; + + flen = sizeof(chunk); + status = switch_file_read(fd, chunk, &flen); + if (status != SWITCH_STATUS_SUCCESS || flen == 0) { + break; + } + + holder->stream->raw_write_function(holder->stream, chunk, flen); + + } + + switch_file_close(fd); + } + + return 0; +} + +static void do_play(vm_profile_t *profile, char *user, char *domain, char *file, switch_stream_handle_t *stream) +{ + char *sql; + struct holder holder; + + sql = switch_mprintf("update voicemail_data set read_epoch=%ld where user='%s' and domain='%s' and file_path like '%%%s'", + (long)time(NULL), user, domain, file); + + vm_execute_sql(profile, sql, profile->mutex); + free(sql); + + sql = switch_mprintf("select * from voicemail_data where user='%s' and domain='%s' and file_path like '%%%s'", user, domain, file); + memset(&holder, 0, sizeof(holder)); + holder.profile = profile; + holder.stream = stream; + switch_core_new_memory_pool(&holder.pool); + vm_execute_sql_callback(profile, profile->mutex, sql, play_callback, &holder); + switch_core_destroy_memory_pool(&holder.pool); + switch_safe_free(sql); + + +} + + +static void do_del(vm_profile_t *profile, char *user, char *domain, char *file, switch_stream_handle_t *stream) +{ + char *sql; + struct holder holder; + char *uri, *host, *port; + + 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"); + } + + sql = switch_mprintf("select * from voicemail_data where user='%s' and domain='%s' and file_path like '%%%s'", user, domain, file); + memset(&holder, 0, sizeof(holder)); + holder.profile = profile; + holder.stream = stream; + vm_execute_sql_callback(profile, profile->mutex, sql, del_callback, &holder); + + switch_safe_free(sql); + sql = switch_mprintf("delete from voicemail_data where user='%s' and domain='%s' and file_path like '%%%s'", user, domain, file); + vm_execute_sql(profile, sql, profile->mutex); + free(sql); + + if (host && port && uri) { + 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); + } + +} + +static int rss_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + struct holder *holder = (struct holder *) pArg; + switch_xml_t x_tmp, x_link; + char *tmp, *del; + switch_time_exp_t tm; + char create_date[80] = ""; + char read_date[80] = ""; + char rss_date[80] = ""; + switch_size_t retsize; + const char *mime_type = "audio/inline", *new_type; + char *ext; + char *fname; + switch_size_t flen; + switch_file_t *fd; + 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]; + + 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; + } + + 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), fmt, &tm); + } + + if (l_read) { + switch_time_exp_lt(&tm, l_read); + switch_strftime(read_date, &retsize, sizeof(read_date), fmt, &tm); + } + + holder->x_item = switch_xml_add_child_d(holder->x_channel, "item", holder->items++); + + x_tmp = switch_xml_add_child_d(holder->x_item, "title", 0); + tmp = switch_mprintf("Message from %s %s on %s", argv[5], argv[6], create_date); + switch_xml_set_txt_d(x_tmp, tmp); + free(tmp); + + x_tmp = switch_xml_add_child_d(holder->x_item, "description", 0); + + snprintf(heard, sizeof(heard), switch_strlen_zero(read_date) ? "never" : read_date); + + if ((fname = strrchr(argv[8], '/'))) { + fname++; + } else { + fname = argv[8]; + } + + 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<br>Last Heard: %s<br>Duration: %s<br><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); + + x_tmp = switch_xml_add_child_d(holder->x_item, "itunes:duration", 0); + 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); + + x_link = switch_xml_add_child_d(holder->x_item, "link", 0); + switch_xml_set_txt_d(x_link, tmp); + + x_tmp = switch_xml_add_child_d(holder->x_item, "enclosure", 0); + switch_xml_set_attr_d(x_tmp, "url", tmp); + free(tmp); + + + + if (switch_file_open(&fd, argv[8], SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, holder->pool) == SWITCH_STATUS_SUCCESS) { + flen = switch_file_get_size(fd); + tmp = switch_mprintf("%ld", (long) flen); + switch_xml_set_attr_d(x_tmp, "length", tmp); + free(tmp); + switch_file_close(fd); + } + + if ((ext = strrchr(fname, '.'))) { + ext++; + if ((new_type = switch_core_mime_ext2type(ext))) { + mime_type = new_type; + } + } + switch_xml_set_attr_d(x_tmp, "type", mime_type); + + return 0; +} + + +static void do_rss(vm_profile_t *profile, char *user, char *domain, char *host, char *port, char *uri, switch_stream_handle_t *stream) +{ + + struct holder holder; + switch_xml_t x_tmp; + char *sql, *xmlstr; + char *tmp = NULL; + + stream->write_function(stream, "Content-type: text/xml\n\n"); + memset(&holder, 0, sizeof(holder)); + holder.profile = profile; + holder.stream = stream; + holder.xml = switch_xml_new("rss"); + holder.user = user; + holder.domain = domain; + holder.host = host; + holder.port = port; + holder.uri = uri; + + switch_core_new_memory_pool(&holder.pool); + assert(holder.xml); + + switch_xml_set_attr_d(holder.xml, "xmlns:itunes", "http://www.itunes.com/dtds/podcast-1.0.dtd"); + switch_xml_set_attr_d(holder.xml, "xmlns:fsvm", "http://www.freeswitch.org/dtd/fsvm.dtd"); + switch_xml_set_attr_d(holder.xml, "version", "2.0"); + holder.x_channel = switch_xml_add_child_d(holder.xml, "channel", 0); + + x_tmp = switch_xml_add_child_d(holder.x_channel, "title", 0); + tmp = switch_mprintf("FreeSWITCH Voicemail for %s@%s", user, domain); + switch_xml_set_txt_d(x_tmp, tmp); + free(tmp); + + x_tmp = switch_xml_add_child_d(holder.x_channel, "link", 0); + switch_xml_set_txt_d(x_tmp, "http://www.freeswitch.org"); + + x_tmp = switch_xml_add_child_d(holder.x_channel, "description", 0); + switch_xml_set_txt_d(x_tmp, "http://www.freeswitch.org"); + + x_tmp = switch_xml_add_child_d(holder.x_channel, "ttl", 0); + switch_xml_set_txt_d(x_tmp, "15"); + + + 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, rss_callback, &holder); + + xmlstr = switch_xml_toxml(holder.xml); + + stream->write_function(stream, "%s", xmlstr); + + switch_safe_free(sql); + switch_safe_free(xmlstr); + switch_xml_free(holder.xml); + switch_core_destroy_memory_pool(&holder.pool); +} + +SWITCH_STANDARD_API(voicemail_api_function) +{ + int argc = 0; + char *mydata = NULL, *argv[6]; + char *host = NULL, *port = NULL, *uri = NULL; + char *user = NULL, *domain = NULL; + int ct = 0; + vm_profile_t *profile = NULL; + char *path_info = NULL; + int rss = 0, xarg = 0; + + 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"); + user = switch_event_get_header(stream->event, "freeswitch-user"); + domain = switch_event_get_header(stream->event, "freeswitch-domain"); + path_info = switch_event_get_header(stream->event, "http-path-info"); + } + + if (!switch_strlen_zero(cmd)) { + mydata = strdup(cmd); + assert(mydata); + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc > 0) { + if (!strcasecmp(argv[0], "rss")) { + rss++; + xarg++; + } + } + + if (!host) { + if (argc - rss < 5) { + goto error; + } + host = argv[xarg++]; + port = argv[xarg++]; + uri = argv[xarg++]; + user = argv[xarg++]; + domain = argv[xarg++]; + } + + if (!(host && port && uri && user && domain)) { + goto error; + } + + profile = switch_core_hash_find(globals.profile_hash, domain); + + if (!profile) { + profile = switch_core_hash_find(globals.profile_hash, "default"); + } + + if (!profile) { + switch_hash_index_t *hi; + void *val; + + 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) { + stream->write_function(stream, "Can't find profile.\n"); + 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); + } + } + + if (rss || (path_info && !strncasecmp(path_info, "rss", 3))) { + do_rss(profile, user, domain, host, port, uri, stream); + } + + goto done; + + error: + if (host) { + if (!ct) { + stream->write_function(stream, "Content-type: text/html\n\n<h2>"); + } + } + stream->write_function(stream, "Error: %s\n", VOICEMAIL_SYNTAX); + + done: + + switch_safe_free(mydata); + + + return SWITCH_STATUS_SUCCESS; + + +} + + SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load) { switch_application_interface_t *app_interface; + switch_api_interface_t *commands_api_interface; switch_status_t status; if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { @@ -2137,6 +2551,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } + + SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Nov 28 14:56:25 2007 @@ -3339,7 +3339,16 @@ SWITCH_STANDARD_API(jsapi_function) { struct request_obj ro = {0}; + char *path_info = NULL; + if (stream->event) { + path_info = switch_event_get_header(stream->event, "http-path-info"); + } + + if (switch_strlen_zero(cmd) && path_info) { + cmd = path_info; + } + if (switch_strlen_zero(cmd)) { stream->write_function(stream, "USAGE: %s\n", jsapi_interface.syntax); return SWITCH_STATUS_SUCCESS; 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 14:56:25 2007 @@ -30,6 +30,7 @@ * */ #include <switch.h> +#include <switch_version.h> #ifdef _MSC_VER #pragma warning(disable:4142) #endif @@ -117,6 +118,14 @@ } +static switch_status_t http_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) +{ + TSession *r = handle->data; + + return HTTPWrite(r, (char *)data, (uint32_t) datalen) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + +} + static switch_status_t http_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { va_list ap; @@ -146,7 +155,8 @@ char *pass; const char *mypass1 = NULL, *mypass2 = NULL; switch_xml_t x_domain, x_domain_root = NULL, x_user, x_params, x_param; - + const char *box; + p = RequestHeaderValue(r, "authorization"); if (p) { @@ -162,16 +172,21 @@ *pass++ = '\0'; } - if (switch_xml_locate_user(user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user(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; } - + + ResponseAddField(r, "freeswitch-user", user); + ResponseAddField(r, "freeswitch-domain", domain_name); + + box = switch_xml_attr_soft(x_user, "mailbox"); + if (!(x_params = switch_xml_child(x_user, "params"))) { goto authed; } - + for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); const char *val = switch_xml_attr_soft(x_param, "value"); @@ -184,23 +199,53 @@ ResponseAddField(r, (char *)var, (char *)val); } } - - sprintf(z, "%s:%s", user, mypass1); - Base64Encode(z, t); - if (!strcmp(p, t)) { - r->user=strdup(user); + if (!(mypass1 && mypass2)) { + r->user=strdup(user); goto authed; - } + } else { + if (mypass1) { + sprintf(z, "%s:%s", user, mypass1); + Base64Encode(z, t); + + if (!strcmp(p, t)) { + r->user=strdup(user); + goto authed; + } + } - sprintf(z, "%s:%s", user, mypass2); - Base64Encode(z, t); + if (mypass2) { + sprintf(z, "%s:%s", user, mypass2); + Base64Encode(z, t); - if (!strcmp(p, t)) { - r->user=strdup(user); - goto authed; + if (!strcmp(p, t)) { + r->user=strdup(user); + goto authed; + } + } + + if (box) { + if (mypass1) { + sprintf(z, "%s:%s", box, mypass1); + Base64Encode(z, t); + + if (!strcmp(p, t)) { + r->user=strdup(box); + goto authed; + } + } + + if (mypass2) { + sprintf(z, "%s:%s", box, mypass2); + Base64Encode(z, t); + + if (!strcmp(p, t)) { + r->user=strdup(box); + goto authed; + } + } + } } - goto fail; @@ -242,15 +287,64 @@ *e++ = '\0'; } + if (!strcmp(domain_name, "this")) { + free(domain_name); + domain_name = strdup(r->host); + } + ret = !http_directory_auth(r, domain_name); free(domain_name); } else { - if (globals.realm) { - if (!RequestAuth(r, globals.realm, globals.user, globals.pass)) { - ret = TRUE; + char tmp[512]; + const char *list[2] = {"index.html", "index.txt"}; + int x; + + if (!strncmp(r->uri, "/pub", 4)) { + char *p = r->uri; + char *new_uri = p + 4; + if (!new_uri) { + new_uri = "/"; + } + + snprintf(tmp, sizeof(tmp), "%s%s", + SWITCH_GLOBAL_dirs.htdocs_dir, + new_uri + ); + + + if (switch_directory_exists(tmp, NULL) == SWITCH_STATUS_SUCCESS) { + for (x = 0; x < 2; x++) { + snprintf(tmp, sizeof(tmp), "%s%s%s%s", + SWITCH_GLOBAL_dirs.htdocs_dir, + new_uri, + end_of(new_uri) == *SWITCH_PATH_SEPARATOR ? "" : SWITCH_PATH_SEPARATOR, + list[x] + ); + + if (switch_file_exists(tmp, NULL) == SWITCH_STATUS_SUCCESS) { + snprintf(tmp, sizeof(tmp), "%s%s%s", + new_uri, + end_of(new_uri) == '/' ? "" : "/", + list[x] + ); + new_uri = tmp; + break; + } + } + } + + r->uri = strdup(new_uri); + free(p); + + } else { + if (globals.realm && strncmp(r->uri, "/pub", 4)) { + if (!RequestAuth(r, globals.realm, globals.user, globals.pass)) { + ret = TRUE; + } } } + } return ret; @@ -265,56 +359,71 @@ int i, j = 0; TTableItem *ti; char *dup = NULL; + int auth = 0; + char *fs_user = NULL, *fs_domain = NULL; + char *path_info = NULL; + abyss_bool ret = TRUE; stream.data = r; stream.write_function = http_stream_write; + stream.raw_write_function = http_stream_raw_write; if ((command = strstr(r->uri, "/api/"))) { command += 5; } else { - return FALSE; + ret = FALSE; + goto end; + } + + if ((path_info = strchr(command, '/'))) { + *path_info++ = '\0'; + } + + if (strncmp(r->uri, "/domains/", 9)) { + goto auth; } for (i=0;i<r->response_headers.size;i++) { ti=&r->response_headers.item[i]; - if (!strcasecmp(ti->name, "http-allowed-api")) { + if (!strcasecmp(ti->name, "freeswitch-user")) { + fs_user = ti->value; + } else if (!strcasecmp(ti->name, "freeswitch-domain")) { + fs_domain = ti->value; + } else if (!strcasecmp(ti->name, "http-allowed-api")) { int argc, x; char *argv[256] = { 0 }; j++; if (!strcasecmp(ti->value, "any")) { - goto auth; - } - - if (!strcasecmp(ti->value, "none")) { - goto unauth; + auth++; } dup = strdup(ti->value); argc = switch_separate_string(dup, ',', argv, (sizeof(argv) / sizeof(argv[0]))); - + for (x = 0; x < argc; x++) { if (!strcasecmp(command, argv[x])) { - goto auth; + auth++; } } - - goto unauth; } } - if (r->user && !j) { - goto unauth; + if (!switch_strlen_zero(r->user) && !j) { + auth = 0; + } + + if (auth) { + goto auth; } - goto auth; - - unauth: + //unauth: ResponseStatus(r, 403); ResponseError(r); switch_safe_free(dup); - return TRUE; + ret = TRUE; + goto end; auth: @@ -322,7 +431,12 @@ if (switch_event_create(&stream.event, SWITCH_EVENT_API) == SWITCH_STATUS_SUCCESS) { const char * const content_length = RequestHeaderValue(r, "content-length"); - + if (fs_user) + switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "FreeSWITCH-User", "%s", fs_user); + if (fs_domain) + switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Domain", "%s", fs_domain); + if (path_info) + switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-Path-Info", "%s", path_info); if (r->uri) switch_event_add_header(stream.event, SWITCH_STACK_BOTTOM, "HTTP-URI", "%s", r->uri); if (r->query) @@ -434,7 +548,7 @@ } /* Generation of the server field */ - ResponseAddField(r,"Server", SERVER_HVERSION); + ResponseAddField(r,"Server", "FreeSWITCH-" SWITCH_VERSION_FULL "-mod_xml_rpc"); for (i=0;i<r->response_headers.size;i++) { ti=&r->response_headers.item[i]; @@ -453,7 +567,10 @@ } //HTTPWriteEnd(r); - return TRUE; + + end: + + return ret; } Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Wed Nov 28 14:56:25 2007 @@ -364,6 +364,28 @@ return apr_file_info_get(&finfo, APR_FINFO_SIZE, thefile) == SWITCH_STATUS_SUCCESS ? (switch_size_t)finfo.size : 0; } +SWITCH_DECLARE(switch_status_t) switch_directory_exists(const char *dirname, switch_memory_pool_t *pool) +{ + apr_dir_t *dir_handle; + switch_memory_pool_t *our_pool = NULL; + switch_status_t status; + + if (!pool) { + switch_core_new_memory_pool(&our_pool); + pool = our_pool; + } + + if ((status = apr_dir_open(&dir_handle, dirname, pool)) == APR_SUCCESS) { + apr_dir_close(dir_handle); + } + + if (our_pool) { + switch_core_destroy_memory_pool(&our_pool); + } + + return status; +} + SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename, switch_memory_pool_t *pool) { int32_t wanted = APR_FINFO_TYPE; Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Wed Nov 28 14:56:25 2007 @@ -34,6 +34,17 @@ #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) +{ + FILE *out = switch_core_get_console(); + + if (out) { + fwrite(data, datalen, 1, out); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Nov 28 14:56:25 2007 @@ -551,6 +551,9 @@ SWITCH_DECLARE(const char *) switch_core_mime_ext2type(const char *ext) { + if (!ext) { + return NULL; + } return (const char *) switch_core_hash_find(runtime.mime_types, ext); } Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Wed Nov 28 14:56:25 2007 @@ -1457,7 +1457,8 @@ static char *switch_xml_ampencode(const char *s, switch_size_t len, char **dst, switch_size_t *dlen, switch_size_t *max, short a) { const char *e = NULL; - + int immune = 0; + if (len) { e = s + len; } @@ -1466,13 +1467,24 @@ while (*dlen + 10 > *max) *dst = (char *)realloc(*dst, *max += SWITCH_XML_BUFSIZE); - switch (*s) { + if (immune) { + if (*s == '\0') { + return *dst; + } + (*dst)[(*dlen)++] = *s; + } else + switch (*s) { case '\0': return *dst; case '&': *dlen += sprintf(*dst + *dlen, "&"); break; case '<': + if (*(s+1) == '!') { + (*dst)[(*dlen)++] = *s; + immune++; + break; + } *dlen += sprintf(*dst + *dlen, "<"); break; case '>':

1 0

[Freeswitch-svn] [commit] r6416 - in freeswitch/trunk/debian: . default
by Freeswitch SVN 27 Nov '07

27 Nov '07

Author: cypromis Date: Tue Nov 27 17:51:17 2007 New Revision: 6416 Added: freeswitch/trunk/debian/compat freeswitch/trunk/debian/conffiles freeswitch/trunk/debian/default/ freeswitch/trunk/debian/default/freeswitch freeswitch/trunk/debian/dirs freeswitch/trunk/debian/freeswitch.1 freeswitch/trunk/debian/freeswitch.init (contents, props changed) freeswitch/trunk/debian/freeswitch.monitrc freeswitch/trunk/debian/postinst freeswitch/trunk/debian/postrm freeswitch/trunk/debian/preinst Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/debian/copyright freeswitch/trunk/debian/rules Log: Added configuration added initscripts added feeswitch user added monit configuration changed ownership to freeswitch:daemon handle with care ... should work but a change in trunk can kill it any time :) Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Tue Nov 27 17:51:17 2007 @@ -1,3 +1,21 @@ +freeswitch (1.0~beta2-2) unstable; urgency=low + + * Additional scripts for changing the user to freeswitch + Added Startup Scripts + Monit integration + Settings file for integration into init + init.d file + added user freeswitch to own and run all off freeswitch + cleaned up config file control + + -- Michal Bielicki <michal.bielicki(a)voiceworks.pl> Tue, 27 Nov 2007 13:20:21 +0100 + +freeswitch (1.0~beta2-1) unstable; urgency=low + + * New upstream release + + -- Paul van Genderen <paulvg(a)member.fsf.org> Wed, 17 Oct 2007 19:32:09 +0200 + freeswitch (1.0~beta1-1) unstable; urgency=low * New packages. Added: freeswitch/trunk/debian/compat ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/compat Tue Nov 27 17:51:17 2007 @@ -0,0 +1 @@ +5 Added: freeswitch/trunk/debian/conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/conffiles Tue Nov 27 17:51:17 2007 @@ -0,0 +1,50 @@ +/opt/freeswitch/conf/default_context_old.xml +/opt/freeswitch/conf/extensions.conf +/opt/freeswitch/conf/freeswitch.xml +/opt/freeswitch/conf/mime.types +/opt/freeswitch/conf/vars.xml +/opt/freeswitch/conf/autoload_configs/alsa.conf.xml +/opt/freeswitch/conf/autoload_configs/cdr.conf.xml +/opt/freeswitch/conf/autoload_configs/conference.conf.xml +/opt/freeswitch/conf/autoload_configs/console.conf.xml +/opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml +/opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +/opt/freeswitch/conf/autoload_configs/enum.conf.xml +/opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +/opt/freeswitch/conf/autoload_configs/event_socket.conf.xml +/opt/freeswitch/conf/autoload_configs/iax.conf.xml +/opt/freeswitch/conf/autoload_configs/ivr.conf.xml +/opt/freeswitch/conf/autoload_configs/java.conf.xml +/opt/freeswitch/conf/autoload_configs/limit.conf.xml +/opt/freeswitch/conf/autoload_configs/local_stream.conf.xml +/opt/freeswitch/conf/autoload_configs/modules.conf.xml +/opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml +/opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +/opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +/opt/freeswitch/conf/autoload_configs/rss.conf.xml +/opt/freeswitch/conf/autoload_configs/sofia.conf.xml +/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml +/opt/freeswitch/conf/autoload_configs/switch.conf.xml +/opt/freeswitch/conf/autoload_configs/syslog.conf.xml +/opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +/opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml +/opt/freeswitch/conf/autoload_configs/woomera.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +/opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml +/opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml +/opt/freeswitch/conf/dialplan/default.xml +/opt/freeswitch/conf/dialplan/US.conf.xml +/opt/freeswitch/conf/directory/default.xml +/opt/freeswitch/conf/lang/de/de.xml +/opt/freeswitch/conf/lang/de/demo/demo.xml +/opt/freeswitch/conf/lang/de/vm/tts.xml +/opt/freeswitch/conf/lang/en/en.xml +/opt/freeswitch/conf/lang/en/demo/demo.xml +/opt/freeswitch/conf/lang/en/vm/sounds.xml +/opt/freeswitch/conf/lang/en/vm/tts.xml +/opt/freeswitch/conf/lang/fr/fr.xml +/opt/freeswitch/conf/lang/fr/demo/demo.xml +/opt/freeswitch/conf/lang/fr/vm/sounds.xml +/opt/freeswitch/conf/sip_profiles/default.xml +/opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Tue Nov 27 17:51:17 2007 @@ -1,11 +1,19 @@ Source: freeswitch Maintainer: Michael Jerris <mike(a)jerris.com> Section: net -Priority: optional -Build-Depends: automake, autoconf, libtool +Priority: extra +Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev, libssl-dev +Standards-Version: 3.7.2 Package: freeswitch Architecture: any -Depends: ${shlibs:Depends} -Description: it is the winning - lalal fixme +Depends: ${shlibs:Depends}, unixodbc, libasound2, libcurl3, openssl +Suggests: monit +Description: A telephony platform that really kicks some ass... + FreeSWITCH is an open source telephony platform designed to facilitate the + creation of voice and chat driven products scaling from a soft-phone up to + a soft-switch. It can be used as a simple switching engine, a media gateway + or a media server to host IVR applications using simple scripts or XML to + control the callflow. + . + Homepage: http://some-project.some-place.org/ Modified: freeswitch/trunk/debian/copyright ============================================================================== --- freeswitch/trunk/debian/copyright (original) +++ freeswitch/trunk/debian/copyright Tue Nov 27 17:51:17 2007 @@ -1 +1,471 @@ -Freeswitch has lots of stuff. Some is MPL. See /usr/share/common-licenses/* for more. + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``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 ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + Added: freeswitch/trunk/debian/default/freeswitch ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/default/freeswitch Tue Nov 27 17:51:17 2007 @@ -0,0 +1,6 @@ +# Startup settings fffor freeswitch +# In this package install if monit is instaled it will automatically control +# start and stop of freeswitch + +# Enable initd (let init handle start and stop of freeswitch) +USE_INIT="false" Added: freeswitch/trunk/debian/dirs ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/dirs Tue Nov 27 17:51:17 2007 @@ -0,0 +1,4 @@ +opt/freeswitch +etc/opt +etc/monit +etc/default Added: freeswitch/trunk/debian/freeswitch.1 ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.1 Tue Nov 27 17:51:17 2007 @@ -0,0 +1,22 @@ +.TH "FREESWITCH" "1" "October 10, 2007" "" "" +.nh +.ad l +.SH "NAME" +freeswitch \- Open Source telephony platform +.SH "SYNOPSIS" +.HP 7 +\fBfreeswitch\fR [\fIoption\fR...] +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBfreeswitch\fR +command. +.PP +This manual page was written for the +Debian +distribution because we're too lame to write a real manual page. But we have a superb website over here: +.UR http://www.freeswitch.org/ +.BR http://www.freeswitch.org/ +.SH "SEE ALSO" +.PP +\fBundocumented\fR(7). Added: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.init Tue Nov 27 17:51:17 2007 @@ -0,0 +1,169 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: freeswitch +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: The FreeSwitch Voice Switching System +# Description: An advanced platform for voice services +### END INIT INFO + +# Author: Anthony Minesalle III <anthmct(a)yahoo.com> +# + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/opt/freeswitch/bin +DESC="FreeSwitch Voice Switching System" +NAME=freeswitch +DAEMON=/opt/freeswitch/bin/$NAME +DAEMON_ARGS="--options -nc" +USER=freeswitch +PIDFILE=/opt/freeswitch/log/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Check if we are being executed by init + +. /etc/default/$NAME +CALLEDSCRIPT=`basename $0` +echo $CALLEDSCRIPT +case "$CALLEDSCRIPT" in + freeswitch) + ;; + *) + if [ "USE_INIT" != "TRUE" ]; then + echo "FreeSwitch disabled" ; + exit 0 ; + fi + ;; +esac + +# Exit if the package is not installed +# [ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon -c $USER --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon -c $USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon -C $USER --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: Added: freeswitch/trunk/debian/freeswitch.monitrc ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.monitrc Tue Nov 27 17:51:17 2007 @@ -0,0 +1,22 @@ + check process freeswitch with pidfile /var/run/freeswitch.pid + group voice + start program = "/etc/init.d/freeswitch start" + stop program = "/etc/init.d/freeswitch stop" + if failed port 5060 type UDP than restart + if 5 restarts within 5 cycles then timeout + depends on freeswitch_bin + depends on freeswitch_rc + + check file freeswitch_bin with path /opt/freeswitch/bin/freeswitch + group voice + if failed checksum then unmonitor + if failed permission 755 then unmonitor + if failed uid freeswitch then unmonitor + if failed gid daemon then unmonitor + + check file sendmail_rc with path /etc/init.d/freeswitch + group voice + if failed checksum then unmonitor + if failed permission 755 then unmonitor + if failed uid root then unmonitor + if failed gid root then unmonitor Added: freeswitch/trunk/debian/postinst ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/postinst Tue Nov 27 17:51:17 2007 @@ -0,0 +1,2 @@ +#!/bin/bash +chown -R freeswitch:daemon /opt/freeswitch Added: freeswitch/trunk/debian/postrm ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/postrm Tue Nov 27 17:51:17 2007 @@ -0,0 +1,2 @@ +#!/bin/bash +userdel -r freeswitch Added: freeswitch/trunk/debian/preinst ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/preinst Tue Nov 27 17:51:17 2007 @@ -0,0 +1,2 @@ +#!/bin/bash +adduser --home /opt/freeswitch --ingroup daemon --disabled-password --disabled-login --gecos "The FreeSwitch Voice Switching System" --no-create-home freeswitch Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Tue Nov 27 17:51:17 2007 @@ -5,35 +5,69 @@ # 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 +ifndef AUTOCONF + AUTOCONFS := $(wildcard /usr/bin/autoconf*) + AUTOCONF = $(shell which autoconf) +ifneq (,$(findstring 2.50,${AUTOCONFS})) + AUTOCONF = /usr/bin/autoconf2.50 +endif +endif + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +FEATURES = --enable-core-libedit-support --enable-core-odbc-support --with-libcurl --with-openssl + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + FEATURES += --disable-optimization +endif + +config.status: configure + dh_testdir + ./configure --prefix=/opt/freeswitch \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + CFLAGS="-D__VIA_HACK__" ${FEATURES} + +configure: bootstrap.sh + AUTOCONF=${AUTOCONF} ./bootstrap.sh + build: build-stamp -build-stamp: +build-stamp: config.status dh_testdir - # Add here commands to compile the package. - ./bootstrap.sh - ./configure $(MAKE) - touch build-stamp + touch $@ clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp - # Add here commands to clean up after the build process. -$(MAKE) clean megaclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub build/config/config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess build/config/config.guess +endif + - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_clean -k dh_installdirs - # Add here commands to install the package into debian/<packagename> - $(MAKE) install DESTDIR=`pwd`/debian/tmp + $(MAKE) DESTDIR=$(CURDIR)/debian/freeswitch install + # Build architecture-independent files here. binary-indep: build install @@ -43,9 +77,9 @@ binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples +# dh_installchangelogs +# dh_installdocs +# dh_installexamples # dh_install # dh_installmenu # dh_installdebconf @@ -54,23 +88,27 @@ # dh_installcatalogs # dh_installpam # dh_installmime -# dh_installinit + dh_installinit # dh_installcron # dh_installinfo # dh_undocumented - dh_installman - dh_link +# dh_installman + dh_install debian/freeswitch.monitrc etc/monit + dh_install debian/default/freeswitch etc/default + dh_install debian/freeswitch.1 opt/man + dh_link opt/freeswitch/conf etc/opt/freeswitch dh_strip dh_compress - dh_fixperms + dh_fixperms --exclude /opt/freeswitch/conf # dh_perl # dh_python # dh_makeshlibs dh_installdeb - dh_shlibdeps + dh_shlibdeps --exclude=/opt/freeswitch dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install +# vim:set ai et sts=2 sw=2 tw=0:

1 0