Skip to content

GitLab

Commit c33dd746 authored by Pekka Pessi's avatar Pekka Pessi
Browse files
Options

nua_session.c: fixed problem of UAC receiving UPDATE on an early dialog. 

test_100rel.c: added test for original UAS sending UPDATE.

darcs-hash:20060831114957-65a35-a422332923eda89f6c14a581fe28efc90f7f40eb.gz
parent b1d68a20
Hide whitespace changes
Inline Side-by-side
Showing with 393 additions and 31 deletions
libsofia-sip-ua/nua/nua_session.c
View file @ c33dd746
......@@ -438,6 +438,9 @@ static int process_response_to_invite(nua_handle_t *nh,
}
#endif
if (status < 300 && !ss->ss_usage) /* Usage is now established */
ss->ss_usage = du;
if (status >= 300) {
if (sip->sip_retry_after)
gracefully = 0;
......@@ -1207,8 +1210,19 @@ void respond_to_invite(nua_t *nua, nua_handle_t *nh,
if (nh->nh_soa)
soa_set_params(nh->nh_soa, TAG_NEXT(tags));
msg = nh_make_response(nua, nh, ss->ss_srequest->sr_irq,
status, phrase,
TAG_IF(status < 300, NUTAG_ADD_CONTACT(1)),
SIPTAG_SUPPORTED(NH_PGET(nh, supported)),
TAG_NEXT(tags));
sip = sip_object(msg);
assert(sip); /* XXX */
reliable =
(status >= 200)
|| (status > 100 && sip->sip_require &&
sip_has_feature(sip->sip_require, "100rel"))
|| (status > 100 &&
ds->ds_remote_ua->nr_require &&
sip_has_feature(ds->ds_remote_ua->nr_require, "100rel"))
......@@ -1229,15 +1243,6 @@ void respond_to_invite(nua_t *nua, nua_handle_t *nh,
sip_has_feature(ds->ds_remote_ua->nr_require, "precondition") &&
sr->sr_offer_recv && !sr->sr_answer_sent);
msg = nh_make_response(nua, nh, ss->ss_srequest->sr_irq,
status, phrase,
TAG_IF(status < 300, NUTAG_ADD_CONTACT(1)),
SIPTAG_SUPPORTED(NH_PGET(nh, supported)),
TAG_NEXT(tags));
sip = sip_object(msg);
assert(sip); /* XXX */
if (!nh->nh_soa)
/* Xyzzy */;
else if (status >= 300) {
......@@ -1390,23 +1395,14 @@ int process_ack_or_cancel(nua_handle_t *nh,
nta_incoming_t *irq,
sip_t const *sip)
{
int retval;
nua_server_request_t *sr = nh->nh_ss->ss_srequest;
enter;
if (sip && sip->sip_request->rq_method == sip_method_ack)
retval = process_ack(nh, irq, sip);
return process_ack(nh, irq, sip);
else if (sip && sip->sip_request->rq_method == sip_method_cancel)
retval = process_cancel(nh, irq, sip);
return process_cancel(nh, irq, sip);
else
retval = process_timeout(nh, irq);
assert(sr->sr_irq == irq);
nta_incoming_destroy(sr->sr_irq);
memset(sr, 0, sizeof *sr);
return retval;
return process_timeout(nh, irq);
}
/** @internal Process PRACK or (timeout from 100rel) */
......@@ -1558,6 +1554,10 @@ int process_ack(nua_handle_t *nh,
set_session_timer(nh);
assert(sr->sr_irq == irq);
nta_incoming_destroy(sr->sr_irq);
memset(sr, 0, sizeof *sr);
return 0;
}
......@@ -1575,9 +1575,20 @@ int process_cancel(nua_handle_t *nh,
signal_call_state_change(nh, 0, "Received CANCEL", nua_callstate_init, 0, 0);
if (nh->nh_soa && ss->ss_state < nua_callstate_ready) {
msg_t *msg = nh_make_response(nh->nh_nua, nh, irq,
SIP_487_REQUEST_TERMINATED,
TAG_END());
nta_incoming_mreply(irq, msg);
soa_terminate(nh->nh_soa, NULL);
nsession_destroy(nh);
}
else {
assert(ss->ss_srequest->sr_irq == irq);
nta_incoming_destroy(ss->ss_srequest->sr_irq);
memset(ss->ss_srequest, 0, sizeof *ss->ss_srequest);
}
return 0;
}
......@@ -1610,6 +1621,7 @@ int process_timeout(nua_handle_t *nh,
TAG_END());
signal_call_state_change(nh, 0, "Timeout",
nua_callstate_init, 0, 0);
nsession_destroy(nh);
}
return 0;
......@@ -1866,6 +1878,7 @@ static
void nsession_destroy(nua_handle_t *nh)
{
struct nua_session_state *ss = nh->nh_ss;
nta_incoming_t *irq = ss->ss_srequest->sr_irq;
ss->ss_active = 0;
ss->ss_state = nua_callstate_init;
......@@ -1881,6 +1894,19 @@ void nsession_destroy(nua_handle_t *nh)
soa_destroy(nh->nh_soa), nh->nh_soa = NULL;
ss->ss_srequest->sr_respond = NULL;
ss->ss_srequest->sr_irq = NULL;
if (irq) {
if (nta_incoming_status(irq) < 200) {
msg_t *msg = nh_make_response(nh->nh_nua, nh, irq,
SIP_500_INTERNAL_SERVER_ERROR,
TAG_END());
if (nta_incoming_mreply(irq, msg) < 0)
nta_incoming_treply(irq, SIP_500_INTERNAL_SERVER_ERROR, TAG_END());
}
nta_incoming_destroy(irq);
}
SU_DEBUG_5(("nua: terminated session %p\n", nh));
}
......@@ -2052,7 +2078,7 @@ static int process_response_to_update(nua_handle_t *nh,
if (sip->sip_retry_after)
gracefully = 0;
terminate = sip_response_terminates_dialog(status, sip_method_invite,
terminate = sip_response_terminates_dialog(status, sip_method_update,
&gracefully);
if (!terminate &&
......@@ -2086,15 +2112,19 @@ static int process_response_to_update(nua_handle_t *nh,
nua_stack_process_response(nh, cr, orq, sip, TAG_END());
if (terminate || gracefully)
nh_referral_respond(nh, status, phrase);
if (!terminate && !gracefully)
return 0;
if (terminate) {
nh_referral_respond(nh, status, phrase);
if (terminate ||
(ss->ss_state < nua_callstate_completed &&
ss->ss_state != nua_callstate_completing)) {
signal_call_state_change(nh, status, phrase,
nua_callstate_terminated, recv, 0);
nsession_destroy(nh);
}
else if (gracefully) {
else /* if (gracefully) */ {
signal_call_state_change(nh, status, phrase,
nua_callstate_terminating, recv, 0);
#if 0
......@@ -2134,7 +2164,7 @@ int nua_stack_process_update(nua_t *nua,
if (!du) {
nua_dialog_state_t *ds = nh->nh_ds;
/* No session for this dialog */
/* No session in this dialog */
nta_incoming_treply(irq,
SET_STATUS1(SIP_405_METHOD_NOT_ALLOWED),
TAG_IF(ds->ds_has_subscribes,
......
libsofia-sip-ua/nua/test_100rel.c
View file @ c33dd746
......@@ -144,7 +144,7 @@ int ringing_pracked(CONDITION_PARAMS)
}
/*
X accept_updated ep
X ringing_updated ep
|-------INVITE------>|
| (sdp) |
|<----100 Trying-----|
......@@ -209,6 +209,87 @@ int ringing_updated(CONDITION_PARAMS)
}
}
/*
X ringing_updated2 ep
|-------INVITE------>|
| (sdp) |
|<----100 Trying-----|
| |
|<-------183---------|
| (sdp) |
|-------PRACK------->|
| (sdp) |
|<-------200---------|
| (sdp) |
| |
|-------UPDATE------>|
| (sdp) |
|<-------200---------|
| (sdp) |
| |
|<------UPDATE-------|
| (sdp) |
|--------200-------->|
| (sdp) |
| |
<using acccept_pracked>
| |
|<-------180---------|
|-------PRACK------->|
|<-------200---------|
| |
|<------200 OK-------|
|--------ACK-------->|
| |
*/
int ringing_updated2(CONDITION_PARAMS)
{
if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR)))
return 0;
save_event_in_list(ctx, event, ep, call);
switch (event) {
case nua_i_update:
if (200 <= status && status < 300) {
UPDATE(ep, call, nh, TAG_END());
}
return 0;
case nua_r_update:
if (200 <= status && status < 300) {
RESPOND(ep, call, nh, SIP_180_RINGING,
SIPTAG_REQUIRE_STR("100rel"),
TAG_END());
ep->next_condition = accept_pracked;
}
else if (300 <= status) {
RESPOND(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR, TAG_END());
}
return 0;
default:
break;
}
switch (callstate(tags)) {
case nua_callstate_received:
RESPOND(ep, call, nh, SIP_183_SESSION_PROGRESS,
SIPTAG_REQUIRE_STR("100rel"),
TAG_IF(call->sdp, SOATAG_USER_SDP_STR(call->sdp)),
TAG_END());
return 0;
case nua_callstate_early:
return 0;
case nua_callstate_ready:
return 1;
case nua_callstate_terminated:
if (call)
nua_handle_destroy(call->nh), call->nh = NULL;
return 1;
default:
return 0;
}
}
/*
X accept_updated ep
|-------INVITE------>|
......@@ -615,6 +696,8 @@ int test_100rel(struct context *ctx)
/* Client transitions:
INIT -(C1)-> CALLING: nua_invite(), nua_i_state
CALLING -(C2)-> PROCEEDING: nua_r_invite, nua_i_state
PROCEEDING --> PROCEEDING: nua_r_prack, nua_i_state
PROCEEDING --> PROCEEDING: nua_r_update, 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);
......@@ -663,9 +746,11 @@ int test_100rel(struct context *ctx)
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite);
TEST(e->data->e_status, 200);
TEST_1(sip = sip_object(e->data->e_msg));
TEST_1(sip->sip_session_expires);
TEST_S(sip->sip_session_expires->x_refresher, "uas");
TEST_1(!sip_has_supported(sip->sip_require, "timer"));
if (ctx->proxy_tests) {
TEST_1(sip->sip_session_expires);
TEST_S(sip->sip_session_expires->x_refresher, "uas");
TEST_1(!sip_has_supported(sip->sip_require, "timer"));
}
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */
......@@ -677,6 +762,9 @@ int test_100rel(struct context *ctx)
Server transitions:
INIT -(S1)-> RECEIVED: nua_i_invite, nua_i_state
RECEIVED -(S2a)-> EARLY: nua_respond(), nua_i_state
EARLY --> EARLY: nua_i_prack, nua_i_state
EARLY --> EARLY: nua_i_update, nua_i_state
EARLY --> EARLY: nua_r_update, nua_i_state
EARLY -(S3b)-> COMPLETED: nua_respond(), nua_i_state
COMPLETED -(S4)-> READY: nua_i_ack, nua_i_state
*/
......@@ -700,8 +788,10 @@ int test_100rel(struct context *ctx)
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_update);
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(!is_offer_sent(e->data->e_tags));
TEST_1(is_offer_recv(e->data->e_tags));
TEST_1(is_answer_sent(e->data->e_tags));
TEST_1(!is_answer_recv(e->data->e_tags));
/* Responded with 180 Ringing */
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
......@@ -943,5 +1033,247 @@ int test_100rel(struct context *ctx)
if (print_headings)
printf("TEST NUA-10.4.1: PASSED\n");
/* -------------------------------------------------------------------- */
if (print_headings)
printf("TEST NUA-10.5: Call with dual UPDATE\n");
/* Test for precondition:
A B
|-------INVITE------>|
|<----100 Trying-----|
| |
|<-------183---------|
|-------PRACK------->|
|<-------200---------|
| |
|-------UPDATE------>|
|<-------200---------|
| |
|<------UPDATE-------|
|--------200-------->|
| |
|<-------180---------|
|-------PRACK------->|
|<-------200---------|
| |
|<------200 OK-------|
|--------ACK-------->|
| |
|<-------BYE---------|
|-------200 OK-------|
| |
*/
a_call->sdp = "m=audio 5008 RTP/AVP 8";
b_call->sdp = "m=audio 5010 RTP/AVP 0 8";
nua_set_params(ctx->a.nua,
NUTAG_EARLY_MEDIA(1),
SIPTAG_SUPPORTED_STR("100rel, precondition"),
TAG_END());
run_a_until(ctx, nua_r_set_params, until_final_response);
nua_set_params(ctx->b.nua,
NUTAG_EARLY_MEDIA(0),
SIPTAG_SUPPORTED_STR("100rel, precondition, timer"),
TAG_END());
run_b_until(ctx, nua_r_set_params, until_final_response);
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),
SIPTAG_SUPPORTED_STR("100rel"),
SIPTAG_REQUIRE_STR("precondition"),
TAG_END());
run_ab_until(ctx, -1, until_ready, -1, ringing_updated2);
/* Client transitions:
INIT -(C1)-> CALLING: nua_invite(), nua_i_state
CALLING -(C2)-> PROCEEDING: nua_r_invite, nua_i_state
PROCEEDING: nua_r_prack, nua_i_state
PROCEEDING: nua_r_update, nua_i_state
PROCEEDING: nua_i_update, 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, 183);
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
TEST(callstate(e->data->e_tags), nua_callstate_proceeding);
TEST_1(is_answer_recv(e->data->e_tags));
TEST_1(is_offer_sent(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_prack);
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_proceeding);
TEST_1(is_answer_recv(e->data->e_tags));
TEST_1(!is_offer_sent(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_proceeding);
TEST_1(!is_answer_recv(e->data->e_tags));
TEST_1(is_offer_sent(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_update);
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_proceeding);
TEST_1(is_answer_recv(e->data->e_tags));
TEST_1(!is_offer_sent(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_update);
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_proceeding);
TEST_1(is_offer_recv(e->data->e_tags));
TEST_1(is_answer_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(!is_offer_answer_done(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_prack);
TEST(e->data->e_status, 200);
/* Does not have effect on call state */
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite);
TEST(e->data->e_status, 200);
if (ctx->proxy_tests) {
TEST_1(sip = sip_object(e->data->e_msg));
TEST_1(sip->sip_session_expires);
TEST_S(sip->sip_session_expires->x_refresher, "uas");
TEST_1(!sip_has_supported(sip->sip_require, "timer"));
}
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_offer_answer_done(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(183), nua_i_state
EARLY --> EARLY: nua_i_prack, nua_i_state
EARLY --> EARLY: nua_i_update, nua_i_state
EARLY --> EARLY: nua_update(), nua_i_state
EARLY --> EARLY: nua_r_update, nua_i_state
EARLY --> EARLY: nua_respond(180), nua_i_state
EARLY --> EARLY: nua_i_prack, nua_i_state
EARLY -(S3b)-> COMPLETED: nua_respond(200), 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 */
/* Responded with 183 Session Progress */
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
TEST(e->data->e_status, 183);
TEST(callstate(e->data->e_tags), nua_callstate_early); /* EARLY */
TEST_1(is_answer_sent(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_prack);
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(is_offer_recv(e->data->e_tags));
TEST_1(is_answer_sent(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_update);
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(is_offer_recv(e->data->e_tags));
TEST_1(is_answer_sent(e->data->e_tags));
/* sent UPDATE */
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(is_offer_sent(e->data->e_tags));
TEST_1(!is_offer_recv(e->data->e_tags));
TEST_1(!is_answer_sent(e->data->e_tags));
TEST_1(!is_answer_recv(e->data->e_tags));
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_update);
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(!is_offer_sent(e->data->e_tags));
TEST_1(!is_offer_recv(e->data->e_tags));
TEST_1(!is_answer_sent(e->data->e_tags));
TEST_1(is_answer_recv(e->data->e_tags));
/* Responded with 180 Ringing */
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
TEST(e->data->e_status, 180);
TEST(callstate(e->data->e_tags), nua_callstate_early); /* EARLY */
TEST_1(!is_offer_answer_done(e->data->e_tags));
/* 180 PRACKed */
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_prack);
/* Does not have effect on call state */
/* Responded with 200 OK */
TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state);
TEST(e->data->e_status, 200);
TEST(callstate(e->data->e_tags), nua_callstate_completed); /* COMPLETED */
TEST_1(!is_offer_answer_done(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(!is_offer_answer_done(e->data->e_tags));
TEST_1(!e->next);
free_events_in_list(ctx, b->events);
if (print_headings)
printf("TEST NUA-10.5: PASSED\n");
if (print_headings)
printf("TEST NUA-10.5.1: terminate call\n");
BYE(b, b_call, b_call->nh, TAG_END());
run_ab_until(ctx, -1, until_terminated, -1, until_terminated);
/* B transitions:
READY --(T2)--> TERMINATING: nua_bye()
TERMINATING --(T3)--> TERMINATED: nua_r_bye, nua_i_state
*/
TEST_1(e = b->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, b->events);
/* A: READY -(T1)-> TERMINATED: nua_i_bye, nua_i_state */
TEST_1(e = a->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, a->events);
nua_handle_destroy(a_call->nh), a_call->nh = NULL;
nua_handle_destroy(b_call->nh), b_call->nh = NULL;
if (print_headings)
printf("TEST NUA-10.5.1: PASSED\n");
END();
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment