November 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

07 Nov '07

Author: anthm Date: Tue Nov 6 19:00:51 2007 New Revision: 6169 Modified: freeswitch/trunk/src/switch_channel.c Log: recurse variable expansion in api variables Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Nov 6 19:00:51 2007 @@ -1379,12 +1379,21 @@ SWITCH_STANDARD_STREAM(stream); if (stream.data) { + char *expanded = NULL; + + if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) { + expanded = NULL; + } else { + vval = expanded; + } + if (switch_api_execute(vname, vval, channel->session, &stream) == SWITCH_STATUS_SUCCESS) { func_val = stream.data; sub_val = func_val; - } else { - free(stream.data); } + + switch_safe_free(expanded); + free(stream.data); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); free(data);

1 0

[commit] r6168 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Nov '07

06 Nov '07

Author: anthm Date: Tue Nov 6 17:34:20 2007 New Revision: 6168 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: remove unused param Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Tue Nov 6 17:34:20 2007 @@ -51,7 +51,6 @@ <param name="dialplan" value="XML,enum"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${global_codec_prefs}"/> - <param name="codec-ms" value="20"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> <param name="rtp-ip" value="$${local_ip_v4}"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Nov 6 17:34:20 2007 @@ -231,7 +231,6 @@ int sip_port; char *codec_string; int running; - int codec_ms; int dtmf_duration; unsigned int flags; unsigned int pflags; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Nov 6 17:34:20 2007 @@ -808,7 +808,7 @@ switch_thread_rwlock_create(&profile->rwlock, profile->pool); switch_mutex_init(&profile->flag_mutex, SWITCH_MUTEX_NESTED, profile->pool); profile->dtmf_duration = 100; - profile->codec_ms = 20; + for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -970,8 +970,6 @@ profile->max_calls = atoi(val); } else if (!strcasecmp(var, "codec-prefs")) { profile->codec_string = switch_core_strdup(profile->pool, val); - } else if (!strcasecmp(var, "codec-ms")) { - profile->codec_ms = atoi(val); } else if (!strcasecmp(var, "dtmf-duration")) { int dur = atoi(val); if (dur > 10 && dur < 8000) {

1 0

[commit] r6167 - freeswitch/trunk/src
by Freeswitch SVN 06 Nov '07

06 Nov '07

Author: anthm Date: Tue Nov 6 17:19:49 2007 New Revision: 6167 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: add default prefix for realitive paths with no prefix defined Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Nov 6 17:19:49 2007 @@ -674,6 +674,10 @@ return SWITCH_STATUS_FALSE; } + if (!prefix) { + prefix = SWITCH_GLOBAL_dirs.base_dir; + } + if (!strstr(file, SWITCH_URL_SEPARATOR)) { if (!switch_is_file_path(file)) { file = switch_core_session_sprintf(session, "%s%s%s", prefix, SWITCH_PATH_SEPARATOR, file);

1 0

[commit] r6166 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 06 Nov '07

06 Nov '07

Author: anthm Date: Tue Nov 6 09:43:27 2007 New Revision: 6166 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add trixter Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Tue Nov 6 09:43:27 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * Justin Cassidy <xachenant(a)hotmail.com> * * mod_xml_curl.c -- CURL XML Gateway

1 0

[commit] r6165 - freeswitch/trunk/src
by Freeswitch SVN 05 Nov '07

05 Nov '07

Author: mikej Date: Mon Nov 5 17:36:59 2007 New Revision: 6165 Modified: freeswitch/trunk/src/switch_utils.c Log: fix newer freebsd builds. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Nov 5 17:36:59 2007 @@ -93,7 +93,7 @@ unsigned char out[B64BUFFLEN + 512]; char *path = NULL; - snprintf(filename, 80, "%smail.%ld%04x", SWITCH_GLOBAL_dirs.temp_dir, time(NULL), rand() & 0xffff); + snprintf(filename, 80, "%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, (int)time(NULL), rand() & 0xffff); if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { if (file) {

1 0

[commit] r6164 - freeswitch/trunk/src
by Freeswitch SVN 05 Nov '07

05 Nov '07

Author: anthm Date: Mon Nov 5 14:13:17 2007 New Revision: 6164 Modified: freeswitch/trunk/src/switch_utils.c Log: make mailer app name a config option Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Nov 5 14:13:17 2007 @@ -180,7 +180,7 @@ if (ifd) { close(ifd); } - snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s", filename, runtime.mailer_app, runtime.mailer_app_args); + snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); if(system(buf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf); }

1 0

[commit] r6163 - in freeswitch/trunk: conf src src/include/private
by Freeswitch SVN 05 Nov '07

05 Nov '07

Author: anthm Date: Mon Nov 5 13:45:26 2007 New Revision: 6163 Modified: freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_utils.c Log: make mailer app name a config option Modified: freeswitch/trunk/conf/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/switch.conf.xml (original) +++ freeswitch/trunk/conf/switch.conf.xml Mon Nov 5 13:45:26 2007 @@ -8,6 +8,8 @@ <param name="loglevel" value="debug"/>  <param name="crash-protection" value="false"/> + <param name="mailer-app" value="sendmail"/> + <param name="mailer-app-args" value="-t"/>    Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Mon Nov 5 13:45:26 2007 @@ -171,6 +171,8 @@ int32_t sps; int32_t sps_last; switch_log_level_t hard_log_level; + char *mailer_app; + char *mailer_app_args; }; extern struct switch_runtime runtime; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Nov 5 13:45:26 2007 @@ -542,6 +542,8 @@ switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); runtime.hard_log_level = SWITCH_LOG_DEBUG; + runtime.mailer_app = "sendmail"; + runtime.mailer_app_args = "-t"; /* INIT APR and Create the pool context */ if (apr_initialize() != SWITCH_STATUS_SUCCESS) { @@ -595,6 +597,10 @@ switch_core_session_ctl(SCSC_LOGLEVEL, &level); + } else if (!strcasecmp(var, "mailer-app")) { + runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val); + } else if (!strcasecmp(var, "mailer-app-args")) { + runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val); } else if (!strcasecmp(var, "sessions-per-second")) { switch_core_sessions_per_second(atoi(val)); } else if (!strcasecmp(var, "max-sessions")) { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Nov 5 13:45:26 2007 @@ -33,6 +33,7 @@ #ifndef WIN32 #include <arpa/inet.h> #endif +#include "private/switch_core_pvt.h" static const char switch_b64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define B64BUFFLEN 1024 @@ -179,7 +180,7 @@ if (ifd) { close(ifd); } - snprintf(buf, B64BUFFLEN, "/bin/cat %s | /usr/sbin/sendmail -tf \"%s\" %s", filename, from, to); + snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s", filename, runtime.mailer_app, runtime.mailer_app_args); if(system(buf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf); }

1 0

[commit] r6162 - freeswitch/trunk/scripts
by Freeswitch SVN 05 Nov '07

05 Nov '07

Author: anthm Date: Mon Nov 5 13:24:19 2007 New Revision: 6162 Added: freeswitch/trunk/scripts/sendmail Log: add perl fake sendmail Added: freeswitch/trunk/scripts/sendmail ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/sendmail Mon Nov 5 13:24:19 2007 @@ -0,0 +1,40 @@ +#!/usr/local/bin/perl +################################################################################ +# sendmail.pl +# <rename this to /usr/sbin/sendmail for a FreeSWITCH +# voicemail gateway with no mail server> +# +# (c) 2005 Anthony Minessale II +# Anthony Minessale <anthmct(a)yahoo.com> +# +################################################################################ +use Net::SMTP; +my $relayhost = "localhost"; # what is the internet address of your smtp server +my $over_from = ""; # define this to override the to +my $over_to = ""; # define this to override the from +my $debug = 0; # set to 1 to watch it deliver +my $timeout = 60; # when to give up. +################################################################################ + + +$/ = undef; +my $msg = <STDIN>; + +my ($to) = $over_to || $msg =~ /To: (.*)/; +my ($from) = $over_from || $msg =~ /From: (.*)/; + + +if($to =~ /<([^>]+)>/) { + $to = $1; +} + +if($from =~ /<([^>]+)>/) { + $from = $1; +} + +my $smtp = Net::SMTP->new($relayhost, Debug => $debug, Timeout => $timout); +$smtp->mail($from); +$smtp->to(split /,/, $to); +$smtp->data($msg); +$smtp->quit(); +

1 0

[commit] r6161 - freeswitch/trunk/libs/pcre
by Freeswitch SVN 04 Nov '07

04 Nov '07

Author: mikej Date: Sun Nov 4 06:41:31 2007 New Revision: 6161 Modified: freeswitch/trunk/libs/pcre/pcre_compile.c freeswitch/trunk/libs/pcre/pcre_dfa_exec.c freeswitch/trunk/libs/pcre/pcre_exec.c freeswitch/trunk/libs/pcre/pcre_internal.h Log: dont print pcre intensive debug messages, even in our debug builds (you can still enable it by defining PCRE_DEBUG on the project. Modified: freeswitch/trunk/libs/pcre/pcre_compile.c ============================================================================== --- freeswitch/trunk/libs/pcre/pcre_compile.c (original) +++ freeswitch/trunk/libs/pcre/pcre_compile.c Sun Nov 4 06:41:31 2007 @@ -46,10 +46,10 @@ #include "pcre_internal.h" -/* When DEBUG is defined, we need the pcre_printint() function, which is also -used by pcretest. DEBUG is not defined when building a production library. */ +/* When PCRE_DEBUG is defined, we need the pcre_printint() function, which is also +used by pcretest. PCRE_DEBUG is not defined when building a production library. */ -#ifdef DEBUG +#ifdef PCRE_DEBUG #include "pcre_printint.src" #endif @@ -5154,7 +5154,7 @@ *code++ = OP_END; -#ifndef DEBUG +#ifndef PCRE_DEBUG if (code - codestart > length) errorcode = ERR23; #endif @@ -5223,7 +5223,7 @@ /* Print out the compiled data if debugging is enabled. This is never the case when building a production library. */ -#ifdef DEBUG +#ifdef PCRE_DEBUG printf("Length = %d top_bracket = %d top_backref = %d\n", length, re->top_bracket, re->top_backref); Modified: freeswitch/trunk/libs/pcre/pcre_dfa_exec.c ============================================================================== --- freeswitch/trunk/libs/pcre/pcre_dfa_exec.c (original) +++ freeswitch/trunk/libs/pcre/pcre_dfa_exec.c Sun Nov 4 06:41:31 2007 @@ -150,7 +150,7 @@ #define INTS_PER_STATEBLOCK (sizeof(stateblock)/sizeof(int)) -#ifdef DEBUG +#ifdef PCRE_DEBUG /************************************************* * Print character string * *************************************************/ @@ -439,7 +439,7 @@ workspace[0] ^= 1; /* Remember for the restarting feature */ workspace[1] = active_count; -#ifdef DEBUG +#ifdef PCRE_DEBUG printf("%.*sNext character: rest of subject = \"", rlevel*2-2, SP); pchars((uschar *)ptr, strlen((char *)ptr), stdout); printf("\"\n"); @@ -486,7 +486,7 @@ int count, codevalue; int chartype, script; -#ifdef DEBUG +#ifdef PCRE_DEBUG printf ("%.*sProcessing state %d c=", rlevel*2-2, SP, state_offset); if (c < 0) printf("-1\n"); else if (c > 32 && c < 127) printf("'%c'\n", c); Modified: freeswitch/trunk/libs/pcre/pcre_exec.c ============================================================================== --- freeswitch/trunk/libs/pcre/pcre_exec.c (original) +++ freeswitch/trunk/libs/pcre/pcre_exec.c Sun Nov 4 06:41:31 2007 @@ -81,7 +81,7 @@ -#ifdef DEBUG +#ifdef PCRE_DEBUG /************************************************* * Debugging function to print chars * *************************************************/ @@ -133,7 +133,7 @@ { USPTR p = md->start_subject + md->offset_vector[offset]; -#ifdef DEBUG +#ifdef PCRE_DEBUG if (eptr >= md->end_subject) printf("matching subject <null>"); else @@ -195,7 +195,7 @@ #ifndef NO_RECURSE #define REGISTER register -#ifdef DEBUG +#ifdef PCRE_DEBUG #define RMATCH(rx,ra,rb,rc,rd,re,rf,rg) \ { \ printf("match() called in line %d\n", __LINE__); \ @@ -537,7 +537,7 @@ /* OK, now we can get on with the real code of the function. Recursive calls are specified by the macro RMATCH and RRETURN is used to return. When NO_RECURSE is *not* defined, these just turn into a recursive call to match() -and a "return", respectively (possibly with some debugging if DEBUG is +and a "return", respectively (possibly with some debugging if PCRE_DEBUG is defined). However, RMATCH isn't like a function call because it's quite a complicated macro. It has to be used in one particular way. This shouldn't, however, impact performance when true recursion is being used. */ @@ -608,7 +608,7 @@ number = GET2(ecode, 2+LINK_SIZE); offset = number << 1; -#ifdef DEBUG +#ifdef PCRE_DEBUG printf("start bracket %d subject=", number); pchars(eptr, 16, TRUE, md); printf("\n"); @@ -1116,7 +1116,7 @@ if (number > EXTRACT_BASIC_MAX) number = GET2(prev, 2+LINK_SIZE); offset = number << 1; -#ifdef DEBUG +#ifdef PCRE_DEBUG printf("end bracket %d", number); printf("\n"); #endif @@ -3777,7 +3777,7 @@ end_subject = save_end_subject; -#ifdef DEBUG /* Sigh. Some compilers never learn. */ +#ifdef PCRE_DEBUG /* Sigh. Some compilers never learn. */ printf(">>>> Match against: "); pchars(start_match, end_subject - start_match, TRUE, md); printf("\n"); Modified: freeswitch/trunk/libs/pcre/pcre_internal.h ============================================================================== --- freeswitch/trunk/libs/pcre/pcre_internal.h (original) +++ freeswitch/trunk/libs/pcre/pcre_internal.h Sun Nov 4 06:41:31 2007 @@ -45,10 +45,10 @@ #ifndef PCRE_INTERNAL_H #define PCRE_INTERNAL_H -/* Define DEBUG to get debugging output on stdout. */ +/* Define PCRE_DEBUG to get debugging output on stdout. */ #if 0 -#define DEBUG +#define PCRE_DEBUG #endif /* Use a macro for debugging printing, 'cause that eliminates the use of #ifdef @@ -56,7 +56,7 @@ pre-processor statements, or at least there were when I first wrote this. After all, it had only been about 10 years then... */ -#ifdef DEBUG +#ifdef PCRE_DEBUG #define DPRINTF(p) printf p #else #define DPRINTF(p) /*nothing*/

1 0

[commit] r6160 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 04 Nov '07

04 Nov '07

Author: mikej Date: Sun Nov 4 06:05:52 2007 New Revision: 6160 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: workaround for gcc 4.3 warning (MODAPP-44) Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sun Nov 4 06:05:52 2007 @@ -464,15 +464,16 @@ switch_xml_t x_fifo; int cc_off = 0; - char tmp[35]; + char buffer[35]; + char *tmp = buffer; x_fifo = switch_xml_add_child_d(x_report, "fifo", (*off)++);; assert(x_fifo); switch_xml_set_attr_d(x_fifo, "name", node->name); - snprintf(tmp, sizeof(tmp), "%d", node->consumer_count); + snprintf(tmp, sizeof(buffer), "%d", node->consumer_count); switch_xml_set_attr_d(x_fifo, "consumer_count", tmp); - snprintf(tmp, sizeof(tmp), "%d", node->caller_count); + snprintf(tmp, sizeof(buffer), "%d", node->caller_count); switch_xml_set_attr_d(x_fifo, "caller_count", tmp); cc_off = xml_hash(x_fifo, node->caller_hash, "callers", "caller", cc_off, verbose);

1 0