Commit 32b7ce6d authored by Benjamin REIS's avatar Benjamin REIS

Add reason heanders to request + tests

parent 329821b5
...@@ -150,7 +150,7 @@ belle_sip_header_contact_t* sal_op_create_contact(SalOp *op) ; ...@@ -150,7 +150,7 @@ belle_sip_header_contact_t* sal_op_create_contact(SalOp *op) ;
bool_t _sal_compute_sal_errors(belle_sip_response_t* response, SalReason* sal_reason, char* reason, size_t reason_size); bool_t _sal_compute_sal_errors(belle_sip_response_t* response, SalReason* sal_reason, char* reason, size_t reason_size);
SalReason _sal_reason_from_sip_code(int code); SalReason _sal_reason_from_sip_code(int code);
void sal_op_set_reason_error_info(SalOp *op, belle_sip_message_t *msg);
void sal_op_set_error_info_from_response(SalOp *op, belle_sip_response_t *response); void sal_op_set_error_info_from_response(SalOp *op, belle_sip_response_t *response);
/*presence*/ /*presence*/
void sal_op_presence_fill_cbs(SalOp*op); void sal_op_presence_fill_cbs(SalOp*op);
......
...@@ -445,6 +445,7 @@ static void call_terminated(SalOp* op,belle_sip_server_transaction_t* server_tra ...@@ -445,6 +445,7 @@ static void call_terminated(SalOp* op,belle_sip_server_transaction_t* server_tra
belle_sip_response_t* resp; belle_sip_response_t* resp;
op->state = SalOpStateTerminating; op->state = SalOpStateTerminating;
op->base.root->callbacks.call_terminated(op,op->dir==SalOpDirIncoming?sal_op_get_from(op):sal_op_get_to(op)); op->base.root->callbacks.call_terminated(op,op->dir==SalOpDirIncoming?sal_op_get_from(op):sal_op_get_to(op));
sal_op_set_reason_error_info(op, BELLE_SIP_MESSAGE(request));
resp=sal_op_create_response_from_request(op,request,status_code); resp=sal_op_create_response_from_request(op,request,status_code);
belle_sip_server_transaction_send_response(server_transaction,resp); belle_sip_server_transaction_send_response(server_transaction,resp);
} }
...@@ -670,10 +671,7 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t ...@@ -670,10 +671,7 @@ static void process_request_event(void *op_base, const belle_sip_request_event_t
ms_message("Ignored received ack since a new client transaction has been started since."); ms_message("Ignored received ack since a new client transaction has been started since.");
} }
} else if(strcmp("BYE",method)==0) { } else if(strcmp("BYE",method)==0) {
resp=sal_op_create_response_from_request(op,req,200); call_terminated(op,server_transaction,req,200);
belle_sip_server_transaction_send_response(server_transaction,resp);
op->base.root->callbacks.call_terminated(op,op->dir==SalOpDirIncoming?sal_op_get_from(op):sal_op_get_to(op));
op->state=SalOpStateTerminating;
/*call end not notified by dialog deletion because transaction can end before dialog*/ /*call end not notified by dialog deletion because transaction can end before dialog*/
} else if(strcmp("INVITE",method)==0 || (is_update=(strcmp("UPDATE",method)==0)) ) { } else if(strcmp("INVITE",method)==0 || (is_update=(strcmp("UPDATE",method)==0)) ) {
if (is_update && !belle_sip_message_get_body(BELLE_SIP_MESSAGE(req))) { if (is_update && !belle_sip_message_get_body(BELLE_SIP_MESSAGE(req))) {
......
...@@ -1002,7 +1002,7 @@ static void simple_call_compatibility_mode(void) { ...@@ -1002,7 +1002,7 @@ static void simple_call_compatibility_mode(void) {
static void terminate_call_with_error(void) { static void terminate_call_with_error(void) {
LinphoneCall* call_callee ; LinphoneCall* call_callee ;
LinphoneErrorInfo *ei ; LinphoneErrorInfo *ei ;
const LinphoneErrorInfo *rei ; const LinphoneErrorInfo *rei = NULL;
LinphoneCoreManager *callee_mgr = linphone_core_manager_new("marie_rc"); LinphoneCoreManager *callee_mgr = linphone_core_manager_new("marie_rc");
LinphoneCoreManager *caller_mgr = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager *caller_mgr = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
...@@ -1018,21 +1018,26 @@ static void terminate_call_with_error(void) { ...@@ -1018,21 +1018,26 @@ static void terminate_call_with_error(void) {
BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallOutgoingProgress, 1)); BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallOutgoingProgress, 1));
call_callee = linphone_core_get_current_call(callee_mgr->lc); call_callee = linphone_core_get_current_call(callee_mgr->lc);
linphone_call_ref(call_callee);
BC_ASSERT_PTR_NOT_NULL(call_callee); BC_ASSERT_PTR_NOT_NULL(call_callee);
BC_ASSERT_EQUAL( linphone_core_accept_call(callee_mgr->lc,call_callee), 0 , int, "%d"); BC_ASSERT_EQUAL( linphone_core_accept_call(callee_mgr->lc,call_callee), 0 , int, "%d");
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallConnected,1)); BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallConnected,1));
BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, 1)); BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallStreamsRunning, 1));
BC_ASSERT_PTR_NOT_NULL(ei);
if (ei){
BC_ASSERT_EQUAL(linphone_error_info_get_protocol_code(ei),200, int, "%d");
BC_ASSERT_PTR_NOT_NULL(linphone_error_info_get_phrase(ei));
BC_ASSERT_STRING_EQUAL(linphone_error_info_get_phrase(ei), "Call completed elsewhere");
BC_ASSERT_STRING_EQUAL(linphone_error_info_get_protocol(ei), "SIP");
}
linphone_call_terminate_with_error_info(out_call,ei);
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallEnd,1));
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallReleased,1));
rei = ei; rei = linphone_call_get_error_info(call_callee);
linphone_call_terminate_with_error_info(out_call,rei);
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallEnd,1));
BC_ASSERT_PTR_NOT_NULL(rei); BC_ASSERT_PTR_NOT_NULL(rei);
if (rei){ if (rei){
BC_ASSERT_EQUAL(linphone_error_info_get_protocol_code(rei),200, int, "%d"); BC_ASSERT_EQUAL(linphone_error_info_get_protocol_code(rei),200, int, "%d");
...@@ -1042,16 +1047,66 @@ static void terminate_call_with_error(void) { ...@@ -1042,16 +1047,66 @@ static void terminate_call_with_error(void) {
} }
BC_ASSERT_EQUAL(caller_mgr->stat.number_of_LinphoneCallEnd,1, int, "%d");
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallReleased,1)); BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallReleased,1));
linphone_error_info_unref(ei); linphone_error_info_unref(ei);
linphone_call_unref(out_call); linphone_call_unref(out_call);
linphone_call_unref(call_callee);
linphone_core_manager_destroy(callee_mgr); linphone_core_manager_destroy(callee_mgr);
linphone_core_manager_destroy(caller_mgr); linphone_core_manager_destroy(caller_mgr);
} }
static void cancel_call_with_error(void) {
LinphoneCall* call_callee ;
LinphoneErrorInfo *ei ;
const LinphoneErrorInfo *rei = NULL;
LinphoneCoreManager *callee_mgr = linphone_core_manager_new("marie_rc");
LinphoneCoreManager *caller_mgr = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc");
LinphoneCall* out_call = linphone_core_invite_address(caller_mgr->lc,callee_mgr->identity);
linphone_call_ref(out_call);
ei = linphone_error_info_new();
linphone_error_info_set(ei, NULL, LinphoneReasonNone, 200, "Call completed elsewhere", NULL);
BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallOutgoingInit,1));
BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &callee_mgr->stat.number_of_LinphoneCallIncomingReceived, 1));
BC_ASSERT_TRUE(wait_for(caller_mgr->lc, callee_mgr->lc, &caller_mgr->stat.number_of_LinphoneCallOutgoingProgress, 1));
call_callee = linphone_core_get_current_call(callee_mgr->lc);
linphone_call_ref(call_callee);
BC_ASSERT_PTR_NOT_NULL(call_callee);
BC_ASSERT_PTR_NOT_NULL(ei);
if (ei){
BC_ASSERT_EQUAL(linphone_error_info_get_protocol_code(ei),200, int, "%d");
BC_ASSERT_PTR_NOT_NULL(linphone_error_info_get_phrase(ei));
BC_ASSERT_STRING_EQUAL(linphone_error_info_get_phrase(ei), "Call completed elsewhere");
BC_ASSERT_STRING_EQUAL(linphone_error_info_get_protocol(ei), "SIP");
}
linphone_call_terminate_with_error_info(out_call,ei);
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallEnd,1));
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&callee_mgr->stat.number_of_LinphoneCallReleased,1));
rei = linphone_call_get_error_info(call_callee);
BC_ASSERT_PTR_NOT_NULL(rei);
if (rei){
BC_ASSERT_EQUAL(linphone_error_info_get_protocol_code(rei),0, int, "%d");
BC_ASSERT_PTR_NOT_NULL(linphone_error_info_get_phrase(rei));
BC_ASSERT_STRING_EQUAL(linphone_error_info_get_phrase(rei), "Incoming call cancelled");
BC_ASSERT_STRING_EQUAL(linphone_error_info_get_protocol(ei), "SIP");
}
BC_ASSERT_TRUE(wait_for(caller_mgr->lc,callee_mgr->lc,&caller_mgr->stat.number_of_LinphoneCallReleased,1));
linphone_error_info_unref(ei);
linphone_call_unref(out_call);
linphone_call_unref(call_callee);
linphone_core_manager_destroy(callee_mgr);
linphone_core_manager_destroy(caller_mgr);
}
static void cancelled_call(void) { static void cancelled_call(void) {
LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
...@@ -6018,7 +6073,8 @@ test_t call_tests[] = { ...@@ -6018,7 +6073,8 @@ test_t call_tests[] = {
TEST_NO_TAG("Call from plain RTP to ZRTP mandatory should be silent", call_from_plain_rtp_to_zrtp), TEST_NO_TAG("Call from plain RTP to ZRTP mandatory should be silent", call_from_plain_rtp_to_zrtp),
TEST_NO_TAG("Call ZRTP mandatory to plain RTP should be silent", call_from_zrtp_to_plain_rtp), TEST_NO_TAG("Call ZRTP mandatory to plain RTP should be silent", call_from_zrtp_to_plain_rtp),
TEST_NO_TAG("Call with network reachable down in callback", call_with_network_reachable_down_in_callback), TEST_NO_TAG("Call with network reachable down in callback", call_with_network_reachable_down_in_callback),
TEST_NO_TAG("Call terminated with reason", terminate_call_with_error) TEST_NO_TAG("Call terminated with reason", terminate_call_with_error),
TEST_NO_TAG("Call cancelled with reason", cancel_call_with_error)
}; };
test_suite_t call_test_suite = {"Single Call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each, test_suite_t call_test_suite = {"Single Call", NULL, NULL, liblinphone_tester_before_each, liblinphone_tester_after_each,
......
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