- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8879 - freeswitch/trunk/src
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: anthm Date: Tue Jul 1 18:30:28 2008 New Revision: 8879 Modified: freeswitch/trunk/src/switch_core.c Log: add USR1 as alias for hup Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Jul 1 18:30:28 2008 @@ -1094,6 +1094,7 @@ #endif signal(SIGHUP, handle_SIGHUP); + signal(SIGUSR1, handle_SIGHUP); switch_load_network_lists(SWITCH_FALSE); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n");

1 0

[commit] r8878 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 14:04:34 2008 New Revision: 8878 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: add header that Nuaunce considers mandatory (MODASRTTS-5) Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Tue Jul 1 14:04:34 2008 @@ -241,6 +241,7 @@ apr_finfo_t finfo; char *buf1; apr_size_t bytes2read = 0; + mrcp_recognizer_header_t *recognizer_header; mrcp_message_t *mrcp_message = mrcp_client_context_message_get(context, asr_session->client_session, asr_session->control_channel, RECOGNIZER_RECOGNIZE); @@ -263,14 +264,25 @@ rv = apr_file_read(fp, buf1, &bytes2read); buf1[bytes2read] = '\0'; + recognizer_header = mrcp_resource_header_prepare(mrcp_message); + + if(!recognizer_header) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not prepare resource_header\n"); + return MRCP_STATUS_FAILURE; + } + recognizer_header->cancel_if_queue = FALSE; + mrcp_resource_header_property_add(mrcp_message,RECOGNIZER_HEADER_CANCEL_IF_QUEUE); + generic_header = mrcp_generic_header_prepare(mrcp_message); if (!generic_header) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not prepare generic_header\n"); return MRCP_STATUS_FAILURE; } - generic_header->content_type = "application/srgs+xml"; + generic_header->content_type = " application/srgs+xml"; mrcp_generic_header_property_add(mrcp_message, GENERIC_HEADER_CONTENT_TYPE); + generic_header->content_id = " <request1(a)form-level.store>"; + mrcp_generic_header_property_add(mrcp_message,GENERIC_HEADER_CONTENT_ID); mrcp_message->body = buf1; /* send the MRCP RECOGNIZE message to MRCP server */

1 0

[commit] r8877 - freeswitch/trunk/libs/pcre
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 13:53:03 2008 New Revision: 8877 Modified: freeswitch/trunk/libs/pcre/Makefile.in Log: fix cross compile (FSBUILD-53) Modified: freeswitch/trunk/libs/pcre/Makefile.in ============================================================================== --- freeswitch/trunk/libs/pcre/Makefile.in (original) +++ freeswitch/trunk/libs/pcre/Makefile.in Tue Jul 1 13:53:03 2008 @@ -107,7 +107,7 @@ @ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir) LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]' $(LDFLAGS) -I. -I$(top_srcdir) -LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir) +LINK_FOR_BUILD = $(LIBTOOL) --mode=link --tag=CC $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir) @ON_WINDOWS@CXXLINK = $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs @NOT_ON_WINDOWS@CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(CXXLDFLAGS) -I. -I$(top_srcdir) CXXLINKLIB = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)

1 0

[commit] r8876 - freeswitch/trunk/src
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 13:49:01 2008 New Revision: 8876 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: allows the "eavesdrop_group" variable to contain several groups, comma separated. (MODAPP-101) Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Jul 1 13:49:01 2008 @@ -528,8 +528,30 @@ if (!switch_strlen_zero(require_group)) { + int argc, i; + int ok = 0; + char *argv[10] = { 0 }; + char *data; + const char *group_name = switch_channel_get_variable(tchannel, "eavesdrop_group"); - if (!group_name || strcmp(group_name, require_group)) { + /* If we don't have a group, then return */ + if (!group_name) { + status = SWITCH_STATUS_BREAK; + goto end; + } + /* Separate the group */ + data = strdup(group_name); + if ( (argc = switch_separate_string(data, ',', argv, (sizeof(argv) / sizeof(argv[0])))) ) { + for ( i = 0; i < argc; i++ ) { + /* If one of the group matches, then ok */ + if ( !strcmp(argv[i], require_group)) { + ok = 1; + } + } + } + switch_safe_free(data); + /* If we didn't find any match, then end */ + if ( !ok ) { status = SWITCH_STATUS_BREAK; goto end; }

1 0

[commit] r8875 - freeswitch/trunk/src
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 13:45:35 2008 New Revision: 8875 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: don't destroy a codec that has not been created (MODAPP-101) Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Jul 1 13:45:35 2008 @@ -495,6 +495,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_channel_t *channel = switch_core_session_get_channel(session); switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + int codec_initialized = 0; if ((tsession = switch_core_session_locate(uuid))) { struct eavesdrop_pvt *ep = NULL; @@ -554,6 +555,8 @@ goto end; } + codec_initialized = 1; + switch_core_session_set_read_codec(session, &codec); write_frame.codec = &codec; write_frame.data = buf; @@ -683,8 +686,8 @@ } end: - - switch_core_codec_destroy(&codec); + if ( codec_initialized ) + switch_core_codec_destroy(&codec); if (bug) { switch_core_media_bug_remove(tsession, &bug);

1 0

[commit] r8874 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 13:41:54 2008 New Revision: 8874 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: dont flood logs with eavesdrop messages (MODAPP-101) Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Jul 1 13:41:54 2008 @@ -304,7 +304,9 @@ } if (e_data.total) { for (x = 0; x < e_data.total && switch_channel_ready(channel); x++) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Spy: %s\n", e_data.uuid_list[x]); + /* If we have a group and 1000 concurrent calls, we will flood the logs. This check avoids this */ + if ( !require_group ) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Spy: %s\n", e_data.uuid_list[x]); if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_new"))) { switch_ivr_play_file(session, NULL, file, NULL); }

1 0

[commit] r8873 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 13:40:53 2008 New Revision: 8873 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h Log: tweak ifdef Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Tue Jul 1 13:40:53 2008 @@ -54,7 +54,7 @@ } #endif -#ifdef __sunos__ +#if defined (__SVR4) && defined (__sun) #define __EXTENSIONS__ 1 #include <strings.h> #endif

1 0

[commit] r8872 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 13:36:53 2008 New Revision: 8872 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h Log: whoops Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Tue Jul 1 13:36:53 2008 @@ -53,8 +53,11 @@ #ifdef __STUPIDFORMATBUG__ } #endif + +#ifdef __sunos__ #define __EXTENSIONS__ 1 #include <strings.h> +#endif #define LDL_HANDLE_QLEN 2000 #define LDL_MAX_CANDIDATES 10

1 0

[commit] r8871 - freeswitch/trunk
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: mikej Date: Tue Jul 1 12:48:11 2008 New Revision: 8871 Modified: freeswitch/trunk/configure.in freeswitch/trunk/freeswitch.spec Log: don't error in spec file and set a version on trunk (FSBUILD-48) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jul 1 12:48:11 2008 @@ -6,7 +6,7 @@ AC_INIT([freeswitch], [1.0.pre4], BUG-REPORT-ADDRESS) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [0]) -AC_SUBST(SWITCH_VERSION_MICRO, [pre4]) +AC_SUBST(SWITCH_VERSION_MICRO, [trunk]) #AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here]) AC_SUBST(SOUNDS_VERSION, [1.0.2]) Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Tue Jul 1 12:48:11 2008 @@ -172,7 +172,7 @@ MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES" export MODULES=$MYMODULES -rm -f modules.conf +test ! -f modules.conf || rm -f modules.conf touch modules.conf for i in $MODULES; do echo $i >> modules.conf; done export VERBOSE=yes

1 0

[commit] r8870 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 01 Jul '08

01 Jul '08

Author: cypromis Date: Tue Jul 1 11:50:06 2008 New Revision: 8870 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h Log: build tweak for solaris Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Tue Jul 1 11:50:06 2008 @@ -53,6 +53,8 @@ #ifdef __STUPIDFORMATBUG__ } #endif +#define __EXTENSIONS__ 1 +#include <strings.h> #define LDL_HANDLE_QLEN 2000 #define LDL_MAX_CANDIDATES 10

1 0