- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5197 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 17 May '07

17 May '07

Author: anthm Date: Thu May 17 10:29:49 2007 New Revision: 5197 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Thu May 17 10:29:49 2007 @@ -334,7 +334,9 @@ { const char p = 0; switch_size_t len = sizeof(p); - switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, &p, &len); + if (tech_pvt->udp_socket && tech_pvt->udpwrite) { + switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, &p, &len); + } } break; }

1 0

[commit] r5196 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 17 May '07

17 May '07

Author: anthm Date: Thu May 17 09:56:10 2007 New Revision: 5196 Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/trunk/libs/libteletone/src/libteletone_detect.h freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Log: add license exception to teleton for openzap Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Thu May 17 09:56:10 2007 @@ -28,6 +28,45 @@ * * libteletone.h -- Tone Generator/Detector * + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef LIBTELETONE_H #define LIBTELETONE_H Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Thu May 17 09:56:10 2007 @@ -49,7 +49,47 @@ * public domain for the benefit of all mankind - even the slimy * ones who might try to proprietize my work and use it to my * detriment. + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #include <math.h> #ifndef _MSC_VER #include <stdint.h> Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.h Thu May 17 09:56:10 2007 @@ -49,7 +49,47 @@ * public domain for the benefit of all mankind - even the slimy * ones who might try to proprietize my work and use it to my * detriment. + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #ifndef LIBTELETONE_DETECT_H #define LIBTELETONE_DETECT_H Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Thu May 17 09:56:10 2007 @@ -28,7 +28,47 @@ * * libteletone.c -- Tone Generator * + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #include <libteletone.h> #define SMAX 32767 #define SMIN -32768 Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Thu May 17 09:56:10 2007 @@ -28,6 +28,45 @@ * * libteletone.h -- Tone Generator * + * + * + * Exception: + * The author hereby grants the use of this source code under the + * following license if and only if the source code is distributed + * as part of the openzap library. Any use or distribution of this + * source code outside the scope of the openzap library will nullify the + * following license and reinact the MPL 1.1 as stated above. + * + * Copyright (c) 2007, Anthony Minessale II + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef LIBTELETONE_GENERATE_H #define LIBTELETONE_GENERATE_H

1 0

[commit] r5194 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 16 May '07

16 May '07

Author: anthm Date: Wed May 16 17:05:22 2007 New Revision: 5194 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: add small sanity check to libsofia Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Wed May 16 17:05:22 2007 @@ -929,7 +929,7 @@ return 0; } - +#define safe_free(it) if (it) { free(it); it = NULL; } /** Internal deinitialization */ static void _su_home_deinit(su_home_t *home) @@ -965,16 +965,17 @@ } else if (su_is_preloaded(b, b->sub_nodes[i].sua_data)) continue; - free(b->sub_nodes[i].sua_data); + safe_free(b->sub_nodes[i].sua_data); + } } if (b->sub_preload && !b->sub_preauto) - free(b->sub_preload); + safe_free(b->sub_preload); if (b->sub_stats) - free(b->sub_stats); + safe_free(b->sub_stats); if (!b->sub_auto) - free(b); + safe_free(b); home->suh_blocks = NULL;

1 0

[commit] r5192 - in freeswitch/trunk: libs/iksemel/src src
by Freeswitch SVN 16 May '07

16 May '07

Author: anthm Date: Wed May 16 13:47:24 2007 New Revision: 5192 Modified: freeswitch/trunk/libs/iksemel/src/ikstack.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/libs/iksemel/src/ikstack.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/ikstack.c (original) +++ freeswitch/trunk/libs/iksemel/src/ikstack.c Wed May 16 13:47:24 2007 @@ -196,6 +196,7 @@ if (!s) { return; } + *sp = NULL; c = s->meta->next; while (c) { tmp = c->next; @@ -209,5 +210,5 @@ c = tmp; } iks_free (s); - *sp = NULL; + } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed May 16 13:47:24 2007 @@ -129,6 +129,8 @@ switch_sockaddr_t *remote_addr; rtp_msg_t recv_msg; srtp_ctx_t *recv_ctx; + uint32_t autoadj_window; + uint32_t autoadj_tally; uint16_t seq; uint16_t rseq; @@ -430,12 +432,13 @@ rtp_session->pool = pool; - rtp_session->flags = flags; rtp_session->te = 101; switch_mutex_init(&rtp_session->flag_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_mutex_init(&rtp_session->dtmf_data.dtmf_mutex, SWITCH_MUTEX_NESTED, rtp_session->pool); switch_buffer_create_dynamic(&rtp_session->dtmf_data.dtmf_buffer, 128, 128, 0); + switch_rtp_set_flag(rtp_session, flags); + /* for from address on recvfrom calls */ switch_sockaddr_info_get(&rtp_session->from_addr, NULL, SWITCH_UNSPEC, 0, 0, rtp_session->pool); @@ -705,7 +708,10 @@ { switch_set_flag_locked(rtp_session, flags); - + if (flags & SWITCH_RTP_FLAG_AUTOADJ) { + rtp_session->autoadj_window = 20; + rtp_session->autoadj_tally = 0; + } } SWITCH_DECLARE(uint8_t) switch_rtp_test_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) @@ -960,30 +966,35 @@ } - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { - + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { char *tx_host; char *old_host; char bufa[30], bufb[30]; tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr); old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr); - - if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) - || strcmp(tx_host, old_host)) { + if ((switch_sockaddr_get_port(rtp_session->from_addr) != rtp_session->remote_port) || strcmp(tx_host, old_host)) { const char *err; uint32_t old = rtp_session->remote_port; if (!switch_strlen_zero(tx_host) && switch_sockaddr_get_port(rtp_session->from_addr) > 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, - switch_sockaddr_get_port(rtp_session->from_addr)); - switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + if (++rtp_session->autoadj_tally >= 10) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, + switch_sockaddr_get_port(rtp_session->from_addr)); + switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + } } } - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } + if (rtp_session->autoadj_window) { + if (--rtp_session->autoadj_window == 0) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); + } + } + + + if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { continue; }

1 0

[commit] r5191 - freeswitch/trunk/src
by Freeswitch SVN 16 May '07

16 May '07

Author: anthm Date: Wed May 16 13:35:00 2007 New Revision: 5191 Modified: freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_bridge.c Log: update Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed May 16 13:35:00 2007 @@ -730,7 +730,7 @@ switch_io_event_hook_kill_channel_t *ptr; switch_status_t status = SWITCH_STATUS_FALSE; - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_INFO, "Kill %s [%s]\n", switch_channel_get_name(session->channel), + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, SWITCH_LOG_DEBUG, "Kill %s [%s]\n", switch_channel_get_name(session->channel), SIG_NAMES[sig]); if (session->endpoint_interface->io_routines->kill_channel) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed May 16 13:35:00 2007 @@ -626,7 +626,7 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; switch_io_event_hook_state_change_t *ptr; - + /* If trylock fails the signal is already awake so we needn't bother */ if (switch_mutex_trylock(session->mutex) == SWITCH_STATUS_SUCCESS) { switch_thread_cond_signal(session->cond); @@ -644,6 +644,7 @@ } } } + switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); } SWITCH_DECLARE(unsigned int) switch_core_session_running(switch_core_session_t *session) Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed May 16 13:35:00 2007 @@ -749,7 +749,6 @@ if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { status = SWITCH_STATUS_SUCCESS; - switch_channel_clear_flag(channel, CF_BYPASS_MEDIA); switch_core_session_receive_message(session, &msg); if ((flags & SMF_REBRIDGE) @@ -765,7 +764,7 @@ switch_channel_clear_state_handler(channel, NULL); } } - + switch_core_session_rwunlock(session); if (other_channel) { @@ -803,22 +802,21 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - switch_ivr_parse_all_events(session); - + //switch_ivr_parse_all_events(session); + 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); - - switch_ivr_parse_all_events(other_session); + //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); Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed May 16 13:35:00 2007 @@ -98,7 +98,7 @@ break; } - if (loop_count > 10 && switch_core_session_private_event_count(session_a)) { + if (loop_count > 50 && 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; @@ -491,7 +491,7 @@ switch_channel_set_state_flag(caller_channel, CF_TRANSFER); switch_channel_set_state_flag(peer_channel, CF_TRANSFER); - + switch_channel_set_state(caller_channel, CS_HIBERNATE); switch_channel_set_state(peer_channel, CS_HIBERNATE);

1 0

[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

[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

[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

[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

[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