- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4697 - in freeswitch/trunk/libs: apr-util apr-util/xml/expat iksemel/include libsndfile/src sofia-sip srtp srtp/doc
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:26:28 2007 New Revision: 4697 Removed: freeswitch/trunk/libs/apr-util/configure freeswitch/trunk/libs/apr-util/xml/expat/config.h.in freeswitch/trunk/libs/iksemel/include/config.h.in freeswitch/trunk/libs/libsndfile/src/config.h.in freeswitch/trunk/libs/sofia-sip/config.h.in freeswitch/trunk/libs/srtp/config_in.h freeswitch/trunk/libs/srtp/doc/Makefile Log: remove generated files from tree

1 0

[commit] r4696 - freeswitch/trunk/src/include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:24:48 2007 New Revision: 4696 Removed: freeswitch/trunk/src/include/switch_private.h.in Log: remove generated file from tree

1 0

[commit] r4695 - freeswitch/trunk
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 17:23:39 2007 New Revision: 4695 Modified: freeswitch/trunk/Makefile.am Log: fix debian build Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Mar 20 17:23:39 2007 @@ -97,7 +97,7 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) -freeswitch_LDADD = ${MOD_LINK} +freeswitch_LDADD = ${MOD_LINK} libs/apr/libapr-1.la $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool

1 0

[commit] r4694 - in freeswitch/trunk/src: . include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 17:20:14 2007 New Revision: 4694 Modified: freeswitch/trunk/src/include/switch_private.h.in freeswitch/trunk/src/switch_core.c Log: update Modified: freeswitch/trunk/src/include/switch_private.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_private.h.in (original) +++ freeswitch/trunk/src/include/switch_private.h.in Tue Mar 20 17:20:14 2007 @@ -7,6 +7,9 @@ */ #undef HAVE_DIRENT_H +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME @@ -148,19 +151,19 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `long long', as computed by sizeof. */ +/* The size of `long long', as computed by sizeof. */ #undef SIZEOF_LONG_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT /* The size of size_t */ @@ -169,7 +172,7 @@ /* The size of ssize_t */ #undef SIZEOF_SSIZE_T -/* The size of a `void*', as computed by sizeof. */ +/* The size of `void*', as computed by sizeof. */ #undef SIZEOF_VOIDP /* Define to 1 if you have the ANSI C header files. */ @@ -202,7 +205,7 @@ /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t /* Define to `int' if <sys/types.h> does not define. */ Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 20 17:20:14 2007 @@ -2516,7 +2516,6 @@ } else { session->bugs = bp->next; } - switch_mutex_unlock(bp->read_mutex); dp = bp; bp = last; switch_core_media_bug_close(dp);

1 0

[commit] r4693 - freeswitch/trunk/src/include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 17:03:03 2007 New Revision: 4693 Modified: freeswitch/trunk/src/include/switch_types.h Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Mar 20 17:03:03 2007 @@ -975,7 +975,7 @@ typedef struct switch_management_interface switch_management_interface_t; typedef struct switch_core_port_allocator switch_core_port_allocator_t; typedef struct switch_media_bug switch_media_bug_t; -typedef void (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); +typedef switch_bool_t (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); typedef void (*switch_application_function_t)(switch_core_session_t *, char *); typedef void (*switch_event_callback_t)(switch_event_t *); typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t)(switch_core_session_t *, void *);

1 0

[commit] r4692 - in freeswitch/trunk: . src/include
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 16:47:21 2007 New Revision: 4692 Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/include/switch_private.h.in Log: remove debug line from my previous commit Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Mar 20 16:47:21 2007 @@ -68,7 +68,6 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then case "$host" in *darwin*) - echo in darwin SOLINK="-dynamic -bundle -force-flat-namespace" ;; *) Modified: freeswitch/trunk/src/include/switch_private.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_private.h.in (original) +++ freeswitch/trunk/src/include/switch_private.h.in Tue Mar 20 16:47:21 2007 @@ -7,9 +7,6 @@ */ #undef HAVE_DIRENT_H -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - /* Define to 1 if you have the `gethostname' function. */ #undef HAVE_GETHOSTNAME

1 0

[commit] r4691 - freeswitch/trunk
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: brian Date: Tue Mar 20 16:44:09 2007 New Revision: 4691 Modified: freeswitch/trunk/configure.in Log: use AC_CANONICAL_HOST to make sure is set. Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Mar 20 16:44:09 2007 @@ -14,6 +14,8 @@ prefix='/usr/local/freeswitch' fi +AC_CANONICAL_HOST + # Absolute source/build directory switch_srcdir=`(cd $srcdir && pwd)` switch_builddir=`pwd` @@ -58,7 +60,7 @@ # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include" -SWITCH_AM_LDFLAGS="-L${prefix}/lib -lm -L/usr/local/lib" +SWITCH_AM_LDFLAGS="-lm -L/usr/local/lib" #set SOLINK variable based on compiler and host if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -66,6 +68,7 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then case "$host" in *darwin*) + echo in darwin SOLINK="-dynamic -bundle -force-flat-namespace" ;; *)

1 0

[commit] r4690 - in freeswitch/trunk/src: . mod/applications/mod_ivrtest
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 16:37:52 2007 New Revision: 4690 Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Tue Mar 20 16:37:52 2007 @@ -233,7 +233,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Done\n"); } -static void bug_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +static switch_bool_t bug_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { switch_frame_t *frame; @@ -247,6 +247,7 @@ break; } + return SWITCH_TRUE; } static void bugtest_function(switch_core_session_t *session, char *data) Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 20 16:37:52 2007 @@ -366,7 +366,10 @@ *new_bug = bug; if (bug->callback) { - bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT); + switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT); + if (result == SWITCH_FALSE) { + return switch_core_media_bug_remove(session, new_bug); + } } return SWITCH_STATUS_SUCCESS; @@ -394,9 +397,25 @@ return SWITCH_STATUS_FALSE; } +static switch_status_t switch_core_media_bug_close(switch_media_bug_t *bp) +{ + if (bp) { + if (bp->callback) { + bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); + bp->ready = 0; + } + switch_core_media_bug_destroy(bp); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(bp->session->channel)); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(switch_core_session_t *session, switch_media_bug_t **bug) { switch_media_bug_t *bp = NULL, *last = NULL; + switch_status_t status = SWITCH_STATUS_FALSE; if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); @@ -416,19 +435,12 @@ } switch_thread_rwlock_unlock(session->bug_rwlock); - if (bp) { - if (bp->callback) { - bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); - bp->ready = 0; - } - switch_core_media_bug_destroy(bp); + if ((status = switch_core_media_bug_close(bp)) == SWITCH_STATUS_SUCCESS) { *bug = NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(session->channel)); - return SWITCH_STATUS_SUCCESS; } } - return SWITCH_STATUS_FALSE; + return status; } struct switch_core_port_allocator { @@ -2195,17 +2207,31 @@ } if (session->bugs) { - switch_media_bug_t *bp; + switch_media_bug_t *bp, *dp, *last = NULL; + switch_thread_rwlock_rdlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { if (bp->ready && switch_test_flag(bp, SMBF_READ_STREAM)) { switch_mutex_lock(bp->read_mutex); switch_buffer_write(bp->raw_read_buffer, read_frame->data, read_frame->datalen); if (bp->callback) { - bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ); + if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ) == SWITCH_FALSE) { + bp->ready = 0; + if (last) { + last->next = bp->next; + } else { + session->bugs = bp->next; + } + switch_mutex_unlock(bp->read_mutex); + dp = bp; + bp = last; + switch_core_media_bug_close(dp); + continue; + } } switch_mutex_unlock(bp->read_mutex); } + last = bp; } switch_thread_rwlock_unlock(session->bug_rwlock); } @@ -2457,7 +2483,9 @@ } if (session->bugs) { - switch_media_bug_t *bp; + switch_media_bug_t *bp, *dp, *last = NULL; + switch_bool_t ok = SWITCH_TRUE; + switch_thread_rwlock_rdlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { if (!bp->ready) { @@ -2468,17 +2496,33 @@ switch_buffer_write(bp->raw_write_buffer, write_frame->data, write_frame->datalen); switch_mutex_unlock(bp->write_mutex); if (bp->callback) { - bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE); + ok = bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE); } } else if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { do_bugs = 0; if (bp->callback) { bp->replace_frame_in = frame; bp->replace_frame_out = NULL; - bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_REPLACE); - write_frame = bp->replace_frame_out; + if ((ok = bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_REPLACE)) == SWITCH_TRUE) { + write_frame = bp->replace_frame_out; + } + } + } + + if (ok == SWITCH_FALSE) { + bp->ready = 0; + if (last) { + last->next = bp->next; + } else { + session->bugs = bp->next; } + switch_mutex_unlock(bp->read_mutex); + dp = bp; + bp = last; + switch_core_media_bug_close(dp); + continue; } + last = bp; } switch_thread_rwlock_unlock(session->bug_rwlock); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Mar 20 16:37:52 2007 @@ -555,7 +555,7 @@ return status; } -static void record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { switch_file_handle_t *fh = (switch_file_handle_t *) user_data; uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; @@ -586,6 +586,8 @@ default: break; } + + return SWITCH_TRUE; } SWITCH_DECLARE(switch_status_t) switch_ivr_stop_record_session(switch_core_session_t *session, char *file) @@ -699,7 +701,7 @@ teletone_dtmf_detect_state_t dtmf_detect; } switch_inband_dtmf_t; -static void inband_dtmf_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +static switch_bool_t inband_dtmf_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { switch_inband_dtmf_t *pvt = (switch_inband_dtmf_t *) user_data; uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; @@ -730,6 +732,8 @@ default: break; } + + return SWITCH_TRUE; } SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_session_t *session) @@ -857,7 +861,7 @@ return NULL; } -static void speech_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +static switch_bool_t speech_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { struct speech_thread_handle *sth = (struct speech_thread_handle *) user_data; uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; @@ -891,7 +895,7 @@ if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { if (switch_core_asr_feed(sth->ah, frame.data, frame.datalen, &flags) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error Feeding Data\n"); - return; + return SWITCH_FALSE; } if (switch_core_asr_check_results(sth->ah, &flags) == SWITCH_STATUS_SUCCESS) { switch_mutex_lock(sth->mutex); @@ -905,6 +909,8 @@ default: break; } + + return SWITCH_TRUE; } SWITCH_DECLARE(switch_status_t) switch_ivr_stop_detect_speech(switch_core_session_t *session)

1 0

[commit] r4689 - freeswitch/trunk/build
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: brian Date: Tue Mar 20 16:00:42 2007 New Revision: 4689 Modified: freeswitch/trunk/build/fixlibtool.sh Log: lets not hozed libtool for Darwin Modified: freeswitch/trunk/build/fixlibtool.sh ============================================================================== --- freeswitch/trunk/build/fixlibtool.sh (original) +++ freeswitch/trunk/build/fixlibtool.sh Tue Mar 20 16:00:42 2007 @@ -4,7 +4,11 @@ wget http://mirrors.kernel.org/gnu/libtool/libtool-1.5.22.tar.gz tar -zxvf libtool-1.5.22.tar.gz cd libtool-1.5.22 +if test "`uname -s`" = "Darwin"; then +./configure --prefix=/usr --program-prefix=g +else ./configure --prefix=/usr +fi make make install cd /tmp

1 0

[commit] r4688 - freeswitch/trunk/build
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 15:24:53 2007 New Revision: 4688 Added: freeswitch/trunk/build/fixlibtool.sh (contents, props changed) Log: add fixlibtool script Added: freeswitch/trunk/build/fixlibtool.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/build/fixlibtool.sh Tue Mar 20 15:24:53 2007 @@ -0,0 +1,11 @@ +cd /tmp +mkdir fix_libtool +cd fix_libtool +wget http://mirrors.kernel.org/gnu/libtool/libtool-1.5.22.tar.gz +tar -zxvf libtool-1.5.22.tar.gz +cd libtool-1.5.22 +./configure --prefix=/usr +make +make install +cd /tmp +rm -fr fix_libtool

1 0