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_notifier.c
|
|
|
|
* @brief SUBSCRIBE server, NOTIFY client and REFER server
|
|
|
|
*
|
|
|
|
* Simpler event server. See nua_event_server.c for more complex event
|
|
|
|
* server.
|
|
|
|
*
|
|
|
|
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* @date Created: Wed Mar 8 15:10:08 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>
|
2007-04-15 02:03:41 +00:00
|
|
|
#include <sofia-sip/sip_extra.h>
|
2006-12-21 06:30:28 +00:00
|
|
|
#include <sofia-sip/sip_status.h>
|
|
|
|
#include <sofia-sip/sip_util.h>
|
|
|
|
#include <sofia-sip/su_uniqueid.h>
|
2007-04-15 02:03:41 +00:00
|
|
|
#include <sofia-sip/su_md5.h>
|
|
|
|
#include <sofia-sip/token64.h>
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
#include "nua_stack.h"
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Notifier event usage */
|
|
|
|
|
|
|
|
struct notifier_usage
|
|
|
|
{
|
|
|
|
enum nua_substate nu_substate; /**< Subscription state */
|
2007-04-15 02:03:41 +00:00
|
|
|
sip_time_t nu_expires; /**< Expiration time */
|
|
|
|
sip_time_t nu_requested; /**< Requested expiration time */
|
|
|
|
#if SU_HAVE_EXPERIMENTAL
|
|
|
|
char *nu_tag; /**< @ETag in last NOTIFY */
|
|
|
|
unsigned nu_etags:1; /**< Subscriber supports etags */
|
|
|
|
unsigned nu_appl_etags:1; /**< Application generates etags */
|
|
|
|
unsigned nu_no_body:1; /**< Suppress body */
|
|
|
|
#endif
|
2006-12-21 06:30:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static char const *nua_notify_usage_name(nua_dialog_usage_t const *du);
|
|
|
|
static int nua_notify_usage_add(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du);
|
|
|
|
static void nua_notify_usage_remove(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du);
|
|
|
|
static void nua_notify_usage_refresh(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du,
|
|
|
|
sip_time_t now);
|
|
|
|
static int nua_notify_usage_shutdown(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du);
|
|
|
|
|
|
|
|
static nua_usage_class const nua_notify_usage[1] = {
|
|
|
|
{
|
|
|
|
sizeof (struct notifier_usage), (sizeof nua_notify_usage),
|
|
|
|
nua_notify_usage_add,
|
|
|
|
nua_notify_usage_remove,
|
|
|
|
nua_notify_usage_name,
|
|
|
|
NULL,
|
|
|
|
nua_notify_usage_refresh,
|
|
|
|
nua_notify_usage_shutdown,
|
|
|
|
}};
|
|
|
|
|
|
|
|
static char const *nua_notify_usage_name(nua_dialog_usage_t const *du)
|
|
|
|
{
|
|
|
|
return "notify";
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int nua_notify_usage_add(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du)
|
|
|
|
{
|
|
|
|
ds->ds_has_events++;
|
|
|
|
ds->ds_has_notifys++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
void nua_notify_usage_remove(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du)
|
|
|
|
{
|
|
|
|
ds->ds_has_events--;
|
|
|
|
ds->ds_has_notifys--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ====================================================================== */
|
|
|
|
/* SUBSCRIBE server */
|
|
|
|
|
|
|
|
/** @NUA_EVENT nua_i_subscribe
|
|
|
|
*
|
|
|
|
* Incoming @b SUBSCRIBE request.
|
|
|
|
*
|
|
|
|
* @b SUBSCRIBE request is used to query SIP event state or establish a SIP
|
|
|
|
* event subscription.
|
|
|
|
*
|
|
|
|
* Initial SUBSCRIBE requests are dropped with <i>489 Bad Event</i>
|
|
|
|
* response, unless the application has explicitly included the @Event in
|
|
|
|
* the list of allowed events with nua_set_params() tag NUTAG_ALLOW_EVENTS()
|
|
|
|
* (or SIPTAG_ALLOW_EVENTS() or SIPTAG_ALLOW_EVENTS_STR()). The application
|
|
|
|
* can decide whether to accept the SUBSCRIBE request or reject it. The
|
|
|
|
* nua_response() call responding to a SUBSCRIBE request must have
|
2007-04-15 02:03:41 +00:00
|
|
|
* NUTAG_WITH() (or NUTAG_WITH_THIS()/NUTAG_WITH_SAVED()) tag.
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* If the application accepts the SUBSCRIBE request, it must immediately
|
|
|
|
* send an initial NOTIFY establishing the dialog. This is because the
|
|
|
|
* response to the SUBSCRIBE request may be lost because the SUBSCRIBE
|
|
|
|
* request was forked by an intermediate proxy.
|
|
|
|
*
|
|
|
|
* SUBSCRIBE requests modifying (usually refreshing or terminating) an
|
|
|
|
* existing event subscription are accepted by default and a <i>200 OK</i>
|
|
|
|
* response along with a copy of previously sent NOTIFY is sent
|
|
|
|
* automatically.
|
|
|
|
*
|
|
|
|
* By default, only event subscriptions accepted are those created
|
|
|
|
* implicitly by REFER request. See #nua_i_refer how the application must
|
|
|
|
* handle the REFER requests.
|
|
|
|
*
|
|
|
|
* @param status status code of response sent automatically by stack
|
|
|
|
* @param phrase response phrase sent automatically by stack
|
|
|
|
* @param nh operation handle associated with the incoming request
|
|
|
|
* @param hmagic application context associated with the handle
|
|
|
|
* (NULL when handle is created by the stack)
|
|
|
|
* @param sip SUBSCRIBE request headers
|
|
|
|
* @param tags NUTAG_SUBSTATE()
|
|
|
|
*
|
|
|
|
* @sa @RFC3265, nua_notify(), NUTAG_SUBSTATE(), @SubscriptionState,
|
|
|
|
* @Event, nua_subscribe(), #nua_r_subscribe, #nua_i_refer, nua_refer()
|
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_subscribe_server_init(nua_server_request_t *sr);
|
|
|
|
static int nua_subscribe_server_preprocess(nua_server_request_t *sr);
|
|
|
|
static int nua_subscribe_server_respond(nua_server_request_t*, tagi_t const *);
|
|
|
|
static int nua_subscribe_server_report(nua_server_request_t*, tagi_t const *);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_server_methods_t const nua_subscribe_server_methods =
|
|
|
|
{
|
|
|
|
SIP_METHOD_SUBSCRIBE,
|
|
|
|
nua_i_subscribe, /* Event */
|
|
|
|
{
|
|
|
|
1, /* Create dialog */
|
|
|
|
0, /* Initial request */
|
|
|
|
1, /* Target refresh request */
|
|
|
|
1, /* Add Contact */
|
|
|
|
},
|
|
|
|
nua_subscribe_server_init,
|
|
|
|
nua_subscribe_server_preprocess,
|
|
|
|
nua_base_server_params,
|
|
|
|
nua_subscribe_server_respond,
|
|
|
|
nua_subscribe_server_report,
|
|
|
|
};
|
|
|
|
|
|
|
|
int nua_subscribe_server_init(nua_server_request_t *sr)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
nua_dialog_state_t *ds = nh->nh_ds;
|
|
|
|
sip_allow_events_t const *allow_events = NH_PGET(nh, allow_events);
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_event_t *o = sip->sip_event;
|
|
|
|
char const *event = o ? o->o_type : NULL;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (sr->sr_initial || !nua_dialog_usage_get(ds, nua_notify_usage, o)) {
|
|
|
|
if (event && str0cmp(event, "refer") == 0)
|
|
|
|
/* refer event subscription should be initiated with REFER */
|
|
|
|
return SR_STATUS1(sr, SIP_403_FORBIDDEN);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
/* XXX - event is case-sensitive, should use msg_header_find_item() */
|
|
|
|
if (!event || !msg_header_find_param(allow_events->k_common, event))
|
|
|
|
return SR_STATUS1(sr, SIP_489_BAD_EVENT);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
int nua_subscribe_server_preprocess(nua_server_request_t *sr)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
nua_dialog_state_t *ds = nh->nh_ds;
|
|
|
|
nua_dialog_usage_t *du;
|
|
|
|
struct notifier_usage *nu;
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
sip_event_t *o = sip->sip_event;
|
|
|
|
char const *event = o ? o->o_type : NULL;
|
|
|
|
/* Maximum expiration time */
|
|
|
|
unsigned long expires = 3600;
|
|
|
|
|
|
|
|
assert(nh && nh->nh_nua->nua_dhandle != nh);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
du = nua_dialog_usage_get(ds, nua_notify_usage, o);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (du == NULL) {
|
|
|
|
/* Create a new subscription */
|
|
|
|
du = nua_dialog_usage_add(nh, ds, nua_notify_usage, o);
|
|
|
|
if (du == NULL)
|
|
|
|
return SR_STATUS1(sr, SIP_500_INTERNAL_SERVER_ERROR);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Refresh existing subscription */
|
2007-04-15 02:03:41 +00:00
|
|
|
if (str0cmp(event, "refer") == 0)
|
|
|
|
expires = NH_PGET(nh, refer_expires);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
SR_STATUS1(sr, SIP_200_OK);
|
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nu = nua_dialog_usage_private(du);
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (sip->sip_expires && sip->sip_expires->ex_delta < expires)
|
|
|
|
expires = sip->sip_expires->ex_delta;
|
|
|
|
nu->nu_requested = sip_now() + expires;
|
|
|
|
|
|
|
|
#if SU_HAVE_EXPERIMENTAL
|
|
|
|
nu->nu_etags =
|
|
|
|
sip_suppress_body_if_match(sip) ||
|
|
|
|
sip_suppress_notify_if_match(sip) ||
|
|
|
|
sip_has_feature(sr->sr_request.sip->sip_supported, "etags");
|
|
|
|
#endif
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
sr->sr_usage = du;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return sr->sr_status <= 100 ? 0 : sr->sr_status;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
/** @internal Respond to a SUBSCRIBE request.
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
static
|
2007-04-15 02:03:41 +00:00
|
|
|
int nua_subscribe_server_respond(nua_server_request_t *sr, tagi_t const *tags)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(sr->sr_usage);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
msg_t *msg = sr->sr_response.msg;
|
|
|
|
sip_t *sip = sr->sr_response.sip;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (200 <= sr->sr_status && sr->sr_status < 300) {
|
|
|
|
sip_expires_t ex[1];
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
sip_expires_init(ex);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu) {
|
|
|
|
sip_time_t now = sip_now();
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu->nu_requested) {
|
|
|
|
if (nu->nu_requested > nu->nu_expires)
|
|
|
|
nu->nu_expires = nu->nu_requested;
|
|
|
|
else if (nu->nu_expires <= now || nu->nu_requested <= now)
|
|
|
|
nu->nu_substate = nua_substate_terminated;
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu->nu_expires > now)
|
|
|
|
ex->ex_delta = nu->nu_expires - now;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Add header Expires: 0 */
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!sip->sip_expires || sip->sip_expires->ex_delta > ex->ex_delta)
|
|
|
|
sip_add_dup(msg, sip, (sip_header_t *)ex);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
return nua_base_server_respond(sr, tags);
|
2007-02-07 21:59:38 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static
|
|
|
|
int nua_subscribe_server_report(nua_server_request_t *sr, tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
nua_dialog_state_t *ds = nh->nh_ds;
|
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(sr->sr_usage);
|
|
|
|
enum nua_substate substate = nua_substate_terminated;
|
|
|
|
int notify = 0;
|
|
|
|
int retval;
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu && !sr->sr_terminating) {
|
|
|
|
substate = nu->nu_substate;
|
|
|
|
}
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
/* nu_requested is set by SUBSCRIBE and cleared when NOTIFY is sent */
|
|
|
|
if (nu && nu->nu_requested && substate != nua_substate_embryonic) {
|
|
|
|
#if SU_HAVE_EXPERIMENTAL
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
sip_suppress_notify_if_match_t *snim = sip_suppress_notify_if_match(sip);
|
|
|
|
sip_suppress_body_if_match_t *sbim = sip_suppress_body_if_match(sip);
|
|
|
|
|
|
|
|
if (!nu->nu_tag)
|
|
|
|
notify = 1;
|
|
|
|
else if (snim && !strcasecmp(snim->snim_tag, nu->nu_tag))
|
|
|
|
notify = 0;
|
|
|
|
else if (sbim && !strcasecmp(snim->snim_tag, nu->nu_tag))
|
|
|
|
notify = 1, nu->nu_no_body = 1;
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
notify = 1;
|
|
|
|
}
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
retval = nua_base_server_treport(sr, NUTAG_SUBSTATE(substate), TAG_END());
|
|
|
|
|
|
|
|
if (retval >= 2 || nu == NULL)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
if (notify) {
|
|
|
|
/* Send NOTIFY (and terminate subscription, when needed) */
|
|
|
|
nua_dialog_usage_refresh(nh, ds, sr->sr_usage, sip_now());
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ======================================================================== */
|
|
|
|
/* NOTIFY client */
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
/**@fn void nua_notify(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...);
|
|
|
|
*
|
|
|
|
* Send a SIP NOTIFY request message.
|
|
|
|
*
|
|
|
|
* This function is used when the application implements itself the
|
|
|
|
* notifier. The application must provide valid @SubscriptionState and
|
|
|
|
* @Event headers using SIP tags. If there is no @SubscriptionState header,
|
|
|
|
* the subscription state can be modified with NUTAG_SUBSTATE().
|
|
|
|
*
|
|
|
|
* @bug If the @Event is not given by application, stack uses the @Event
|
|
|
|
* header from the first subscription usage on handle.
|
|
|
|
*
|
|
|
|
* @param nh Pointer to operation handle
|
|
|
|
* @param tag, value, ... List of tagged parameters
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* nothing
|
|
|
|
*
|
|
|
|
* @par Related Tags:
|
|
|
|
* NUTAG_SUBSTATE() \n
|
|
|
|
* Tags of nua_set_hparams() \n
|
2007-08-06 19:24:10 +00:00
|
|
|
* Header tags defined in <sofia-sip/sip_tag.h>
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* @par Events:
|
|
|
|
* #nua_r_notify
|
|
|
|
*
|
|
|
|
* @sa @RFC3265, #nua_i_subscribe, #nua_i_refer, NUTAG_ALLOW_EVENTS()
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_notify_client_init(nua_client_request_t *cr,
|
|
|
|
msg_t *, sip_t *,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_notify_client_init_etag(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_notify_client_request(nua_client_request_t *cr,
|
|
|
|
msg_t *, sip_t *,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_notify_client_report(nua_client_request_t *cr,
|
|
|
|
int status, char const *phrase,
|
|
|
|
sip_t const *sip,
|
|
|
|
nta_outgoing_t *orq,
|
|
|
|
tagi_t const *tags);
|
|
|
|
|
|
|
|
static nua_client_methods_t const nua_notify_client_methods = {
|
|
|
|
SIP_METHOD_NOTIFY,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
/* create_dialog */ 1,
|
|
|
|
/* in_dialog */ 1,
|
|
|
|
/* target refresh */ 1
|
|
|
|
},
|
|
|
|
/* nua_notify_client_template */ NULL,
|
|
|
|
nua_notify_client_init,
|
|
|
|
nua_notify_client_request,
|
|
|
|
/* nua_notify_client_check_restart */ NULL,
|
|
|
|
/* nua_notify_client_response */ NULL,
|
|
|
|
/* nua_notify_client_preliminary */ NULL,
|
|
|
|
nua_notify_client_report
|
|
|
|
};
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
/**@internal Send NOTIFY. */
|
|
|
|
int nua_stack_notify(nua_t *nua,
|
|
|
|
nua_handle_t *nh,
|
|
|
|
nua_event_t e,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
return nua_client_create(nh, e, &nua_notify_client_methods, tags);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_notify_client_init(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
|
|
|
nua_dialog_usage_t *du;
|
2006-12-21 06:30:28 +00:00
|
|
|
struct notifier_usage *nu;
|
2007-04-15 02:03:41 +00:00
|
|
|
sip_event_t const *o = sip->sip_event;
|
|
|
|
sip_subscription_state_t *ss = sip->sip_subscription_state;
|
|
|
|
sip_time_t now = sip_now();
|
|
|
|
|
|
|
|
if (o == NULL && nh->nh_ds->ds_has_notifys == 1)
|
2007-02-17 06:25:21 +00:00
|
|
|
o = NONE;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-02-17 06:25:21 +00:00
|
|
|
du = nua_dialog_usage_get(nh->nh_ds, nua_notify_usage, o);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!du) {
|
|
|
|
tagi_t const *newsub = tl_find_last(tags, nutag_newsub);
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!newsub || !newsub->t_value)
|
|
|
|
return 0; /* Rejected eventually by nua_notify_client_request() */
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
/* Create new notifier */
|
|
|
|
du = nua_dialog_usage_add(nh, nh->nh_ds, nua_notify_usage, o);
|
|
|
|
if (du == NULL)
|
|
|
|
return -1;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nu = nua_dialog_usage_private(du);
|
|
|
|
nu->nu_expires = now;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
nu = nua_dialog_usage_private(du);
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu->nu_substate == nua_substate_terminated) {
|
|
|
|
/*Xyzzy*/;
|
|
|
|
}
|
|
|
|
else if (ss != NULL) {
|
|
|
|
/* SIPTAG_SUBSCRIPTION_STATE() overrides NUTAG_SUBSTATE() */
|
|
|
|
nu->nu_substate = nua_substate_make(ss->ss_substate);
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (ss->ss_expires) {
|
|
|
|
unsigned long expires = strtoul(ss->ss_expires, NULL, 10);
|
|
|
|
if (now + expires < now)
|
|
|
|
expires = SIP_TIME_MAX - now - 1;
|
|
|
|
|
|
|
|
/* Notifier can only shorten the subscription time */
|
|
|
|
if (nu->nu_requested == 0 || nu->nu_requested >= now + expires)
|
|
|
|
nu->nu_expires = nu->nu_requested = now + expires;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2007-04-15 02:03:41 +00:00
|
|
|
enum nua_substate substate = nu->nu_substate;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu->nu_expires > now) {
|
2006-12-21 06:30:28 +00:00
|
|
|
tagi_t const *t = tl_find_last(tags, nutag_substate);
|
|
|
|
if (t)
|
2007-04-15 02:03:41 +00:00
|
|
|
substate = (enum nua_substate)t->t_value;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
else
|
|
|
|
substate = nua_substate_terminated;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
switch (substate) {
|
|
|
|
case nua_substate_embryonic:
|
|
|
|
/*FALLTHROUGH*/
|
|
|
|
case nua_substate_pending:
|
|
|
|
nu->nu_substate = nua_substate_pending;
|
|
|
|
break;
|
|
|
|
case nua_substate_active:
|
|
|
|
default:
|
|
|
|
nu->nu_substate = nua_substate_active;
|
|
|
|
break;
|
|
|
|
case nua_substate_terminated:
|
|
|
|
nu->nu_substate = nua_substate_terminated;
|
|
|
|
break;
|
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
}
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu->nu_substate == nua_substate_terminated)
|
|
|
|
cr->cr_terminating = 1;
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
cr->cr_usage = du;
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return nua_notify_client_init_etag(cr, msg, sip, tags);
|
|
|
|
}
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_notify_client_init_etag(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
#if SU_HAVE_EXPERIMENTAL
|
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(cr->cr_usage);
|
|
|
|
nua_server_request_t *sr;
|
|
|
|
|
|
|
|
if (nu->nu_tag)
|
|
|
|
su_free(nh->nh_home, nu->nu_tag), nu->nu_tag = NULL;
|
|
|
|
nu->nu_no_body = 0;
|
|
|
|
|
|
|
|
if (sip->sip_etag) {
|
|
|
|
nu->nu_appl_etags = 1;
|
|
|
|
nu->nu_tag = su_strdup(nh->nh_home, sip->sip_etag->g_string);
|
2007-02-07 21:59:38 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
else if (!nu->nu_appl_etags && nu->nu_etags) {
|
|
|
|
su_md5_t md5[1];
|
|
|
|
unsigned char digest[SU_MD5_DIGEST_SIZE];
|
|
|
|
sip_payload_t pl[1] = { SIP_PAYLOAD_INIT() };
|
|
|
|
char token[2 * 16];
|
|
|
|
|
|
|
|
su_md5_init(md5);
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (sip->sip_payload) *pl = *sip->sip_payload;
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (pl->pl_len)
|
|
|
|
su_md5_update(md5, pl->pl_data, pl->pl_len);
|
|
|
|
su_md5_update(md5, &pl->pl_len, sizeof(pl->pl_len));
|
|
|
|
|
|
|
|
if (sip->sip_content_type)
|
|
|
|
su_md5_striupdate(md5, sip->sip_content_type->c_type);
|
|
|
|
|
|
|
|
su_md5_digest(md5, digest);
|
|
|
|
token64_e(token, sizeof token, digest, sizeof digest);
|
|
|
|
token[(sizeof token) - 1] = '\0';
|
|
|
|
nu->nu_tag = su_strdup(nh->nh_home, token);
|
2007-02-07 21:59:38 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!nu->nu_requested || !nu->nu_tag)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Check if SUBSCRIBE had matching suppression */
|
|
|
|
for (sr = nh->nh_ds->ds_sr; sr; sr = sr->sr_next)
|
|
|
|
if (sr->sr_usage == cr->cr_usage && sr->sr_method == sip_method_subscribe)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (sr) {
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
|
|
|
|
sip_suppress_body_if_match_t *sbim;
|
|
|
|
sip_suppress_notify_if_match_t *snim;
|
|
|
|
|
|
|
|
if (cr->cr_usage->du_ready) {
|
|
|
|
snim = sip_suppress_notify_if_match(sip);
|
|
|
|
|
|
|
|
if (snim && !strcasecmp(snim->snim_tag, nu->nu_tag)) {
|
|
|
|
if (nu->nu_requested > nu->nu_expires)
|
|
|
|
nu->nu_expires = nu->nu_requested;
|
|
|
|
nu->nu_requested = 0;
|
|
|
|
return nua_client_return(cr, 202, "NOTIFY Suppressed", msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sbim = sip_suppress_body_if_match(sip);
|
|
|
|
if (sbim && !strcasecmp(sbim->sbim_tag, nu->nu_tag))
|
|
|
|
nu->nu_no_body = 1;
|
|
|
|
}
|
|
|
|
#endif
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return 0;
|
2007-02-17 06:25:21 +00:00
|
|
|
}
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-02-17 06:25:21 +00:00
|
|
|
static
|
2007-04-15 02:03:41 +00:00
|
|
|
int nua_notify_client_request(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
2007-02-17 06:25:21 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_dialog_usage_t *du = cr->cr_usage;
|
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(du);
|
|
|
|
su_home_t *home = msg_home(msg);
|
|
|
|
sip_time_t now = sip_now();
|
|
|
|
sip_subscription_state_t *ss = sip->sip_subscription_state;
|
|
|
|
char const *expires;
|
|
|
|
|
|
|
|
if (du == NULL) /* Subscription has been terminated */
|
|
|
|
return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg);
|
|
|
|
|
|
|
|
assert(du && nu);
|
|
|
|
|
|
|
|
if (du && nua_client_bind(cr, du) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (nu->nu_requested)
|
|
|
|
nu->nu_expires = nu->nu_requested;
|
|
|
|
nu->nu_requested = 0;
|
|
|
|
|
|
|
|
if (nu->nu_expires <= now || du->du_shutdown) {
|
|
|
|
nu->nu_substate = nua_substate_terminated;
|
|
|
|
expires = "expires=0";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
expires = su_sprintf(home, "expires=%lu", nu->nu_expires - now);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ss == NULL || nua_substate_make(ss->ss_substate) != nu->nu_substate) {
|
|
|
|
if (nu->nu_substate == nua_substate_terminated)
|
|
|
|
expires = nu->nu_expires > now ? "noresource" : "timeout";
|
|
|
|
|
|
|
|
ss = sip_subscription_state_format(home, "%s;%s",
|
|
|
|
nua_substate_name(nu->nu_substate),
|
|
|
|
expires);
|
|
|
|
|
|
|
|
msg_header_insert(msg, (void *)sip, (void *)ss);
|
|
|
|
}
|
|
|
|
else if (nu->nu_substate != nua_substate_terminated) {
|
|
|
|
msg_header_replace_param(home, ss->ss_common, expires);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SU_HAVE_EXPERIMENTAL
|
|
|
|
if (nu->nu_tag && !sip->sip_etag)
|
|
|
|
msg_header_add_make(msg, (void *)sip, sip_etag_class, nu->nu_tag);
|
|
|
|
|
|
|
|
if (nu->nu_no_body) {
|
|
|
|
nu->nu_no_body = 0;
|
|
|
|
msg_header_remove(msg, (void *)sip, (void *)sip->sip_payload);
|
|
|
|
msg_header_remove(msg, (void *)sip, (void *)sip->sip_content_length);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (nu->nu_substate == nua_substate_terminated)
|
|
|
|
cr->cr_terminating = 1;
|
|
|
|
|
|
|
|
if (du->du_event && !sip->sip_event)
|
|
|
|
sip_add_dup(cr->cr_msg, sip, (sip_header_t *)du->du_event);
|
|
|
|
|
|
|
|
return nua_base_client_request(cr, msg, sip, tags);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/** @NUA_EVENT nua_r_notify
|
|
|
|
*
|
|
|
|
* Response to an outgoing @b NOTIFY request.
|
|
|
|
*
|
|
|
|
* The @b NOTIFY may be sent explicitly by nua_notify() or implicitly by NUA
|
|
|
|
* state machine. Implicit @b NOTIFY is sent when an established dialog is
|
|
|
|
* refreshed by client or it is terminated (either by client or because of a
|
|
|
|
* timeout)
|
|
|
|
*
|
|
|
|
* @param status response status code
|
|
|
|
* (if the request is retried, @a status is 100, the @a
|
|
|
|
* sip->sip_status->st_status contain the real status code
|
|
|
|
* from the response message, e.g., 302, 401, or 407)
|
|
|
|
* @param phrase a short textual description of @a status code
|
|
|
|
* @param nh operation handle associated with the subscription
|
|
|
|
* @param hmagic application context associated with the handle
|
|
|
|
* @param sip response to @b NOTIFY request or NULL upon an error
|
|
|
|
* (status code is in @a status and
|
|
|
|
* descriptive message in @a phrase parameters)
|
|
|
|
* @param tags NUTAG_SUBSTATE() indicating subscription state
|
2007-04-15 02:03:41 +00:00
|
|
|
* SIPTAG_EVENT() indicating subscription event
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* @sa nua_notify(), @RFC3265, #nua_i_subscribe, #nua_i_refer
|
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_notify_client_report(nua_client_request_t *cr,
|
|
|
|
int status, char const *phrase,
|
|
|
|
sip_t const *sip,
|
|
|
|
nta_outgoing_t *orq,
|
|
|
|
tagi_t const *tags)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
|
|
|
nua_dialog_usage_t *du = cr->cr_usage;
|
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(du);
|
2006-12-21 06:30:28 +00:00
|
|
|
enum nua_substate substate = nua_substate_terminated;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu && !cr->cr_terminated)
|
2007-02-17 06:25:21 +00:00
|
|
|
substate = nu->nu_substate;
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
nua_stack_tevent(nh->nh_nua, nh,
|
|
|
|
nta_outgoing_getresponse(orq),
|
|
|
|
cr->cr_event,
|
|
|
|
status, phrase,
|
|
|
|
NUTAG_SUBSTATE(substate),
|
|
|
|
SIPTAG_EVENT(du ? du->du_event : NULL),
|
|
|
|
TAG_NEXT(tags));
|
|
|
|
|
|
|
|
if (du && du->du_cr == cr && !cr->cr_terminated) {
|
|
|
|
if (nu->nu_requested) {
|
|
|
|
/* Re-SUBSCRIBEd while NOTIFY was in progress, resend NOTIFY */
|
|
|
|
nua_client_resend_request(cr, 0);
|
|
|
|
}
|
|
|
|
else if (nu->nu_expires) {
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
nua_dialog_usage_set_refresh_at(du, nu->nu_expires);
|
2007-04-15 02:03:41 +00:00
|
|
|
}
|
2007-02-17 06:25:21 +00:00
|
|
|
}
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return 0;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void nua_notify_usage_refresh(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du,
|
|
|
|
sip_time_t now)
|
|
|
|
{
|
2007-02-17 06:25:21 +00:00
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(du);
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_client_request_t *cr = du->du_cr;
|
|
|
|
nua_event_t e = nua_r_notify;
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (cr) {
|
|
|
|
int terminating = 0;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu->nu_expires && nu->nu_expires <= now)
|
|
|
|
terminating = 1;
|
|
|
|
else if (nu->nu_requested && nu->nu_requested <= now)
|
|
|
|
terminating = 1;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nua_client_resend_request(cr, terminating) >= 0)
|
|
|
|
return;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
else {
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nua_client_create(nh, e, &nua_notify_client_methods, NULL) >= 0)
|
|
|
|
return;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
nua_stack_tevent(nh->nh_nua, nh, NULL, e, NUA_INTERNAL_ERROR,
|
|
|
|
NUTAG_SUBSTATE(nua_substate_terminated),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
nua_dialog_usage_remove(nh, ds, du);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/** @interal Shut down NOTIFY usage.
|
|
|
|
*
|
|
|
|
* @retval >0 shutdown done
|
|
|
|
* @retval 0 shutdown in progress
|
|
|
|
* @retval <0 try again later
|
|
|
|
*/
|
|
|
|
static int nua_notify_usage_shutdown(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du)
|
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(du);
|
|
|
|
nua_client_request_t *cr = du->du_cr;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nu->nu_substate = nua_substate_terminated;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (cr) {
|
|
|
|
if (nua_client_resend_request(cr, 1) >= 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (nua_client_create(nh, nua_r_notify,
|
|
|
|
&nua_notify_client_methods, NULL) >= 0)
|
|
|
|
return 0;
|
|
|
|
}
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_dialog_usage_remove(nh, ds, du);
|
|
|
|
return 200;
|
2007-02-07 21:59:38 +00:00
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
/* ======================================================================== */
|
|
|
|
/* REFER */
|
|
|
|
/* RFC 3515 */
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_refer_server_init(nua_server_request_t *sr);
|
|
|
|
static int nua_refer_server_preprocess(nua_server_request_t *sr);
|
|
|
|
static int nua_refer_server_respond(nua_server_request_t*, tagi_t const *);
|
|
|
|
static int nua_refer_server_report(nua_server_request_t*, tagi_t const *);
|
|
|
|
|
|
|
|
nua_server_methods_t const nua_refer_server_methods =
|
|
|
|
{
|
|
|
|
SIP_METHOD_REFER,
|
|
|
|
nua_i_refer, /* Event */
|
|
|
|
{
|
|
|
|
1, /* Create dialog */
|
|
|
|
0, /* Initial request */
|
|
|
|
1, /* Target refresh request */
|
|
|
|
1, /* Add Contact */
|
|
|
|
},
|
|
|
|
nua_refer_server_init,
|
|
|
|
nua_refer_server_preprocess,
|
|
|
|
nua_base_server_params,
|
|
|
|
nua_refer_server_respond,
|
|
|
|
nua_refer_server_report,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int nua_refer_server_init(nua_server_request_t *sr)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nua_refer_server_preprocess(nua_server_request_t *sr)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
struct notifier_usage *nu;
|
|
|
|
sip_event_t *o;
|
|
|
|
|
|
|
|
if (nh->nh_ds->ds_got_referrals || NH_PGET(nh, refer_with_id))
|
|
|
|
o = sip_event_format(nh->nh_home, "refer;id=%u", sip->sip_cseq->cs_seq);
|
|
|
|
else
|
|
|
|
o = sip_event_make(nh->nh_home, "refer");
|
|
|
|
|
|
|
|
if (o) {
|
|
|
|
sr->sr_usage = nua_dialog_usage_add(nh, nh->nh_ds, nua_notify_usage, o);
|
|
|
|
msg_header_free(nh->nh_home, (msg_header_t *)o);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!sr->sr_usage)
|
|
|
|
return SR_STATUS1(sr, SIP_500_INTERNAL_SERVER_ERROR);
|
|
|
|
|
|
|
|
nu = nua_dialog_usage_private(sr->sr_usage);
|
|
|
|
nu->nu_requested = sip_now() + NH_PGET(nh, refer_expires);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int nua_refer_server_respond(nua_server_request_t *sr, tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(sr->sr_usage);
|
|
|
|
sip_refer_sub_t const *rs = sip_refer_sub(sr->sr_response.sip);
|
|
|
|
|
|
|
|
if (sr->sr_status < 200 || nu == NULL) {
|
|
|
|
}
|
|
|
|
else if (sr->sr_status < 300 &&
|
|
|
|
/* Application included Refer-Sub: false in response */
|
|
|
|
(rs == NULL || str0casecmp("false", rs->rs_value))) {
|
|
|
|
sr->sr_usage->du_ready = 1;
|
|
|
|
|
|
|
|
nu->nu_expires = sip_now() + NH_PGET(nh, refer_expires);
|
|
|
|
|
|
|
|
if (sr->sr_application) /* Application responded to REFER */
|
|
|
|
nu->nu_substate = nua_substate_active;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Destroy the implicit subscription usage */
|
|
|
|
sr->sr_terminating = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nua_base_server_respond(sr, tags);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
/** @NUA_EVENT nua_i_refer
|
|
|
|
*
|
|
|
|
* Incoming @b REFER request used to transfer calls.
|
|
|
|
*
|
|
|
|
* @param status status code of response sent automatically by stack
|
|
|
|
* @param phrase a short textual description of @a status code
|
|
|
|
* @param nh operation handle associated with the incoming request
|
|
|
|
* @param hmagic application context associated with the handle
|
|
|
|
* (NULL if outside of an already established session)
|
|
|
|
* @param sip incoming REFER request
|
|
|
|
* @param tags NUTAG_REFER_EVENT() \n
|
|
|
|
* SIPTAG_REFERRED_BY()
|
|
|
|
*
|
|
|
|
* @sa nua_refer(), #nua_r_refer, @ReferTo, NUTAG_REFER_EVENT(),
|
|
|
|
* SIPTAG_REFERRED_BY(), @ReferredBy, NUTAG_NOTIFY_REFER(),
|
|
|
|
* NUTAG_REFER_WITH_ID(), @RFC3515.
|
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static
|
|
|
|
int nua_refer_server_report(nua_server_request_t *sr, tagi_t const *tags)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
struct notifier_usage *nu = nua_dialog_usage_private(sr->sr_usage);
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
sip_referred_by_t *by = sip->sip_referred_by, default_by[1];
|
|
|
|
sip_event_t const *o = sr->sr_usage->du_event;
|
|
|
|
enum nua_substate substate = nua_substate_terminated;
|
|
|
|
int initial = sr->sr_initial, retval;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (nu) {
|
|
|
|
if (!sr->sr_terminating)
|
|
|
|
substate = nu->nu_substate;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (by == NULL) {
|
|
|
|
by = sip_referred_by_init(default_by);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
by->b_display = sip->sip_from->a_display;
|
|
|
|
*by->b_url = *sip->sip_from->a_url;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
retval = nua_base_server_treport(sr,
|
|
|
|
NUTAG_SUBSTATE(substate),
|
|
|
|
NUTAG_REFER_EVENT(o),
|
|
|
|
TAG_IF(by, SIPTAG_REFERRED_BY(by)),
|
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (retval >= 2 || nu == NULL)
|
|
|
|
return retval;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (initial)
|
2006-12-21 06:30:28 +00:00
|
|
|
nua_stack_post_signal(nh,
|
|
|
|
nua_r_notify,
|
2007-04-15 02:03:41 +00:00
|
|
|
SIPTAG_EVENT(o),
|
2006-12-21 06:30:28 +00:00
|
|
|
SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
|
|
|
|
SIPTAG_PAYLOAD_STR("SIP/2.0 100 Trying\r\n"),
|
|
|
|
TAG_END());
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return retval;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|