From 82a42fc67801527ee5c7679c3cc883f4249e567f Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 3 Mar 2009 17:23:31 +0000 Subject: [PATCH] Tue Mar 3 10:49:51 CST 2009 Pekka Pessi * test_nta.c: timer C now CANCELs INVITE transaction Ignore-this: 8de2e5747e7ae0e62e2d8ad9aeb0cbed 408 response is not generated (unless CANCEL times out, too.) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12383 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 2f7b7fdd7e..1caba8901d 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Tue Mar 3 11:22:42 CST 2009 +Tue Mar 3 11:23:11 CST 2009 diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c index 75be9291b1..392b30913e 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c +++ b/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c @@ -530,7 +530,7 @@ until_server_canceled(client_t *c) { agent_t *ag = c->c_ag; - for (ag->ag_canceled = 0; !ag->ag_canceled;) { + for (ag->ag_canceled = 0; !ag->ag_canceled || c->c_status < 200;) { if (tstflags & tst_verbatim) { fputs(".", stdout); fflush(stdout); } @@ -3612,8 +3612,9 @@ int test_prack(agent_t *ag) SIPTAG_PAYLOAD(sdp), TAG_END())); - /* Run until 1) server gets CANCEL and 2) client gets 408 */ - TEST_1(!client_run_until_canceled(ctx, 408)); + /* Run until 1) server gets CANCEL and 2) client gets 487 */ + /* Note: this has been changed in 1.12.11 */ + TEST_1(!client_run_until_canceled(ctx, 487)); TEST_1(ag->ag_canceled != 0); TEST_P(ag->ag_latest_leg, ag->ag_server_leg);