2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the Sofia-SIP package
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 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 test_nua_re_invite.c
|
|
|
|
* @brief Test re_inviteing, outbound, nat traversal.
|
|
|
|
*
|
|
|
|
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
|
|
|
|
* @author Martti Mela <Martti Mela@nokia.com>
|
|
|
|
*
|
|
|
|
* @date Created: Wed Aug 17 12:12:12 EEST 2005 ppessi
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include "test_nua.h"
|
|
|
|
#include <sofia-sip/su_tag_class.h>
|
|
|
|
|
|
|
|
#if HAVE_FUNC
|
|
|
|
#elif HAVE_FUNCTION
|
|
|
|
#define __func__ __FUNCTION__
|
|
|
|
#else
|
|
|
|
#define __func__ "test_call_hold"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* ======================================================================== */
|
|
|
|
/* NUA-9 tests: REFER */
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
int test_refer0(struct context *ctx, char const *tests,
|
|
|
|
int refer_with_id, int notify_by_appl);
|
|
|
|
int notify_until_terminated(CONDITION_PARAMS);
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
int test_challenge_refer(struct context *ctx);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
int test_refer(struct context *ctx)
|
|
|
|
{
|
|
|
|
/* test twice, once without id and once with id */
|
|
|
|
return
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
test_challenge_refer(ctx) ||
|
2007-04-15 02:03:41 +00:00
|
|
|
test_refer0(ctx, "NUA-9.1", 0, 0) ||
|
|
|
|
test_refer0(ctx, "NUA-9.2", 1, 0) ||
|
|
|
|
test_refer0(ctx, "NUA-9.3", 0, 1) ||
|
|
|
|
test_refer0(ctx, "NUA-9.4", 1, 1);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Referred call:
|
|
|
|
|
|
|
|
A B
|
|
|
|
| |
|
|
|
|
|-------INVITE------>|
|
|
|
|
|<----100 Trying-----|
|
|
|
|
| |
|
|
|
|
|<----180 Ringing----|
|
|
|
|
| |
|
|
|
|
|<------200 OK-------|
|
|
|
|
|--------ACK-------->|
|
|
|
|
| |
|
|
|
|
|<------REFER--------|
|
|
|
|
|-------200 OK------>| C
|
|
|
|
[|-------NOTIFY------>|] |
|
|
|
|
[|<------200 OK-------|] |
|
|
|
|
| | |
|
|
|
|
| | |
|
|
|
|
|<-----SUBSCRIBE-----| |
|
|
|
|
|-------200 OK------>| |
|
|
|
|
| | |
|
|
|
|
| | |
|
|
|
|
|-----------------INVITE-------------------->|
|
|
|
|
| | |
|
|
|
|
|<------------------180----------------------|
|
|
|
|
|-------NOTIFY------>| |
|
|
|
|
|<------200 OK-------| |
|
|
|
|
| | |
|
|
|
|
|<------------------200----------------------|
|
|
|
|
|-------NOTIFY------>| |
|
|
|
|
|<------200 OK-------| |
|
|
|
|
|-------------------ACK--------------------->|
|
|
|
|
| | |
|
|
|
|
|--------BYE-------->| |
|
|
|
|
|<------200 OK-------| |
|
|
|
|
| X |
|
|
|
|
| |
|
|
|
|
|-------------------BYE--------------------->|
|
|
|
|
|<------------------200----------------------|
|
|
|
|
| |
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
int test_refer0(struct context *ctx, char const *tests,
|
|
|
|
int refer_with_id, int notify_by_appl)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
|
|
|
|
struct endpoint *a = &ctx->a, *b = &ctx->b, *c = &ctx->c;
|
|
|
|
struct call *a_call = a->call, *b_call = b->call, *c_call = c->call;
|
2007-04-15 02:03:41 +00:00
|
|
|
struct call *a_refer, *a_c2, *b_refer;
|
|
|
|
struct eventlist *a_revents, *b_revents;
|
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
|
|
|
struct event *e, *notify_e;
|
2006-12-21 06:30:28 +00:00
|
|
|
sip_t const *sip;
|
|
|
|
sip_event_t const *a_event, *b_event;
|
|
|
|
sip_refer_to_t const *refer_to;
|
|
|
|
sip_referred_by_t const *referred_by;
|
|
|
|
|
|
|
|
sip_refer_to_t r0[1];
|
|
|
|
sip_to_t to[1];
|
|
|
|
|
|
|
|
su_home_t tmphome[SU_HOME_AUTO_SIZE(16384)];
|
|
|
|
|
|
|
|
su_home_auto(tmphome, sizeof(tmphome));
|
|
|
|
|
|
|
|
if (print_headings)
|
2007-04-15 02:03:41 +00:00
|
|
|
printf("TEST %s: REFER: refer A to C%s%s%s\n", tests,
|
|
|
|
refer_with_id ? " with Event id" : "",
|
|
|
|
refer_with_id && !notify_by_appl ? " and" : "",
|
|
|
|
!notify_by_appl ? " nua generating the NOTIFYs" : "");
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.1: REFER: make a call between A and B\n", tests);
|
|
|
|
|
|
|
|
/* Do (not) include id with first implicit Event: refer */
|
|
|
|
nua_set_params(ctx->a.nua, NUTAG_REFER_WITH_ID(refer_with_id), TAG_END());
|
|
|
|
run_a_until(ctx, nua_r_set_params, until_final_response);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (refer_with_id) {
|
|
|
|
TEST_1(a_refer = calloc(1, (sizeof *a_refer) + (sizeof *a_refer->events)));
|
|
|
|
call_init(a_refer);
|
|
|
|
a_refer->events = (void *)(a_refer + 1);
|
|
|
|
eventlist_init(a_refer->events);
|
|
|
|
|
|
|
|
a_call->next = a_refer;
|
|
|
|
a_revents = a_refer->events;
|
|
|
|
|
|
|
|
TEST_1(b_refer = calloc(1, (sizeof *b_refer) + (sizeof *b_refer->events)));
|
|
|
|
call_init(b_refer);
|
|
|
|
b_refer->events = (void *)(b_refer + 1);
|
|
|
|
eventlist_init(b_refer->events);
|
|
|
|
|
|
|
|
b_call->next = b_refer;
|
|
|
|
b_revents = b_refer->events;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
a_refer = a_call, b_refer = b_call;
|
|
|
|
a_revents = a->events, b_revents = b->events;
|
|
|
|
}
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST_1(a_c2 = calloc(1, (sizeof *a_c2) + (sizeof *a_c2->events)));
|
|
|
|
call_init(a_c2);
|
|
|
|
a_c2->events = (void *)(a_c2 + 1);
|
|
|
|
eventlist_init(a_c2->events);
|
|
|
|
|
|
|
|
a_call->sdp = "m=audio 5008 RTP/AVP 8";
|
|
|
|
b_call->sdp = "m=audio 5010 RTP/AVP 0 8";
|
|
|
|
a_c2->sdp = "m=audio 5012 RTP/AVP 8";
|
|
|
|
c_call->sdp = "m=audio 5014 RTP/AVP 0 8";
|
|
|
|
|
|
|
|
TEST_1(a_call->nh = nua_handle(a->nua, a_call, SIPTAG_TO(b->to), TAG_END()));
|
|
|
|
|
|
|
|
INVITE(a, a_call, a_call->nh,
|
|
|
|
TAG_IF(!ctx->proxy_tests, NUTAG_URL(b->contact->m_url)),
|
|
|
|
SOATAG_USER_SDP_STR(a_call->sdp),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
run_ab_until(ctx, -1, until_ready, -1, accept_call);
|
|
|
|
|
|
|
|
/* Client transitions:
|
|
|
|
INIT -(C1)-> CALLING: nua_invite(), nua_i_state
|
|
|
|
CALLING -(C2)-> PROCEEDING: nua_r_invite, nua_i_state
|
|
|
|
PROCEEDING -(C3+C4)-> READY: nua_r_invite, nua_i_state
|
|
|
|
*/
|
|
|
|
TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_calling); /* CALLING */
|
|
|
|
TEST_1(is_offer_sent(e->data->e_tags));
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite);
|
|
|
|
TEST(e->data->e_status, 180);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_proceeding); /* PROCEEDING */
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */
|
|
|
|
TEST_1(is_answer_recv(e->data->e_tags));
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, a->events);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Server transitions:
|
|
|
|
INIT -(S1)-> RECEIVED: nua_i_invite, nua_i_state
|
|
|
|
RECEIVED -(S2a)-> EARLY: nua_respond(), nua_i_state
|
|
|
|
EARLY -(S3b)-> COMPLETED: nua_respond(), nua_i_state
|
|
|
|
COMPLETED -(S4)-> READY: nua_i_ack, nua_i_state
|
|
|
|
*/
|
|
|
|
TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_invite);
|
|
|
|
TEST(e->data->e_status, 100);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_received); /* RECEIVED */
|
|
|
|
TEST_1(is_offer_recv(e->data->e_tags));
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_early); /* EARLY */
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_completed); /* COMPLETED */
|
|
|
|
TEST_1(is_answer_sent(e->data->e_tags));
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_ack);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, b->events);
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.1: PASSED\n", tests);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
2007-04-15 02:03:41 +00:00
|
|
|
/* REFER (initial NOTIFY is no more sent unless REFER creates a new dialog)
|
2006-12-21 06:30:28 +00:00
|
|
|
A B
|
|
|
|
|<------REFER--------|
|
|
|
|
|-------200 OK------>|
|
|
|
|
[|-------NOTIFY------>|] |
|
|
|
|
[|<------200 OK-------|] |
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (print_headings)
|
2007-04-15 02:03:41 +00:00
|
|
|
printf("TEST %s.2: B refers A to C\n", tests);
|
|
|
|
|
|
|
|
if (b_refer != b_call)
|
|
|
|
TEST_1(b_refer->nh =
|
|
|
|
nua_handle(b->nua, b_refer, SIPTAG_TO(a->to), TAG_END()));
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
*sip_refer_to_init(r0)->r_url = *c->contact->m_url;
|
|
|
|
r0->r_url->url_headers = "subject=referred";
|
|
|
|
r0->r_display = "C";
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
REFER(b, b_refer, b_refer->nh, SIPTAG_REFER_TO(r0),
|
|
|
|
TAG_IF(!ctx->proxy_tests && b_refer != b_call,
|
|
|
|
NUTAG_URL(a->contact->m_url)),
|
|
|
|
TAG_END());
|
2006-12-21 06:30:28 +00:00
|
|
|
run_ab_until(ctx, -1, save_until_received,
|
|
|
|
-1, save_until_final_response);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Events in A:
|
|
|
|
nua_i_refer
|
|
|
|
*/
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST_1(e = a_revents->head); TEST_E(e->data->e_event, nua_i_refer);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(e->data->e_status, 202);
|
|
|
|
a_event = NULL;
|
|
|
|
TEST(tl_gets(e->data->e_tags,
|
|
|
|
NUTAG_REFER_EVENT_REF(a_event),
|
|
|
|
TAG_END()), 1);
|
|
|
|
TEST_1(a_event); TEST_1(a_event = sip_event_dup(tmphome, a_event));
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_refer_to);
|
|
|
|
TEST_1(refer_to = sip_refer_to_dup(tmphome, sip->sip_refer_to));
|
|
|
|
TEST_1(sip->sip_referred_by);
|
|
|
|
TEST_1(referred_by = sip_referred_by_dup(tmphome, sip->sip_referred_by));
|
|
|
|
|
|
|
|
/*
|
|
|
|
Events in B after nua_refer():
|
|
|
|
nua_r_refer
|
|
|
|
*/
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST_1(e = b_revents->head); TEST_E(e->data->e_event, nua_r_refer);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(e->data->e_status, 100);
|
|
|
|
TEST(tl_gets(e->data->e_tags,
|
|
|
|
NUTAG_REFER_EVENT_REF(b_event),
|
|
|
|
TAG_END()), 1);
|
|
|
|
TEST_1(b_event); TEST_1(b_event->o_id);
|
|
|
|
TEST_1(b_event = sip_event_dup(tmphome, b_event));
|
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
|
|
|
|
|
|
|
notify_e = NULL;
|
|
|
|
|
|
|
|
TEST_1(e = e->next);
|
|
|
|
if (e->data->e_event == nua_i_notify) {
|
|
|
|
notify_e = e;
|
|
|
|
TEST_1(e = e->next);
|
|
|
|
}
|
|
|
|
TEST_E(e->data->e_event, nua_r_refer);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(e->data->e_status, 202);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_SIZE(strtoul(b_event->o_id, NULL, 10), sip->sip_cseq->cs_seq);
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
if (a_refer != a_call) {
|
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
|
|
|
while (!notify_e) {
|
|
|
|
for (e = b_revents->head; e; e = e->next) {
|
|
|
|
if (e->data->e_event == nua_i_notify) {
|
|
|
|
notify_e = e;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!notify_e)
|
|
|
|
run_ab_until(ctx, -1, save_until_received, nua_i_notify, save_events);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a_revents->head->next == NULL)
|
2007-04-15 02:03:41 +00:00
|
|
|
run_a_until(ctx, -1, save_until_received);
|
|
|
|
|
|
|
|
TEST_1(e = a_revents->head->next); TEST_E(e->data->e_event, nua_r_notify);
|
|
|
|
TEST_1(!e->next);
|
|
|
|
|
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
|
|
|
TEST_1(e = notify_e);
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST_E(e->data->e_event, nua_i_notify);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_event);
|
|
|
|
if (refer_with_id)
|
|
|
|
TEST_S(sip->sip_event->o_id, b_event->o_id);
|
|
|
|
TEST_1(sip->sip_subscription_state);
|
|
|
|
TEST_S(sip->sip_subscription_state->ss_substate, "pending");
|
|
|
|
TEST_1(sip->sip_payload && sip->sip_payload->pl_data);
|
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
|
|
|
TEST_M(sip->sip_payload->pl_data, "SIP/2.0 100 Trying\r\n",
|
|
|
|
sip->sip_payload->pl_len);
|
2007-04-15 02:03:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free_events_in_list(ctx, a_revents);
|
|
|
|
free_events_in_list(ctx, b_revents);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.2: PASSED\n", tests);
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/*
|
|
|
|
A B
|
|
|
|
|<-----SUBSCRIBE-----|
|
|
|
|
|-------200 OK------>|
|
|
|
|
|-------NOTIFY------>| |
|
|
|
|
|<------200 OK-------| |
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.3: extend expiration time for implied subscription\n", tests);
|
|
|
|
|
|
|
|
SUBSCRIBE(b, b_call, b_call->nh,
|
|
|
|
SIPTAG_EVENT(b_event),
|
|
|
|
SIPTAG_EXPIRES_STR("3600"),
|
|
|
|
TAG_END());
|
|
|
|
run_ab_until(ctx, -1, save_until_final_response,
|
|
|
|
-1, save_until_final_response);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Events in A:
|
|
|
|
nua_i_subscribe, nua_r_notify
|
|
|
|
*/
|
|
|
|
TEST_1(e = a->events->head);
|
|
|
|
if (e->data->e_event == nua_r_notify)
|
|
|
|
TEST_1(e = e->next);
|
|
|
|
TEST_E(e->data->e_event, nua_i_subscribe);
|
|
|
|
TEST(e->data->e_status, 202);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_event);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_notify);
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, a->events);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Events in B after nua_subscribe():
|
|
|
|
nua_r_subscribe, nua_i_notify
|
|
|
|
*/
|
|
|
|
TEST_1(e = b->events->head);
|
|
|
|
if (e->data->e_event == nua_i_notify) {
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_event);
|
|
|
|
if (refer_with_id)
|
|
|
|
TEST_S(sip->sip_event->o_id, b_event->o_id);
|
|
|
|
TEST_1(sip->sip_subscription_state);
|
|
|
|
TEST_S(sip->sip_subscription_state->ss_substate, "pending");
|
|
|
|
TEST_1(sip->sip_payload && sip->sip_payload->pl_data);
|
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
|
|
|
TEST_M(sip->sip_payload->pl_data, "SIP/2.0 100 Trying\r\n",
|
|
|
|
sip->sip_payload->pl_len);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST_1(e = e->next);
|
|
|
|
}
|
|
|
|
TEST_E(e->data->e_event, nua_r_subscribe);
|
|
|
|
TEST(e->data->e_status, 202);
|
|
|
|
if (!e->next)
|
|
|
|
run_b_until(ctx, -1, save_until_received);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_notify);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_event);
|
|
|
|
if (refer_with_id)
|
|
|
|
TEST_S(sip->sip_event->o_id, b_event->o_id);
|
|
|
|
TEST_1(sip->sip_subscription_state);
|
|
|
|
TEST_S(sip->sip_subscription_state->ss_substate, "pending");
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, b->events);
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.3: PASSED\n", tests);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/*
|
|
|
|
A B C
|
|
|
|
| | |
|
|
|
|
|-----------------INVITE-------------------->|
|
|
|
|
| | |
|
|
|
|
XXX | |
|
|
|
|
| | |
|
|
|
|
|<------------------180----------------------|
|
|
|
|
|-------NOTIFY------>| |
|
|
|
|
|<------200 OK-------| |
|
|
|
|
| | |
|
|
|
|
XXX | |
|
|
|
|
| | |
|
|
|
|
|<------------------200----------------------|
|
|
|
|
|-------NOTIFY------>| |
|
|
|
|
|<------200 OK-------| |
|
|
|
|
|-------------------ACK--------------------->|
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.4: A invites C\n", tests);
|
|
|
|
|
|
|
|
*sip_to_init(to)->a_url = *refer_to->r_url;
|
|
|
|
to->a_display = refer_to->r_display;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
a_refer->next = a_c2;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
TEST_1(a_c2->nh = nua_handle(a->nua, a_c2, SIPTAG_TO(to), TAG_END()));
|
|
|
|
|
|
|
|
INVITE(a, a_c2, a_c2->nh, /* NUTAG_URL(refer_to->r_url), */
|
2007-04-15 02:03:41 +00:00
|
|
|
TAG_IF(!notify_by_appl, NUTAG_REFER_EVENT(a_event)),
|
|
|
|
TAG_IF(!notify_by_appl, NUTAG_NOTIFY_REFER(a_refer->nh)),
|
2006-12-21 06:30:28 +00:00
|
|
|
SOATAG_USER_SDP_STR(a_c2->sdp),
|
|
|
|
SIPTAG_REFERRED_BY(referred_by),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
run_abc_until(ctx,
|
2007-04-15 02:03:41 +00:00
|
|
|
-1, notify_by_appl ? notify_until_terminated : until_ready,
|
2006-12-21 06:30:28 +00:00
|
|
|
-1, save_until_received,
|
2007-04-15 02:03:41 +00:00
|
|
|
-1, accept_call);
|
|
|
|
|
|
|
|
/* Wait until both NOTIFY has been responded */
|
|
|
|
while (a_revents->head == NULL || a_revents->head->next == NULL)
|
|
|
|
run_ab_until(ctx, -1, save_until_received, -1, save_events);
|
|
|
|
while (b_revents->head == NULL || b_revents->head->next == NULL)
|
|
|
|
run_ab_until(ctx, -1, save_events, -1, save_until_received);
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
/* Client A transitions:
|
|
|
|
INIT -(C1)-> CALLING: nua_invite(), nua_i_state
|
|
|
|
CALLING -(C2+C4)-> PROCEEDING: nua_r_invite, nua_i_state
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_r_notify
|
2006-12-21 06:30:28 +00:00
|
|
|
PROCEEDING -(C3+C4)-> READY: nua_r_invite, nua_i_state
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_r_notify
|
2006-12-21 06:30:28 +00:00
|
|
|
*/
|
|
|
|
TEST_1(e = a_c2->events->head); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_calling); /* CALLING */
|
|
|
|
TEST_1(is_offer_sent(e->data->e_tags));
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite);
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST(e->data->e_status, 180);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_proceeding); /* PROCEEDING */
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */
|
|
|
|
TEST_1(is_answer_recv(e->data->e_tags));
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, a_c2->events);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST_1(e = a_revents->head); TEST_E(e->data->e_event, nua_r_notify);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_notify);
|
|
|
|
if (a_refer == a_call && notify_by_appl) {
|
|
|
|
free_event_in_list(ctx, a_revents, a_revents->head);
|
|
|
|
free_event_in_list(ctx, a_revents, a_revents->head);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, a_revents);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
Events in B after nua_refer():
|
|
|
|
nua_i_notify
|
|
|
|
*/
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST_1(e = b_revents->head); TEST_E(e->data->e_event, nua_i_notify);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_subscription_state);
|
|
|
|
TEST_S(sip->sip_subscription_state->ss_substate, "active");
|
|
|
|
TEST_1(sip->sip_payload && sip->sip_payload->pl_data);
|
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
|
|
|
TEST_M(sip->sip_payload->pl_data, "SIP/2.0 180 Ringing\r\n", sip->sip_payload->pl_len);
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST_1(sip->sip_event);
|
|
|
|
if (refer_with_id)
|
|
|
|
TEST_S(sip->sip_event->o_id, b_event->o_id);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_notify);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_subscription_state);
|
|
|
|
TEST_S(sip->sip_subscription_state->ss_substate, "terminated");
|
|
|
|
TEST_1(sip->sip_payload && sip->sip_payload->pl_data);
|
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
|
|
|
TEST_M(sip->sip_payload->pl_data, "SIP/2.0 200 OK\r\n", sip->sip_payload->pl_len);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST_1(sip->sip_event);
|
|
|
|
if (refer_with_id)
|
|
|
|
TEST_S(sip->sip_event->o_id, b_event->o_id);
|
2007-04-15 02:03:41 +00:00
|
|
|
if (b_refer == b_call && notify_by_appl) {
|
|
|
|
free_event_in_list(ctx, b_revents, b_revents->head);
|
|
|
|
free_event_in_list(ctx, b_revents, b_revents->head);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, b_revents);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
C transitions:
|
|
|
|
INIT -(S1)-> RECEIVED: nua_i_invite, nua_i_state
|
2007-04-15 02:03:41 +00:00
|
|
|
RECEIVED -(S2a)-> EARLY: nua_respond(), nua_i_state
|
|
|
|
EARLY -(S3b)-> COMPLETED: nua_respond(), nua_i_state
|
2006-12-21 06:30:28 +00:00
|
|
|
COMPLETED -(S4)-> READY: nua_i_ack, nua_i_state
|
|
|
|
*/
|
|
|
|
TEST_1(e = c->events->head); TEST_E(e->data->e_event, nua_i_invite);
|
|
|
|
TEST(e->data->e_status, 100);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_received); /* RECEIVED */
|
|
|
|
TEST_1(is_offer_recv(e->data->e_tags));
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
2007-04-15 02:03:41 +00:00
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_early); /* EARLY */
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
2006-12-21 06:30:28 +00:00
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_completed); /* COMPLETED */
|
|
|
|
TEST_1(is_answer_sent(e->data->e_tags));
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_ack);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, c->events);
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.4: PASSED\n", tests);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/*
|
|
|
|
A B
|
|
|
|
|---------BYE------->|
|
|
|
|
|<--------200--------|
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.5.1: terminate call between A and B\n", tests);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (notify_by_appl) {
|
|
|
|
if (!a->events->head || !a->events->head->next)
|
|
|
|
run_ab_until(ctx, -1, until_terminated, -1, save_events);
|
|
|
|
if (!b->events->head || !b->events->head->next)
|
|
|
|
run_ab_until(ctx, -1, save_events, -1, until_terminated);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BYE(a, a_call, a_call->nh, TAG_END());
|
|
|
|
run_ab_until(ctx, -1, until_terminated, -1, until_terminated);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
/*
|
2007-04-15 02:03:41 +00:00
|
|
|
Transitions of A:
|
|
|
|
READY --(T2)--> TERMINATING: nua_bye()
|
|
|
|
TERMINATING --(T3)--> TERMINATED: nua_r_bye, nua_i_state
|
2006-12-21 06:30:28 +00:00
|
|
|
*/
|
|
|
|
TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_r_bye);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, a->events);
|
2007-04-15 02:03:41 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
/* Transitions of B:
|
|
|
|
READY -(T1)-> TERMINATED: nua_i_bye, nua_i_state
|
|
|
|
*/
|
|
|
|
TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_bye);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, b->events);
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.5.1: PASSED\n", tests);
|
|
|
|
|
|
|
|
nua_handle_destroy(a_call->nh), a_call->nh = NULL;
|
|
|
|
nua_handle_destroy(b_call->nh), b_call->nh = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/*
|
|
|
|
A C
|
|
|
|
|-------------------BYE--------------------->|
|
|
|
|
|<------------------200----------------------|
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.5.2: terminate call between A and C\n", tests);
|
|
|
|
|
|
|
|
BYE(a, a_c2, a_c2->nh, TAG_END());
|
|
|
|
run_abc_until(ctx, -1, until_terminated, -1, NULL, -1, until_terminated);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Transitions of A:
|
|
|
|
READY --(T2)--> TERMINATING: nua_bye()
|
|
|
|
TERMINATING --(T3)--> TERMINATED: nua_r_bye, nua_i_state
|
|
|
|
*/
|
|
|
|
TEST_1(e = a_c2->events->head); TEST_E(e->data->e_event, nua_r_bye);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, a_c2->events);
|
|
|
|
|
|
|
|
/* Transitions of B:
|
|
|
|
READY -(T1)-> TERMINATED: nua_i_bye, nua_i_state
|
|
|
|
*/
|
|
|
|
TEST_1(e = c->events->head); TEST_E(e->data->e_event, nua_i_bye);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
|
|
|
|
TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */
|
|
|
|
TEST_1(!e->next);
|
|
|
|
free_events_in_list(ctx, c->events);
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s.5.2: PASSED\n", tests);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
nua_handle_destroy(c_call->nh), c_call->nh = NULL;
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
nua_handle_destroy(a_c2->nh), a_c2->nh = NULL;
|
2007-04-15 02:03:41 +00:00
|
|
|
a_refer->next = NULL; free(a_c2);
|
2007-02-07 21:59:38 +00:00
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
if (a_refer != a_call) {
|
|
|
|
nua_handle_destroy(a_refer->nh), a_refer->nh = NULL;
|
|
|
|
a_call->next = NULL; free(a_refer);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (b_refer != b_call) {
|
|
|
|
nua_handle_destroy(b_refer->nh), b_refer->nh = NULL;
|
|
|
|
b_call->next = NULL; free(b_refer);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST %s: PASSED\n", tests);
|
|
|
|
|
|
|
|
su_home_deinit(tmphome);
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
X INVITE
|
|
|
|
| |
|
|
|
|
|-----------------INVITE-------------------->|
|
|
|
|
| | |
|
|
|
|
| | |
|
|
|
|
|<------------------200----------------------|
|
|
|
|
|-------NOTIFY------>| |
|
|
|
|
|--------BYE-------->| |
|
|
|
|
|-------------------ACK--------------------->|
|
|
|
|
|
|
|
|
*/
|
|
|
|
int notify_until_terminated(CONDITION_PARAMS)
|
|
|
|
{
|
|
|
|
if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
save_event_in_list(ctx, event, ep, call);
|
|
|
|
|
|
|
|
if (event == nua_r_invite) {
|
|
|
|
sip_status_t *st = sip->sip_status;
|
|
|
|
sip_payload_t *pl;
|
2007-04-15 02:03:41 +00:00
|
|
|
struct call *r_call;
|
|
|
|
|
|
|
|
if (!nua_handle_has_events(ep->call->nh))
|
|
|
|
r_call = ep->call->next;
|
|
|
|
else
|
|
|
|
r_call = ep->call;
|
|
|
|
|
|
|
|
assert(nua_handle_has_events(r_call->nh));
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
pl = sip_payload_format(NULL, "SIP/2.0 %u %s\r\n",
|
|
|
|
st->st_status, st->st_phrase);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
NOTIFY(ep, r_call, r_call->nh,
|
2006-12-21 06:30:28 +00:00
|
|
|
SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
|
|
|
|
SIPTAG_PAYLOAD(pl),
|
2007-04-15 02:03:41 +00:00
|
|
|
NUTAG_SUBSTATE(st->st_status >= 200
|
|
|
|
? nua_substate_terminated
|
|
|
|
: nua_substate_active),
|
2006-12-21 06:30:28 +00:00
|
|
|
TAG_END());
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
su_free(NULL, pl);
|
|
|
|
|
|
|
|
if (st->st_status >= 200)
|
|
|
|
BYE(ep, ep->call, ep->call->nh, TAG_END());
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (call != ep->call)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (callstate(tags)) {
|
|
|
|
case nua_callstate_terminated:
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
|
|
|
|
int authenticate_refer(CONDITION_PARAMS);
|
|
|
|
int reject_refer_after_notified(CONDITION_PARAMS);
|
|
|
|
|
|
|
|
int test_challenge_refer(struct context *ctx)
|
|
|
|
{
|
|
|
|
BEGIN();
|
|
|
|
|
|
|
|
struct endpoint *a = &ctx->a, *b = &ctx->b, *c = &ctx->c;
|
|
|
|
struct call *a_call = a->call, *c_call = c->call;
|
|
|
|
struct event *e;
|
|
|
|
sip_t const *sip;
|
|
|
|
|
|
|
|
sip_refer_to_t r0[1];
|
|
|
|
|
|
|
|
if (!ctx->proxy_tests)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST NUA-9.0.1: challenge REFER\n");
|
|
|
|
|
|
|
|
nua_set_params(ctx->a.nua, NUTAG_APPL_METHOD("REFER"), TAG_END());
|
|
|
|
run_a_until(ctx, nua_r_set_params, until_final_response);
|
|
|
|
|
|
|
|
*sip_refer_to_init(r0)->r_url = *b->contact->m_url;
|
|
|
|
r0->r_url->url_headers = "subject=referred";
|
|
|
|
r0->r_display = "B";
|
|
|
|
|
|
|
|
TEST_1(c_call->nh = nua_handle(c->nua, c_call, SIPTAG_TO(a->to), TAG_END()));
|
|
|
|
|
|
|
|
REFER(c, c_call, c_call->nh,
|
|
|
|
SIPTAG_FROM(c->to),
|
|
|
|
SIPTAG_REFER_TO(r0),
|
|
|
|
TAG_END());
|
|
|
|
|
|
|
|
run_abc_until(ctx, -1, reject_refer_after_notified, -1, NULL, -1, authenticate_refer);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Events in A:
|
|
|
|
nua_i_refer
|
|
|
|
*/
|
|
|
|
TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_refer);
|
|
|
|
TEST(e->data->e_status, 100);
|
|
|
|
TEST_1(sip = sip_object(e->data->e_msg));
|
|
|
|
TEST_1(sip->sip_refer_to);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_notify);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
TEST_1(!e->next);
|
|
|
|
/*
|
|
|
|
Events in C after nua_refer():
|
|
|
|
nua_r_refer
|
|
|
|
*/
|
|
|
|
TEST_1(e = c->events->head); TEST_E(e->data->e_event, nua_r_refer);
|
|
|
|
TEST(e->data->e_status, 100);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_refer);
|
|
|
|
TEST(e->data->e_status, 407);
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_refer);
|
|
|
|
TEST(e->data->e_status, 100);
|
|
|
|
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_notify);
|
|
|
|
TEST(e->data->e_status, 200);
|
|
|
|
|
|
|
|
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_refer);
|
|
|
|
TEST(e->data->e_status, 480);
|
|
|
|
|
|
|
|
TEST_1(!e->next);
|
|
|
|
|
|
|
|
free_events_in_list(ctx, a->events);
|
|
|
|
free_events_in_list(ctx, c->events);
|
|
|
|
|
|
|
|
nua_handle_destroy(a_call->nh), a_call->nh = NULL;
|
|
|
|
nua_handle_destroy(c_call->nh), c_call->nh = NULL;
|
|
|
|
|
|
|
|
nua_set_params(ctx->a.nua,
|
|
|
|
NUTAG_APPL_METHOD(NULL),
|
|
|
|
NUTAG_APPL_METHOD("INVITE, REGISTER, PUBLISH, SUBSCRIBE"),
|
|
|
|
TAG_END());
|
|
|
|
run_a_until(ctx, nua_r_set_params, until_final_response);
|
|
|
|
|
|
|
|
if (print_headings)
|
|
|
|
printf("TEST NUA-9.0.1: PASSED\n");
|
|
|
|
|
|
|
|
END();
|
|
|
|
}
|
|
|
|
|
|
|
|
int reject_refer_after_notified(CONDITION_PARAMS)
|
|
|
|
{
|
|
|
|
if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
save_event_in_list(ctx, event, ep, call);
|
|
|
|
|
|
|
|
if (event == nua_i_refer) {
|
|
|
|
}
|
|
|
|
|
|
|
|
if (event == nua_r_notify) {
|
|
|
|
/* Respond to refer only after initial notify has been responded */
|
|
|
|
struct eventlist *list;
|
|
|
|
struct event *e;
|
|
|
|
|
|
|
|
if (call->events)
|
|
|
|
list = call->events;
|
|
|
|
else
|
|
|
|
list = ep->events;
|
|
|
|
|
|
|
|
for (e = list->head; e; e = e->next)
|
|
|
|
if (e->data->e_event == nua_i_refer)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (e) {
|
|
|
|
RESPOND(ep, call, nh, SIP_480_TEMPORARILY_UNAVAILABLE,
|
|
|
|
NUTAG_WITH(e->data->e_msg),
|
|
|
|
TAG_END());
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int authenticate_refer(CONDITION_PARAMS)
|
|
|
|
{
|
|
|
|
if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
save_event_in_list(ctx, event, ep, call);
|
|
|
|
|
|
|
|
if (status == 401 || status == 407) {
|
|
|
|
AUTHENTICATE(ep, call, nh,
|
|
|
|
NUTAG_AUTH("Digest:\"test-proxy\":charlie:secret"),
|
|
|
|
TAG_END());
|
|
|
|
}
|
|
|
|
|
|
|
|
return status == 480;
|
|
|
|
}
|