May 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5186 - freeswitch/trunk/libs/js/nsprpub/pr/src/misc
by Freeswitch SVN 15 May '07

15 May '07

Author: mikej Date: Tue May 15 13:22:49 2007 New Revision: 5186 Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pratom.c Log: fix the fallback atomic operation implementation for use on arm devices. Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pratom.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pratom.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/misc/pratom.c Tue May 15 13:22:49 2007 @@ -54,6 +54,50 @@ */ #if !defined(_PR_HAVE_ATOMIC_OPS) +#include "prbit.h" + +/* +** Compute the log of the least power of 2 greater than or equal to n +*/ +PR_IMPLEMENT(PRIntn) PR_CeilingLog2(PRUint32 n) +{ + PRIntn log2 = 0; + + if (n & (n-1)) + log2++; + if (n >> 16) + log2 += 16, n >>= 16; + if (n >> 8) + log2 += 8, n >>= 8; + if (n >> 4) + log2 += 4, n >>= 4; + if (n >> 2) + log2 += 2, n >>= 2; + if (n >> 1) + log2++; + return log2; +} + +/* +** Compute the log of the greatest power of 2 less than or equal to n. +** This really just finds the highest set bit in the word. +*/ +PR_IMPLEMENT(PRIntn) PR_FloorLog2(PRUint32 n) +{ + PRIntn log2 = 0; + + if (n >> 16) + log2 += 16, n >>= 16; + if (n >> 8) + log2 += 8, n >>= 8; + if (n >> 4) + log2 += 4, n >>= 4; + if (n >> 2) + log2 += 2, n >>= 2; + if (n >> 1) + log2++; + return log2; +} #if defined(_PR_PTHREADS) && !defined(_PR_DCETHREADS) /*

1 0

[Freeswitch-svn] [commit] r5185 - freeswitch/trunk/scripts
by Freeswitch SVN 15 May '07

15 May '07

Author: anthm Date: Tue May 15 10:28:12 2007 New Revision: 5185 Added: freeswitch/trunk/scripts/api.js Log: Add jsapi example of new javascript FSAPI Gateway interface Added: freeswitch/trunk/scripts/api.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/api.js Tue May 15 10:28:12 2007 @@ -0,0 +1,63 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * api.js Demo javascript FSAPI Interface + * + * To use this script: + * 1) Put it in $prefix/scripts. (eg /usr/local/freeswitch/scripts) + * 2) Load mod_xml_rpc and point a browser to your FreeSWITCH machine. + * http://your.freeswitch.box:8080/api/jsapi?api.js + */ + +/* Other possible js commands */ +//env = request.dumpENV("text"); +//xmlenv = new XML(request.dumpENV("xml")); +//request.addHeader("js-text", "You were in a javascript script"); + + +if (session) { + request.write("Don't call me from the dialplan silly! I'm a web interface today.\n"); + consoleLog("err", "Invalid usage!\n"); + exit(); +} + +request.write("<title>FreeSWITCH Command Portal</title>"); +request.write("<h2>FreeSWITCH Command Portal</h2>"); +request.write("<form method=post><input name=command size=40> "); +request.write("<input type=submit value=\"Execute\">"); +request.write("</form><hr noshade size=1><br>"); + +if ((command = request.getHeader("command"))) { + cmd_list = command.split(" ", 2); + + if ((reply = apiExecute(cmd_list[0], cmd_list[1]))) { + request.write("<B>Command Result</b><br><pre>" + reply + "\n</pre>"); + } +} + +

1 0

[Freeswitch-svn] [commit] r5184 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 15 May '07

15 May '07

Author: anthm Date: Tue May 15 10:22:23 2007 New Revision: 5184 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue May 15 10:22:23 2007 @@ -2678,14 +2678,17 @@ static JSBool js_api_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { - - if (argc > 1) { + if (argc > 0) { char *cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + char *arg = NULL; switch_core_session_t *session = NULL; switch_stream_handle_t stream = { 0 }; char retbuf[2048] = ""; + if (argc > 1) { + arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + } + if (argc > 2) { JSObject *session_obj; struct js_session *jss; @@ -2801,6 +2804,7 @@ static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, + {"consoleLog", js_log, 2}, {"exit", js_exit, 0}, {"include", js_include, 1}, {"bridge", js_bridge, 2}, @@ -2853,6 +2857,9 @@ /* Emaculent conception of session object into the script if one is available */ if (session && new_js_session(cx, javascript_global_object, session, &jss, "session", flags)) { JS_SetPrivate(cx, javascript_global_object, session); + } else { + snprintf(buf, sizeof(buf), "~var session = false;"); + eval_some_js(buf, cx, javascript_global_object, &rval); } if (ro) { new_request(cx, javascript_global_object, ro);

1 0

[Freeswitch-svn] [commit] r5183 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 15 May '07

15 May '07

Author: anthm Date: Mon May 14 22:21:53 2007 New Revision: 5183 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_ivr_bridge.c Log: fix locking bug Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon May 14 22:21:53 2007 @@ -491,7 +491,7 @@ SWITCH_DECLARE(char *) switch_core_get_uuid(void); #ifdef SWITCH_DEBUG_RWLOCKS -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(char *uuid_str, const char *file, const char *func, int line); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_perform_locate(const char *uuid_str, const char *file, const char *func, int line); #endif /*! Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon May 14 22:21:53 2007 @@ -575,7 +575,7 @@ stream->write_function(stream, "-Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } - + if (switch_strlen_zero(action) || switch_strlen_zero(path)) { goto usage; } @@ -594,11 +594,11 @@ stream->write_function(stream, "USAGE: %s\n", session_record_api_interface.syntax); switch_safe_free(mycmd); - return SWITCH_STATUS_SUCCESS; + done: - if (session) { + if (rsession) { switch_core_session_rwunlock(rsession); } 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 14 22:21:53 2007 @@ -644,14 +644,14 @@ switch_channel_set_state_flag(originator_channel, CF_TRANSFER); switch_channel_set_state_flag(originatee_channel, CF_TRANSFER); - /* release the read locks we have on the channels */ - switch_core_session_rwunlock(originator_session); - switch_core_session_rwunlock(originatee_session); - /* change the states and let the chips fall where they may */ switch_channel_set_state(originator_channel, CS_TRANSMIT); switch_channel_set_state(originatee_channel, CS_TRANSMIT); + /* release the read locks we have on the channels */ + switch_core_session_rwunlock(originator_session); + switch_core_session_rwunlock(originatee_session); + status = SWITCH_STATUS_SUCCESS; while (switch_channel_get_state(originatee_channel) < CS_HANGUP && switch_channel_test_flag(originatee_channel, CF_TAGGED)) {

1 0

[Freeswitch-svn] [commit] r5182 - in freeswitch/trunk/src: . include
by Freeswitch SVN 15 May '07

15 May '07

Author: anthm Date: Mon May 14 20:05:32 2007 New Revision: 5182 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_session.c Log: update Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon May 14 20:05:32 2007 @@ -690,7 +690,7 @@ \param session the session to check \return the number of events */ -SWITCH_DECLARE(int32_t) switch_core_session_event_count(switch_core_session_t *session); +SWITCH_DECLARE(uint32_t) switch_core_session_event_count(switch_core_session_t *session); /*! \brief DE-Queue an event on a given session @@ -714,7 +714,7 @@ \param session the session to check \return the number of events */ -SWITCH_DECLARE(int32_t) switch_core_session_private_event_count(switch_core_session_t *session); +SWITCH_DECLARE(uint32_t) switch_core_session_private_event_count(switch_core_session_t *session); /*! \brief DE-Queue a private event on a given session Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon May 14 20:05:32 2007 @@ -500,13 +500,13 @@ return status; } -SWITCH_DECLARE(int32_t) switch_core_session_event_count(switch_core_session_t *session) +SWITCH_DECLARE(uint32_t) switch_core_session_event_count(switch_core_session_t *session) { if (session->event_queue) { - return (int32_t) switch_queue_size(session->event_queue); + return switch_queue_size(session->event_queue); } - return -1; + return 0; } SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_event(switch_core_session_t *session, switch_event_t **event) @@ -547,13 +547,13 @@ return status; } -SWITCH_DECLARE(int32_t) switch_core_session_private_event_count(switch_core_session_t *session) +SWITCH_DECLARE(uint32_t) switch_core_session_private_event_count(switch_core_session_t *session) { if (session->private_event_queue) { - return (int32_t) switch_queue_size(session->private_event_queue); + return switch_queue_size(session->private_event_queue); } - - return -1; + + return 0; } SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_private_event(switch_core_session_t *session, switch_event_t **event)

1 0

[Freeswitch-svn] [commit] r5181 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Mon May 14 19:50:38 2007 New Revision: 5181 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_play_say.c Log: update Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon May 14 19:50:38 2007 @@ -92,13 +92,20 @@ /*! \brief Parse command from an event - \param session the session to send the message to - \param event the event to send + \param session the session on which to parse the event + \param event the event to parse \return SWITCH_STATUS_SUCCESS if successful */ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *session, switch_event_t *event); /*! + \brief Parse all commands from an event + \param session the session on which to parse the events + \return SWITCH_STATUS_SUCCESS if successful +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session); + +/*! \brief Wait for time to pass for a specified number of milliseconds \param session the session to wait for. \param ms the number of milliseconds Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon May 14 19:50:38 2007 @@ -690,6 +690,11 @@ switch_core_session_t *other_session; switch_channel_t *other_channel; char *ip = NULL, *port = NULL; + + if (switch_channel_get_state(channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + switch_channel_set_flag(channel, CF_BYPASS_MEDIA); tech_pvt->local_sdp_str = NULL; if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) @@ -710,6 +715,11 @@ break; case SWITCH_MESSAGE_INDICATE_MEDIA:{ uint32_t count = 0; + + if (switch_channel_get_state(channel) >= CS_HANGUP) { + return SWITCH_STATUS_FALSE; + } + switch_channel_clear_flag(channel, CF_BYPASS_MEDIA); tech_pvt->local_sdp_str = NULL; if (!switch_rtp_ready(tech_pvt->rtp_session)) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon May 14 19:50:38 2007 @@ -581,6 +581,7 @@ return status; } + SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session) { switch_channel_t *channel; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 14 19:50:38 2007 @@ -374,6 +374,23 @@ } +SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session) +{ + switch_event_t *event; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { + switch_ivr_parse_event(session, event); + switch_event_fire(&event); + } + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session, switch_input_args_t *args) { switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -383,6 +400,7 @@ switch_event_t *event; switch_unicast_conninfo_t *conninfo = NULL; switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -467,10 +485,8 @@ } } - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_channel_event_set_data(switch_core_session_get_channel(session), event); - switch_event_fire(&event); + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); } if (switch_channel_has_dtmf(channel)) { @@ -540,10 +556,9 @@ } } - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); - } + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } if (switch_channel_has_dtmf(channel)) { switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); @@ -606,8 +621,7 @@ while (switch_channel_ready(channel)) { switch_frame_t *read_frame; - switch_event_t *event; - + if (timeout) { elapsed = (uint32_t) ((switch_time_now() - started) / 1000); if (elapsed >= timeout) { @@ -615,10 +629,9 @@ } } - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); - } + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } if (switch_channel_has_dtmf(channel)) { char dtmf[128]; @@ -776,8 +789,7 @@ switch_core_session_message_t msg = { 0 }; switch_status_t status = SWITCH_STATUS_GENERR; uint8_t swap = 0; - switch_event_t *event; - + msg.message_id = SWITCH_MESSAGE_INDICATE_NOMEDIA; msg.from = __FILE__; @@ -791,27 +803,23 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); - } - - switch_channel_set_flag(channel, CF_BYPASS_MEDIA); - switch_core_session_receive_message(session, &msg); + switch_ivr_parse_all_events(session); + if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); - - while (switch_core_session_dequeue_private_event(other_session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(other_session, event); - switch_event_destroy(&event); - } + + switch_ivr_parse_all_events(other_session); switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); - + } + + switch_channel_set_flag(channel, CF_BYPASS_MEDIA); + switch_core_session_receive_message(session, &msg); + if (other_channel) { switch_channel_clear_state_handler(channel, NULL); if (swap) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon May 14 19:50:38 2007 @@ -771,7 +771,7 @@ if ((session = switch_core_session_locate(uuid))) { char *cause = NULL; - char *mypath = strdup(path); + char *mypath; char *p; master = session; @@ -779,6 +779,16 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); + if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s] already broadcasting...broadcast aborted\n", + switch_channel_get_name(channel)); + switch_core_session_rwunlock(session); + return SWITCH_STATUS_FALSE; + } + + mypath = strdup(path); + + if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) { switch_ivr_media(uuid, SMF_REBRIDGE); } 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 14 19:50:38 2007 @@ -55,6 +55,7 @@ switch_channel_t *chan_a, *chan_b; switch_frame_t *read_frame; switch_core_session_t *session_a, *session_b; + uint32_t loop_count = 0; session_a = data->session; if (!(session_b = switch_core_session_locate(data->b_uuid))) { @@ -80,6 +81,7 @@ switch_channel_state_t b_state; switch_status_t status; switch_event_t *event; + loop_count++; /* if you really want to make sure it's not ready, test it twice because it might be just a break */ if (!switch_channel_ready(chan_a) && !switch_channel_ready(chan_a)) { @@ -96,21 +98,20 @@ break; } - if (switch_core_session_dequeue_private_event(session_a, &event) == SWITCH_STATUS_SUCCESS) { + if (loop_count > 10 && switch_core_session_private_event_count(session_a)) { switch_channel_set_flag(chan_b, CF_SUSPEND); msg.string_arg = data->b_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - switch_ivr_parse_event(session_a, event); + switch_ivr_parse_all_events(session_a); msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE; switch_core_session_receive_message(session_a, &msg); switch_channel_clear_flag(chan_b, CF_SUSPEND); - switch_event_destroy(&event); } if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) { - switch_yield(100000); + switch_yield(1000); continue; } 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 Mon May 14 19:50:38 2007 @@ -394,11 +394,9 @@ while (switch_channel_ready(channel)) { switch_size_t len; - switch_event_t *event; - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); } if (start && (time(NULL) - start) > limit) { @@ -425,6 +423,8 @@ } if (args->input_callback) { + switch_event_t *event = NULL; + if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); switch_event_destroy(&event); @@ -682,12 +682,9 @@ int done = 0; int do_speed = 1; int last_speed = -1; - switch_event_t *event; - - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { - switch_ivr_parse_event(session, event); - switch_event_destroy(&event); + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); } if (args && (args->input_callback || args->buf || args->buflen)) { @@ -711,6 +708,8 @@ } if (args->input_callback) { + switch_event_t *event; + if (switch_core_session_dequeue_event(session, &event) == SWITCH_STATUS_SUCCESS) { status = args->input_callback(session, event, SWITCH_INPUT_TYPE_EVENT, args->buf, args->buflen); switch_event_destroy(&event);

1 0

[Freeswitch-svn] [commit] r5180 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Mon May 14 18:04:28 2007 New Revision: 5180 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon May 14 18:04:28 2007 @@ -332,11 +332,16 @@ stale = 1; } - if ((v_contact_str = switch_event_get_header(*v_event, "forced-contact"))) { + if (v_event && *v_event && (v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { + char *p; switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); + for(p = contact_str; p && *p; p++) { + if (*p == '\'' || *p == '[' || *p == ']') { + *p = '"'; + } + } } - if (auth_res != AUTH_OK && !stale) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", from_user, from_host); if (auth_res == AUTH_FORBIDDEN) { @@ -465,6 +470,7 @@ void sofia_reg_handle_sip_i_register(nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sofia_private_t * sofia_private, sip_t const *sip, tagi_t tags[]) { char key[128] = ""; + switch_event_t *v_event = NULL; if (!sip || !sip->sip_request || !sip->sip_request->rq_method_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); @@ -478,7 +484,10 @@ return; } - sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key), NULL); + sofia_reg_handle_register(nua, profile, nh, sip, REG_REGISTER, key, sizeof(key), &v_event); + if (v_event) { + switch_event_fire(&v_event); + } }

1 0

[Freeswitch-svn] [commit] r5179 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Mon May 14 17:30:31 2007 New Revision: 5179 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon May 14 17:30:31 2007 @@ -327,10 +327,16 @@ } if (authorization) { + char *v_contact_str; if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event)) == AUTH_STALE) { stale = 1; } + if ((v_contact_str = switch_event_get_header(*v_event, "forced-contact"))) { + switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); + } + + if (auth_res != AUTH_OK && !stale) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", from_user, from_host); if (auth_res == AUTH_FORBIDDEN) {

1 0

[Freeswitch-svn] [commit] r5178 - freeswitch/trunk/src
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Mon May 14 16:38:18 2007 New Revision: 5178 Modified: freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 14 16:38:18 2007 @@ -272,15 +272,13 @@ unsigned long CMD_NOMEDIA = switch_hashfunc_default("nomedia", &hlen); unsigned long CMD_UNICAST = switch_hashfunc_default("unicast", &hlen); char *lead_frames = switch_event_get_header(event, "lead-frames"); - switch_status_t status = SWITCH_STATUS_SUCCESS; - + assert(channel != NULL); assert(event != NULL); if (switch_strlen_zero(cmd)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Command!\n"); - status = SWITCH_STATUS_FALSE; - goto done; + return SWITCH_STATUS_FALSE; } hlen = (switch_size_t) strlen(cmd); @@ -291,11 +289,12 @@ if (lead_frames) { switch_frame_t *read_frame; int frame_count = atoi(lead_frames); - + switch_status_t status; + while(frame_count > 0) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { - goto done; + return status; } if (!switch_test_flag(read_frame, SFF_CNG)) { frame_count--; @@ -366,33 +365,12 @@ switch_channel_hangup(channel, cause); } else if (cmd_hash == CMD_NOMEDIA) { char *uuid = switch_event_get_header(event, "nomedia-uuid"); - char *waitfor = switch_event_get_header(event, "wait-for"); - if (waitfor) { - switch_core_session_t *w_session; - - if ((w_session = switch_core_session_locate(waitfor))) { - switch_channel_t *w_channel = switch_core_session_get_channel(w_session); - int sanity = 0; - - while(switch_channel_test_flag(w_channel, CF_WAIT_FOR_ME)) { - switch_yield(1000); - if (++sanity > 10000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Timeout waiting for channel %s\n", switch_channel_get_name(w_channel)); - switch_channel_clear_flag(w_channel, CF_WAIT_FOR_ME); - break; - } - } - switch_core_session_rwunlock(w_session); - } - - } switch_ivr_nomedia(uuid, SMF_REBRIDGE); } - done: + switch_channel_clear_flag(channel, CF_EVENT_PARSE); - switch_channel_clear_flag(channel, CF_WAIT_FOR_ME); - return status; + return SWITCH_STATUS_SUCCESS; } @@ -798,6 +776,7 @@ switch_core_session_message_t msg = { 0 }; switch_status_t status = SWITCH_STATUS_GENERR; uint8_t swap = 0; + switch_event_t *event; msg.message_id = SWITCH_MESSAGE_INDICATE_NOMEDIA; msg.from = __FILE__; @@ -812,12 +791,23 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { + while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { + switch_ivr_parse_event(session, event); + switch_event_destroy(&event); + } + switch_channel_set_flag(channel, CF_BYPASS_MEDIA); switch_core_session_receive_message(session, &msg); if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); + + while (switch_core_session_dequeue_private_event(other_session, &event) == SWITCH_STATUS_SUCCESS) { + switch_ivr_parse_event(other_session, event); + switch_event_destroy(&event); + } + switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon May 14 16:38:18 2007 @@ -775,10 +775,10 @@ char *p; master = session; - + channel = switch_core_session_get_channel(session); assert(channel != NULL); - + if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) { switch_ivr_media(uuid, SMF_REBRIDGE); } @@ -796,9 +796,8 @@ } } - if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) + if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app); @@ -807,13 +806,12 @@ if ((flags & SMF_LOOP)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); } + switch_core_session_queue_private_event(other_session, &event); } - - master = other_session; switch_core_session_rwunlock(other_session); - + master = other_session; other_session = NULL; } @@ -835,17 +833,6 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "nomedia"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "nomedia-uuid", "%s", uuid); - if ((flags & SMF_ECHO_BLEG) && (flags & SMF_ECHO_ALEG)) { - switch_channel_t *channel = switch_core_session_get_channel(master); - char *bto = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE); - if ((other_session = switch_core_session_locate(bto))) { - switch_channel_t *other_channel = switch_core_session_get_channel(other_session); - switch_channel_set_flag(other_channel, CF_WAIT_FOR_ME); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "wait-for", "%s", bto); - switch_core_session_rwunlock(other_session); - } - } - switch_core_session_queue_private_event(master, &event); } } 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 14 16:38:18 2007 @@ -96,11 +96,6 @@ break; } - if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) { - switch_yield(100000); - continue; - } - if (switch_core_session_dequeue_private_event(session_a, &event) == SWITCH_STATUS_SUCCESS) { switch_channel_set_flag(chan_b, CF_SUSPEND); msg.string_arg = data->b_uuid; @@ -114,6 +109,10 @@ switch_event_destroy(&event); } + if (switch_channel_test_flag(chan_a, CF_SUSPEND) || switch_channel_test_flag(chan_b, CF_SUSPEND)) { + switch_yield(100000); + continue; + } /* if 1 channel has DTMF pass it to the other */ if (switch_channel_has_dtmf(chan_a)) {

1 0

[Freeswitch-svn] [commit] r5177 - in freeswitch/trunk/src: . include
by Freeswitch SVN 14 May '07

14 May '07

Author: anthm Date: Mon May 14 14:18:38 2007 New Revision: 5177 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c 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 Mon May 14 14:18:38 2007 @@ -538,7 +538,7 @@ CF_ORIGINATOR = (1 << 3) - Channel is an originator CF_TRANSFER = (1 << 4) - Channel is being transfered CF_ACCEPT_CNG = (1 << 5) - Channel will accept CNG frames -CF_LOCK_THREAD = (1 << 6) - Prevent the channel thread from exiting while this flag is set +CF_WAIT_FOR_ME = (1 << 6) - Channel wants you to wait CF_BRIDGED = (1 << 7) - Channel in a bridge CF_HOLD = (1 << 8) - Channel is on hold CF_SERVICE = (1 << 9) - Channel has a service thread @@ -565,7 +565,7 @@ CF_ORIGINATOR = (1 << 3), CF_TRANSFER = (1 << 4), CF_ACCEPT_CNG = (1 << 5), - CF_LOCK_THREAD = (1 << 6), + CF_WAIT_FOR_ME = (1 << 6), CF_BRIDGED = (1 << 7), CF_HOLD = (1 << 8), CF_SERVICE = (1 << 9), Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon May 14 14:18:38 2007 @@ -272,13 +272,15 @@ unsigned long CMD_NOMEDIA = switch_hashfunc_default("nomedia", &hlen); unsigned long CMD_UNICAST = switch_hashfunc_default("unicast", &hlen); char *lead_frames = switch_event_get_header(event, "lead-frames"); - + switch_status_t status = SWITCH_STATUS_SUCCESS; + assert(channel != NULL); assert(event != NULL); if (switch_strlen_zero(cmd)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Command!\n"); - return SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_FALSE; + goto done; } hlen = (switch_size_t) strlen(cmd); @@ -289,12 +291,11 @@ if (lead_frames) { switch_frame_t *read_frame; int frame_count = atoi(lead_frames); - switch_status_t status; - + while(frame_count > 0) { status = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { - return status; + goto done; } if (!switch_test_flag(read_frame, SFF_CNG)) { frame_count--; @@ -365,12 +366,33 @@ switch_channel_hangup(channel, cause); } else if (cmd_hash == CMD_NOMEDIA) { char *uuid = switch_event_get_header(event, "nomedia-uuid"); + char *waitfor = switch_event_get_header(event, "wait-for"); + if (waitfor) { + switch_core_session_t *w_session; + + if ((w_session = switch_core_session_locate(waitfor))) { + switch_channel_t *w_channel = switch_core_session_get_channel(w_session); + int sanity = 0; + + while(switch_channel_test_flag(w_channel, CF_WAIT_FOR_ME)) { + switch_yield(1000); + if (++sanity > 10000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Timeout waiting for channel %s\n", switch_channel_get_name(w_channel)); + switch_channel_clear_flag(w_channel, CF_WAIT_FOR_ME); + break; + } + } + switch_core_session_rwunlock(w_session); + } + + } switch_ivr_nomedia(uuid, SMF_REBRIDGE); } - + done: switch_channel_clear_flag(channel, CF_EVENT_PARSE); - return SWITCH_STATUS_SUCCESS; + switch_channel_clear_flag(channel, CF_WAIT_FOR_ME); + return status; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon May 14 14:18:38 2007 @@ -775,10 +775,10 @@ char *p; master = session; - + channel = switch_core_session_get_channel(session); assert(channel != NULL); - + if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) { switch_ivr_media(uuid, SMF_REBRIDGE); } @@ -796,8 +796,9 @@ } } - if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) + if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app); @@ -806,12 +807,13 @@ if ((flags & SMF_LOOP)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); } - switch_core_session_queue_private_event(other_session, &event); } - switch_core_session_rwunlock(other_session); + master = other_session; + switch_core_session_rwunlock(other_session); + other_session = NULL; } @@ -833,6 +835,17 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "nomedia"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "nomedia-uuid", "%s", uuid); + if ((flags & SMF_ECHO_BLEG) && (flags & SMF_ECHO_ALEG)) { + switch_channel_t *channel = switch_core_session_get_channel(master); + char *bto = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE); + if ((other_session = switch_core_session_locate(bto))) { + switch_channel_t *other_channel = switch_core_session_get_channel(other_session); + switch_channel_set_flag(other_channel, CF_WAIT_FOR_ME); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "wait-for", "%s", bto); + switch_core_session_rwunlock(other_session); + } + } + switch_core_session_queue_private_event(master, &event); } }

1 0