Skip to content

F
freeswitch
提交 fe71e492 authored 作者: Brian West's avatar Brian West
浏览文件
操作

Thu Mar 5 10:19:35 CST 2009 Pekka Pessi <first.last@nokia.com> 

  * check_nua: using fail_unless_event() macro
  Ignore-this: b03dc7431e8fea9835322bd8f825a803



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12731 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 4025b424
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 143 行增加 和 140 行删除
libs/sofia-sip/.update
浏览文件 @ fe71e492
Tue Mar 10 14:57:43 CDT 2009
Tue Mar 24 10:29:44 CDT 2009
libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c
浏览文件 @ fe71e492
......@@ -103,7 +103,7 @@ static void etsi_teardown(void)
mark_point();
nua_shutdown(nua);
fail_unless(s2_check_event(nua_r_shutdown, 200));
fail_unless_event(nua_r_shutdown, 200);
s2_nua_teardown();
}
......@@ -186,7 +186,7 @@ bye_by_nua(struct dialog *dialog, nua_handle_t *nh,
fail_if(!bye);
s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END());
s2_sip_free_message(bye);
fail_unless(s2_check_event(nua_r_bye, 200));
fail_unless_event(nua_r_bye, 200);
fail_unless(s2_check_callstate(nua_callstate_terminated));
}
......@@ -216,7 +216,7 @@ START_TEST(SIP_CC_OE_CE_V_019)
respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
fail_unless(s2_check_event(nua_r_invite, 200));
fail_unless_event(nua_r_invite, 200);
fail_unless(s2_check_callstate(nua_callstate_ready));
fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
......@@ -253,7 +253,7 @@ START_TEST(SIP_CC_OE_CE_TI_008)
invite = invite_sent_by_nua(nh, TAG_END());
s2_sip_respond_to(invite, d1, 404, "First not found", TAG_END());
fail_unless(s2_check_event(nua_r_invite, 404));
fail_unless_event(nua_r_invite, 404);
fail_unless(s2_check_callstate(nua_callstate_terminated));
fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
......@@ -276,7 +276,7 @@ START_TEST(SIP_CC_OE_CE_TI_008)
/* Wake up nua thread and let it time out INVITE transaction */
nua_set_params(s2->nua, TAG_END());
s2_check_event(nua_r_set_params, 0);
fail_unless_event(nua_r_set_params, 0);
s2_sip_respond_to(invite, d1, 404, "Not found after 32 seconds", TAG_END());
s2_sip_free_message(invite);
......@@ -307,7 +307,7 @@ START_TEST(SIP_CC_OE_CE_TI_011_012)
respond_with_sdp(invite, d1, SIP_200_OK, TAG_END());
fail_unless(s2_check_event(nua_r_invite, 200));
fail_unless_event(nua_r_invite, 200);
fail_unless(s2_check_callstate(nua_callstate_ready));
fail_unless(s2_sip_check_request(SIP_METHOD_ACK));
......
libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c
浏览文件 @ fe71e492
......@@ -405,7 +405,7 @@ void s2_register_setup(void)
s2_sip_free_message(m);
assert(s2->registration->contact != NULL);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
s2->registration->nh = nh;
}
......@@ -437,7 +437,7 @@ void s2_register_teardown(void)
s2_sip_free_message(m);
s2_check_event(nua_r_unregister, 200);
fail_unless_event(nua_r_unregister, 200);
nua_handle_destroy(nh);
s2->registration->nh = NULL;
......
libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h
浏览文件 @ fe71e492
......@@ -83,6 +83,9 @@ int s2_check_event(nua_event_t event, int status);
int s2_check_callstate(enum nua_callstate state);
int s2_check_substate(struct event *e, enum nua_substate state);
#define fail_unless_event(event, status) \
fail_unless(s2_check_event(event, status))
#define SIP_METHOD_UNKNOWN sip_method_unknown, NULL
void s2_flush_all(void);
......
libs/sofia-sip/libsofia-sip-ua/nua/check_register.c
浏览文件 @ fe71e492
......@@ -94,7 +94,7 @@ static void register_teardown(void)
{
s2_teardown_started("register");
nua_shutdown(nua);
fail_unless(s2_check_event(nua_r_shutdown, 200));
fail_unless_event(nua_r_shutdown, 200);
s2_nua_teardown();
}
......@@ -162,7 +162,7 @@ START_TEST(register_1_1_2)
SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 407);
fail_unless_event(nua_r_register, 407);
nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
......@@ -173,7 +173,7 @@ START_TEST(register_1_1_2)
SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str),
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 401);
fail_unless_event(nua_r_register, 401);
nua_authenticate(nh, NUTAG_AUTH(s2_auth2_credentials), TAG_END());
......@@ -190,7 +190,7 @@ START_TEST(register_1_1_2)
s2_sip_free_message(m);
assert(s2->registration->contact != NULL);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
s2->registration->nh = nh;
......@@ -250,7 +250,7 @@ START_TEST(register_1_2_1) {
s2_sip_free_message(m);
assert(s2->registration->contact != NULL);
s2_check_event(nua_r_register, 100);
fail_unless_event(nua_r_register, 100);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m);
......@@ -266,7 +266,7 @@ START_TEST(register_1_2_1) {
fail_unless(s2->registration->contact != NULL);
fail_if(s2->registration->contact->m_next != NULL);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
s2->registration->nh = nh;
......@@ -294,7 +294,7 @@ static nua_handle_t *make_auth_natted_register(
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 401);
fail_unless_event(nua_r_register, 401);
nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
......@@ -315,7 +315,7 @@ static nua_handle_t *make_auth_natted_register(
s2_sip_free_message(m);
assert(s2->registration->contact != NULL);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
return nh;
}
......@@ -392,7 +392,7 @@ START_TEST(register_1_2_2_2)
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_i_outbound, 0);
fail_unless_event(nua_i_outbound, 0);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m); fail_if(!m->sip->sip_authorization);
......@@ -406,7 +406,7 @@ START_TEST(register_1_2_2_2)
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
fail_unless(s2->registration->contact != NULL);
fail_if(s2->registration->contact->m_next != NULL);
......@@ -448,7 +448,7 @@ START_TEST(register_1_2_2_3)
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 100);
fail_unless_event(nua_r_register, 100);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m); fail_if(!m->sip->sip_authorization);
......@@ -465,7 +465,7 @@ START_TEST(register_1_2_2_3)
fail_unless(s2->registration->contact != NULL);
fail_if(s2->registration->contact->m_next != NULL);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
s2_register_teardown();
......@@ -494,7 +494,7 @@ START_TEST(register_1_2_3) {
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 100);
fail_unless_event(nua_r_register, 100);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m);
......@@ -509,7 +509,7 @@ START_TEST(register_1_2_3) {
fail_unless(s2->registration->contact != NULL);
fail_if(s2->registration->contact->m_next != NULL);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
s2->registration->nh = nh;
......@@ -545,7 +545,7 @@ START_TEST(register_1_3_1)
s2_sip_free_message(m);
assert(s2->registration->contact != NULL);
s2_check_event(nua_r_register, 100);
fail_unless_event(nua_r_register, 100);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m);
......@@ -563,7 +563,7 @@ START_TEST(register_1_3_1)
fail_if(s2->registration->contact->m_next != NULL);
fail_unless(
url_has_param(s2->registration->contact->m_url, "transport=tcp"));
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
s2->registration->nh = nh;
......@@ -599,7 +599,7 @@ START_TEST(register_1_3_2_2)
"close TCP at server, wait for re-REGISTERs.");
nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END());
s2_check_event(nua_r_set_params, 200);
fail_unless_event(nua_r_set_params, 200);
mark_point();
s2->registration->nh = nh;
......@@ -623,7 +623,7 @@ START_TEST(register_1_3_2_2)
/* The "NAT binding" changed when new TCP connection is established */
/* => NUA re-REGISTERs with newly detected contact */
s2_check_event(nua_r_register, 100);
fail_unless_event(nua_r_register, 100);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m); fail_if(!m->sip->sip_authorization);
......@@ -637,7 +637,7 @@ START_TEST(register_1_3_2_2)
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
fail_unless(s2->registration->contact != NULL);
fail_if(s2->registration->contact->m_next != NULL);
......@@ -656,7 +656,7 @@ START_TEST(register_1_3_3_1)
"Register with UDP, UDP time-outing, then w/ TCP using rport. ");
nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END());
s2_check_event(nua_r_set_params, 200);
fail_unless_event(nua_r_set_params, 200);
mark_point();
s2->registration->nh = nh;
......@@ -683,7 +683,7 @@ START_TEST(register_1_3_3_1)
SIPTAG_VIA(natted_via(m)),
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 401);
fail_unless_event(nua_r_register, 401);
nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
/* Turn off pong */
......@@ -703,7 +703,7 @@ START_TEST(register_1_3_3_1)
s2_sip_free_message(m);
/* NUA detects oops... re-registers UDP */
s2_check_event(nua_r_register, 100);
fail_unless_event(nua_r_register, 100);
m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
fail_if(!m); fail_if(!m->sip->sip_authorization);
......@@ -717,7 +717,7 @@ START_TEST(register_1_3_3_1)
TAG_END());
s2_sip_free_message(m);
s2_check_event(nua_r_register, 200);
fail_unless_event(nua_r_register, 200);
fail_unless(s2->registration->contact != NULL);
fail_if(s2->registration->contact->m_next != NULL);
......
libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c
浏览文件 @ fe71e492
......@@ -80,7 +80,7 @@ void s2_dialog_teardown(void)
nua_shutdown(nua);
fail_unless(s2_check_event(nua_r_shutdown, 200));
fail_unless_event(nua_r_shutdown, 200);
s2_nua_teardown();
}
......@@ -509,7 +509,7 @@ subscribe_to_nua(char const *event,
nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"),
SIPTAG_ALLOW_EVENTS_STR(event),
TAG_END());
s2_check_event(nua_r_set_params, 200);
fail_unless_event(nua_r_set_params, 200);
ta_start(ta, tag, value);
s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
......@@ -550,7 +550,7 @@ START_TEST(notify_6_3_1)
s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE);
nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"), TAG_END());
s2_check_event(nua_r_set_params, 200);
fail_unless_event(nua_r_set_params, 200);
s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
SIPTAG_EVENT_STR("presence"),
......@@ -558,7 +558,7 @@ START_TEST(notify_6_3_1)
s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE);
nua_set_params(nua, SIPTAG_ALLOW_EVENTS_STR("presence"), TAG_END());
s2_check_event(nua_r_set_params, 200);
fail_unless_event(nua_r_set_params, 200);
s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL,
SIPTAG_EVENT_STR("presence"),
......@@ -601,7 +601,7 @@ START_TEST(notify_6_3_1)
"terminated"));
s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
s2_check_event(nua_r_notify, 200);
fail_unless_event(nua_r_notify, 200);
nua_handle_destroy(nh);
}
END_TEST
......@@ -629,7 +629,7 @@ START_TEST(notify_6_3_2)
fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
"active"));
s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
s2_check_event(nua_r_notify, 200);
fail_unless_event(nua_r_notify, 200);
s2_nua_fast_forward(300, s2base->root);
......@@ -640,7 +640,7 @@ START_TEST(notify_6_3_2)
fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
"terminated"));
s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
s2_check_event(nua_r_notify, 200);
fail_unless_event(nua_r_notify, 200);
nua_handle_destroy(nh);
}
......@@ -682,7 +682,7 @@ START_TEST(notify_6_3_3)
fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
"active"));
s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
s2_check_event(nua_r_notify, 200);
fail_unless_event(nua_r_notify, 200);
nua_notify(nh,
NUTAG_SUBSTATE(nua_substate_active),
......@@ -728,7 +728,7 @@ START_TEST(notify_6_3_4)
fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate,
"active"));
s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END());
s2_check_event(nua_r_notify, 200);
fail_unless_event(nua_r_notify, 200);
nua_notify(nh,
NUTAG_SUBSTATE(nua_substate_active),
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论