April 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8135 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 15:02:51 2008 New Revision: 8135 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: honor disable dtx in fmtp (MODCODEC-3) Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Mon Apr 21 15:02:51 2008 @@ -93,11 +93,17 @@ AMR_BITRATE_1220 } amr_bitrate_t; +typedef enum { + AMR_DTX_DISABLED = 0, + AMR_DTX_ENABLED +} amr_dtx_t; + struct amr_context { void *encoder_state; void *decoder_state; switch_byte_t enc_modes; switch_byte_t enc_mode; + switch_int_t dtx_mode; uint32_t change_period; switch_byte_t max_ptime; switch_byte_t ptime; @@ -133,8 +139,9 @@ if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct amr_context))))) { return SWITCH_STATUS_FALSE; - } else { - + } else { + + context->dtx_mode = AMR_DTX_ENABLED; if (codec->fmtp_in) { argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0]))); for (x = 0; x < argc; x++) { @@ -180,6 +187,8 @@ for (y = 0; y < m_argc; y++) { context->enc_modes |= (1 << atoi(m_argv[y])); } + } else if (!strcasecmp(data, "dtx")) { + context->dtx_mode = if (atoi(arg)) ? AMR_DTX_ENABLED : AMR_DTX_DISABLED; } } } @@ -206,7 +215,7 @@ context->decoder_state = NULL; if (encoding) { - context->encoder_state = Encoder_Interface_init(1); + context->encoder_state = Encoder_Interface_init(context->dtx_mode); } if (decoding) {

1 0

[commit] r8134 - freeswitch/trunk/src
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 12:48:34 2008 New Revision: 8134 Modified: freeswitch/trunk/src/inet_pton.c Log: tweak windows build for inet_pton Modified: freeswitch/trunk/src/inet_pton.c ============================================================================== --- freeswitch/trunk/src/inet_pton.c (original) +++ freeswitch/trunk/src/inet_pton.c Mon Apr 21 12:48:34 2008 @@ -36,8 +36,6 @@ #include <string.h> #include <errno.h> -#include "inet_pton.h" - #define IN6ADDRSZ 16 #define INADDRSZ 4 #define INT16SZ 2

1 0

[commit] r8133 - in freeswitch/trunk/src/mod: applications/mod_voicemail event_handlers/mod_event_socket
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: brian Date: Mon Apr 21 11:25:09 2008 New Revision: 8133 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: Add MODEVENT-21 and a small tweak to voicemail to not light up on saved message counts 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 Mon Apr 21 11:25:09 2008 @@ -1429,7 +1429,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { char *mwi_id; const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages ) { yn = "yes"; } mwi_id = switch_mprintf("%s@%s", myid, domain_name); @@ -1940,7 +1940,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages) { yn = "yes"; } mwi_id = switch_mprintf("%s@%s", id, domain_name); @@ -2187,7 +2187,7 @@ if (total_new_messages || total_saved_messages) { if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages ) { yn = "yes"; } switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Apr 21 11:25:09 2008 @@ -1334,7 +1334,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port); break; sock_fail: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error! Could not listen on %s:%u\n", prefs.ip, prefs.port); switch_yield(100000); }

1 0

[commit] r8132 - freeswitch/trunk/src
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: anthm Date: Mon Apr 21 10:44:23 2008 New Revision: 8132 Modified: freeswitch/trunk/src/switch_time.c Log: tweak Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Apr 21 10:44:23 2008 @@ -298,7 +298,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime) { - switch_time_t too_late = STEP_MIC * 128; + switch_time_t too_late = STEP_MIC * 1000; uint32_t current_ms = 0; uint32_t x, tick = 0; switch_time_t ts = 0, last = 0; @@ -324,6 +324,7 @@ MONO = 0; runtime.reference = switch_time_now(); runtime.initiated = runtime.reference; + break; } switch_yield(STEP_MIC); last = ts;

1 0

[commit] r8131 - in freeswitch/trunk: src src/include src/mod/applications/mod_enum src/mod/applications/mod_voicemail w32/Library
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: mikej Date: Mon Apr 21 10:35:14 2008 New Revision: 8131 Added: freeswitch/trunk/src/inet_pton.c Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_utils.c freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Log: tweak windows build for inet_pton and other build problems Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Apr 21 10:35:14 2008 @@ -356,6 +356,7 @@ SWITCH_DECLARE(switch_bool_t) switch_network_list_validate_ip(switch_network_list_t *list, uint32_t ip); #define switch_test_subnet(_ip, _net, _mask) (_mask ? ((_net & _mask) == (_ip & _mask)) : _net ? _net == _ip : 1) +int switch_inet_pton(int af, const char *src, void *dst); /* malloc or DIE macros */ #ifdef NDEBUG Added: freeswitch/trunk/src/inet_pton.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/inet_pton.c Mon Apr 21 10:35:14 2008 @@ -0,0 +1,240 @@ +/* This is from the BIND 4.9.4 release, modified to compile by itself */ + +/* Copyright (c) 1996 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#ifndef HAVE_INET_PTON + +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#include <string.h> +#include <errno.h> + +#include "inet_pton.h" + +#define IN6ADDRSZ 16 +#define INADDRSZ 4 +#define INT16SZ 2 + +#ifdef WIN32 +#include <winsock2.h> +#define EAFNOSUPPORT WSAEAFNOSUPPORT +#endif + +/* + * WARNING: Don't even consider trying to compile this on a system where + * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. + */ + +static int inet_pton4(const char *src, unsigned char *dst); +#ifdef ENABLE_IPV6 +static int inet_pton6(const char *src, unsigned char *dst); +#endif + +/* int + * inet_pton(af, src, dst) + * convert from presentation format (which usually means ASCII printable) + * to network format (which is usually some kind of binary format). + * return: + * 1 if the address was valid for the specified address family + * 0 if the address wasn't valid (`dst' is untouched in this case) + * -1 if some other error occurred (`dst' is untouched in this case, too) + * author: + * Paul Vixie, 1996. + */ +int +switch_inet_pton(int af, const char *src, void *dst) +{ + switch (af) { + case AF_INET: + return (inet_pton4(src, (unsigned char *)dst)); +#ifdef ENABLE_IPV6 +#ifndef AF_INET6 +#define AF_INET6 (AF_MAX+1) /* just to let this compile */ +#endif + case AF_INET6: + return (inet_pton6(src, (unsigned char *)dst)); +#endif + default: + errno = EAFNOSUPPORT; + return (-1); + } + /* NOTREACHED */ +} + +/* int + * inet_pton4(src, dst) + * like inet_aton() but without all the hexadecimal and shorthand. + * return: + * 1 if `src' is a valid dotted quad, else 0. + * notice: + * does not touch `dst' unless it's returning 1. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton4(const char *src, unsigned char *dst) +{ + static const char digits[] = "0123456789"; + int saw_digit, octets, ch; + unsigned char tmp[INADDRSZ], *tp; + + saw_digit = 0; + octets = 0; + tp = tmp; + *tp = 0; + while ((ch = *src++) != '\0') { + const char *pch; + + if ((pch = strchr(digits, ch)) != NULL) { + unsigned int val = *tp * 10 + (unsigned int)(pch - digits); + + if (val > 255) + return (0); + *tp = (unsigned char)val; + if (! saw_digit) { + if (++octets > 4) + return (0); + saw_digit = 1; + } + } else if (ch == '.' && saw_digit) { + if (octets == 4) + return (0); + *++tp = 0; + saw_digit = 0; + } else + return (0); + } + if (octets < 4) + return (0); + /* bcopy(tmp, dst, INADDRSZ); */ + memcpy(dst, tmp, INADDRSZ); + return (1); +} + +#ifdef ENABLE_IPV6 +/* int + * inet_pton6(src, dst) + * convert presentation level address to network order binary form. + * return: + * 1 if `src' is a valid [RFC1884 2.2] address, else 0. + * notice: + * (1) does not touch `dst' unless it's returning 1. + * (2) :: in a full address is silently ignored. + * credit: + * inspired by Mark Andrews. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton6(const char *src, unsigned char *dst) +{ + static const char xdigits_l[] = "0123456789abcdef", + xdigits_u[] = "0123456789ABCDEF"; + unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp; + const char *xdigits, *curtok; + int ch, saw_xdigit; + unsigned int val; + + memset((tp = tmp), 0, IN6ADDRSZ); + endp = tp + IN6ADDRSZ; + colonp = NULL; + /* Leading :: requires some special handling. */ + if (*src == ':') + if (*++src != ':') + return (0); + curtok = src; + saw_xdigit = 0; + val = 0; + while ((ch = *src++) != '\0') { + const char *pch; + + if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) + pch = strchr((xdigits = xdigits_u), ch); + if (pch != NULL) { + val <<= 4; + val |= (pch - xdigits); + if (val > 0xffff) + return (0); + saw_xdigit = 1; + continue; + } + if (ch == ':') { + curtok = src; + if (!saw_xdigit) { + if (colonp) + return (0); + colonp = tp; + continue; + } + if (tp + INT16SZ > endp) + return (0); + *tp++ = (unsigned char) (val >> 8) & 0xff; + *tp++ = (unsigned char) val & 0xff; + saw_xdigit = 0; + val = 0; + continue; + } + if (ch == '.' && ((tp + INADDRSZ) <= endp) && + inet_pton4(curtok, tp) > 0) { + tp += INADDRSZ; + saw_xdigit = 0; + break; /* '\0' was seen by inet_pton4(). */ + } + return (0); + } + if (saw_xdigit) { + if (tp + INT16SZ > endp) + return (0); + *tp++ = (unsigned char) (val >> 8) & 0xff; + *tp++ = (unsigned char) val & 0xff; + } + if (colonp != NULL) { + /* + * Since some memmove()'s erroneously fail to handle + * overlapping regions, we'll do the shift by hand. + */ + const int n = tp - colonp; + int i; + + for (i = 1; i <= n; i++) { + endp[- i] = colonp[n - i]; + colonp[n - i] = 0; + } + tp = endp; + } + if (tp != endp) + return (0); + /* bcopy(tmp, dst, IN6ADDRSZ); */ + memcpy(dst, tmp, IN6ADDRSZ); + return (1); +} +#endif /* ENABLE_IPV6 */ + +#endif /* HAVE_INET_PTON */ Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Apr 21 10:35:14 2008 @@ -767,7 +767,8 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { dest = argv[0]; root = argv[1]; - + switch_assert(dest); + if (!strcasecmp(dest, "reload")) { do_load(); stream->write_function(stream, "+OK ENUM Reloaded.\n"); 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 Mon Apr 21 10:35:14 2008 @@ -1480,8 +1480,8 @@ vm_check_state = VM_CHECK_MENU; } else if (!strcmp(input, profile->choose_greeting_key)) { int num; - switch_input_args_t args = { 0 }; - args.input_callback = cancel_on_dtmf; + switch_input_args_t greeting_args = { 0 }; + greeting_args.input_callback = cancel_on_dtmf; TRY_CODE(vm_macro_get(session, VM_CHOOSE_GREETING_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout)); @@ -1493,13 +1493,13 @@ } else { switch_file_handle_t fh = { 0 }; memset(&fh, 0, sizeof(fh)); - args.input_callback = control_playback; + greeting_args.input_callback = control_playback; memset(&cc, 0, sizeof(cc)); cc.profile = profile; cc.fh = &fh; cc.noexit = 1; - args.buf = &cc; - status = switch_ivr_play_file(session, NULL, file_path, &args); + greeting_args.buf = &cc; + status = switch_ivr_play_file(session, NULL, file_path, &greeting_args); } if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Apr 21 10:35:14 2008 @@ -700,7 +700,7 @@ switch_bool_t ok = SWITCH_FALSE; switch_mutex_lock(runtime.global_mutex); - inet_pton(AF_INET, ip_str, &ip); + switch_inet_pton(AF_INET, ip_str, &ip); if ((list = switch_core_hash_find(IP_LIST.hash, list_name))) { ok = switch_network_list_validate_ip(list, ip); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Apr 21 10:35:14 2008 @@ -53,6 +53,12 @@ switch_memory_pool_t *pool; }; +#ifndef WIN32 +int switch_inet_pton(int af, const char *src, void *dst) +{ + return inet_pton(af, src, dst); +} +#endif SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, switch_bool_t default_type, switch_memory_pool_t *pool) { @@ -120,8 +126,8 @@ int ip, mask; switch_network_node_t *node; - inet_pton(AF_INET, host, &ip); - inet_pton(AF_INET, mask_str, &mask); + switch_inet_pton(AF_INET, host, &ip); + switch_inet_pton(AF_INET, mask_str, &mask); node = switch_core_alloc(list->pool, sizeof(*node)); @@ -162,7 +168,7 @@ } bits = atoi(bit_str); - inet_pton(AF_INET, host, ip); + switch_inet_pton(AF_INET, host, ip); *mask = 0xFFFFFFFF & ~(0xFFFFFFFF << bits); *bitp = bits; @@ -766,7 +772,7 @@ memset(&remote, 0, sizeof(struct sockaddr_in6)); remote.sin6_family = AF_INET6; - inet_pton(AF_INET6, buf, &remote.sin6_addr); + switch_inet_pton(AF_INET6, buf, &remote.sin6_addr); remote.sin6_port = htons(4242); memset(&iface_out, 0, sizeof(iface_out)); Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Mon Apr 21 10:35:14 2008 @@ -225,6 +225,26 @@ </FileConfiguration> </File> <File + RelativePath="..\..\src\inet_pton.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\libs\stfu\stfu.c" > <FileConfiguration

1 0

[commit] r8130 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 21 Apr '08

21 Apr '08

Author: anthm Date: Mon Apr 21 09:48:35 2008 New Revision: 8130 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: fix locking issue Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Apr 21 09:48:35 2008 @@ -539,9 +539,10 @@ return SWITCH_STATUS_SUCCESS; } - get_samples: switch_mutex_lock(globals.device_lock); + get_samples: + if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame, &globals.timer)) == 0) {

1 0

[commit] r8129 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 19 Apr '08

19 Apr '08

Author: brian Date: Fri Apr 18 23:00:58 2008 New Revision: 8129 Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml Log: doc this Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Fri Apr 18 23:00:58 2008 @@ -24,6 +24,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"/> <param name="dump-cores" value="yes"/>

1 0

[commit] r8128 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 18 Apr '08

18 Apr '08

Author: anthm Date: Fri Apr 18 18:05:44 2008 New Revision: 8128 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: Moc likes to inturrupt the hello message 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 Fri Apr 18 18:05:44 2008 @@ -1281,6 +1281,8 @@ int total_saved_urgent_messages = 0; int heard_auto_saved = 0, heard_auto_new = 0; char *email_vm = NULL; + char foo[2] = ""; + switch_input_args_t args = { 0 }; if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); @@ -1289,8 +1291,9 @@ timeout = profile->digit_timeout; attempts = profile->max_login_attempts; - - status = switch_ivr_phrase_macro(session, VM_HELLO_MACRO, NULL, NULL, NULL); + args.buf = &foo; + args.buflen = sizeof(foo); + status = switch_ivr_phrase_macro(session, VM_HELLO_MACRO, NULL, NULL, &args); while(switch_channel_ready(channel)) { switch_ivr_sleep(session, 100);

1 0

[commit] r8127 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 18 Apr '08

18 Apr '08

Author: brian Date: Fri Apr 18 17:58:41 2008 New Revision: 8127 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Log: tweak Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Fri Apr 18 17:58:41 2008 @@ -91,6 +91,8 @@ <param name="caller-id-number" value="$${outbound_caller_id}"/>   +  + <param name="comfort-noise" value="true"/> </profile> <profile name="wideband"> @@ -113,6 +115,7 @@ <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/> <param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/> + <param name="comfort-noise" value="true"/> </profile> <profile name="ultrawideband"> @@ -135,6 +138,7 @@ <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/> <param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/> + <param name="comfort-noise" value="true"/> </profile> </profiles> </configuration>

1 0

[commit] r8126 - in freeswitch/trunk/src: . include include/private mod/applications/mod_commands mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/languages/mod_spidermonkey
by Freeswitch SVN 18 Apr '08

18 Apr '08

Author: anthm Date: Fri Apr 18 13:03:34 2008 New Revision: 8126 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_rtp.c Log: make dtmf duration defaults tweakable 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 Fri Apr 18 13:03:34 2008 @@ -184,6 +184,8 @@ switch_log_level_t hard_log_level; char *mailer_app; char *mailer_app_args; + uint32_t max_dtmf_duration; + uint32_t default_dtmf_duration; }; extern struct switch_runtime runtime; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Apr 18 13:03:34 2008 @@ -1598,6 +1598,8 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload); SWITCH_DECLARE(switch_bool_t) switch_check_network_list_ip(const char *ip_str, const char *list_name); SWITCH_DECLARE(void) switch_time_set_monotonic(switch_bool_t enable); +SWITCH_DECLARE(uint32_t) switch_core_max_dtmf_duration(uint32_t duration); +SWITCH_DECLARE(uint32_t) switch_core_default_dtmf_duration(uint32_t duration); ///\} Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Apr 18 13:03:34 2008 @@ -1137,7 +1137,9 @@ SCSC_LAST_SPS, SCSC_RECLAIM, SCSC_MAX_SESSIONS, - SCSC_SYNC_CLOCK + SCSC_SYNC_CLOCK, + SCSC_MAX_DTMF_DURATION, + SCSC_DEFAULT_DTMF_DURATION } switch_session_ctl_t; typedef struct apr_pool_t switch_memory_pool_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Apr 18 13:03:34 2008 @@ -562,7 +562,7 @@ return SWITCH_STATUS_SUCCESS; } -#define CTL_SYNTAX "[hupall|pause|resume|shutdown|sync_clock|reclaim_mem|max_sessions [num]|loglevel [level]]" +#define CTL_SYNTAX "[hupall|pause|resume|shutdown|sync_clock|reclaim_mem|max_sessions|max_dtmf_duration [num]|loglevel [level]]" SWITCH_STANDARD_API(ctl_function) { int argc; @@ -597,6 +597,18 @@ } switch_core_session_ctl(SCSC_MAX_SESSIONS, &arg); stream->write_function(stream, "+OK max sessions: %d\n", arg); + } else if (!strcasecmp(argv[0], "max_dtmf_duration")) { + if (argc > 1) { + arg = atoi(argv[1]); + } + switch_core_session_ctl(SCSC_MAX_DTMF_DURATION, &arg); + stream->write_function(stream, "+OK max dtmf duration: %d\n", arg); + } else if (!strcasecmp(argv[0], "default_dtmf_duration")) { + if (argc > 1) { + arg = atoi(argv[1]); + } + switch_core_session_ctl(SCSC_DEFAULT_DTMF_DURATION, &arg); + stream->write_function(stream, "+OK default dtmf duration: %d\n", arg); } else if (!strcasecmp(argv[0], "loglevel")) { if (argc > 1) { if (*argv[1] > 47 && *argv[1] < 58) { Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Fri Apr 18 13:03:34 2008 @@ -1212,7 +1212,7 @@ static switch_status_t dtmf_call(char **argv, int argc, switch_stream_handle_t *stream) { char *dtmf_str = argv[0]; - switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + switch_dtmf_t dtmf = {0, switch_core_default_dtmf_duration(0)}; if (switch_strlen_zero(dtmf_str)) { stream->write_function(stream, "No DTMF Supplied!\n"); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Apr 18 13:03:34 2008 @@ -2706,7 +2706,7 @@ if (msg) { if (*msg == '+') { char *p = msg + 1; - switch_dtmf_t dtmf = { 0, SWITCH_DEFAULT_DTMF_DURATION }; + switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) }; while (p && *p) { dtmf.digit = *p; switch_channel_queue_dtmf(channel, &dtmf); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri Apr 18 13:03:34 2008 @@ -1126,7 +1126,7 @@ break; case IAX_EVENT_DTMF: if (channel) { - switch_dtmf_t dtmf = { (char) iaxevent->subclass , SWITCH_DEFAULT_DTMF_DURATION }; + switch_dtmf_t dtmf = { (char) iaxevent->subclass , switch_core_default_dtmf_duration(0) }; if (globals.debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", dtmf.digit, switch_channel_get_name(channel)); } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Apr 18 13:03:34 2008 @@ -1203,7 +1203,7 @@ static switch_status_t dtmf_call(char **argv, int argc, switch_stream_handle_t *stream) { char *dtmf_str = argv[0]; - switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + switch_dtmf_t dtmf = {0, switch_core_default_dtmf_duration(0)}; if (switch_strlen_zero(dtmf_str)) { stream->write_function(stream, "No DTMF Supplied!\n"); 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 Fri Apr 18 13:03:34 2008 @@ -2382,7 +2382,7 @@ const char *signal_ptr; const char *rec_header; const char *clientcode_header; - switch_dtmf_t dtmf = { 0, SWITCH_DEFAULT_DTMF_DURATION }; + switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0) }; if (session) { /* Get the channel */ @@ -2408,7 +2408,7 @@ int tmp; signal_ptr += 9; if ((tmp = atoi(signal_ptr)) <= 0) { - tmp = SWITCH_DEFAULT_DTMF_DURATION; + tmp = switch_core_default_dtmf_duration(0); } dtmf.duration = tmp * 8; } 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 Fri Apr 18 13:03:34 2008 @@ -761,7 +761,7 @@ static JSBool dtmf_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { switch_dtmf_t *dtmf; - int32 duration = SWITCH_DEFAULT_DTMF_DURATION; + int32 duration = switch_core_default_dtmf_duration(0); char *ename; if (argc > 0) { @@ -774,7 +774,7 @@ if (argc > 1) { JS_ValueToInt32(cx, argv[1], &duration); if (duration <= 0) { - duration = SWITCH_DEFAULT_DTMF_DURATION; + duration = switch_core_default_dtmf_duration(0); } } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Apr 18 13:03:34 2008 @@ -226,12 +226,12 @@ switch_dtmf_t *dt; int x = 0; - if (new_dtmf.duration > SWITCH_MAX_DTMF_DURATION) { + if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(channel), new_dtmf.digit, new_dtmf.duration); - new_dtmf.duration = SWITCH_MAX_DTMF_DURATION; + new_dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!new_dtmf.duration) { - new_dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + new_dtmf.duration = switch_core_default_dtmf_duration(0); } switch_zmalloc(dt, sizeof(*dt)); @@ -259,7 +259,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf_string(switch_channel_t *channel, const char *dtmf_string) { char *p; - switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + switch_dtmf_t dtmf = {0, switch_core_default_dtmf_duration(0)}; int sent = 0, dur; char *string; int i, argc; @@ -273,8 +273,8 @@ argc = switch_separate_string(string, '+', argv, (sizeof(argv) / sizeof(argv[0]))); for(i = 0; i < argc; i++) { - dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; - dur = SWITCH_DEFAULT_DTMF_DURATION / 8; + dtmf.duration = switch_core_default_dtmf_duration(0); + dur = switch_core_default_dtmf_duration(0) / 8; if ((p = strchr(argv[i], '@'))) { *p++ = '\0'; if ((dur = atoi(p)) > 50) { @@ -282,11 +282,11 @@ } } - if (dtmf.duration > SWITCH_MAX_DTMF_DURATION) { + if (dtmf.duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "EXECSSIVE DTMF DIGIT LEN %c %d\n", dtmf.digit, dtmf.duration); - dtmf.duration = SWITCH_MAX_DTMF_DURATION; + dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!dtmf.duration) { - dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + dtmf.duration = switch_core_default_dtmf_duration(0); } @@ -320,12 +320,12 @@ *dtmf = *dt; free(dt); - if (dtmf->duration > SWITCH_MAX_DTMF_DURATION) { + if (dtmf->duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(channel), dtmf->digit, dtmf->duration); - dtmf->duration = SWITCH_MAX_DTMF_DURATION; + dtmf->duration = switch_core_max_dtmf_duration(0); } else if (!dtmf->duration) { - dtmf->duration = SWITCH_DEFAULT_DTMF_DURATION; + dtmf->duration = switch_core_default_dtmf_duration(0); } status = SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Apr 18 13:03:34 2008 @@ -812,6 +812,28 @@ switch_mutex_unlock(runtime.global_mutex); } +SWITCH_DECLARE(uint32_t) switch_core_max_dtmf_duration(uint32_t duration) +{ + if (duration) { + if (duration > SWITCH_MAX_DTMF_DURATION) { + duration = SWITCH_MAX_DTMF_DURATION; + } + runtime.max_dtmf_duration = duration; + } + return runtime.max_dtmf_duration; +} + +SWITCH_DECLARE(uint32_t) switch_core_default_dtmf_duration(uint32_t duration) +{ + if (duration) { + if (duration < SWITCH_DEFAULT_DTMF_DURATION) { + duration = SWITCH_DEFAULT_DTMF_DURATION; + } + runtime.default_dtmf_duration = duration; + } + return runtime.default_dtmf_duration; +} + SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err) { switch_xml_t xml = NULL, cfg = NULL; @@ -824,6 +846,8 @@ runtime.hard_log_level = SWITCH_LOG_DEBUG; runtime.mailer_app = "sendmail"; runtime.mailer_app_args = "-t"; + runtime.max_dtmf_duration = SWITCH_MAX_DTMF_DURATION; + runtime.default_dtmf_duration = SWITCH_DEFAULT_DTMF_DURATION; /* INIT APR and Create the pool context */ if (apr_initialize() != SWITCH_STATUS_SUCCESS) { @@ -898,6 +922,16 @@ 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_dtmf_duration")) { + int tmp = atoi(val); + if (tmp > 0) { + switch_core_max_dtmf_duration((uint32_t)tmp); + } + } else if (!strcasecmp(var, "default_dtmf_duration")) { + int tmp = atoi(val); + if (tmp > 0) { + switch_core_default_dtmf_duration((uint32_t)tmp); + } } else if (!strcasecmp(var, "disable-monotonic-timing")) { switch_time_set_monotonic(SWITCH_FALSE); } else if (!strcasecmp(var, "max-sessions")) { @@ -1137,6 +1171,12 @@ case SCSC_LAST_SPS: *val = runtime.sps_last; break; + case SCSC_MAX_DTMF_DURATION: + *val = switch_core_max_dtmf_duration(*val); + break; + case SCSC_DEFAULT_DTMF_DURATION: + *val = switch_core_default_dtmf_duration(*val); + break; case SCSC_SPS: switch_mutex_lock(runtime.throttle_mutex); if (*val > 0) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Apr 18 13:03:34 2008 @@ -952,12 +952,12 @@ new_dtmf = *dtmf; - if (new_dtmf.duration > SWITCH_MAX_DTMF_DURATION) { + if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(session->channel), new_dtmf.digit, new_dtmf.duration); - new_dtmf.duration = SWITCH_MAX_DTMF_DURATION; + new_dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!new_dtmf.duration) { - new_dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + new_dtmf.duration = switch_core_default_dtmf_duration(0); } for (ptr = session->event_hooks.recv_dtmf; ptr; ptr = ptr->next) { @@ -982,12 +982,12 @@ new_dtmf = *dtmf; - if (new_dtmf.duration > SWITCH_MAX_DTMF_DURATION) { + if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(session->channel), new_dtmf.digit, new_dtmf.duration); - new_dtmf.duration = SWITCH_MAX_DTMF_DURATION; + new_dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!new_dtmf.duration) { - new_dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + new_dtmf.duration = switch_core_default_dtmf_duration(0); } @@ -1012,7 +1012,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core_session_t *session, const char *dtmf_string) { char *p; - switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + switch_dtmf_t dtmf = {0, switch_core_default_dtmf_duration(0)}; int sent = 0, dur; char *string; int i, argc; @@ -1042,8 +1042,8 @@ } for(i = 0; i < argc; i++) { - dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; - dur = SWITCH_DEFAULT_DTMF_DURATION / 8; + dtmf.duration = switch_core_default_dtmf_duration(0); + dur = switch_core_default_dtmf_duration(0) / 8; if ((p = strchr(argv[i], '@'))) { *p++ = '\0'; if ((dur = atoi(p)) > 50) { @@ -1052,12 +1052,12 @@ } - if (dtmf.duration > SWITCH_MAX_DTMF_DURATION) { + if (dtmf.duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(session->channel), dtmf.digit, dtmf.duration); - dtmf.duration = SWITCH_MAX_DTMF_DURATION; + dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!dtmf.duration) { - dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + dtmf.duration = switch_core_default_dtmf_duration(0); } for (p = argv[i]; p && *p; p++) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Apr 18 13:03:34 2008 @@ -845,7 +845,7 @@ while(p && *p) { switch_dtmf_t dtmf; dtmf.digit = *p; - dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + dtmf.duration = switch_core_default_dtmf_duration(0); switch_channel_queue_dtmf(channel, &dtmf); p++; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Apr 18 13:03:34 2008 @@ -1467,8 +1467,8 @@ if ((rdigit = malloc(sizeof(*rdigit))) != 0) { *rdigit = *dtmf; - if (rdigit->duration < SWITCH_DEFAULT_DTMF_DURATION) { - rdigit->duration = SWITCH_DEFAULT_DTMF_DURATION; + if (rdigit->duration < switch_core_default_dtmf_duration(0)) { + rdigit->duration = switch_core_default_dtmf_duration(0); } if ((switch_queue_trypush(rtp_session->dtmf_data.dtmf_queue, rdigit)) != SWITCH_STATUS_SUCCESS) { @@ -1492,8 +1492,8 @@ if ((rdigit = malloc(sizeof(*rdigit))) != 0) { *rdigit = *dtmf; - if (rdigit->duration < SWITCH_DEFAULT_DTMF_DURATION) { - rdigit->duration = SWITCH_DEFAULT_DTMF_DURATION; + if (rdigit->duration < switch_core_default_dtmf_duration(0)) { + rdigit->duration = switch_core_default_dtmf_duration(0); } if ((switch_queue_trypush(rtp_session->dtmf_data.dtmf_inqueue, rdigit)) != SWITCH_STATUS_SUCCESS) {

1 0