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_subnotref.c
|
|
|
|
* @brief Subscriber (event watcher)
|
|
|
|
*
|
|
|
|
* This file contains implementation SUBSCRIBE UAC, NOTIFY UAS, REFER UAC.
|
|
|
|
* The implementation of SUBSCRIBE UAS, NOTIFY UAC and REFER UAS is in
|
|
|
|
* nua_notifier.c.
|
|
|
|
* Alternative implementation using nea is in nua_event_server.c.
|
|
|
|
*
|
|
|
|
* @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>
|
|
|
|
#include <sofia-sip/sip_status.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_util.h>
|
|
|
|
#include <sofia-sip/su_uniqueid.h>
|
|
|
|
|
|
|
|
#include "nua_stack.h"
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Subcriber event usage */
|
|
|
|
|
|
|
|
struct event_usage
|
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
enum nua_substate eu_substate; /**< Subscription state */
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_time_t eu_expires; /**< Proposed expiration time */
|
|
|
|
unsigned eu_notified; /**< Number of NOTIFYs received */
|
2007-04-15 02:03:41 +00:00
|
|
|
unsigned eu_unsolicited:1; /**< Not SUBSCRIBEd or REFERed */
|
|
|
|
unsigned eu_refer:1; /**< Implied subscription by refer */
|
2006-12-21 06:30:28 +00:00
|
|
|
unsigned eu_final_wait:1; /**< Waiting for final NOTIFY */
|
|
|
|
unsigned eu_no_id:1; /**< Do not use "id" (even if we have one) */
|
|
|
|
};
|
|
|
|
|
|
|
|
static char const *nua_subscribe_usage_name(nua_dialog_usage_t const *du);
|
|
|
|
static int nua_subscribe_usage_add(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du);
|
|
|
|
static void nua_subscribe_usage_remove(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du);
|
|
|
|
static void nua_subscribe_usage_refresh(nua_handle_t *,
|
|
|
|
nua_dialog_state_t *,
|
|
|
|
nua_dialog_usage_t *,
|
|
|
|
sip_time_t);
|
|
|
|
static int nua_subscribe_usage_shutdown(nua_handle_t *,
|
|
|
|
nua_dialog_state_t *,
|
|
|
|
nua_dialog_usage_t *);
|
|
|
|
|
|
|
|
static nua_usage_class const nua_subscribe_usage[1] = {
|
|
|
|
{
|
|
|
|
sizeof (struct event_usage), (sizeof nua_subscribe_usage),
|
|
|
|
nua_subscribe_usage_add,
|
|
|
|
nua_subscribe_usage_remove,
|
|
|
|
nua_subscribe_usage_name,
|
|
|
|
NULL,
|
|
|
|
nua_subscribe_usage_refresh,
|
|
|
|
nua_subscribe_usage_shutdown
|
|
|
|
}};
|
|
|
|
|
|
|
|
static char const *nua_subscribe_usage_name(nua_dialog_usage_t const *du)
|
|
|
|
{
|
|
|
|
return "subscribe";
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int nua_subscribe_usage_add(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du)
|
|
|
|
{
|
|
|
|
ds->ds_has_events++;
|
|
|
|
ds->ds_has_subscribes++;
|
2007-04-15 02:03:41 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
void nua_subscribe_usage_remove(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du)
|
|
|
|
{
|
|
|
|
ds->ds_has_events--;
|
|
|
|
ds->ds_has_subscribes--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ====================================================================== */
|
|
|
|
/* SUBSCRIBE */
|
|
|
|
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
/**@fn void nua_subscribe(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...);
|
|
|
|
*
|
|
|
|
* Subscribe to a SIP event.
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* Subscribe a SIP event using the SIP SUBSCRIBE request. If the
|
|
|
|
* SUBSCRBE is successful a subscription state is established and
|
|
|
|
* the subscription is refreshed regularly. The refresh requests will
|
|
|
|
* generate #nua_r_subscribe events.
|
|
|
|
*
|
|
|
|
* @param nh Pointer to operation handle
|
|
|
|
* @param tag, value, ... List of tagged parameters
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* nothing
|
|
|
|
*
|
|
|
|
* @par Related Tags:
|
|
|
|
* NUTAG_URL()
|
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_subscribe \n
|
|
|
|
* #nua_i_notify
|
|
|
|
*
|
|
|
|
* @sa NUTAG_SUBSTATE(), @RFC3265
|
|
|
|
*/
|
|
|
|
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
/**@fn void nua_unsubscribe(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...);
|
|
|
|
*
|
|
|
|
* Unsubscribe an event.
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* Unsubscribe an active or pending subscription with SUBSCRIBE request
|
|
|
|
* containing Expires: header with value 0. The dialog associated with
|
|
|
|
* subscription will be destroyed if there is no other subscriptions or
|
|
|
|
* call using this dialog.
|
|
|
|
*
|
|
|
|
* @param nh Pointer to operation handle
|
|
|
|
* @param tag, value, ... List of tagged parameters
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* nothing
|
|
|
|
*
|
|
|
|
* @par Related Tags:
|
|
|
|
* SIPTAG_EVENT() or SIPTAG_EVENT_STR() \n
|
2007-08-06 19:24:10 +00:00
|
|
|
* Header tags defined in <sofia-sip/sip_tag.h> except SIPTAG_EXPIRES() or SIPTAG_EXPIRES_STR()
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* @par Events:
|
|
|
|
* #nua_r_unsubscribe
|
|
|
|
*
|
|
|
|
* @sa NUTAG_SUBSTATE(), @RFC3265
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_subscribe_client_init(nua_client_request_t *cr,
|
|
|
|
msg_t *, sip_t *,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_subscribe_client_request(nua_client_request_t *cr,
|
|
|
|
msg_t *, sip_t *,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_subscribe_client_response(nua_client_request_t *cr,
|
|
|
|
int status, char const *phrase,
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_t const *sip);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static nua_client_methods_t const nua_subscribe_client_methods = {
|
|
|
|
SIP_METHOD_SUBSCRIBE,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
/* create_dialog */ 1,
|
|
|
|
/* in_dialog */ 1,
|
|
|
|
/* target refresh */ 1
|
|
|
|
},
|
|
|
|
NULL,
|
|
|
|
nua_subscribe_client_init,
|
|
|
|
nua_subscribe_client_request,
|
|
|
|
/* nua_subscribe_client_check_restart */ NULL,
|
|
|
|
nua_subscribe_client_response
|
|
|
|
};
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
nua_stack_subscribe(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_subscribe_client_methods, tags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nua_subscribe_client_init(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
|
|
|
nua_dialog_usage_t *du;
|
|
|
|
sip_event_t *o = sip->sip_event;
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
du = nua_dialog_usage_get(nh->nh_ds, nua_subscribe_usage, o);
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (du == NULL && o == NULL)
|
|
|
|
du = nua_dialog_usage_get(nh->nh_ds, nua_subscribe_usage, NONE);
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (du) {
|
|
|
|
if (du->du_event && o == NULL)
|
|
|
|
/* Add Event header */
|
|
|
|
sip_add_dup(msg, sip, (sip_header_t *)du->du_event);
|
|
|
|
}
|
|
|
|
else if (cr->cr_event == nua_r_subscribe) {
|
|
|
|
/* Create dialog usage */
|
|
|
|
du = nua_dialog_usage_add(nh, nh->nh_ds, nua_subscribe_usage, o);
|
|
|
|
/* Note that we allow SUBSCRIBE without event */
|
|
|
|
}
|
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 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nua_subscribe_client_request(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_dialog_usage_t *du = cr->cr_usage;
|
|
|
|
sip_time_t expires = 0;
|
|
|
|
|
|
|
|
if (cr->cr_event != nua_r_subscribe ||
|
|
|
|
(du && du->du_shutdown) ||
|
|
|
|
(sip->sip_expires && sip->sip_expires->ex_delta == 0))
|
|
|
|
cr->cr_terminating = 1;
|
|
|
|
|
|
|
|
if (du) {
|
|
|
|
struct event_usage *eu = nua_dialog_usage_private(du);
|
|
|
|
sip_event_t *o = sip->sip_event;
|
|
|
|
|
|
|
|
if (nua_client_bind(cr, du) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (eu->eu_no_id && o && o->o_id) {
|
|
|
|
/* Notifier does not handle id properly, remove it */
|
|
|
|
msg_header_remove_param(o->o_common, "id");
|
2007-02-17 06:25:21 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
#if 0
|
|
|
|
if (cr->cr_terminating) {
|
|
|
|
/* Already terminated subscription? */
|
2006-12-21 06:30:28 +00:00
|
|
|
if (eu->eu_substate == nua_substate_terminated ||
|
|
|
|
eu->eu_substate == nua_substate_embryonic) {
|
2007-04-15 02:03:41 +00:00
|
|
|
return nua_client_return(cr, SIP_200_OK, msg);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
#endif
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_dialog_usage_reset_refresh(du); /* during SUBSCRIBE transaction */
|
|
|
|
|
|
|
|
if (cr->cr_terminating)
|
|
|
|
expires = eu->eu_expires = 0;
|
|
|
|
else if (sip->sip_expires)
|
|
|
|
/* Use value specified by application or negotiated with Min-Expires */
|
|
|
|
expires = eu->eu_expires = sip->sip_expires->ex_delta;
|
2006-12-21 06:30:28 +00:00
|
|
|
else
|
|
|
|
/* We just use common default value, but the default is actually
|
|
|
|
package-specific according to the RFC 3265 section 4.4.4:
|
|
|
|
[Event] packages MUST also define a
|
|
|
|
default "Expires" value to be used if none is specified. */
|
2007-04-15 02:03:41 +00:00
|
|
|
expires = eu->eu_expires = 3600;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
eu->eu_final_wait = 0;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (eu->eu_substate == nua_substate_terminated)
|
|
|
|
eu->eu_substate = nua_substate_embryonic;
|
|
|
|
}
|
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 != expires) {
|
|
|
|
sip_expires_t ex[1];
|
|
|
|
sip_expires_init(ex)->ex_delta = expires;
|
|
|
|
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_client_request(cr, msg, sip, tags);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/** @NUA_EVENT nua_r_subscribe
|
|
|
|
*
|
|
|
|
* Response to an outgoing SUBSCRIBE request.
|
|
|
|
*
|
|
|
|
* The SUBSCRIBE request may have been sent explicitly by nua_subscribe() or
|
|
|
|
* implicitly by NUA state machine.
|
|
|
|
*
|
|
|
|
* @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 SUBSCRIBE request or NULL upon an error
|
|
|
|
* (status code is in @a status and
|
|
|
|
* descriptive message in @a phrase parameters)
|
|
|
|
* @param tags NUTAG_SUBSTATE()
|
|
|
|
*
|
|
|
|
* @sa nua_subscribe(), @RFC3265
|
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** @NUA_EVENT nua_r_unsubscribe
|
|
|
|
*
|
|
|
|
* Response to an outgoing un-SUBSCRIBE.
|
|
|
|
*
|
|
|
|
* @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 SUBSCRIBE request or NULL upon an error
|
|
|
|
* (status code is in @a status and
|
|
|
|
* descriptive message in @a phrase parameters)
|
|
|
|
* @param tags NUTAG_SUBSTATE()
|
|
|
|
*
|
|
|
|
* @sa nua_unsubscribe(), @RFC3265
|
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_subscribe_client_response(nua_client_request_t *cr,
|
|
|
|
int status, char const *phrase,
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_t const *sip)
|
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
2006-12-21 06:30:28 +00:00
|
|
|
nua_dialog_usage_t *du = cr->cr_usage;
|
|
|
|
struct event_usage *eu = nua_dialog_usage_private(du);
|
2007-04-15 02:03:41 +00:00
|
|
|
enum nua_substate substate;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (eu == NULL || cr->cr_terminated)
|
|
|
|
substate = nua_substate_terminated;
|
|
|
|
else if (status >= 300)
|
|
|
|
substate = eu->eu_substate;
|
|
|
|
else {
|
2006-12-21 06:30:28 +00:00
|
|
|
int win_messenger_enable = NH_PGET(nh, win_messenger_enable);
|
|
|
|
sip_time_t delta, now = sip_now();
|
|
|
|
|
|
|
|
du->du_ready = 1;
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
if (eu->eu_substate != nua_substate_terminated)
|
|
|
|
/* If there is no @Expires header,
|
2006-12-21 06:30:28 +00:00
|
|
|
use default value stored in eu_expires */
|
|
|
|
delta = sip_contact_expires(NULL, sip->sip_expires, sip->sip_date,
|
|
|
|
eu->eu_expires, now);
|
2007-04-15 02:03:41 +00:00
|
|
|
else
|
|
|
|
delta = 0;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (win_messenger_enable && !nua_dialog_is_established(nh->nh_ds)) {
|
|
|
|
/* Notify from messanger does not match with dialog tag */
|
|
|
|
nh->nh_ds->ds_remote_tag = su_strdup(nh->nh_home, "");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (delta > 0) {
|
|
|
|
nua_dialog_usage_set_refresh(du, delta);
|
2007-04-15 02:03:41 +00:00
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
else if (!eu->eu_notified) {
|
|
|
|
/* This is a fetch: subscription was really terminated
|
|
|
|
but we wait 32 seconds for NOTIFY. */
|
|
|
|
delta = 64 * NTA_SIP_T1 / 1000;
|
|
|
|
|
|
|
|
if (win_messenger_enable)
|
|
|
|
delta = 4 * 60; /* Wait 4 minutes for NOTIFY from Messenger */
|
|
|
|
|
|
|
|
eu->eu_final_wait = 1;
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
if (eu->eu_substate == nua_substate_terminated)
|
|
|
|
eu->eu_substate = nua_substate_embryonic;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
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_range(du, delta, delta);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
else {
|
2007-04-15 02:03:41 +00:00
|
|
|
eu->eu_substate = nua_substate_terminated;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
substate = eu->eu_substate;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (substate == nua_substate_terminated)
|
|
|
|
/* let nua_base_client_tresponse to remove usage */
|
|
|
|
cr->cr_terminated = 1;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-08-06 19:24:10 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return nua_base_client_tresponse(cr, status, phrase, sip,
|
|
|
|
NUTAG_SUBSTATE(substate),
|
2007-08-06 19:24:10 +00:00
|
|
|
SIPTAG_EVENT(du ? du->du_event : NULL),
|
2007-04-15 02:03:41 +00:00
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Refresh subscription */
|
|
|
|
static void nua_subscribe_usage_refresh(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du,
|
|
|
|
sip_time_t now)
|
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_client_request_t *cr = du->du_cr;
|
2006-12-21 06:30:28 +00:00
|
|
|
struct event_usage *eu = nua_dialog_usage_private(du);
|
2007-04-15 02:03:41 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
assert(eu);
|
|
|
|
|
|
|
|
if (eu->eu_final_wait) {
|
2007-04-15 02:03:41 +00:00
|
|
|
/* Did not receive NOTIFY for fetch */
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_event_t const *o = du->du_event;
|
|
|
|
char const *id = o ? o->o_id : NULL;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
SU_DEBUG_3(("nua(%p): event %s%s%s fetch timeouts\n",
|
|
|
|
(void *)nh, o ? o->o_type : "(empty)",
|
2006-12-21 06:30:28 +00:00
|
|
|
id ? "; id=" : "", id ? id : ""));
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_stack_tevent(nh->nh_nua, nh, NULL,
|
|
|
|
nua_i_notify, 408, "Fetch Timeouts without NOTIFY",
|
|
|
|
NUTAG_SUBSTATE(nua_substate_terminated),
|
|
|
|
SIPTAG_EVENT(du->du_event),
|
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
nua_dialog_usage_remove(nh, ds, du);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (cr) {
|
|
|
|
if (nua_client_resend_request(cr, 0) >= 0)
|
|
|
|
return;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
else if (eu->eu_refer) {
|
|
|
|
/*
|
|
|
|
* XXX - If we have received a NOTIFY, we should try to terminate
|
|
|
|
* subscription
|
|
|
|
*/
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!eu->eu_unsolicited)
|
|
|
|
nua_stack_tevent(nh->nh_nua, nh, NULL,
|
|
|
|
nua_i_notify, NUA_INTERNAL_ERROR,
|
|
|
|
NUTAG_SUBSTATE(nua_substate_terminated),
|
|
|
|
SIPTAG_EVENT(du->du_event),
|
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_dialog_usage_remove(nh, ds, du);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
/** Terminate subscription.
|
|
|
|
*
|
|
|
|
* @retval >0 shutdown done
|
|
|
|
* @retval 0 shutdown in progress
|
|
|
|
* @retval <0 try again later
|
|
|
|
*/
|
2006-12-21 06:30:28 +00:00
|
|
|
static int nua_subscribe_usage_shutdown(nua_handle_t *nh,
|
|
|
|
nua_dialog_state_t *ds,
|
|
|
|
nua_dialog_usage_t *du)
|
|
|
|
{
|
|
|
|
struct event_usage *eu = nua_dialog_usage_private(du);
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_client_request_t *cr = du->du_cr;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
assert(eu); (void)eu;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (cr) {
|
|
|
|
if (nua_client_resend_request(cr, 1) >= 0)
|
|
|
|
return 0;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
nua_dialog_usage_remove(nh, ds, du);
|
|
|
|
return 200;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ======================================================================== */
|
|
|
|
/* NOTIFY server */
|
|
|
|
|
|
|
|
/** @NUA_EVENT nua_i_notify
|
|
|
|
*
|
|
|
|
* Event for incoming NOTIFY request.
|
|
|
|
*
|
|
|
|
* @param status statuscode of response sent automatically by stack
|
|
|
|
* @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 incoming NOTIFY request
|
|
|
|
* @param tags NUTAG_SUBSTATE() indicating the subscription state
|
|
|
|
*
|
|
|
|
* @sa nua_subscribe(), nua_unsubscribe(), @RFC3265, #nua_i_subscribe
|
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
int nua_notify_server_init(nua_server_request_t *sr);
|
|
|
|
int nua_notify_server_preprocess(nua_server_request_t *sr);
|
|
|
|
int nua_notify_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_notify_server_methods =
|
|
|
|
{
|
|
|
|
SIP_METHOD_NOTIFY,
|
|
|
|
nua_i_notify, /* Event */
|
|
|
|
{
|
|
|
|
/* create_dialog: */ 1, /* Do create dialog */
|
|
|
|
/* in_dialog: */ 0, /* Not always in-dialog request */
|
|
|
|
/* target_refresh: */ 1, /* Target refresh request */
|
|
|
|
/* add_contact: */ 1, /* Add Contact to response */
|
|
|
|
},
|
|
|
|
nua_notify_server_init,
|
|
|
|
nua_notify_server_preprocess,
|
|
|
|
nua_base_server_params,
|
|
|
|
nua_base_server_respond,
|
|
|
|
nua_notify_server_report,
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
int nua_notify_server_init(nua_server_request_t *sr)
|
|
|
|
{
|
|
|
|
if (!sr->sr_initial) {
|
|
|
|
nua_dialog_state_t *ds = sr->sr_owner->nh_ds;
|
|
|
|
|
|
|
|
/* Check for forked subscription. */
|
|
|
|
if (ds->ds_remote_tag && ds->ds_remote_tag[0] &&
|
|
|
|
str0cmp(ds->ds_remote_tag, sr->sr_request.sip->sip_from->a_tag)) {
|
|
|
|
sip_contact_t const *m = NULL;
|
|
|
|
|
|
|
|
m = nua_stack_get_contact(sr->sr_owner->nh_nua->nua_registrations);
|
|
|
|
|
|
|
|
if (m) {
|
|
|
|
sip_warning_t w[1];
|
|
|
|
|
|
|
|
sip_warning_init(w)->w_code = 399;
|
|
|
|
w->w_host = m->m_url->url_host;
|
|
|
|
w->w_port = m->m_url->url_port;
|
|
|
|
w->w_text = "Forking SUBSCRIBEs are not supported";
|
|
|
|
|
|
|
|
sip_add_dup(sr->sr_response.msg, NULL, (sip_header_t*)w);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return SR_STATUS(sr, 481, "Subscription Does Not Exist");
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nua_notify_server_preprocess(nua_server_request_t *sr)
|
|
|
|
{
|
|
|
|
nua_dialog_state_t *ds = sr->sr_owner->nh_ds;
|
|
|
|
nua_dialog_usage_t *du;
|
|
|
|
struct event_usage *eu;
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
sip_event_t *o = sip->sip_event;
|
|
|
|
enum nua_substate substate = nua_substate_terminated;
|
|
|
|
sip_subscription_state_t *subs = sip->sip_subscription_state;
|
|
|
|
char const *what = "", *reason = NULL;
|
|
|
|
int solicited = 1;
|
|
|
|
|
|
|
|
du = nua_dialog_usage_get(ds, nua_subscribe_usage, o);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (du == NULL) {
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!sip_is_allowed(NH_PGET(sr->sr_owner, appl_method), SIP_METHOD_NOTIFY))
|
|
|
|
return SR_STATUS(sr, 481, "Subscription Does Not Exist");
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
solicited = 0; /* Let application to handle unsolicited NOTIFY */
|
|
|
|
du = nua_dialog_usage_add(sr->sr_owner, ds, nua_subscribe_usage, o);
|
|
|
|
if (!du)
|
|
|
|
return SR_STATUS1(sr, SIP_500_INTERNAL_SERVER_ERROR);
|
|
|
|
}
|
|
|
|
|
|
|
|
sr->sr_usage = du;
|
2006-12-21 06:30:28 +00:00
|
|
|
eu = nua_dialog_usage_private(du); assert(eu);
|
|
|
|
eu->eu_notified++;
|
2007-04-15 02:03:41 +00:00
|
|
|
if (!o->o_id)
|
2006-12-21 06:30:28 +00:00
|
|
|
eu->eu_no_id = 1;
|
|
|
|
|
|
|
|
if (subs == NULL) {
|
2007-04-15 02:03:41 +00:00
|
|
|
/* Compatibility */
|
|
|
|
unsigned long delta = eu->eu_expires;
|
|
|
|
if (sip->sip_expires)
|
|
|
|
delta = sip->sip_expires->ex_delta;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (delta == 0)
|
2007-04-15 02:03:41 +00:00
|
|
|
substate = nua_substate_terminated, what = "terminated";
|
2006-12-21 06:30:28 +00:00
|
|
|
else
|
2007-04-15 02:03:41 +00:00
|
|
|
substate = nua_substate_active, what = "active";
|
|
|
|
}
|
|
|
|
else if (strcasecmp(subs->ss_substate, what = "terminated") == 0) {
|
|
|
|
substate = nua_substate_terminated;
|
|
|
|
reason = subs->ss_reason;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (str0casecmp(reason, "deactivated") == 0 ||
|
|
|
|
str0casecmp(reason, "probation") == 0)
|
|
|
|
substate = nua_substate_embryonic;
|
|
|
|
}
|
|
|
|
else if (strcasecmp(subs->ss_substate, what = "pending") == 0) {
|
|
|
|
substate = nua_substate_pending;
|
|
|
|
}
|
|
|
|
else /* if (strcasecmp(subs->ss_substate, what = "active") == 0) */ {
|
|
|
|
/* Any extended state is considered as active */
|
|
|
|
what = subs->ss_substate;
|
|
|
|
substate = nua_substate_active;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
eu->eu_substate = substate;
|
|
|
|
if (!solicited)
|
|
|
|
eu->eu_unsolicited = 1;
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
SU_DEBUG_5(("nua(%p): %s: %s (%s)\n",
|
|
|
|
(void *)sr->sr_owner, "nua_notify_server_preprocess",
|
|
|
|
what, reason ? reason : ""));
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (solicited)
|
|
|
|
return SR_STATUS1(sr, SIP_200_OK);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int nua_notify_server_report(nua_server_request_t *sr, tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = sr->sr_owner;
|
|
|
|
nua_dialog_usage_t *du = sr->sr_usage;
|
|
|
|
struct event_usage *eu = nua_dialog_usage_private(du);
|
|
|
|
sip_t const *sip = sr->sr_request.sip;
|
|
|
|
enum nua_substate substate = nua_substate_terminated;
|
|
|
|
sip_time_t delta = SIP_TIME_MAX;
|
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
|
|
|
sip_event_t const *o = sip->sip_event;
|
2007-04-15 02:03:41 +00:00
|
|
|
int retry = -1;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
if (eu) {
|
|
|
|
sip_subscription_state_t *subs = sip->sip_subscription_state;
|
|
|
|
|
|
|
|
substate = eu->eu_substate;
|
|
|
|
|
|
|
|
if (substate == nua_substate_active || substate == nua_substate_pending) {
|
|
|
|
if (subs && subs->ss_expires)
|
|
|
|
delta = strtoul(subs->ss_expires, NULL, 10);
|
|
|
|
else
|
|
|
|
delta = eu->eu_expires;
|
|
|
|
}
|
|
|
|
else if (substate == nua_substate_embryonic) {
|
|
|
|
if (subs && subs->ss_reason) {
|
|
|
|
if (str0casecmp(subs->ss_reason, "deactivated") == 0) {
|
|
|
|
retry = 0; /* retry immediately */
|
|
|
|
}
|
|
|
|
else if (str0casecmp(subs->ss_reason, "probation") == 0) {
|
|
|
|
retry = 30;
|
|
|
|
if (subs->ss_retry_after)
|
|
|
|
retry = strtoul(subs->ss_retry_after, NULL, 10);
|
|
|
|
if (retry > 3600)
|
|
|
|
retry = 3600;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (substate == nua_substate_terminated) {
|
|
|
|
sr->sr_terminating = 1;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
2007-02-17 06:25:21 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
retval = nua_base_server_treport(sr, /* can destroy sr */
|
|
|
|
NUTAG_SUBSTATE(substate),
|
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
|
|
|
SIPTAG_EVENT(o),
|
2007-04-15 02:03:41 +00:00
|
|
|
TAG_NEXT(tags));
|
|
|
|
|
|
|
|
if (retval != 1 || du == NULL)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
if (eu->eu_unsolicited) {
|
|
|
|
/* Xyzzy */;
|
2007-02-17 06:25:21 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
else if (retry >= 0) { /* Try to subscribe again */
|
|
|
|
/* XXX - this needs through testing */
|
|
|
|
nua_dialog_remove(nh, nh->nh_ds, du); /* tear down */
|
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_range(du, retry, retry + 5);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
nua_dialog_usage_set_refresh(du, delta);
|
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return retval;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
/* ======================================================================== */
|
|
|
|
/* REFER */
|
|
|
|
|
Update sofia-sip from darcs:
Mon May 14 12:43:07 EDT 2007 martti.mela@nokia.com
* su_base_port.c: fixed a double free in su_base_port_start_shared().
Fri May 25 13:56:23 EDT 2007 Pekka.Pessi@nokia.com
* soa: added SOATAG_ORDERED_USER(), SOATAG_REUSE_REJECTED().
Allow replacing existing m=lines.
Sun May 27 14:52:13 EDT 2007 Pekka.Pessi@nokia.com
* msg_parser.c: fixed bug #1726034
Mon May 28 04:57:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nth.c: using non-blocking connect in test program, too.
Mon May 28 04:58:05 EDT 2007 Pekka.Pessi@nokia.com
* su.c: making all sockets non-blocking by default.
Mon May 28 04:59:28 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su.m4: moved contents into sac-s2.m4
Mon May 28 05:32:26 EDT 2007 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed May 30 10:37:53 EDT 2007 Pekka.Pessi@nokia.com
* m4/sac-su2.m4: added configure option --disable-tag-cast.
Added SU_INLINE_TAG_CAST into sofia-sip/su_configure.h{,.in}.
Using SU_INLINE_TAG_CAST in
sofia-sip/sip_tag.h{,.in}
sofia-sip/http_tag.h{,.in}
sofia-sip/su_tag.h
sofia-sip/su_tag_io.h
sofia-sip/auth_module.h
sofia-sip/nth_tag.h
sofia-sip/nua_tag.h
Fri Jun 1 15:11:52 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed tport_set_params() with secondary transports
Fri Jun 1 15:13:23 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_tcp.c: checking for end-of-stream even if su_getmsgsize() promised more data
Fri Jun 1 15:15:34 EDT 2007 Pekka.Pessi@nokia.com
* tport: added tport_is_clear_to_send(), allow use of tport_pending() without msg
The error callback from tport can now be registered even if there is no
request pending on transport (e.g., when keeping a transport connection open
for inbound messages).
Fri Jun 1 15:16:43 EDT 2007 Pekka.Pessi@nokia.com
* nta: not retrying after an transport error if application provided the transport
Fri Jun 1 15:17:23 EDT 2007 Pekka.Pessi@nokia.com
* sip: do not accept empty URIs (<>) in From, To, and other headers expecting name-addr format
Fri Jun 1 15:17:43 EDT 2007 Pekka.Pessi@nokia.com
* torture_url.c: added test for parsing empty URLs.
Fri Jun 1 15:19:27 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.[hc]: use registered connections for outbound with TCP.
Added test_proxy_close_tports() used testing recovering from TCP failures.
Fri Jun 1 15:20:33 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: added --print-tags and --tags-a, --tags=b and --tags=c options
Added more functions for handling events
Fri Jun 1 15:22:08 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed some tests depending on delivery of responses in correct order
Reordering might happen if some messages are sent over TCP, other over UDP.
Fri Jun 1 15:27:55 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: re-registering in case the TCP connection towards proxy is closed
In test_nua, Mr. B is now using TCP with the test proxy.
Fri Jun 1 15:35:39 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_refer.c: fixed SIP payload checks
Fri Jun 1 15:36:08 EDT 2007 Pekka.Pessi@nokia.com
* nta_internal.h: added orq_user_tport field
Tue Jun 5 06:16:43 EDT 2007 Pekka.Pessi@nokia.com
* hide_email.sh: now fixing links, too.
Fri Jun 15 05:34:29 EDT 2007 Pekka.Pessi@nokia.com
* nua: fixed documentation entries for API functions left out from doxygen
Thanks for Jerry Ricahrds for pointing this out.
Wed May 23 10:26:26 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Correct documentation for parameter type of NUTAG_WITH_SAVED
Mon Jun 18 12:34:58 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* Make nua_saved_event_request() and hence NUTAG_WITH_SAVED resilient to a NULL event content
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5413 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-06-20 10:41:15 +00:00
|
|
|
/**@fn void nua_refer(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...);
|
|
|
|
*
|
|
|
|
* Transfer a call.
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* Send a REFER request asking the recipient to transfer the call.
|
|
|
|
*
|
|
|
|
* The REFER request also establishes an implied subscription to the "refer"
|
|
|
|
* event. The "refer" event can have an "id" parameter, which has the value
|
|
|
|
* of CSeq number in the REFER request. After initiating the REFER request,
|
|
|
|
* the nua engine sends application a #nua_r_refer event with status 100 and
|
|
|
|
* tag NUTAG_REFER_EVENT() containing a matching event header with id
|
|
|
|
* parameter.
|
|
|
|
*
|
|
|
|
* Note that the @Event header in the locally generated #nua_r_refer event
|
|
|
|
* contains the @a id parameter. The @a id parameter contains the @CSeq
|
|
|
|
* number of the REFER request, and it may get incremented if the request is
|
|
|
|
* retried because it got challenged or redirected. In that case, the
|
|
|
|
* application gets a new #nua_r_refer event with status 100 and tag
|
|
|
|
* NUTAG_REFER_EVENT(). Also the recipient of the REFER request may or may
|
|
|
|
* not include the @a id parameter with the @Event header in the NOTIFY
|
|
|
|
* requests messages which it sends to the sender of the REFER request.
|
|
|
|
*
|
|
|
|
* Therefore the application is not able to modify the state of the implied
|
|
|
|
* subscription before receiving the first NOTIFY request.
|
|
|
|
*
|
|
|
|
* @param nh Pointer to operation handle
|
|
|
|
* @param tag, value, ... List of tagged parameters
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* nothing
|
|
|
|
*
|
|
|
|
* @par Related Tags:
|
|
|
|
* NUTAG_URL() \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_refer \n
|
|
|
|
* #nua_i_notify
|
|
|
|
*
|
|
|
|
* @sa #nua_r_refer, NUTAG_SUBSTATE(), NUTAG_REFER_EVENT(),#nua_i_refer,
|
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
|
|
|
* @RFC3515, @ReferTo, SIPTAG_REFER_TO(), SIPTAG_REFER_TO_STR(),
|
|
|
|
* @RFC3892, @ReferredBy, SIPTAG_REFERRED_BY(), SIPTAG_REFERRED_BY_STR(),
|
|
|
|
* @RFC3891, @Replaces, SIPTAG_REPLACES(), SIPTAG_REPLACES_STR(),
|
|
|
|
* @RFC4488, @ReferSub, SIPTAG_REFER_SUB(), SIPTAG_REFER_SUB_STR()
|
2006-12-21 06:30:28 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/**@NUA_EVENT nua_r_refer
|
|
|
|
*
|
|
|
|
* @brief Response to outgoing REFER.
|
|
|
|
*
|
|
|
|
* @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 REFER request
|
|
|
|
* @param hmagic application context associated with the handle
|
|
|
|
* @param sip response to REFER request or NULL upon an error
|
|
|
|
* (status code is in @a status and
|
|
|
|
* descriptive message in @a phrase parameters)
|
|
|
|
* @param tags NUTAG_REFER_EVENT() \n
|
|
|
|
* NUTAG_SUBSTATE()
|
|
|
|
*
|
|
|
|
* @sa nua_refer(), NUTAG_SUBSTATE(), #nua_i_refer,
|
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
|
|
|
* @RFC3515, @RFC4488, @ReferSub
|
2006-12-21 06:30:28 +00:00
|
|
|
*
|
|
|
|
* @END_NUA_EVENT
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
static int nua_refer_client_init(nua_client_request_t *cr,
|
|
|
|
msg_t *, sip_t *,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_refer_client_request(nua_client_request_t *cr,
|
|
|
|
msg_t *, sip_t *,
|
|
|
|
tagi_t const *tags);
|
|
|
|
static int nua_refer_client_response(nua_client_request_t *cr,
|
|
|
|
int status, char const *phrase,
|
|
|
|
sip_t const *sip);
|
|
|
|
|
|
|
|
static nua_client_methods_t const nua_refer_client_methods = {
|
|
|
|
SIP_METHOD_REFER,
|
|
|
|
0,
|
|
|
|
{
|
|
|
|
/* create_dialog */ 1,
|
|
|
|
/* in_dialog */ 1,
|
|
|
|
/* target refresh */ 1
|
|
|
|
},
|
|
|
|
/*nua_refer_client_template*/ NULL,
|
|
|
|
nua_refer_client_init,
|
|
|
|
nua_refer_client_request,
|
|
|
|
/* nua_refer_client_check_restart */ NULL,
|
|
|
|
nua_refer_client_response,
|
|
|
|
nua_refer_client_response, /* Preliminary */
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
int
|
|
|
|
nua_stack_refer(nua_t *nua, nua_handle_t *nh, nua_event_t e,
|
|
|
|
tagi_t const *tags)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-04-15 02:03:41 +00:00
|
|
|
return nua_client_create(nh, e, &nua_refer_client_methods, tags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nua_refer_client_init(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
|
|
|
|
|
|
|
if (sip->sip_referred_by == NULL) {
|
|
|
|
sip_from_t *a = sip->sip_from;
|
|
|
|
sip_referred_by_t by[1];
|
|
|
|
|
|
|
|
sip_referred_by_init(by);
|
|
|
|
|
|
|
|
if (a == NULL)
|
|
|
|
a = nh->nh_nua->nua_from;
|
|
|
|
by->b_display = a->a_display;
|
|
|
|
*by->b_url = *a->a_url;
|
|
|
|
|
|
|
|
sip_add_dup(msg, sip, (sip_header_t *)by);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
if (sip->sip_event)
|
|
|
|
sip_header_remove(msg, sip, (sip_header_t *)sip->sip_event);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nua_refer_client_request(nua_client_request_t *cr,
|
|
|
|
msg_t *msg, sip_t *sip,
|
|
|
|
tagi_t const *tags)
|
|
|
|
{
|
|
|
|
nua_handle_t *nh = cr->cr_owner;
|
|
|
|
nua_dialog_usage_t *du = cr->cr_usage;
|
|
|
|
struct event_usage *eu;
|
|
|
|
sip_event_t *event;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
cr->cr_usage = NULL;
|
|
|
|
|
|
|
|
if (du)
|
|
|
|
nua_dialog_usage_remove(nh, nh->nh_ds, du);
|
|
|
|
|
|
|
|
event = sip_event_format(nh->nh_home, "refer;id=%u", sip->sip_cseq->cs_seq);
|
|
|
|
if (!event)
|
|
|
|
return -1;
|
|
|
|
du = nua_dialog_usage_add(nh, nh->nh_ds, nua_subscribe_usage, event);
|
|
|
|
if (!du)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
eu = nua_dialog_usage_private(cr->cr_usage = du);
|
|
|
|
eu ->eu_refer = 1;
|
|
|
|
|
|
|
|
error = nua_base_client_request(cr, msg, sip, tags);
|
|
|
|
|
|
|
|
if (!error) {
|
|
|
|
/* Give application an Event header for matching NOTIFYs with REFER */
|
|
|
|
nua_stack_tevent(nh->nh_nua, nh, NULL,
|
|
|
|
cr->cr_event, SIP_100_TRYING,
|
|
|
|
NUTAG_REFER_EVENT(event),
|
2007-08-06 19:24:10 +00:00
|
|
|
SIPTAG_EVENT(event),
|
2007-04-15 02:03:41 +00:00
|
|
|
TAG_END());
|
|
|
|
su_free(nh->nh_home, event);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nua_refer_client_response(nua_client_request_t *cr,
|
|
|
|
int status, char const *phrase,
|
|
|
|
sip_t const *sip)
|
|
|
|
{
|
|
|
|
nua_dialog_usage_t *du = cr->cr_usage;
|
|
|
|
enum nua_substate substate = nua_substate_terminated;
|
|
|
|
|
|
|
|
if (du) {
|
|
|
|
struct event_usage *eu = nua_dialog_usage_private(du);
|
|
|
|
|
|
|
|
if (status < 200) {
|
|
|
|
substate = eu->eu_substate;
|
|
|
|
}
|
|
|
|
else if (status < 300) {
|
|
|
|
sip_refer_sub_t const *rs = sip_refer_sub(sip);
|
|
|
|
|
|
|
|
if (rs && strcasecmp("false", rs->rs_value) == 0)
|
|
|
|
cr->cr_terminated = 1;
|
|
|
|
|
|
|
|
if (!cr->cr_terminated)
|
|
|
|
substate = eu->eu_substate;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nua_base_client_tresponse(cr, status, phrase, sip,
|
|
|
|
NUTAG_SUBSTATE(substate),
|
2007-08-06 19:24:10 +00:00
|
|
|
SIPTAG_EVENT(du ? du->du_event : NULL),
|
2007-04-15 02:03:41 +00:00
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|