Commit 1aa22ff9 authored by Pekka Pessi's avatar Pekka Pessi
Browse files

Simplified test_basic_call().

darcs-hash:20051018162414-65a35-4c66b25602b8b3b1bf173f035e3acf3ab8401e80.gz
parent ed76cec0
...@@ -1026,25 +1026,12 @@ CONDITION_FUNCTION(until_terminated) ...@@ -1026,25 +1026,12 @@ CONDITION_FUNCTION(until_terminated)
CONDITION_FUNCTION(receive_basic_call) CONDITION_FUNCTION(receive_basic_call)
{ {
int state = nua_callstate_init;
if (!check_handle(ep, nh, SIP_486_BUSY_HERE)) if (!check_handle(ep, nh, SIP_486_BUSY_HERE))
return 0; return 0;
if (event != nua_i_active && event != nua_i_terminated) if (event != nua_i_active && event != nua_i_terminated)
save_event_in_list(ctx, ep); save_event_in_list(ctx, ep);
if (event != nua_i_state) switch (callstate(tags)) {
return 0;
tl_gets(tags, NUTAG_CALLSTATE_REF(state), TAG_END());
switch (state) {
case nua_callstate_init:
return 0;
case nua_callstate_calling:
return 0;
case nua_callstate_proceeding:
return 0;
case nua_callstate_received: case nua_callstate_received:
respond(ep, nh, SIP_180_RINGING, TAG_END()); respond(ep, nh, SIP_180_RINGING, TAG_END());
return 0; return 0;
...@@ -1054,13 +1041,9 @@ CONDITION_FUNCTION(receive_basic_call) ...@@ -1054,13 +1041,9 @@ CONDITION_FUNCTION(receive_basic_call)
"a=rtcp:5011"), "a=rtcp:5011"),
TAG_END()); TAG_END());
return 0; return 0;
case nua_callstate_completed:
return 0;
case nua_callstate_ready: case nua_callstate_ready:
bye(ep, nh, TAG_END()); bye(ep, nh, TAG_END());
return 0; return 0;
case nua_callstate_terminating:
return 0;
case nua_callstate_terminated: case nua_callstate_terminated:
return 1; return 1;
default: default:
......
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