May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8462 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 19 May '08

19 May '08

Author: anthm Date: Mon May 19 12:26:50 2008 New Revision: 8462 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: fix possible memory overload during error condition 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 Mon May 19 12:26:50 2008 @@ -569,7 +569,11 @@ switch_core_session_flush_private_events(session); if (moh) { - switch_ivr_play_file(session, NULL, moh, &args); + switch_status_t status = switch_ivr_play_file(session, NULL, moh, &args); + if (!SWITCH_READ_ACCEPTABLE(status)) { + aborted = 1; + goto abort; + } } else { switch_ivr_collect_digits_callback(session, &args, 0); } @@ -736,10 +740,15 @@ pop = NULL; if (moh && do_wait) { + switch_status_t status = switch_ivr_play_file(session, NULL, moh, &args); memset(&args, 0, sizeof(args)); args.read_frame_callback = consumer_read_frame_callback; args.user_data = node_list; switch_ivr_play_file(session, NULL, moh, &args); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } } for(i = 0; i < node_count; i++) {

1 0

[commit] r8461 - freeswitch/trunk/src
by Freeswitch SVN 19 May '08

19 May '08

Author: anthm Date: Mon May 19 10:30:39 2008 New Revision: 8461 Modified: freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: fix small att_xfer issue from mailing list Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 19 10:30:39 2008 @@ -279,8 +279,9 @@ if (lead_frames) { switch_frame_t *read_frame; int frame_count = atoi(lead_frames); - - while(frame_count > 0) { + int max_frames = frame_count * 2; + + while(frame_count > 0 && --max_frames > 0) { status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { goto done; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon May 19 10:30:39 2008 @@ -648,7 +648,8 @@ switch_channel_state_t state; switch_event_t *event; int br = 0; - + int nosuspend = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); + switch_channel_set_flag(caller_channel, CF_ORIGINATOR); switch_channel_clear_flag(caller_channel, CF_TRANSFER); switch_channel_clear_flag(peer_channel, CF_TRANSFER); @@ -785,9 +786,6 @@ done: - switch_channel_clear_flag(caller_channel, CF_INNER_BRIDGE); - switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); - if (br && switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(caller_channel, event); switch_event_fire(&event); @@ -795,7 +793,7 @@ state = switch_channel_get_state(caller_channel); - if (!switch_channel_test_flag(caller_channel, CF_TRANSFER)) { + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !nosuspend) { if ((state != CS_EXECUTE && state != CS_PARK && state != CS_ROUTING) || (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP && switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE)))) {

1 0

[commit] r8460 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Sat May 17 11:48:18 2008 New Revision: 8460 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: doh 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 Sat May 17 11:48:18 2008 @@ -2237,7 +2237,7 @@ id = dup; if (!strncasecmp(account, "sip:", 4)) { - dup += 4; + id += 4; } if (!id) {

1 0

[commit] r8459 - freeswitch/trunk
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Sat May 17 11:42:28 2008 New Revision: 8459 Modified: freeswitch/trunk/Makefile.am Log: add sofia-reconf targer Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sat May 17 11:42:28 2008 @@ -341,6 +341,11 @@ cd libs/sofia-sip && $(MAKE) -j $(MAKE) -j modules +sofia-reconf: + cd libs/sofia-sip && $(MAKE) clean + cd libs/sofia-sip && autoreconf -fi + cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared + current: update-clean svn update $(MAKE) all

1 0

[commit] r8458 - freeswitch/trunk/conf/jingle_profiles
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Fri May 16 22:01:22 2008 New Revision: 8458 Modified: freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/conf/jingle_profiles/server.xml Log: forgot to tell ppl to take x- away in the example Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Fri May 16 22:01:22 2008 @@ -1,5 +1,6 @@ <include>  +  <x-profile type="client"> <param name="name" value="$${xmpp_client_profile}"/> <param name="login" value="myjid(a)myserver.com/talk"/> Modified: freeswitch/trunk/conf/jingle_profiles/server.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/server.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/server.xml Fri May 16 22:01:22 2008 @@ -1,5 +1,6 @@ <include>  +  <x-profile type="component"> <param name="name" value="$${xmpp_server_profile}"/> <param name="password" value="secret"/>

1 0

[commit] r8457 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 17 May '08

17 May '08

Author: anthm Date: Fri May 16 20:33:34 2008 New Revision: 8457 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add vm_boxcount api func 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 May 16 20:33:34 2008 @@ -2153,11 +2153,75 @@ } } -static void message_query_handler(switch_event_t *event) +#define BOXCOUNT_SYNTAX "<user>@<domain>[|[new|saved|new-urgent|saved-urgent|all]]" +SWITCH_STANDARD_API(boxcount_api_function) +{ + char *dup; + char *how = "new"; + int total_new_messages = 0; + int total_saved_messages = 0; + int total_new_urgent_messages = 0; + int total_saved_urgent_messages = 0; + + if (cmd) { + switch_hash_index_t *hi; + void *val; + vm_profile_t *profile; + char *id, *domain, *p; + + dup = strdup(cmd); + id = dup; + + if (!strncasecmp(cmd, "sip:", 4)) { + id += 4; + } + + if (!id) { + stream->write_function(stream, "%d", 0); + free(dup); + return SWITCH_STATUS_SUCCESS; + } + + if ((domain = strchr(id, '@'))) { + *domain++ = '\0'; + if ((p = strchr(domain, '|'))) { + *p++ = '\0'; + how = p; + } + + for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + profile = (vm_profile_t *) val; + total_new_messages = total_saved_messages = 0; + message_count(profile, id, domain, "inbox", &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + } + } + + switch_safe_free(id); + } + + if (!strcasecmp(how, "saved")) { + stream->write_function(stream, "%d", total_saved_messages); + } else if (!strcasecmp(how, "new-urgent")) { + stream->write_function(stream, "%d", total_new_urgent_messages); + } else if (!strcasecmp(how, "new-saved")) { + stream->write_function(stream, "%d", total_saved_urgent_messages); + } else if (!strcasecmp(how, "all")) { + stream->write_function(stream, "%d:%d:%d:%d", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); + } else { + stream->write_function(stream, "%d", total_new_messages); + } + + return SWITCH_STATUS_SUCCESS; +} + +static void message_query_handler(switch_event_t *event) { char *account = switch_event_get_header(event, "message-account"); int created = 0; switch_event_t *new_event = NULL; + char *dup = NULL; if (account) { switch_hash_index_t *hi; @@ -2169,12 +2233,17 @@ vm_profile_t *profile; char *id, *domain; + dup = strdup(account); + id = dup; + if (!strncasecmp(account, "sip:", 4)) { - id = strdup(account + 4); - } else { - id = strdup(account); + dup += 4; + } + + if (!id) { + free(dup); + return; } - switch_assert(id); if ((domain = strchr(id, '@'))) { *domain++ = '\0'; @@ -2200,7 +2269,7 @@ } } - switch_safe_free(id); + switch_safe_free(dup); } @@ -2784,7 +2853,8 @@ } SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX); - + SWITCH_ADD_API(commands_api_interface, "vm_boxcount", "vm_boxcount", boxcount_api_function, BOXCOUNT_SYNTAX); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; }

1 0

[commit] r8456 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 16 May '08

16 May '08

Author: stkn Date: Fri May 16 17:38:00 2008 New Revision: 8456 Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile.in Log: Force CXXLINK for mod_python and remove -lstdcc++ from LOCAL_LDFLAGS to fix build on solaris Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile.in ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/Makefile.in (original) +++ freeswitch/trunk/src/mod/languages/mod_python/Makefile.in Fri May 16 17:38:00 2008 @@ -4,10 +4,12 @@ # and define these variables to impact your build LOCAL_CFLAGS = @PYTHON_CFLAGS@ -LOCAL_LDFLAGS= @PYTHON_LDFLAGS@ -lstdc++ +LOCAL_LDFLAGS= @PYTHON_LDFLAGS@ LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o include ../../../../build/modmake.rules +LINK=$(CXXLINK) + PYMOD=freeswitch PYTHON_SITE_DIR=@PYTHON_SITE_DIR@

1 0

[commit] r8455 - freeswitch/trunk
by Freeswitch SVN 16 May '08

16 May '08

Author: stkn Date: Fri May 16 15:58:16 2008 New Revision: 8455 Modified: freeswitch/trunk/configure.in Log: Drop python-config support, use non-platform-specific site-packages dir Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 16 15:58:16 2008 @@ -436,14 +436,6 @@ [with_python="try"] ) -AC_ARG_WITH( - [python-config], - [AS_HELP_STRING([--with-python-config=PATH], [Location of python-config])], - [with_python_config="$withval"], - [with_python_config="no"] -) - - if test "$with_python" != "no" then save_CFLAGS="$CFLAGS" @@ -469,62 +461,19 @@ fi AC_MSG_RESULT([$PYTHON_VER]) - AC_MSG_CHECKING([for python distutils]) - python_has_distutils="no" - if test "$PYTHON -c 'import distutils;' 2>/dev/null" ; then + python_result="`$PYTHON -c 'import distutils;' 2>&1`" + if test -z "$python_result" ; then python_has_distutils="yes" + else + python_has_distutils="no" fi AC_MSG_RESULT([$python_has_distutils]) - - if test "$python_has_distutils" = "no" ; then - AC_MSG_RESULT([Falling back to python-config]) - - # NOTE: this assumes our desired location is always the last one in the list - # (= system package location is searched last) - # - # needs double brackets because m4 removes one pair - AC_MSG_CHECKING([location of site-packages]) - - PYTHON_SITE_DIR="`$PYTHON -c 'import sys; print sys.path[[-1]];'`" - - if test -z "$PYTHON_SITE_DIR" ; then - AC_MSG_ERROR([Unable to detect python site-packages path]) - elif test ! -d "$PYTHON_SITE_DIR" ; then - AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!]) - fi - AC_MSG_RESULT([$PYTHON_SITE_DIR]) - AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) - - # - # no python distutils, try to use python-config - # (do we really need to keep this?) - - if test "$with_python_config" != "no" ; then - AC_MSG_CHECKING([for python-config]) - if test ! -x "$with_python_config" ; then - AC_MSG_ERROR([Specified python-config does not exist or is not executable: $with_python_config]) - fi - AC_MSG_RESULT([$with_python_config]) - AC_SUBST([PYTHON_CONFIG], ["$with_python_config"]) - else - AC_PATH_PROG([PYTHON_CONFIG], ["python-config"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) - fi - - if test "$PYTHON_CONFIG" != "no" ; then - PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags`" - PYTHON_LDFLAGS="`$PYTHON_CONFIG --ldflags`" - else - AS_IF([test "$with_python" = "try"], - [AC_MSG_WARN([python-config could not be found, mod_python will not build, use --with-python-config to specify the location])], - [AC_MSG_ERROR([python-config could not be found, use --with-python-config to specify the location])] - ) - fi - else + if test "$python_has_distutils" != "no" ; then AC_MSG_CHECKING([location of site-packages]) - PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1);'`" + PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_lib(0);'`" if test -z "$PYTHON_SITE_DIR" ; then AC_MSG_ERROR([Unable to detect python site-packages path]) @@ -540,10 +489,7 @@ PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print \" \".join(flags);'`" PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print \" \".join(libs);'`" PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print \"python\" + sysconfig.get_config_var(\"VERSION\");'`" - fi - if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LDFLAGS" - then # check libpython AC_CHECK_LIB([$PYTHON_LIB], [main], [has_libpython="yes"], [has_libpython="no"]) @@ -571,8 +517,8 @@ fi else AS_IF([test "$with_python" = "try"], - [AC_MSG_WARN([Unable to use python, maybe you need to install "python-devel"])], - [AC_MSG_ERROR([Unable to use python, maybe you need to install "python-devel"])] + [AC_MSG_WARN([Could not find or use python distutils module: $python_result])], + [AC_MSG_ERROR([Could not find or use python distutils module: $python_result])] ) fi @@ -581,6 +527,7 @@ unset python_has_threads unset python_has_distutils + unset python_result else AS_IF([test "$with_python" = "try"], [AC_MSG_WARN([Could not find python, mod_python will not build, use --with-python to specify the location])],

1 0

[commit] r8454 - freeswitch/trunk
by Freeswitch SVN 16 May '08

16 May '08

Author: stkn Date: Fri May 16 15:29:26 2008 New Revision: 8454 Modified: freeswitch/trunk/configure.in Log: Non-bash and m4 quoting fixes, improve site-packages detection with distutils Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri May 16 15:29:26 2008 @@ -469,21 +469,6 @@ fi AC_MSG_RESULT([$PYTHON_VER]) - AC_MSG_CHECKING([location of site-packages]) - - # NOTE: this assumes our desired location is always the last one in the list - # (= system package location is searched last) - # - # needs double brackets because m4 removes one pair - PYTHON_SITE_DIR="`$PYTHON -c 'import sys; print sys.path[[-1]];'`" - - if test -z "$PYTHON_SITE_DIR" ; then - AC_MSG_ERROR([Unable to detect python site-packages path]) - elif test ! -d "$PYTHON_SITE_DIR" ; then - AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!]) - fi - AC_MSG_RESULT([$PYTHON_SITE_DIR]) - AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) AC_MSG_CHECKING([for python distutils]) python_has_distutils="no" @@ -496,6 +481,22 @@ if test "$python_has_distutils" = "no" ; then AC_MSG_RESULT([Falling back to python-config]) + # NOTE: this assumes our desired location is always the last one in the list + # (= system package location is searched last) + # + # needs double brackets because m4 removes one pair + AC_MSG_CHECKING([location of site-packages]) + + PYTHON_SITE_DIR="`$PYTHON -c 'import sys; print sys.path[[-1]];'`" + + if test -z "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Unable to detect python site-packages path]) + elif test ! -d "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!]) + fi + AC_MSG_RESULT([$PYTHON_SITE_DIR]) + AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) + # # no python distutils, try to use python-config # (do we really need to keep this?) @@ -521,12 +522,24 @@ ) fi else + AC_MSG_CHECKING([location of site-packages]) + + PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1);'`" + + if test -z "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Unable to detect python site-packages path]) + elif test ! -d "$PYTHON_SITE_DIR" ; then + AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!]) + fi + AC_MSG_RESULT([$PYTHON_SITE_DIR]) + AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) + # # python distutils found, get settings from python directly # - PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = ["-I" + sysconfig.get_python_inc(0), "-I" + sysconfig.get_python_inc(1), " ".join(sysconfig.get_config_var("CFLAGS").split())]; print " ".join(flags);'`" - PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var("LIBS").split() + sysconfig.get_config_var("SYSLIBS").split(); libs.append("-lpython"+sysconfig.get_config_var("VERSION")); print " ".join(libs);'`" - PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print "python" + sysconfig.get_config_var("VERSION");'`" + PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print \" \".join(flags);'`" + PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print \" \".join(libs);'`" + PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print \"python\" + sysconfig.get_config_var(\"VERSION\");'`" fi if test -n "$PYTHON_CFLAGS" -a -n "$PYTHON_LDFLAGS"

1 0

[commit] r8453 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 15:11:44 2008 New Revision: 8453 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak asserts. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 16 15:11:44 2008 @@ -201,12 +201,12 @@ unsigned int elapsed; switch_size_t bytes; switch_status_t status = SWITCH_STATUS_SUCCESS; - - WRITE_INC(rtp_session); switch_assert(rtp_session != NULL); switch_assert(rtp_session->ice_user != NULL); + WRITE_INC(rtp_session); + if (rtp_session->stuncount != 0) { rtp_session->stuncount--; goto end;

1 0