- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4973 - freeswitch/trunk/libs/sofia-sip/utils
by Freeswitch SVN 19 Apr '07

19 Apr '07

Author: anthm Date: Thu Apr 19 14:30:14 2007 New Revision: 4973 Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-options.c Log: workaround explicit link warning from comment?? Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-options.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-options.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-options.c Thu Apr 19 14:30:14 2007 @@ -77,7 +77,7 @@ * @endcode * * @section environment Environment - * #SIPADDRESS, #sip_proxy, #NTA_DEBUG, #TPORT_DEBUG, #TPORT_LOG. + * SIPADDRESS, sip_proxy, NTA_DEBUG, TPORT_DEBUG, TPORT_LOG. * * @section bugs Reporting Bugs * Report bugs to <sofia-sip-devel(a)lists.sourceforge.net>.

1 0

[commit] r4972 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta libsofia-sip-ua/sresolv libsofia-sip-ua/stun libsofia-sip-ua/tport
by Freeswitch SVN 19 Apr '07

19 Apr '07

Author: mikej Date: Thu Apr 19 14:16:05 2007 New Revision: 4972 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Log: consistent ifdef for DOXYGEN defined symbols Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Apr 19 14:16:05 2007 @@ -1 +1 @@ -Tue Apr 17 11:04:59 CDT 2007 +Tue Apr 19 14:23:59 EDT 2007 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Thu Apr 19 14:16:05 2007 @@ -292,7 +292,9 @@ * * @sa <su_debug.h>, #su_log_global, #SOFIA_DEBUG */ -extern char const NTA_DEBUG[]; +#ifdef DOXYGEN +extern char const NTA_DEBUG[]; /* dummy declaration for Doxygen */ +#endif #ifndef SU_DEBUG #define SU_DEBUG 3 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c Thu Apr 19 14:16:05 2007 @@ -549,7 +549,6 @@ #include <winreg.h> #endif -#if DOXYGEN_ONLY /**@ingroup sresolv_env * * Environment variable determining the debug log level for @b sresolv @@ -560,7 +559,8 @@ * * @sa <su_debug.h>, sresolv_log, SOFIA_DEBUG */ -extern SRESOLV_DEBUG; +#ifdef DOXYGEN +extern char const SRESOLV_DEBUG[]; /* dummy declaration for Doxygen */ #endif /**Debug log for @b sresolv module. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stun_internal.h Thu Apr 19 14:16:05 2007 @@ -71,7 +71,9 @@ SOFIA_BEGIN_DECLS +#ifdef DOXYGEN extern char const STUN_DEBUG[]; /* dummy declaration for Doxygen */ +#endif /* XXX -- mela: note that this are 100 times too small */ #if 1 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Thu Apr 19 14:16:05 2007 @@ -52,7 +52,9 @@ * * @sa TPORT_DUMP, TPORT_DEBUG, tport_log */ +#ifdef DOXYGEN extern char const TPORT_LOG[]; /* dummy declaration for Doxygen */ +#endif /**@var TPORT_DUMP * @@ -64,7 +66,9 @@ * * @sa TPORT_LOG, TPORT_DEBUG, tport_log */ +#ifdef DOXYGEN extern char const TPORT_DUMP[]; /* dummy declaration for Doxygen */ +#endif /**@var TPORT_DEBUG * @@ -75,7 +79,9 @@ * * @sa <su_debug.h>, tport_log, SOFIA_DEBUG */ +#ifdef DOXYGEN extern char const TPORT_DEBUG[]; /* dummy declaration for Doxygen */ +#endif /**Debug log for @b tport module. *

1 0

[commit] r4971 - in freeswitch/trunk/src/mod/endpoints/mod_wanpipe: . libsangoma
by Freeswitch SVN 19 Apr '07

19 Apr '07

Author: anthm Date: Thu Apr 19 11:34:30 2007 New Revision: 4971 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.h freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.h freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: update wanpipe Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Thu Apr 19 11:34:30 2007 @@ -3,7 +3,7 @@ LIBPRI=libpri-1.2.4 LIBPRI_FILE=$(LIBPRI).tar.gz LIBPRI_DIR=$(BASE)/libs/$(LIBPRI) -WANPIPE=wanpipe-3.1.0.p15 +WANPIPE=wanpipe-3.1.0.p18 WANPIPE_HOST=ftp://ftp.sangoma.com/linux/custom/3.1 WANPIPE_FILE=$(WANPIPE).tgz WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.c Thu Apr 19 11:34:30 2007 @@ -1,25 +1,6 @@ -/***************************************************************************** - * libsangoma.c AFT T1/E1: HDLC API Code Library - * - * Author(s): Anthony Minessale II <anthmct(a)yahoo.com> - * Nenad Corbic <ncorbic(a)sangoma.com> - * David Rokhvarg <davidr(a)sangoma.com> - * Michael Jerris <mike(a)jerris.com> - * - * Copyright: (c) 2005 Anthony Minessale II - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * ============================================================================ - * - * Aug 15, 2006 David Rokhvarg <davidr(a)sangoma.com> Ported to MS Windows 2000/XP - * Sep 24, 2006 Michael Jerris <mike(a)jerris.com> Windows port, standardize api, cleanup - * - */ - #include "libsangoma.h" +#include <stdarg.h> + #define DFT_CARD "wanpipe1" #if defined(WIN32) @@ -265,6 +246,48 @@ return fd; } +static char *cut_path(char *in) +{ + char *p, *ret = in; + char delims[] = "/\\"; + char *i; + + for (i = delims; *i; i++) { + p = in; + while ((p = strchr(p, *i)) != 0) { + ret = ++p; + } + } + return ret; +} + + +static void default_logger(char *file, const char *func, int line, int level, char *fmt, ...) +{ + char *fp; + char data[1024]; + + va_list ap; + + fp = cut_path(file); + + va_start(ap, fmt); + + vsnprintf(data, sizeof(data), fmt, ap); + + fprintf(stderr, "%s:%d %s() %s", file, line, func, data); + + va_end(ap); + +} + +sangoma_logger_t global_logger = default_logger; + +void sangoma_set_logger(sangoma_logger_t logger) +{ + global_logger = logger; +} + int sangoma_readmsg_tdm(sng_fd_t fd, void *hdrbuf, int hdrlen, void *databuf, int datalen, int flag) { int rx_len=0; Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/libsangoma.h Thu Apr 19 11:34:30 2007 @@ -1,18 +1,3 @@ -/***************************************************************************** - * libsangoma.c AFT T1/E1: HDLC API Code Library - * - * Author(s): Anthony Minessale II <anthmct(a)yahoo.com> - * Nenad Corbic <ncorbic(a)sangoma.com> - * - * Copyright: (c) 2005 Anthony Minessale II - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * ============================================================================ - */ - #ifndef _LIBSNAGOMA_H #define _LIBSNAGOMA_H #include <stdio.h> @@ -161,6 +146,21 @@ int sangoma_tdm_get_fe_alarms(sng_fd_t fd, wanpipe_tdm_api_t *tdm_api); int sangoma_tdm_cmd_exec(sng_fd_t fd, wanpipe_tdm_api_t *tdm_api); +#define WP_PRE __FILE__, __FUNCTION__, __LINE__ +#define WP_LOG_DEBUG WP_PRE, 7 +#define WP_LOG_INFO WP_PRE, 6 +#define WP_LOG_NOTICE WP_PRE, 5 +#define WP_LOG_WARNING WP_PRE, 4 +#define WP_LOG_ERROR WP_PRE, 3 +#define WP_LOG_CRIT WP_PRE, 2 +#define WP_LOG_ALERT WP_PRE, 1 +#define WP_LOG_EMERG WP_PRE, 0 + +typedef void (*sangoma_logger_t)(char *file, const char *func, int line, int level, char *fmt, ...); +void sangoma_set_logger(sangoma_logger_t logger); + +extern sangoma_logger_t global_logger; + #ifndef LIBSANGOMA_GET_HWCODING #define LIBSANGOMA_GET_HWCODING 1 #endif Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.c Thu Apr 19 11:34:30 2007 @@ -1,18 +1,3 @@ -/***************************************************************************** - * sangoma_pri.c libpri Sangoma integration - * - * Author(s): Anthony Minessale II <anthmct(a)yahoo.com> - * Nenad Corbic <ncorbic(a)sangoma.com> - * - * Copyright: (c) 2005 Anthony Minessale II - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * ============================================================================ - */ - #include <libsangoma.h> #include <sangoma_pri.h> #ifndef HAVE_GETTIMEOFDAY @@ -158,6 +143,10 @@ } else { if ((spri->pri = pri_new_cb((int) dfd, node, swtype, __pri_sangoma_read, __pri_sangoma_write, NULL))) { spri->span = span; + spri->dchan = dchan; + spri->swtype = swtype; + spri->node = node; + spri->debug = debug; pri_set_debug(spri->pri, debug); ret = 0; } else { @@ -183,7 +172,7 @@ FD_ZERO(&efds); #ifdef _MSC_VER -//Windows macro for FD_SET includes a warning C4127: conditional expression is constant +//Windows macro for FD_SET includes a warning C4127: conditional expression is constant #pragma warning(push) #pragma warning(disable:4127) #endif @@ -211,6 +200,13 @@ sel = select(spri->pri->fd + 1, &rfds, NULL, &efds, next ? &now : NULL); event = NULL; + + if (FD_ISSET(spri->pri->fd, &efds)) { + wanpipe_tdm_api_t tdm_api = {0}; + + sangoma_tdm_read_event(spri->pri->fd, &tdm_api); + global_logger(WP_LOG_ERROR, "DCHANNEL ERROR! [span %d]\n", spri->span); + } if (!sel) { event = pri_schedule_run(spri->pri); Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/libsangoma/sangoma_pri.h Thu Apr 19 11:34:30 2007 @@ -79,6 +79,10 @@ void *private_info; event_handler eventmap[MAX_EVENT + 1]; loop_handler on_loop; + int dfd; + int swtype; + int node; + int debug; }; struct sangoma_pri_event_list { Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Thu Apr 19 11:34:30 2007 @@ -211,6 +211,19 @@ +static void wp_logger(char *file, const char *func, int line, int level, char *fmt, ...) +{ + va_list ap; + char *data = NULL; + int ret; + + va_start(ap, fmt); + if ((ret = switch_vasprintf(&data, fmt, ap)) != -1) { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, level, "%s", data); + } + va_end(ap); +} + static int local_sangoma_tdm_read_event(sng_fd_t fd, wp_tdm_api_rx_hdr_t *rx_event) { wanpipe_tdm_api_t tdm_api[1]; @@ -1299,6 +1312,8 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; + sangoma_set_logger(wp_logger); + memset(SPANS, 0, sizeof(SPANS)); pri_set_error(s_pri_error);

1 0

[commit] r4970 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Apr '07

18 Apr '07

Author: mikej Date: Wed Apr 18 16:21:53 2007 New Revision: 4970 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: merge patch from http://jira.freeswitch.org/browse/SFSIP-11 . Please note, when registering to a UA that requires the from header to match the auth username, you must now use the new setting force-fromuser. See sample configuration file for more details. Thanks Marcel. Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Apr 18 16:21:53 2007 @@ -10,6 +10,8 @@    +  +     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 Wed Apr 18 16:21:53 2007 @@ -890,7 +890,9 @@ } profile = gateway_ptr->profile; - tech_pvt->gateway_from_str = switch_core_session_strdup(nsession, gateway_ptr->register_from); + if (gateway_ptr->force_fromuser) { + tech_pvt->gateway_from_str = switch_core_session_strdup(nsession, gateway_ptr->register_from); + } if (!strchr(dest, '@')) { tech_pvt->dest = switch_core_session_sprintf(nsession, "sip:%s@%s", dest, gateway_ptr->register_proxy + 4); } else { @@ -1095,3 +1097,4 @@ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: */ + Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Apr 18 16:21:53 2007 @@ -176,6 +176,7 @@ char *register_realm; char *register_username; char *register_password; + switch_bool_t force_fromuser; char *register_from; char *register_contact; char *register_to; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Apr 18 16:21:53 2007 @@ -680,7 +680,7 @@ if ((gateway = switch_core_alloc(profile->pool, sizeof(*gateway)))) { char *register_str = "true", *scheme = "Digest", *realm = NULL, - *username = NULL, *password = NULL, *extension = NULL, *proxy = NULL, *context = "default", *expire_seconds = "3600"; + *username = NULL, *password = NULL, *force_fromuser = "false", *extension = NULL, *proxy = NULL, *context = "default", *expire_seconds = "3600"; gateway->pool = profile->pool; gateway->profile = profile; @@ -702,6 +702,8 @@ username = val; } else if (!strcmp(var, "password")) { password = val; + } else if (!strcmp(var, "force-fromuser")) { + force_fromuser = val; } else if (!strcmp(var, "extension")) { extension = val; } else if (!strcmp(var, "proxy")) { @@ -745,6 +747,7 @@ gateway->register_realm = switch_core_strdup(gateway->pool, realm); gateway->register_username = switch_core_strdup(gateway->pool, username); gateway->register_password = switch_core_strdup(gateway->pool, password); + gateway->force_fromuser = switch_true(force_fromuser); gateway->register_from = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, realm); gateway->register_contact = switch_core_sprintf(gateway->pool, "sip:%s@%s:%d", extension, profile->sipip, profile->sip_port); @@ -1765,3 +1768,4 @@ +

1 0

[commit] r4969 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 18 Apr '07

18 Apr '07

Author: anthm Date: Wed Apr 18 13:26:58 2007 New Revision: 4969 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: update Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Wed Apr 18 13:26:58 2007 @@ -655,8 +655,10 @@ if (!apr_hash_get(handle->sub_hash, from, APR_HASH_KEY_STRING)) { iks *msg; apr_hash_set(handle->sub_hash, apr_pstrdup(handle->pool, from), APR_HASH_KEY_STRING, &marker); - msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, "Ding A Ling...."); - apr_queue_push(handle->queue, msg); + if ((msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, "Ding A Ling...."))) { + apr_queue_push(handle->queue, msg); + msg = NULL; + } } if (resource && strstr(resource, "talk") && (buffer = apr_hash_get(handle->probe_hash, id, APR_HASH_KEY_STRING))) { @@ -812,6 +814,7 @@ } apr_queue_push(handle->queue, pres); + pres = NULL; } } @@ -851,20 +854,24 @@ *r++ = '\0'; } - msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, "Ding A Ling...."); - - if (to && ldl_test_flag(handle, LDL_FLAG_COMPONENT)) { - iks_insert_attrib(msg, "from", to); + if ((msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, "Ding A Ling...."))) { + if (to && ldl_test_flag(handle, LDL_FLAG_COMPONENT)) { + iks_insert_attrib(msg, "from", to); + } + + apr_queue_push(handle->queue, msg); + msg = NULL; } - apr_queue_push(handle->queue, msg); - msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, "Ding A Ling...."); + if ((msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, "Ding A Ling...."))) { - if (to && ldl_test_flag(handle, LDL_FLAG_COMPONENT)) { - iks_insert_attrib(msg, "from", to); - } + if (to && ldl_test_flag(handle, LDL_FLAG_COMPONENT)) { + iks_insert_attrib(msg, "from", to); + } - apr_queue_push(handle->queue, msg); + apr_queue_push(handle->queue, msg); + msg = NULL; + } if (handle->session_callback) { handle->session_callback(handle, NULL, LDL_SIGNAL_SUBSCRIBE, to, from, NULL, NULL); @@ -950,11 +957,13 @@ //printf("SESSION type=%s name=%s id=%s\n", type, name, id); if (parse_session_code(handle, id, from, to, xml, strcasecmp(type, "error") ? NULL : type) == LDL_STATUS_SUCCESS) { iks *reply; - reply = iks_make_iq(IKS_TYPE_RESULT, NULL); - iks_insert_attrib(reply, "to", from); - iks_insert_attrib(reply, "from", to); - iks_insert_attrib(reply, "id", iqid); - apr_queue_push(handle->queue, reply); + if ((reply = iks_make_iq(IKS_TYPE_RESULT, NULL))) { + iks_insert_attrib(reply, "to", from); + iks_insert_attrib(reply, "from", to); + iks_insert_attrib(reply, "id", iqid); + apr_queue_push(handle->queue, reply); + reply = NULL; + } } } xml = iks_child (xml); @@ -970,16 +979,18 @@ ldl_handle_t *handle = user_data; iks *msg, *ctag; - msg = iks_make_pres (IKS_SHOW_AVAILABLE, handle->status_msg); - ctag = iks_insert(msg, "c"); - iks_insert_attrib(ctag, "node", "http://www.freeswitch.org/xmpp/client/caps"); - iks_insert_attrib(ctag, "ver", "1.0.0.1"); - iks_insert_attrib(ctag, "ext", "sidebar voice-v1"); - iks_insert_attrib(ctag, "client", "libdingaling"); - iks_insert_attrib(ctag, "xmlns", "http://jabber.org/protocol/caps"); + if ((msg = iks_make_pres (IKS_SHOW_AVAILABLE, handle->status_msg))) { + ctag = iks_insert(msg, "c"); + iks_insert_attrib(ctag, "node", "http://www.freeswitch.org/xmpp/client/caps"); + iks_insert_attrib(ctag, "ver", "1.0.0.1"); + iks_insert_attrib(ctag, "ext", "sidebar voice-v1"); + iks_insert_attrib(ctag, "client", "libdingaling"); + iks_insert_attrib(ctag, "xmlns", "http://jabber.org/protocol/caps"); - apr_queue_push(handle->queue, msg); - ldl_set_flag_locked(handle, LDL_FLAG_READY); + apr_queue_push(handle->queue, msg); + msg = NULL; + ldl_set_flag_locked(handle, LDL_FLAG_READY); + } return IKS_FILTER_EAT; } @@ -1122,15 +1133,17 @@ if (ldl_test_flag(handle, LDL_FLAG_CONNECTED)) { iks *t; if (handle->features & IKS_STREAM_BIND) { - t = iks_make_resource_bind(handle->acc); - apr_queue_push(handle->queue, t); - t = NULL; + if ((t = iks_make_resource_bind(handle->acc))) { + apr_queue_push(handle->queue, t); + t = NULL; + } } if (handle->features & IKS_STREAM_SESSION) { - t = iks_make_session(); - iks_insert_attrib(t, "id", "auth"); - apr_queue_push(handle->queue, t); - t = NULL; + if ((t = iks_make_session())) { + iks_insert_attrib(t, "id", "auth"); + apr_queue_push(handle->queue, t); + t = NULL; + } } } else { if (handle->features & IKS_STREAM_SASL_MD5) { @@ -1306,10 +1319,12 @@ void *pop = NULL; unsigned int len = 0, x = 0; + apr_thread_mutex_lock(handle->lock); + while(apr_queue_trypop(handle->queue, &pop) == APR_SUCCESS) { if (pop) { msg = (iks *) pop; - iks_send(handle->parser, msg); + if (!done) iks_send(handle->parser, msg); iks_delete(msg); pop = NULL; } else { @@ -1321,7 +1336,6 @@ if (globals.debug && len) { globals.logger(DL_LOG_DEBUG, "Processing %u packets in retry queue\n", len); } - apr_thread_mutex_lock(handle->lock); pop = NULL; @@ -1352,6 +1366,7 @@ free(packet_node); } else { apr_queue_push(handle->retry_queue, packet_node); + packet_node = NULL; } pop = NULL; } @@ -1574,8 +1589,9 @@ packet_node->xml = xml; packet_node->retries = retries; packet_node->next = apr_time_now(); - apr_queue_push(handle->retry_queue, packet_node); apr_hash_set(handle->retry_hash, packet_node->id, APR_HASH_KEY_STRING, packet_node); + apr_queue_push(handle->retry_queue, packet_node); + packet_node = NULL; } apr_thread_mutex_unlock(handle->lock); @@ -1619,21 +1635,28 @@ myid = next_id(); snprintf(idbuf, sizeof(idbuf), "%u", myid); - iq = iks_new("iq"); - iks_insert_attrib(iq, "type", "set"); - iks_insert_attrib(iq, "id", idbuf); - iks_insert_attrib(iq, "from", session->login); - iks_insert_attrib(iq, "to", session->them); - sess = iks_insert (iq, "session"); - iks_insert_attrib(sess, "xmlns", "http://www.google.com/session"); - iks_insert_attrib(sess, "type", "transport-accept"); - iks_insert_attrib(sess, "id", candidate->tid); - iks_insert_attrib(sess, "xmlns", "http://www.google.com/session"); - iks_insert_attrib(sess, "initiator", session->initiator ? session->initiator : session->them); - tp = iks_insert (sess, "transport"); - iks_insert_attrib(tp, "xmlns", "http://www.google.com/transport/p2p"); + if ((iq = iks_new("iq"))) { + if (!iks_insert_attrib(iq, "type", "set")) goto fail; + if (!iks_insert_attrib(iq, "id", idbuf)) goto fail; + if (!iks_insert_attrib(iq, "from", session->login)) goto fail; + if (!iks_insert_attrib(iq, "to", session->them)) goto fail; + if (!(sess = iks_insert (iq, "session"))) goto fail; + if (!iks_insert_attrib(sess, "xmlns", "http://www.google.com/session")) goto fail; + if (!iks_insert_attrib(sess, "type", "transport-accept")) goto fail; + if (!iks_insert_attrib(sess, "id", candidate->tid)) goto fail; + if (!iks_insert_attrib(sess, "xmlns", "http://www.google.com/session")) goto fail; + if (!iks_insert_attrib(sess, "initiator", session->initiator ? session->initiator : session->them)) goto fail; + if (!(tp = iks_insert (sess, "transport"))) goto fail; + if (!iks_insert_attrib(tp, "xmlns", "http://www.google.com/transport/p2p")) goto fail; + apr_queue_push(session->handle->queue, iq); + iq = NULL; + } + + fail: + if (iq) { + iks_delete(iq); + } - apr_queue_push(session->handle->queue, iq); } void *ldl_handle_get_private(ldl_handle_t *handle) @@ -1716,16 +1739,24 @@ return; } - iks_insert_attrib(iq, "to", to); - iks_insert_attrib(iq, "xmlns", "jabber:client"); - iks_insert_attrib(iq,"from", from); - iks_insert_attrib(iq, "type", "result"); - iks_insert_attrib(iq, "id", id); - iks_insert_node(iq, vxml); - + if (!iks_insert_attrib(iq, "to", to)) goto fail; + if (!iks_insert_attrib(iq, "xmlns", "jabber:client")) goto fail; + if (!iks_insert_attrib(iq,"from", from)) goto fail; + if (!iks_insert_attrib(iq, "type", "result")) goto fail; + if (!iks_insert_attrib(iq, "id", id)) goto fail; + if (!iks_insert_node(iq, vxml)) goto fail; + apr_queue_push(handle->queue, iq); + iq = NULL; + vxml = NULL; - iks_free(vxml); + fail: + if (iq) { + iks_delete(iq); + } + if (vxml) { + iks_delete(vxml); + } } @@ -1781,6 +1812,7 @@ } apr_queue_push(handle->queue, msg); + msg = NULL; } @@ -1890,13 +1922,15 @@ msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); iks_insert_attrib(msg, "from", from); apr_queue_push(handle->queue, msg); - + msg = NULL; + pres = iks_new("presence"); iks_insert_attrib(pres, "xmlns", "jabber:client"); iks_insert_attrib(pres, "type", "probe"); iks_insert_attrib(pres, "to", id); iks_insert_attrib(pres, "from", from); apr_queue_push(handle->queue, pres); + pres = NULL; next += 5; } if (elapsed >= 17) { @@ -1958,9 +1992,12 @@ apr_hash_set(handle->probe_hash, id, APR_HASH_KEY_STRING, &buffer); msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); apr_queue_push(handle->queue, msg); + msg = NULL; msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, id, notice); apr_queue_push(handle->queue, msg); + msg = NULL; apr_queue_push(handle->queue, iq); + iq = NULL; //schedule_packet(handle, next_id(), pres, LDL_RETRY); @@ -1970,6 +2007,7 @@ if (elapsed > 5000 && ! again) { msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); apr_queue_push(handle->queue, msg); + msg = NULL; again++; } if (elapsed > 10000) {

1 0

[commit] r4968 - in freeswitch/trunk/libs: iksemel/include iksemel/src libdingaling/src
by Freeswitch SVN 18 Apr '07

18 Apr '07

Author: anthm Date: Wed Apr 18 12:10:46 2007 New Revision: 4968 Modified: freeswitch/trunk/libs/iksemel/include/iksemel.h freeswitch/trunk/libs/iksemel/src/filter.c freeswitch/trunk/libs/iksemel/src/iks.c freeswitch/trunk/libs/iksemel/src/ikstack.c freeswitch/trunk/libs/iksemel/src/sax.c freeswitch/trunk/libs/iksemel/src/utility.c freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: update Modified: freeswitch/trunk/libs/iksemel/include/iksemel.h ============================================================================== --- freeswitch/trunk/libs/iksemel/include/iksemel.h (original) +++ freeswitch/trunk/libs/iksemel/include/iksemel.h Wed Apr 18 12:10:46 2007 @@ -24,12 +24,13 @@ char *iks_stack_strdup (ikstack *s, const char *src, size_t len); char *iks_stack_strcat (ikstack *s, char *old, size_t old_len, const char *src, size_t src_len); void iks_stack_stat (ikstack *s, size_t *allocated, size_t *used); -void iks_stack_delete (ikstack *s); +void iks_stack_delete (ikstack **sp); + /***** utilities *****/ void *iks_malloc (size_t size); -void iks_free (void *ptr); +void iks_real_free (void *ptr); void iks_set_mem_funcs (void *(*malloc_func)(size_t size), void (*free_func)(void *ptr)); char *iks_strdup (const char *src); @@ -42,6 +43,8 @@ char *iks_escape (ikstack *s, char *src, size_t len); char *iks_unescape (ikstack *s, char *src, size_t len); +#define iks_free(p) if (p) {iks_real_free(p) ; p = NULL;} + /***** dom tree *****/ enum ikstype { Modified: freeswitch/trunk/libs/iksemel/src/filter.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/filter.c (original) +++ freeswitch/trunk/libs/iksemel/src/filter.c Wed Apr 18 12:10:46 2007 @@ -96,7 +96,7 @@ if (rule->next) rule->next->prev = rule->prev; if (f->rules == rule) f->rules = rule->next; if (f->last_rule == rule) f->last_rule = rule->prev; - iks_stack_delete (rule->s); + iks_stack_delete (&rule->s); } void @@ -174,7 +174,7 @@ rule = f->rules; while (rule) { tmp = rule->next; - iks_stack_delete (rule->s); + iks_stack_delete (&rule->s); rule = tmp; } iks_free (f); Modified: freeswitch/trunk/libs/iksemel/src/iks.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/iks.c (original) +++ freeswitch/trunk/libs/iksemel/src/iks.c Wed Apr 18 12:10:46 2007 @@ -60,7 +60,7 @@ if (!s) return NULL; x = iks_new_within (name, s); if (!x) { - iks_stack_delete (s); + iks_stack_delete (&s); return NULL; } return x; @@ -202,7 +202,7 @@ void iks_delete (iks *x) { - if (x) iks_stack_delete (x->s); + if (x) iks_stack_delete (&x->s); } /***** Node Traversing *****/ Modified: freeswitch/trunk/libs/iksemel/src/ikstack.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/ikstack.c (original) +++ freeswitch/trunk/libs/iksemel/src/ikstack.c Wed Apr 18 12:10:46 2007 @@ -182,10 +182,20 @@ } void -iks_stack_delete (ikstack *s) +iks_stack_delete (ikstack **sp) { ikschunk *c, *tmp; + ikstack *s; + if (!sp) { + return; + } + + s = *sp; + + if (!s) { + return; + } c = s->meta->next; while (c) { tmp = c->next; @@ -199,4 +209,5 @@ c = tmp; } iks_free (s); + *sp = NULL; } Modified: freeswitch/trunk/libs/iksemel/src/sax.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/sax.c (original) +++ freeswitch/trunk/libs/iksemel/src/sax.c Wed Apr 18 12:10:46 2007 @@ -629,5 +629,5 @@ if (prs->deleteHook) prs->deleteHook (prs->user_data); if (prs->stack) iks_free (prs->stack); if (prs->atts) iks_free (prs->atts); - if (prs->s) iks_stack_delete (prs->s); else iks_free (prs); + if (prs->s) iks_stack_delete (&prs->s); else iks_free (prs); } Modified: freeswitch/trunk/libs/iksemel/src/utility.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/utility.c (original) +++ freeswitch/trunk/libs/iksemel/src/utility.c Wed Apr 18 12:10:46 2007 @@ -22,7 +22,7 @@ } void -iks_free (void *ptr) +iks_real_free (void *ptr) { if (my_free_func) my_free_func (ptr); Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Wed Apr 18 12:10:46 2007 @@ -595,8 +595,8 @@ iks_insert_attrib(tag, "var", FEATURES[x].name); } } - - iks_send(handle->parser, iq); + apr_queue_push(handle->queue, iq); + iq = NULL; send = 1; } fail: @@ -919,8 +919,8 @@ iks_insert_attrib(x, "xmlns:gr", "google:roster"); iks_insert_attrib(x, "gr:ext", "2"); iks_insert_attrib(x, "gr:include", "all"); - iks_send(handle->parser, iq); - iks_delete(iq); + apr_queue_push(handle->queue, iq); + iq = NULL; break; } #endif @@ -1123,14 +1123,14 @@ iks *t; if (handle->features & IKS_STREAM_BIND) { t = iks_make_resource_bind(handle->acc); - iks_send(handle->parser, t); - iks_delete(t); + apr_queue_push(handle->queue, t); + t = NULL; } if (handle->features & IKS_STREAM_SESSION) { t = iks_make_session(); iks_insert_attrib(t, "id", "auth"); - iks_send(handle->parser, t); - iks_delete(t); + apr_queue_push(handle->queue, t); + t = NULL; } } else { if (handle->features & IKS_STREAM_SASL_MD5) { @@ -1150,8 +1150,8 @@ slen = (uint32_t)(strlen(handle->acc->user) + strlen(handle->password) + 2); b64encode((unsigned char *)s, slen, (unsigned char *) base64, sizeof(base64)); iks_insert_cdata(x, base64, 0); - iks_send(handle->parser, x); - iks_delete(x); + apr_queue_push(handle->queue, x); + x = NULL; } else { globals.logger(DL_LOG_DEBUG, "Memory ERROR!\n"); break; @@ -1303,45 +1303,57 @@ static void ldl_flush_queue(ldl_handle_t *handle, int done) { iks *msg; - void *pop; + void *pop = NULL; unsigned int len = 0, x = 0; while(apr_queue_trypop(handle->queue, &pop) == APR_SUCCESS) { - msg = (iks *) pop; - iks_send(handle->parser, msg); - iks_delete(msg); + if (pop) { + msg = (iks *) pop; + iks_send(handle->parser, msg); + iks_delete(msg); + pop = NULL; + } else { + break; + } } len = apr_queue_size(handle->retry_queue); - if (globals.debug && len) { globals.logger(DL_LOG_DEBUG, "Processing %u packets in retry queue\n", len); } apr_thread_mutex_lock(handle->lock); + + pop = NULL; + while(x < len && apr_queue_trypop(handle->retry_queue, &pop) == APR_SUCCESS) { - struct packet_node *packet_node = (struct packet_node *) pop; - apr_time_t now = apr_time_now(); - x++; - - if (packet_node->next <= now) { - if (packet_node->retries > 0) { - packet_node->retries--; - if (globals.debug) { - globals.logger(DL_LOG_DEBUG, "Sending packet %s (%d left)\n", packet_node->id, packet_node->retries); + if (!pop) { + break; + } else { + struct packet_node *packet_node = (struct packet_node *) pop; + apr_time_t now = apr_time_now(); + x++; + + if (packet_node->next <= now) { + if (packet_node->retries > 0) { + packet_node->retries--; + if (globals.debug) { + globals.logger(DL_LOG_DEBUG, "Sending packet %s (%d left)\n", packet_node->id, packet_node->retries); + } + iks_send(handle->parser, packet_node->xml); + packet_node->next = now + 5000000; } - iks_send(handle->parser, packet_node->xml); - packet_node->next = now + 5000000; } - } - if (packet_node->retries == 0 || done) { - if (globals.debug) { - globals.logger(DL_LOG_DEBUG, "Discarding packet %s\n", packet_node->id); + if (packet_node->retries == 0 || done) { + if (globals.debug) { + globals.logger(DL_LOG_DEBUG, "Discarding packet %s\n", packet_node->id); + } + apr_hash_set(handle->retry_hash, packet_node->id, APR_HASH_KEY_STRING, NULL); + iks_delete(packet_node->xml); + free(packet_node); + } else { + apr_queue_push(handle->retry_queue, packet_node); } - apr_hash_set(handle->retry_hash, packet_node->id, APR_HASH_KEY_STRING, NULL); - iks_delete(packet_node->xml); - free(packet_node); - } else { - apr_queue_push(handle->retry_queue, packet_node); + pop = NULL; } } apr_thread_mutex_unlock(handle->lock);

1 0

[commit] r4967 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Apr '07

17 Apr '07

Author: anthm Date: Tue Apr 17 14:53:18 2007 New Revision: 4967 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: cleanup 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 Tue Apr 17 14:53:18 2007 @@ -136,7 +136,7 @@ // map QSIG cause codes to SIP from RFC4497 section 8.4.1 static int hangup_cause_to_sip(switch_call_cause_t cause) -{ +{ switch (cause) { case SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET: case SWITCH_CAUSE_NO_ROUTE_DESTINATION: @@ -175,12 +175,11 @@ case SWITCH_CAUSE_BEARERCAPABILITY_NOTAVAIL: return 503; case SWITCH_CAUSE_BEARERCAPABILITY_NOTIMPL: + case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION: return 488; case SWITCH_CAUSE_FACILITY_NOT_IMPLEMENTED: case SWITCH_CAUSE_SERVICE_NOT_IMPLEMENTED: return 501; - case SWITCH_CAUSE_INCOMPATIBLE_DESTINATION: - return 503; case SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE: return 504; case SWITCH_CAUSE_ORIGINATOR_CANCEL: @@ -852,7 +851,7 @@ if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(nsession, sizeof(*tech_pvt)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n"); - sofia_glue_terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); goto done; } switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); @@ -867,7 +866,7 @@ if (!(gw = strchr(profile_name, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); - sofia_glue_terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; goto done; } @@ -876,7 +875,7 @@ if (!(dest = strchr(gw, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); - sofia_glue_terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; goto done; } @@ -885,7 +884,7 @@ if (!(gateway_ptr = sofia_reg_find_gateway(gw))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Gateway\n"); - sofia_glue_terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; goto done; } @@ -901,7 +900,7 @@ } else { if (!(dest = strchr(profile_name, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); - sofia_glue_terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT; goto done; } @@ -909,7 +908,7 @@ if (!(profile = sofia_glue_find_profile(profile_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile\n"); - sofia_glue_terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; goto done; } @@ -931,7 +930,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; - sofia_glue_terminate_session(&nsession, cause, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); goto done; } } else if (!strchr(dest, '@')) { @@ -943,7 +942,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name); cause = SWITCH_CAUSE_NO_ROUTE_DESTINATION; - sofia_glue_terminate_session(&nsession, cause, __FILE__, __LINE__); + switch_core_session_destroy(&nsession); goto done; } } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Apr 17 14:53:18 2007 @@ -343,8 +343,6 @@ void sofia_glue_attach_private(switch_core_session_t *session, sofia_profile_t *profile, private_object_t *tech_pvt, const char *channame); -void sofia_glue_terminate_session(switch_core_session_t **session, switch_call_cause_t cause, const char *file, int line); - switch_status_t sofia_glue_tech_choose_port(private_object_t *tech_pvt); switch_status_t sofia_glue_do_invite(switch_core_session_t *session); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Apr 17 14:53:18 2007 @@ -180,18 +180,8 @@ done: if (session) { - if (tech_pvt->hangup_status) { - if (!switch_core_session_running(session)) { - switch_core_session_rwunlock(session); - switch_core_session_destroy(&session); - } else { - switch_channel_hangup(channel, sofia_glue_sip_cause_to_freeswitch(tech_pvt->hangup_status)); - switch_core_session_rwunlock(session); - } - tech_pvt->hangup_status = 0; - } else { - switch_core_session_rwunlock(session); - } + switch_core_session_rwunlock(session); + } } @@ -919,7 +909,7 @@ if (sofia_glue_tech_media(tech_pvt, (char *) r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } } goto done; @@ -941,9 +931,9 @@ if (r_sdp) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOMEDIA"); - switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); - switch_core_session_thread_launch(session); + switch_channel_set_state(channel, CS_INIT); + //switch_core_session_thread_launch(session); goto done; } else { sdp_parser_t *parser; @@ -963,10 +953,9 @@ nua_handle_t *bnh; sip_replaces_t *replaces; switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED"); - switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); - - switch_core_session_thread_launch(session); + switch_channel_set_state(channel, CS_INIT); + //switch_core_session_thread_launch(session); if (replaces_str && (replaces = sip_replaces_make(tech_pvt->sofia_private->home, replaces_str)) && (bnh = nua_handle_by_replaces(nua, replaces))) { @@ -1000,6 +989,7 @@ switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } } else { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { @@ -1131,6 +1121,7 @@ switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } } @@ -1148,7 +1139,7 @@ } else { snprintf(st, sizeof(st), "%d", status); switch_channel_set_variable(channel, "sip_term_status", st); - tech_pvt->hangup_status = status; + switch_channel_hangup(channel, sofia_glue_sip_cause_to_freeswitch(status)); } } @@ -1600,7 +1591,7 @@ if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); - sofia_glue_terminate_session(&session, SWITCH_CAUSE_SWITCH_CONGESTION, __FILE__, __LINE__); + switch_core_session_destroy(&session); return; } switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); @@ -1757,6 +1748,7 @@ switch_copy_string(tech_pvt->sofia_private->uuid, switch_core_session_get_uuid(session), sizeof(tech_pvt->sofia_private->uuid)); nua_handle_bind(nh, tech_pvt->sofia_private); tech_pvt->nh = nh; + switch_core_session_thread_launch(session); } void sofia_handle_sip_i_options(int status, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Apr 17 14:53:18 2007 @@ -236,30 +236,6 @@ } -void sofia_glue_terminate_session(switch_core_session_t **session, switch_call_cause_t cause, const char *file, int line) -{ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Term called from %s line: %d\n", file, line); - if (*session) { - switch_channel_t *channel = switch_core_session_get_channel(*session); - struct private_object *tech_pvt = NULL; - unsigned running = switch_core_session_running(*session); - tech_pvt = switch_core_session_get_private(*session); - - if (running) { - switch_channel_hangup(channel, cause); - } else { - if (tech_pvt) { - sofia_on_hangup(*session); - } - if (session && *session) { - switch_core_session_destroy(session); - } - } - } -} - - - switch_status_t sofia_glue_ext_address_lookup(char **ip, switch_port_t *port, char *sourceip, switch_memory_pool_t *pool) { char *error; @@ -759,7 +735,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP REPORTS ERROR: [%s]\n", err); - sofia_glue_terminate_session(&tech_pvt->session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_clear_flag_locked(tech_pvt, TFLAG_IO); return SWITCH_STATUS_FALSE; } @@ -1037,7 +1013,7 @@ return SWITCH_CAUSE_INVALID_NUMBER_FORMAT; case 488: case 606: - return SWITCH_CAUSE_BEARERCAPABILITY_NOTIMPL; + return SWITCH_CAUSE_INCOMPATIBLE_DESTINATION; case 502: return SWITCH_CAUSE_NETWORK_OUT_OF_ORDER; case 405:

1 0

[commit] r4966 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 17 Apr '07

17 Apr '07

Author: brian Date: Tue Apr 17 12:04:14 2007 New Revision: 4966 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: update Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Apr 17 12:04:14 2007 @@ -1 +1 @@ -Sat Feb 17 01:18:56 EST 2007 +Tue Apr 17 11:04:59 CDT 2007

1 0

[commit] r4965 - in freeswitch/trunk/src: . include mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 17 Apr '07

17 Apr '07

Author: anthm Date: Tue Apr 17 11:58:52 2007 New Revision: 4965 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_xml.c Log: update Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Tue Apr 17 11:58:52 2007 @@ -117,6 +117,8 @@ ///\return a formated xml node or NULL SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file); +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file_simple(const char *file); + ///\brief Wrapper for switch_xml_parse_str() that accepts a file stream. Reads the entire ///\ stream into memory and then parses it. For xml files, use switch_xml_parse_file() ///\ or switch_xml_parse_fd() Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Tue Apr 17 11:58:52 2007 @@ -316,7 +316,7 @@ if (!switch_strlen_zero(alt_path)) { switch_xml_t conf = NULL, tag = NULL; - if (!(alt_root = switch_xml_parse_file(alt_path))) { + if (!(alt_root = switch_xml_parse_file_simple(alt_path))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of [%s] failed\n", alt_path); goto done; } Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Tue Apr 17 11:58:52 2007 @@ -1032,7 +1032,26 @@ return write_fd; } -// a wrapper for switch_xml_parse_fd that accepts a file name +SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file_simple(const char *file) +{ + int fd = -1; + struct stat st; + switch_size_t l; + void *m; + switch_xml_root_t root; + + if ((fd = open(file, O_RDONLY, 0)) > -1) { + fstat(fd, &st); + l = read(fd, m = malloc(st.st_size), st.st_size); + root = (switch_xml_root_t) switch_xml_parse_str(m, l); + root->dynamic = 1; + close(fd); + return &root->xml; + } + + return NULL; +} + SWITCH_DECLARE(switch_xml_t) switch_xml_parse_file(const char *file) { int fd = -1, write_fd = -1; @@ -1045,7 +1064,7 @@ } else { abs = file; } - + if (!(new_file = switch_mprintf("%s%s%s.fsxml", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, abs))) { return NULL; }

1 0

[commit] r4964 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Apr '07

17 Apr '07

Author: anthm Date: Tue Apr 17 10:44:22 2007 New Revision: 4964 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: cleanup 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 Tue Apr 17 10:44:22 2007 @@ -91,6 +91,7 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { if (sofia_glue_do_invite(session) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_FALSE; } } @@ -296,6 +297,7 @@ } if ((status = sofia_glue_tech_choose_port(tech_pvt)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return status; } @@ -609,6 +611,7 @@ if (!switch_rtp_ready(tech_pvt->rtp_session)) { sofia_glue_tech_prepare_codecs(tech_pvt); if ((status = sofia_glue_tech_choose_port(tech_pvt)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return status; } } @@ -708,6 +711,7 @@ } if ((status = sofia_glue_tech_choose_port(tech_pvt)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return status; } sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Apr 17 10:44:22 2007 @@ -306,7 +306,6 @@ if (tech_pvt->profile->extrtpip) { if (sofia_glue_ext_address_lookup(&ip, &sdp_port, tech_pvt->profile->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { - sofia_glue_terminate_session(&tech_pvt->session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __FILE__, __LINE__); return SWITCH_STATUS_FALSE; } }

1 0