February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11680 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 07 Feb '09

07 Feb '09

Author: anthm Date: Sat Feb 7 10:44:46 2009 New Revision: 11680 Log: add extra checking for race cond in bgapi Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 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 Sat Feb 7 10:44:46 2009 @@ -1199,7 +1199,8 @@ char *arg; listener_t *listener; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - uint8_t bg; + int bg; + int ack; switch_memory_pool_t *pool; }; @@ -1210,18 +1211,21 @@ switch_stream_handle_t stream = { 0 }; char *reply, *freply = NULL; switch_status_t status; - + if (!acs) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Internal error.\n"); return NULL; } - if (!acs->listener || !acs->listener->rwlock || switch_thread_rwlock_tryrdlock(acs->listener->rwlock) != SWITCH_STATUS_SUCCESS) { + if (!acs->listener || !switch_test_flag(acs->listener, LFLAG_RUNNING) || + !acs->listener->rwlock || switch_thread_rwlock_tryrdlock(acs->listener->rwlock) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! cannot get read lock.\n"); + acs->ack = -1; goto done; } - - + + acs->ack = 1; + SWITCH_STANDARD_STREAM(stream); if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { @@ -1270,12 +1274,23 @@ } done: + if (acs->bg) { switch_memory_pool_t *pool = acs->pool; + if (acs->ack == -1) { + int sanity = 2000; + while(acs->ack == -1) { + switch_cond_next(); + if (--sanity <= 0) break; + } + } + acs = NULL; switch_core_destroy_memory_pool(&pool); pool = NULL; + } + return NULL; } @@ -1539,6 +1554,7 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; switch_uuid_t uuid; + int sanity; strip_cr(api_cmd); @@ -1571,6 +1587,14 @@ } switch_snprintf(reply, reply_len, "~Reply-Text: +OK Job-UUID: %s\nJob-UUID: %s\n\n", acs->uuid_str, acs->uuid_str); switch_thread_create(&thread, thd_attr, api_exec, acs, acs->pool); + sanity = 2000; + while(!acs->ack) { + switch_cond_next(); + if (--sanity <= 0) break; + } + if (acs->ack == -1) { + acs->ack--; + } status = SWITCH_STATUS_SUCCESS; goto done_noreply; @@ -1942,7 +1966,7 @@ if (revent) { switch_event_destroy(&revent); } - + remove_listener(listener); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");

1 0

[commit] r11678 - freeswitch/trunk/src
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 17:49:22 2009 New Revision: 11678 Log: fix windows build Modified: freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 6 17:49:22 2009 @@ -46,7 +46,7 @@ int16_t peak = 0; int16_t *data; switch_frame_t *read_frame = NULL; - int i; + uint32_t i; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_SUCCESS; int64_t global_total = 0, global_sum = 0, period_sum = 0; @@ -88,7 +88,7 @@ peak = 0; avg = 0; for (i = 0; i < read_frame->samples; i++) { - const int16_t s = abs(data[i]); + const int16_t s = (int16_t)abs(data[i]); if (s > peak) { peak = s; } @@ -103,13 +103,13 @@ global_total++; period_total++; - period_avg = period_sum / period_total; + period_avg = (int)(period_sum / period_total); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "\npacket_avg=%d packet_peak=%d period_avg=%d global_avg=%d\n\n", avg, peak, period_avg, global_avg); if (period_total >= period_len) { - global_avg = global_sum / global_total; + global_avg = (int)(global_sum / global_total); period_total = 0; period_sum = 0; }

1 0

[commit] r11677 - freeswitch/trunk/src
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: anthm Date: Fri Feb 6 14:44:53 2009 New Revision: 11677 Log: add enable_file_write_buffering variable Modified: freeswitch/trunk/src/switch_ivr_play_say.c 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 Fri Feb 6 14:44:53 2009 @@ -420,7 +420,10 @@ } } - fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; + vval = switch_channel_get_variable(channel, "enable_file_write_buffering"); + if (!vval || !switch_true(vval)) { + fh->pre_buffer_datalen = SWITCH_DEFAULT_FILE_BUFFER_LEN; + } if (switch_core_file_open(fh, file,

1 0

[commit] r11676 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mcollins Date: Fri Feb 6 14:33:20 2009 New Revision: 11676 Log: Too many people asking 'how do I...' with fs_cli Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Feb 6 14:33:20 2009 @@ -379,7 +379,8 @@ "* FreeSWITCH (http://www.freeswitch.org) *\n" "* Brought to you by ClueCon http://www.cluecon.com/ *\n" "*****************************************************\n" - "\n\n" + "\n" + "Type /help <enter> to see a list of commands\n\n\n" ); }

1 0

[commit] r11671 - in freeswitch/trunk: libs/apr libs/apr-util/xml/expat libs/libsndfile src/mod/formats/mod_shout
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 13:15:42 2009 New Revision: 11671 Log: merge parts of libtool 2.2 fixes (FSBUILD-82) Modified: freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh freeswitch/trunk/libs/apr/configure.in freeswitch/trunk/libs/libsndfile/configure.ac freeswitch/trunk/src/mod/formats/mod_shout/Makefile Modified: freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh Fri Feb 6 13:15:42 2009 @@ -58,6 +58,8 @@ ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" echo "Creating configure ..." +${ACLOCAL:-aclocal} + ### do some work to toss config.cache? ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" Modified: freeswitch/trunk/libs/apr/configure.in ============================================================================== --- freeswitch/trunk/libs/apr/configure.in (original) +++ freeswitch/trunk/libs/apr/configure.in Fri Feb 6 13:15:42 2009 @@ -200,8 +200,8 @@ if test "x$use_libtool" = "xyes"; then lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' - LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" - link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" + lt_version="-version-info `$get_version libtool $version_hdr APR`" + link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${lt_version} \$(ALL_LDFLAGS) -o \$@" so_ext='lo' lib_target='-rpath $(libdir) $(OBJECTS)' export_lib_target='-rpath \$(libdir) \$(OBJECTS)' Modified: freeswitch/trunk/libs/libsndfile/configure.ac ============================================================================== --- freeswitch/trunk/libs/libsndfile/configure.ac (original) +++ freeswitch/trunk/libs/libsndfile/configure.ac Fri Feb 6 13:15:42 2009 @@ -32,6 +32,7 @@ AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AM_PROG_LIBTOOL AC_CHECK_PROG(autogen, autogen, yes, no) Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Fri Feb 6 13:15:42 2009 @@ -30,7 +30,7 @@ $(GETLIB) $(MPG123).tar.gz $(MPG123_DIR)/Makefile: $(MPG123_DIR) - cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= + cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(MPG123LA): $(MPG123_DIR)/Makefile @@ -41,7 +41,7 @@ $(GETLIB) $(LAME).tar.gz $(LAME_DIR)/Makefile: $(LAME_DIR) - cd $(LAME_DIR) && ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS= + cd $(LAME_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(LAMELA): $(LAME_DIR)/Makefile @@ -52,7 +52,7 @@ $(GETLIB) $(SHOUT).tar.gz $(SHOUT_DIR)/Makefile: $(SHOUT_DIR) - cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= + cd $(SHOUT_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_DIR)/Makefile

1 0

[commit] r11670 - freeswitch/trunk
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 12:46:12 2009 New Revision: 11670 Log: build: fix configure --sysconfdir (FSBUILD-84) Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Feb 6 12:46:12 2009 @@ -206,25 +206,26 @@ yaml-files: - @echo `mkdir $(DESTDIR)$(prefix)/conf/yaml 2>/dev/null` - $(INSTALL) -m 644 conf/yaml/*.yaml $(DESTDIR)$(prefix)/conf/yaml + @echo `mkdir $(DESTDIR)@confdir@/yaml 2>/dev/null` + $(INSTALL) -m 644 conf/yaml/*.yaml $(DESTDIR)@confdir@/yaml vm-sync: - test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf - test -d $(DESTDIR)$(prefix)/conf/lang || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/lang - test -d $(DESTDIR)$(prefix)/conf/lang/en || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/lang/en - test -d $(DESTDIR)$(prefix)/conf/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/lang/en/vm - $(INSTALL) -m 644 conf/lang/en/vm/* $(DESTDIR)$(prefix)/conf/lang/en/vm + test -d $(DESTDIR)@confdir@ || $(mkinstalldirs) $(DESTDIR)@confdir@ + test -d $(DESTDIR)@confdir@/lang || $(mkinstalldirs) $(DESTDIR)@confdir@/lang + test -d $(DESTDIR)@confdir@/lang/en || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en + test -d $(DESTDIR)@confdir@/lang/en/vm || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en/vm + $(INSTALL) -m 644 conf/lang/en/vm/* $(DESTDIR)@confdir@/lang/en/vm samples-conf: - test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf + test -d $(DESTDIR)@confdir@/ || $(mkinstalldirs) $(DESTDIR)@confdir@ for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name \*.ttml && find conf -name mime.types` ; do \ - dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ + src_dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ + dir=`echo $$src_dir | sed -e 's|conf||'`; \ filename=`echo $$conffile | sed -e 's|^.*/||'`; \ - test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ - test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || \ - test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename.noload || \ - $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + test -d $(DESTDIR)@confdir@/$$dir || $(mkinstalldirs) $(DESTDIR)@confdir@/$$dir ; \ + test -f $(DESTDIR)@confdir@/$$dir/$$filename || \ + test -f $(DESTDIR)@confdir@/$$dir/$$filename.noload || \ + $(INSTALL) -m 644 $$src_dir/$$filename $(DESTDIR)@confdir@/$$dir; \ done samples-htdocs: @@ -244,7 +245,7 @@ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done $(mkinstalldirs) $(DESTDIR)@modinstdir@ - test -d $(DESTDIR)$(prefix)/conf || $(MAKE) samples-conf + test -d $(DESTDIR)@confdir@ || $(MAKE) samples-conf test -d $(DESTDIR)$(prefix)/htdocs || $(MAKE) samples-htdocs .version: @@ -429,7 +430,7 @@ -e "s,@LIB_DIR\@,@libdir@," \ -e "s,@BIN_DIR\@,@bindir@," \ -e "s,@INC_DIR\@,@includedir@," \ - -e "s,@CFG_DIR\@,$(PREFIX)/conf," \ + -e "s,@CFG_DIR\@,@confdir@," \ -e "s,@DB_DIR\@,$(PREFIX)/db," \ -e "s,@PREFIX\@,$(PREFIX)," \ -e "s,@CC\@,$(CC)," \

1 0

[commit] r11669 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:29:51 2009 New Revision: 11669 Log: update the src to reference mod_dahdi_codec Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Fri Feb 6 12:29:51 2009 @@ -24,7 +24,7 @@ * Contributor(s): * Moises Silva <moy(a)sangoma.com> * - * mod_dahdi -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit) + * mod_dahdi_codec -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit) * * Thanks to Voiceway for sponsoring this module and Neocenter for providing the DAHDI hardware to test * @@ -53,8 +53,8 @@ static const char transcoding_device[] = "/dev/dahdi/transcode"; static const char transcoder_name[] = "DAHDI"; -SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load); -SWITCH_MODULE_DEFINITION(mod_dahdi, mod_dahdi_load, NULL, NULL); +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load); +SWITCH_MODULE_DEFINITION(mod_dahdi_codec, mod_dahdi_codec_load, NULL, NULL); struct dahdi_context { int32_t encoding_fd; @@ -301,7 +301,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load) +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load) { switch_api_interface_t *api_interface; switch_codec_interface_t *codec_interface;

1 0

[commit] r11668 - freeswitch/trunk/build
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:27:40 2009 New Revision: 11668 Log: adding to modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Fri Feb 6 12:27:40 2009 @@ -30,6 +30,7 @@ codecs/mod_speex #codecs/mod_siren #codecs/mod_celt +#codecs/mod_dahdi_codec #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml dialplans/mod_dialplan_asterisk

1 0

[commit] r11667 - in freeswitch/trunk/src/mod/codecs: mod_dahdi mod_dahdi_codec
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:26:53 2009 New Revision: 11667 Log: rename so nobody is confused that this is just the codec interface Added: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/ - copied from r11665, /freeswitch/trunk/src/mod/codecs/mod_dahdi/ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c - copied unchanged from r11665, /freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c Removed: freeswitch/trunk/src/mod/codecs/mod_dahdi/ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi.c

1 0

[commit] r11666 - in freeswitch/trunk: . build/config
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 12:23:14 2009 New Revision: 11666 Log: tweak odbc detection Modified: freeswitch/trunk/build/config/odbc.m4 freeswitch/trunk/configure.in Modified: freeswitch/trunk/build/config/odbc.m4 ============================================================================== --- freeswitch/trunk/build/config/odbc.m4 (original) +++ freeswitch/trunk/build/config/odbc.m4 Fri Feb 6 12:23:14 2009 @@ -119,7 +119,9 @@ ac_cv_odbc_where_lib=$with_odbc_lib fi if test "X$ac_cv_odbc_where_lib" = "X"; then + AC_CHECK_LIB([odbc],[SQLDisconnect],[ac_cv_odbc_where_lib="yes"],[ ODBC_LIB_WHERE(/usr/$LIB_SUBDIR /usr/local/$LIB_SUBDIR) + ]) fi if test "X$with_odbc_include" != "X"; then @@ -138,15 +140,16 @@ AC_MSG_RESULT(yes) ODBC_INC_DIR=$ac_cv_pcap_where_inc ODBC_LIB_DIR=$ac_cv_pcap_where_lib - ODBC_INC_FLAGS="-I${ODBC_INC_DIR}" + ODBC_INC_FLAGS="-I$ac_cv_pcap_where_inc" + ODBC_LIB_FLAGS="-Wl,-lodbc" case "$host" in *darwin*) - ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc -framework CoreFoundation" - ;; - *) - ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc" + ODBC_LIB_FLAGS="$ODBC_LIB_FLAGS -framework CoreFoundation" ;; esac + if test "$ac_cv_odbc_where_lib" != "yes"; then + ODBC_LIB_FLAGS="-L$ac_cv_odbc_where_lib $ODBC_LIB_FLAGS" + fi AC_SUBST(ODBC_INC_DIR) AC_SUBST(ODBC_LIB_DIR) AC_SUBST(ODBC_INC_FLAGS) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Feb 6 12:23:14 2009 @@ -112,7 +112,7 @@ # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" -SWITCH_AM_LDFLAGS="-lm -L/usr/local/lib" +SWITCH_AM_LDFLAGS="-lm" #set SOLINK variable based on compiler and host if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -161,11 +161,15 @@ APR_ADDTO(SWITCH_AM_CFLAGS, -m64) APR_ADDTO(SWITCH_AM_CXXFLAGS, -m64) APR_ADDTO(SWITCH_AM_LDFLAGS, -m64) + LIBS="$LIBS -m64" fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) + if test "${enable_64}" = "yes"; then + LIBS="$LIBS -m64" + fi fi # Enable debugging (default: on)

1 0