- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12596 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: brian Date: Fri Mar 13 17:31:25 2009 New Revision: 12596 Log: sigh Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Mar 13 17:31:25 2009 @@ -193,11 +193,9 @@ </extension>  <extension name="Local_Extension"> <condition field="destination_number" expression="^(10[01][0-9])$">

1 0

[commit] r12595 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: anthm Date: Fri Mar 13 17:01:39 2009 New Revision: 12595 Log: avoiding sillyness Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Mar 13 17:01:39 2009 @@ -320,6 +320,19 @@ continue; } } + + if (!ans_a && !ans_b) { + switch_channel_t *un = ans_a ? chan_b : chan_a; + + if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un)); + goto end_of_bridge_loop; + } + + if (ans_a) ans_b++; else ans_a++; + } + + #ifndef SWITCH_VIDEO_IN_THREADS if (switch_channel_test_flag(chan_a, CF_VIDEO) && switch_channel_test_flag(chan_b, CF_VIDEO)) { /* read video from 1 channel and write it to the other */

1 0

[commit] r12594 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: andrew Date: Fri Mar 13 14:55:55 2009 New Revision: 12594 Log: Unlock the session like we should be doing Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Fri Mar 13 14:55:55 2009 @@ -584,6 +584,9 @@ ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badsession"); } + /* release the lock returned by switch_core_locate_session */ + switch_core_session_rwunlock(session); + } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error");

1 0

[commit] r12593 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: anthm Date: Fri Mar 13 14:18:05 2009 New Revision: 12593 Log: pad buffer Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Fri Mar 13 14:18:05 2009 @@ -63,7 +63,7 @@ return NULL; } - len = strlen(cmd) + (arg ? strlen(arg) : 0) + 5; + len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10; cmd_buf = (char *) malloc(len); assert(cmd_buf); @@ -92,7 +92,7 @@ return NULL; } - len = strlen(cmd) + (arg ? strlen(arg) : 0) + 8; + len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10; cmd_buf = (char *) malloc(len); assert(cmd_buf);

1 0

[commit] r12592 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: andrew Date: Fri Mar 13 12:33:17 2009 New Revision: 12592 Log: Make handlecall return more correct errors; sync freeswitch.erl with git version Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl Fri Mar 13 12:33:17 2009 @@ -14,13 +14,13 @@ -module(freeswitch). --export([send/2, api/3, bgapi/3, event/2, +-export([send/2, api/3, api/2, bgapi/3, bgapi/4, event/2, nixevent/2, noevents/1, close/1, get_event_header/2, get_event_body/1, get_event_name/1, getpid/1, sendmsg/3, - sendevent/3, handlecall/2, start_fetch_handler/4, + sendevent/3, handlecall/2, handlecall/3, start_fetch_handler/4, start_log_handler/3, start_event_handler/3]). --define(TIMEOUT, 10000). +-define(TIMEOUT, 5000). %% @doc Return the value for a specific header in an event or `{error,notfound}'. get_event_header([], _Needle) -> @@ -63,11 +63,18 @@ api(Node, Cmd, Args) -> {api, Node} ! {api, Cmd, Args}, receive - X -> X + {ok, X} -> + {ok, X}; + {error, X} -> + {error, X} after ?TIMEOUT -> timeout end. +%% @doc Same as @link{api/3} except there's no additional arguments. +api(Node, Cmd) -> + api(Node, Cmd, ""). + %% @doc Make a backgrounded API call to FreeSWITCH. The asynchronous reply is %% sent to calling process after it is received. This function %% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails @@ -104,11 +111,48 @@ {api, X} -> X end. +%% @doc Make a backgrounded API call to FreeSWITCH. The asynchronous reply is +%% passed as the argument to `Fun' after it is received. This function +%% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails +%% to respond. +bgapi(Node, Cmd, Args, Fun) -> + Self = self(), + % spawn a new process so that both responses go here instead of directly to + % the calling process. + spawn(fun() -> + {bgapi, Node} ! {bgapi, Cmd, Args}, + receive + {error, Reason} -> + % send the error condition to the calling process + Self ! {api, {error, Reason}}; + {ok, JobID} -> + % send the reply to the calling process + Self ! {api, ok}, + receive % wait for the job's reply + {bgok, JobID, Reply} -> + % Call the function with the reply + Fun(ok, Reply); + {bgerror, JobID, Reply} -> + Fun(error, Reply) + end + after ?TIMEOUT -> + % send a timeout to the calling process + Self ! {api, timeout} + end + end), + + % get the initial result of the command, NOT the asynchronous response, and + % return it + receive + {api, X} -> X + end. + %% @doc Request to receive any events in the list `List'. event(Node, Events) when is_list(Events) -> {event, Node} ! list_to_tuple(lists:append([event], Events)), receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end; @@ -130,7 +174,8 @@ noevents(Node) -> {noevents, Node} ! noevents, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. @@ -139,7 +184,7 @@ close(Node) -> {close, Node} ! exit, receive - X -> X + ok -> ok after ?TIMEOUT -> timeout end. @@ -150,7 +195,8 @@ sendevent(Node, EventName, Headers) -> {sendevent, Node} ! {sendevent, EventName, Headers}, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. @@ -160,7 +206,8 @@ sendmsg(Node, UUID, Headers) -> {sendmsg, Node} ! {sendmsg, UUID, Headers}, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. @@ -171,17 +218,29 @@ getpid(Node) -> {getpid, Node} ! getpid, receive - X -> X + {ok, Pid} when is_pid(Pid) -> {ok, Pid} after ?TIMEOUT -> timeout end. %% @doc Request that FreeSWITCH send any events pertaining to call `UUID' to %% `Process' where process is a registered process name. -handlecall(Node, Process) -> - {handlecall, Node} ! {handlecall, Process}, +handlecall(Node, UUID, Process) -> + {handlecall, Node} ! {handlecall, UUID, Process}, receive - X -> X + ok -> ok; + {error, Reason} -> {error, Reason} + after ?TIMEOUT -> + timeout + end. + +%% @doc Request that FreeSWITCH send any events pertaining to call `UUID' to +%% the calling process. +handlecall(Node, UUID) -> + {handlecall, Node} ! {handlecall, UUID}, + receive + ok -> ok; + {error, Reason} -> {error, Reason} after ?TIMEOUT -> timeout end. Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Fri Mar 13 12:33:17 2009 @@ -568,11 +568,17 @@ ei_x_encode_atom(rbuf, "badarg"); } else { switch_core_session_t *session; - if (!switch_strlen_zero_buf(uuid_str) && (session = switch_core_session_locate(uuid_str))) { - /* create a new session list element and attach it to this listener */ - if ((arity==2 && attach_call_to_pid(listener, &msg->from, session)) || - (arity==3 && attach_call_to_registered_process(listener, reg_name, session))) { - ei_x_encode_atom(rbuf, "ok"); + if (!switch_strlen_zero_buf(uuid_str) && SWITCH_UUID_FORMATTED_LENGTH == strlen(uuid_str)) { + if ((session = switch_core_session_locate(uuid_str))) { + /* create a new session list element and attach it to this listener */ + if ((arity==2 && attach_call_to_pid(listener, &msg->from, session)) || + (arity==3 && attach_call_to_registered_process(listener, reg_name, session))) { + ei_x_encode_atom(rbuf, "ok"); + } else { + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "error"); + ei_x_encode_atom(rbuf, "session_attach_failed"); + } } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error");

1 0

[commit] r12591 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: mrene Date: Fri Mar 13 10:13:18 2009 New Revision: 12591 Log: tweak Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Fri Mar 13 10:13:18 2009 @@ -143,6 +143,8 @@ switch_bool_t changed = SWITCH_FALSE; switch_xml_config_callback_t callback = (switch_xml_config_callback_t)item->function; + switch_assert(item->ptr); + if (value) { matched_count++; } @@ -236,7 +238,7 @@ /* We have a preallocated buffer */ char *dest = (char*)item->ptr; - if (!dest || strncasecmp(dest, newstring, string_options->length)) { + if (strncasecmp(dest, newstring, string_options->length)) { switch_copy_string(dest, newstring, string_options->length); changed = SWITCH_TRUE; }

1 0

[commit] r12590 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: brian Date: Thu Mar 12 20:57:10 2009 New Revision: 12590 Log: FSCORE-332 Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Mar 12 20:57:10 2009 @@ -379,6 +379,7 @@ peer_profile = switch_channel_get_caller_profile(peer_channel); if ((use_uuid = switch_event_get_header(var_event, "origination_uuid"))) { + use_uuid = switch_core_session_strdup(*new_session, use_uuid); if (switch_core_session_set_uuid(*new_session, use_uuid) == SWITCH_STATUS_SUCCESS) { switch_event_del_header(var_event, "origination_uuid"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(peer_channel), use_uuid); @@ -1068,14 +1069,15 @@ switch_assert(use_uuid); + switch_mutex_lock(runtime.session_hash_mutex); if (switch_core_hash_find(session_manager.session_table, use_uuid)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Duplicate UUID!\n"); + switch_mutex_unlock(runtime.session_hash_mutex); return SWITCH_STATUS_FALSE; } switch_event_create(&event, SWITCH_EVENT_CHANNEL_UUID); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Unique-ID", session->uuid_str); - switch_mutex_lock(runtime.session_hash_mutex); switch_core_hash_delete(session_manager.session_table, session->uuid_str); switch_set_string(session->uuid_str, use_uuid); switch_core_hash_insert(session_manager.session_table, session->uuid_str, session);

1 0

[commit] r12589 - in freeswitch/trunk/scripts/contrib/intralanman/perl: cdr cdr-csv
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: intralanman Date: Thu Mar 12 16:47:43 2009 New Revision: 12589 Log: new sample cdr goodies Added: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr/ (props changed) - copied from r12588, /freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/ Removed: freeswitch/trunk/scripts/contrib/intralanman/perl/cdr-csv/

1 0

[commit] r12588 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: andrew Date: Thu Mar 12 14:57:22 2009 New Revision: 12588 Log: Remove old hardcoded makefile now that we can check for erlang stuff in configure Removed: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/Makefile

1 0

[commit] r12587 - in freeswitch/trunk: . build build/config
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: andrew Date: Thu Mar 12 14:54:20 2009 New Revision: 12587 Log: FSBUILD-142 (with approval from MikeJ) Added: freeswitch/trunk/build/config/erlang.m4 Modified: freeswitch/trunk/acinclude.m4 freeswitch/trunk/build/modules.conf.in freeswitch/trunk/configure.in Modified: freeswitch/trunk/acinclude.m4 ============================================================================== --- freeswitch/trunk/acinclude.m4 (original) +++ freeswitch/trunk/acinclude.m4 Thu Mar 12 14:54:20 2009 @@ -6,6 +6,7 @@ m4_include([build/config/ac_gcc_x86_cpuid.m4]) m4_include([build/config/ax_lib_mysql.m4]) m4_include([build/config/ax_check_java.m4]) +m4_include([build/config/erlang.m4]) m4_include([build/config/odbc.m4]) m4_include([libs/apr/build/apr_common.m4]) m4_include([build/config/libcurl.m4]) Added: freeswitch/trunk/build/config/erlang.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/build/config/erlang.m4 Thu Mar 12 14:54:20 2009 @@ -0,0 +1,96 @@ +AC_DEFUN([CHECK_ERLANG], [ +# +# Erlang checks for mod_erlang_event +# +AC_ARG_WITH( + [erlang], + [AS_HELP_STRING([--with-erlang], [Use system provided version of erlang (default: try)])], + [with_erlang="$withval"], + [with_erlang="try"] +) + +if test "$with_erlang" != "no" +then + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" + + if test "$with_erlang" != "yes" -a "$with_erlang" != "try" ; then + AC_MSG_CHECKING([for erlang]) + if test ! -x "$with_erlang" ; then + AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang]) + fi + AC_MSG_RESULT([$with_erlang]) + AC_SUBST([ERLANG], ["$with_erlang"]) + else + AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) + fi + + if test "$ERLANG" != "no" ; then + AC_MSG_CHECKING([erlang version]) + ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`" + + if test -z "$ERLANG_VER" ; then + AC_MSG_ERROR([Unable to detect erlang version]) + fi + AC_MSG_RESULT([$ERLANG_VER]) + + ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt` + AC_MSG_CHECKING([erlang libdir]) + if test -z "`echo $ERLANG_LIBDIR`" ; then + AC_MSG_ERROR([failed]) + else + ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS" + LIBS="-L$ERLANG_LIBDIR $LIBS" + fi + AC_MSG_RESULT([$ERLANG_LIBDIR]) + + ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt` + AC_MSG_CHECKING([erlang incdir]) + if test -z "`echo $ERLANG_INCDIR`" ; then + AC_MSG_ERROR([failed]) + else + ERLANG_CFLAGS="-I$ERLANG_INCDIR $ERLANG_CFLAGS" + CFLAGS="-I$ERLANG_INCDIR $CFLAGS" + fi + AC_MSG_RESULT([$ERLANG_INCDIR]) + + AC_CHECK_HEADERS([ei.h], [has_ei_h="yes"], [has_ei_h="no"]) + + ERLANG_LIB="ei" + + # check liei + AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"]) + # maybe someday ei will actually expose this? + AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"]) + + if test "$has_libei" = "no" ; then + AS_IF([test "$with_erlang" = "try"], + [AC_MSG_WARN([$ERLANG_LIB is unusable])], + [AC_MSG_ERROR([$ERLANG_LIB is unusable])] + ) + elif test "$has_ei_h" = "no"; then + AS_IF([test "$with_erlang" = "try"], + [AC_MSG_WARN([ei.h is unusable - are the erlang development headers installed?])], + [AC_MSG_ERROR([ei.h is unusable - are the erlang development headers installed?])] + ) + else + ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei" + AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf]) + AC_SUBST([ERLANG_CFLAGS], [$ERLANG_CFLAGS]) + AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS]) + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + else + AS_IF([test "$with_erlang" = "try"], + [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])], + [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])] + ) + fi +else + AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!]) +fi + +]) Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Thu Mar 12 14:54:20 2009 @@ -50,6 +50,7 @@ event_handlers/mod_event_socket event_handlers/mod_cdr_csv #event_handlers/mod_radius_cdr +#event_handlers/mod_erlang_event formats/mod_native_file formats/mod_sndfile #formats/mod_shout Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Mar 12 14:54:20 2009 @@ -692,6 +692,8 @@ AC_MSG_WARN([python support disabled, building mod_python will fail!]) fi +CHECK_ERLANG + AC_CONFIG_FILES([Makefile src/Makefile src/mod/Makefile @@ -699,6 +701,7 @@ src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_python/Makefile + src/mod/event_handlers/mod_erlang_event/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh

1 0