2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the Sofia-SIP package
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Nokia Corporation.
|
|
|
|
*
|
|
|
|
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2.1 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**@CFILE nua_event_server.c
|
|
|
|
* @brief Easy event server
|
|
|
|
*
|
|
|
|
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* @date Created: Wed Mar 8 11:48:49 EET 2006 ppessi
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <limits.h>
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include <sofia-sip/string0.h>
|
|
|
|
|
|
|
|
#include <sofia-sip/sip_protos.h>
|
|
|
|
#include <sofia-sip/sip_status.h>
|
|
|
|
#include <sofia-sip/su_tagarg.h>
|
|
|
|
|
|
|
|
#define NEA_SMAGIC_T struct nua_handle_s
|
|
|
|
#define NEA_EMAGIC_T struct nua_handle_s
|
|
|
|
|
|
|
|
#include "nua_stack.h"
|
|
|
|
|
|
|
|
/* ======================================================================== */
|
|
|
|
/* Event server */
|
|
|
|
|
|
|
|
static
|
2008-12-16 18:05:22 +00:00
|
|
|
nea_event_t *nh_notifier_event(nua_handle_t *nh,
|
|
|
|
su_home_t *home,
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_event_t const *event,
|
|
|
|
tagi_t const *tags);
|
|
|
|
|
|
|
|
static
|
|
|
|
void authorize_watcher(nea_server_t *nes,
|
|
|
|
nua_handle_t *nh,
|
|
|
|
nea_event_t *ev,
|
|
|
|
nea_subnode_t *sn,
|
|
|
|
sip_t const *sip);
|
|
|
|
|
|
|
|
void
|
|
|
|
nua_stack_notifier(nua_t *nua, nua_handle_t *nh, nua_event_t e, tagi_t const *tags)
|
|
|
|
{
|
|
|
|
su_home_t home[1] = { SU_HOME_INIT(home) };
|
|
|
|
sip_event_t const *event = NULL;
|
|
|
|
sip_content_type_t const *ct = NULL;
|
|
|
|
sip_payload_t const *pl = NULL;
|
|
|
|
url_string_t const *url = NULL;
|
|
|
|
char const *event_s = NULL, *ct_s = NULL, *pl_s = NULL;
|
|
|
|
nea_event_t *ev;
|
|
|
|
int status = 900;
|
|
|
|
char const *phrase = nua_internal_error;
|
|
|
|
|
Sync to current darcs tree:
Mon Sep 17 14:50:04 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/sip_util.h: updated documentation
Mon Sep 17 14:50:18 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: updated documentation
Mon Sep 17 14:50:28 EDT 2007 Pekka.Pessi@nokia.com
* soa_tag.c: updated documentation
Wed Sep 19 12:50:01 EDT 2007 Pekka.Pessi@nokia.com
* msg: updated documentation
Wed Sep 19 13:29:50 EDT 2007 Pekka.Pessi@nokia.com
* url: updated documentation
Wed Sep 19 13:32:14 EDT 2007 Pekka.Pessi@nokia.com
* nth: updated documentation
Wed Sep 19 13:32:27 EDT 2007 Pekka.Pessi@nokia.com
* nea: updated documentation
Wed Sep 19 13:33:36 EDT 2007 Pekka.Pessi@nokia.com
* http: updated documentation
Wed Sep 19 13:36:58 EDT 2007 Pekka.Pessi@nokia.com
* bnf: updated documentation
Wed Sep 19 13:38:58 EDT 2007 Pekka.Pessi@nokia.com
* nua: updated nua_stack_init_handle() prototype
Wed Sep 19 18:45:56 EDT 2007 Pekka.Pessi@nokia.com
* sip: added sip_name_addr_xtra(), sip_name_addr_dup()
Wed Sep 19 19:00:19 EDT 2007 Pekka.Pessi@nokia.com
* sip_basic.c: cleaned old crud
Thu Sep 20 13:34:04 EDT 2007 Pekka.Pessi@nokia.com
* iptsec: updated documentation
Thu Sep 20 13:36:22 EDT 2007 Pekka.Pessi@nokia.com
* tport: updated documentation
Thu Sep 20 13:36:56 EDT 2007 Pekka.Pessi@nokia.com
* su: updated documentation
Removed internal files from doxygen-generated documentation.
Thu Sep 20 13:38:29 EDT 2007 Pekka.Pessi@nokia.com
* soa: fixed documentation
Thu Sep 20 13:39:56 EDT 2007 Pekka.Pessi@nokia.com
* sdp: updated documentation
Thu Sep 20 13:40:16 EDT 2007 Pekka.Pessi@nokia.com
* ipt: updated documentation
Thu Sep 20 14:24:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: updated documentation
Thu Sep 20 14:41:04 EDT 2007 Pekka.Pessi@nokia.com
* nua: updated documentation
Updated tag documentation.
Moved doxygen doc entries from sofia-sip/nua_tag.h to nua_tag.c.
Removed internal datatypes and files from the generated documents.
Wed Sep 19 13:34:20 EDT 2007 Pekka.Pessi@nokia.com
* docs: updated the generation of documentation. Updated links to header files.
Thu Sep 20 08:45:32 EDT 2007 Pekka.Pessi@nokia.com
* sip/Makefile.am: added tags to <sofia-sip/sip_extra.h>
Added check for extra tags in torture_sip.c.
Thu Sep 20 14:45:22 EDT 2007 Pekka.Pessi@nokia.com
* stun: updated documentation
Wed Jul 4 18:55:20 EDT 2007 Pekka.Pessi@nokia.com
* torture_heap.c: added tests for ##sort() and su_smoothsort()
Wed Jul 4 18:56:59 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: added smoothsort.c
Fri Jul 13 12:38:44 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/heap.h: heap_remove() now set()s index to 0 on removed item
Mon Jul 23 11:14:22 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/heap.h: fixed bug in heap##remove()
If left kid was in heap but right was not, left kid was ignored.
Wed Jul 4 18:51:08 EDT 2007 Pekka.Pessi@nokia.com
* smoothsort.c: added
Wed Jul 4 18:51:34 EDT 2007 Pekka.Pessi@nokia.com
* heap.h: using su_smoothsort()
Fri Jul 6 10:20:27 EDT 2007 Pekka.Pessi@nokia.com
* smoothsort.c: added
Wed Sep 19 17:40:30 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.awk: generate two parser tables, default and extended
Wed Sep 19 18:39:45 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.awk: just generate list of extra headers
Allocate extended parser dynamically.
Wed Sep 19 18:59:59 EDT 2007 Pekka.Pessi@nokia.com
* sip: added Remote-Party-ID, P-Asserted-Identity, P-Preferred-Identity
Added functions sip_update_default_mclass() and sip_extend_mclass()
for handling the extended parser. Note that Reply-To and Alert-Info are only
available with the extended parser.
Wed Sep 19 19:05:44 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated
Thu Sep 20 13:38:59 EDT 2007 Pekka.Pessi@nokia.com
* sip: updated documentation
Thu Sep 20 14:17:28 EDT 2007 Pekka.Pessi@nokia.com
* docs/conformance.docs: updated
Mon Oct 1 10:11:14 EDT 2007 Pekka.Pessi@nokia.com
* tport_tag.c: re-enabled tptag_trusted
Thu Oct 4 09:21:07 EDT 2007 Pekka.Pessi@nokia.com
* su_osx_runloop.c: moved virtual function table after struct definition
Preparing for su_port_vtable_t refactoring.
Thu Oct 4 10:22:03 EDT 2007 Pekka.Pessi@nokia.com
* su_source.c: refactored initialization/deinitialization
Fri Oct 5 04:58:18 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* sip_extra.c: fixed prototypes with isize_t
Fri Oct 5 04:58:45 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_nta_api.c: removed warnings about signedness
Fri Oct 5 04:59:02 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_nua_params.c: removed warnings about constness
Fri Oct 5 07:20:26 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* su_port.h, su_root.c: cleaned argument checking
The su_root_*() and su_port_*() functions now check their arguments once
and do not assert() with NULL arguments. The sur_task->sut_port should
always be valid while su_root_t is alive.
Fri Oct 5 07:22:09 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* su: added su_root_obtain(), su_root_release() and su_root_has_thread()
When root is created with su_root_create() or cloned with su_clone_start(),
the resulting root is obtained by the calling or created thread,
respectively.
The root can be released with su_root_release() and another thread can
obtain it.
The function su_root_has_thread() can be used to check if a thread has
obtained or released the root.
Implementation upgraded the su_port_own_thread() method as su_port_thread().
Fri Oct 5 07:28:10 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* su_port.h: removed su_port_threadsafe() and su_port_yield() methods
su_port_wait_events() replaces su_port_yield().
Fri Oct 5 13:26:04 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* msg_parser.awk: not extending header structure unless needed.
Removed gawk-ish /* comments */.
Fri Oct 5 14:32:25 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* run_test_su: removed GNUisms
Fri Oct 5 14:32:47 EDT 2007 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: removed implicit check target test_urlmap
Fri Oct 5 14:22:32 EDT 2007 Pekka Pessi <first.lastname@nokia.com>
* torture_sresolv.c: use CLOCK_REALTIME if no CLOCK_PROCESS_CPUTIME_ID available
Casting timespec tv_sec to unsigned long.
Fri Oct * nua_s added handling nua_prack()
Thanks to Fabio Margarido for the patch.
Mon Oct 8 10:24:35 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1803686
Mon Oct 8 08:15:23 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Mon Oct 8 09:30:36 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack: added handling nua_prack()
Thanks to Fabio Margarido for the patch.
Mon Oct 8 10:24:35 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1803686
Mon Oct 8 10:26:31 EDT 2007 Pekka.Pessi@nokia.com
* nua: added test for nua_prack() (sf.net bug #1804248)
Avoid sending nua_i_state after nua_prack() if no SDP O/A is happening, too.
Mon Oct 8 10:32:04 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* su_source.c: don t leak the wait arrays
Mon Oct 8 10:37:11 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated
Wed Oct 10 11:55:21 EDT 2007 Pekka.Pessi@nokia.com
* sip_parser.c: silenced warning about extra const in sip_extend_mclass()
Wed Oct 10 11:57:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_tag.c: updated tag documentation
Wed Oct 10 13:16:40 EDT 2007 Pekka.Pessi@nokia.com
* nua: fix logging crash if outbound used with application contact
Silenced warnings.
Wed Oct 10 13:30:45 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.awk: removed extra "const"
Wed Oct 10 13:31:45 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am's: fixed distclean of documentation
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5840 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-10-11 14:16:59 +00:00
|
|
|
nua_stack_init_handle(nua, nh, tags);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
tl_gets(tags,
|
|
|
|
NUTAG_URL_REF(url),
|
2006-12-21 06:30:28 +00:00
|
|
|
SIPTAG_EVENT_REF(event),
|
|
|
|
SIPTAG_EVENT_STR_REF(event_s),
|
|
|
|
SIPTAG_CONTENT_TYPE_STR_REF(ct_s),
|
|
|
|
SIPTAG_PAYLOAD_REF(pl),
|
|
|
|
SIPTAG_PAYLOAD_STR_REF(pl_s),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
if (!event && !event_s)
|
|
|
|
status = 400, phrase = "Missing Event";
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
else if (!ct && !ct_s)
|
2006-12-21 06:30:28 +00:00
|
|
|
status = 400, phrase = "Missing Content-Type";
|
|
|
|
|
|
|
|
else if (!nh->nh_notifier &&
|
2008-12-16 18:05:22 +00:00
|
|
|
!(nh->nh_notifier =
|
2006-12-21 06:30:28 +00:00
|
|
|
nea_server_create(nua->nua_nta, nua->nua_root,
|
|
|
|
url->us_url,
|
2008-12-16 18:05:22 +00:00
|
|
|
NH_PGET(nh, max_subscriptions),
|
2006-12-21 06:30:28 +00:00
|
|
|
NULL, nh,
|
2008-12-16 18:05:22 +00:00
|
|
|
TAG_NEXT(tags))))
|
2006-12-21 06:30:28 +00:00
|
|
|
status = 900, phrase = nua_internal_error;
|
|
|
|
|
|
|
|
else if (!event && !(event = sip_event_make(home, event_s)))
|
|
|
|
status = 900, phrase = "Could not create an event header";
|
|
|
|
|
|
|
|
else if (!(ev = nh_notifier_event(nh, home, event, tags)))
|
|
|
|
status = 900, phrase = "Could not create an event view";
|
|
|
|
|
|
|
|
else if (nea_server_update(nh->nh_notifier, ev, TAG_NEXT(tags)) < 0)
|
|
|
|
status = 900, phrase = "No content for event";
|
|
|
|
|
|
|
|
else if (nea_server_notify(nh->nh_notifier, ev) < 0)
|
|
|
|
status = 900, phrase = "Error when notifying watchers";
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
else
|
|
|
|
nua_stack_tevent(nua, nh, NULL, e, status = SIP_200_OK,
|
2007-04-15 02:03:41 +00:00
|
|
|
SIPTAG_EVENT(event),
|
|
|
|
SIPTAG_CONTENT_TYPE(ct),
|
|
|
|
TAG_END());
|
2008-12-16 18:05:22 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
if (status != 200)
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_stack_event(nua, nh, NULL, e, status, phrase, NULL);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
su_home_deinit(home);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a event view for notifier */
|
|
|
|
static
|
2008-12-16 18:05:22 +00:00
|
|
|
nea_event_t *nh_notifier_event(nua_handle_t *nh,
|
|
|
|
su_home_t *home,
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_event_t const *event,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nea_event_t *ev = nea_event_get(nh->nh_notifier, event->o_type);
|
|
|
|
sip_accept_t const *accept = NULL;
|
|
|
|
char const *accept_s = NULL;
|
|
|
|
sip_content_type_t const *ct = NULL;
|
|
|
|
char const *ct_s = NULL;
|
|
|
|
|
|
|
|
if (ev == NULL) {
|
|
|
|
char *o_type = su_strdup(home, event->o_type);
|
2008-05-25 13:51:11 +00:00
|
|
|
char *o_subtype = o_type ? strchr(o_type, '.') : NULL;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (o_subtype)
|
|
|
|
*o_subtype++ = '\0';
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
tl_gets(tags,
|
2006-12-21 06:30:28 +00:00
|
|
|
SIPTAG_ACCEPT_REF(accept),
|
|
|
|
SIPTAG_ACCEPT_STR_REF(accept_s),
|
|
|
|
SIPTAG_CONTENT_TYPE_REF(ct),
|
|
|
|
SIPTAG_CONTENT_TYPE_STR_REF(ct_s),
|
|
|
|
TAG_END());
|
2008-12-16 18:05:22 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* XXX - We really should build accept header when we add new content
|
|
|
|
* types
|
|
|
|
*/
|
|
|
|
if (accept_s == NULL && accept)
|
|
|
|
accept_s = sip_header_as_string(home, (sip_header_t *)accept);
|
|
|
|
if (accept_s == NULL && ct)
|
|
|
|
accept_s = ct->c_type;
|
|
|
|
if (accept_s == NULL && ct_s)
|
|
|
|
accept_s = ct_s;
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
ev = nea_event_create(nh->nh_notifier,
|
2006-12-21 06:30:28 +00:00
|
|
|
authorize_watcher, nh,
|
|
|
|
o_type, o_subtype,
|
|
|
|
ct ? ct->c_type : ct_s,
|
|
|
|
accept_s);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ev;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Callback from nea_server asking nua to authorize subscription */
|
|
|
|
static
|
|
|
|
void authorize_watcher(nea_server_t *nes,
|
|
|
|
nua_handle_t *nh,
|
|
|
|
nea_event_t *ev,
|
|
|
|
nea_subnode_t *sn,
|
|
|
|
sip_t const *sip)
|
|
|
|
{
|
|
|
|
nua_t *nua = nh->nh_nua;
|
|
|
|
msg_t *msg = NULL;
|
|
|
|
nta_incoming_t *irq = NULL;
|
|
|
|
int substate = sn->sn_state;
|
|
|
|
int status; char const *phrase;
|
|
|
|
|
|
|
|
SET_STATUS1(SIP_200_OK);
|
|
|
|
|
|
|
|
/* OK. In nhp (nua_handle_preferences_t) structure we have the
|
|
|
|
current default action (or state) for incoming
|
2008-12-16 18:05:22 +00:00
|
|
|
subscriptions.
|
|
|
|
Action can now be modified by the application with NUTAG_SUBSTATE().
|
2006-12-21 06:30:28 +00:00
|
|
|
*/
|
|
|
|
irq = nea_sub_get_request(sn->sn_subscriber);
|
|
|
|
msg = nta_incoming_getrequest(irq);
|
|
|
|
|
|
|
|
if (sn->sn_state == nea_embryonic) {
|
|
|
|
char const *what;
|
|
|
|
|
|
|
|
substate = NH_PGET(nh, substate);
|
|
|
|
|
|
|
|
if (substate == nua_substate_embryonic)
|
|
|
|
substate = nua_substate_pending;
|
|
|
|
|
|
|
|
if (substate == nua_substate_terminated) {
|
|
|
|
what = "rejected"; SET_STATUS1(SIP_403_FORBIDDEN);
|
|
|
|
}
|
|
|
|
else if (substate == nua_substate_pending) {
|
|
|
|
what = "pending"; SET_STATUS1(SIP_202_ACCEPTED);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
what = "active";
|
|
|
|
}
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
SU_DEBUG_7(("nua(%p): authorize_watcher: %s\n", (void *)nh, what));
|
2006-12-21 06:30:28 +00:00
|
|
|
nea_sub_auth(sn->sn_subscriber, substate,
|
|
|
|
TAG_IF(substate == nua_substate_pending,
|
|
|
|
NEATAG_FAKE(1)),
|
|
|
|
TAG_IF(substate == nua_substate_terminated,
|
|
|
|
NEATAG_REASON("rejected")),
|
|
|
|
TAG_END());
|
|
|
|
}
|
|
|
|
else if (sn->sn_state == nea_terminated || sn->sn_expires == 0) {
|
|
|
|
substate = nua_substate_terminated;
|
|
|
|
nea_server_flush(nes, NULL);
|
2008-12-16 18:05:22 +00:00
|
|
|
SU_DEBUG_7(("nua(%p): authorize_watcher: %s\n",
|
|
|
|
(void *)nh, "watcher is removed"));
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_stack_tevent(nua, nh, msg, nua_i_subscription, status, phrase,
|
|
|
|
NUTAG_SUBSTATE(substate),
|
|
|
|
NEATAG_SUB(sn->sn_subscriber),
|
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Authorization of watchers by application */
|
|
|
|
|
|
|
|
void nua_stack_authorize(nua_t *nua,
|
|
|
|
nua_handle_t *nh,
|
|
|
|
nua_event_t e,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nea_sub_t *sub = NULL;
|
|
|
|
int state = nea_extended;
|
|
|
|
|
|
|
|
tl_gets(tags,
|
|
|
|
NEATAG_SUB_REF(sub),
|
|
|
|
NUTAG_SUBSTATE_REF(state),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
if (sub && state > 0) {
|
|
|
|
nea_sub_auth(sub, state, TAG_NEXT(tags));
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_stack_event(nua, nh, NULL, e, SIP_200_OK, NULL);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
else {
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
nua_stack_event(nua, nh, NULL, e, NUA_ERROR_AT(__FILE__, __LINE__), NULL);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** @internal Shutdown notifier object */
|
|
|
|
int nh_notifier_shutdown(nua_handle_t *nh,
|
|
|
|
nea_event_t *ev,
|
2008-12-16 18:05:22 +00:00
|
|
|
tag_type_t t,
|
2006-12-21 06:30:28 +00:00
|
|
|
tag_value_t v, ...)
|
|
|
|
{
|
|
|
|
nea_server_t *nes = nh->nh_notifier;
|
|
|
|
nea_subnode_t const **subs;
|
|
|
|
int busy = 0;
|
|
|
|
|
|
|
|
if (nes == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
subs = nea_server_get_subscribers(nes, ev);
|
|
|
|
|
|
|
|
if (subs) {
|
|
|
|
int i;
|
|
|
|
ta_list ta;
|
|
|
|
|
|
|
|
ta_start(ta, t, v);
|
2008-12-16 18:05:22 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
for (i = 0; subs[i]; i++)
|
|
|
|
nea_sub_auth(subs[i]->sn_subscriber, nea_terminated, ta_tags(ta));
|
2008-12-16 18:05:22 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
ta_end(ta);
|
|
|
|
|
|
|
|
busy++;
|
|
|
|
}
|
|
|
|
|
|
|
|
nea_server_free_subscribers(nes, subs);
|
2008-12-16 18:05:22 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
nea_server_flush(nh->nh_notifier, NULL);
|
|
|
|
|
|
|
|
if (ev == NULL)
|
|
|
|
nea_server_destroy(nh->nh_notifier), nh->nh_notifier = NULL;
|
|
|
|
|
|
|
|
return busy;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** @internal Terminate notifier. */
|
|
|
|
void nua_stack_terminate(nua_t *nua,
|
|
|
|
nua_handle_t *nh,
|
|
|
|
nua_event_t e,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
sip_event_t const *event = NULL;
|
|
|
|
sip_content_type_t const *ct = NULL;
|
|
|
|
sip_payload_t const *pl = NULL;
|
|
|
|
char const *event_s = NULL, *ct_s = NULL, *pl_s = NULL;
|
|
|
|
nea_event_t *nev = NULL;
|
|
|
|
|
|
|
|
if (nh->nh_notifier == NULL) {
|
|
|
|
UA_EVENT2(e, 900, "No event server to terminate");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
tl_gets(tags,
|
2006-12-21 06:30:28 +00:00
|
|
|
SIPTAG_EVENT_REF(event),
|
|
|
|
SIPTAG_EVENT_STR_REF(event_s),
|
|
|
|
SIPTAG_CONTENT_TYPE_REF(ct),
|
|
|
|
SIPTAG_CONTENT_TYPE_STR_REF(ct_s),
|
|
|
|
SIPTAG_PAYLOAD_REF(pl),
|
|
|
|
SIPTAG_PAYLOAD_STR_REF(pl_s),
|
|
|
|
TAG_END());
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
nev = nea_event_get(nh->nh_notifier,
|
2006-12-21 06:30:28 +00:00
|
|
|
event ? event->o_type : event_s);
|
|
|
|
|
|
|
|
if (nev && (pl || pl_s) && (ct || ct_s)) {
|
|
|
|
nea_server_update(nh->nh_notifier, nev, TAG_NEXT(tags));
|
|
|
|
}
|
|
|
|
|
2008-12-16 18:05:22 +00:00
|
|
|
nh_notifier_shutdown(nh, NULL,
|
|
|
|
NEATAG_REASON("noresource"),
|
2006-12-21 06:30:28 +00:00
|
|
|
TAG_NEXT(tags));
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_stack_event(nua, nh, NULL, e, SIP_200_OK, NULL);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|