Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
95387d37
Commit
95387d37
authored
Apr 07, 2017
by
Sandrine Avakian
Browse files
Fixes with reason header call decline.
parent
9d6f6f66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
9 deletions
+25
-9
coreapi/bellesip_sal/sal_op_impl.c
coreapi/bellesip_sal/sal_op_impl.c
+1
-0
coreapi/error_info.c
coreapi/error_info.c
+1
-1
tester/call_single_tester.c
tester/call_single_tester.c
+23
-8
No files found.
coreapi/bellesip_sal/sal_op_impl.c
View file @
95387d37
...
...
@@ -643,6 +643,7 @@ void sal_op_set_error_info_from_response(SalOp *op, belle_sip_response_t *respon
warnings
=
warning
?
belle_sip_header_get_unparsed_value
(
warning
)
:
NULL
;
sal_error_info_set
(
ei
,
SalReasonUnknown
,
"SIP"
,
code
,
reason_phrase
,
warnings
);
sal_op_set_reason_error_info
(
op
,
BELLE_SIP_MESSAGE
(
response
));
}
const
SalErrorInfo
*
sal_op_get_error_info
(
const
SalOp
*
op
){
...
...
coreapi/error_info.c
View file @
95387d37
...
...
@@ -222,7 +222,7 @@ LinphoneErrorInfo* linphone_error_info_get_sub(const LinphoneErrorInfo *ei){
void
linphone_error_info_set_sub_error_info
(
LinphoneErrorInfo
*
ei
,
LinphoneErrorInfo
*
appended_ei
){
if
(
appended_ei
!=
NULL
){
ei
->
sub_ei
=
appended_ei
;
ei
->
sub_ei
=
linphone_error_info_ref
(
appended_ei
)
;
}
}
...
...
tester/call_single_tester.c
View file @
95387d37
...
...
@@ -1193,18 +1193,23 @@ static void call_declined_with_error(void) {
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
*
in_call
;
LinphoneCall
*
in_call
=
NULL
;
LinphoneCall
*
out_call
=
linphone_core_invite_address
(
caller_mgr
->
lc
,
callee_mgr
->
identity
);
LinphoneFactory
*
factory
=
linphone_factory_get
();
const
LinphoneErrorInfo
*
rcvd_ei
;
const
LinphoneErrorInfo
*
sub_rcvd_ei
;
LinphoneErrorInfo
*
ei
=
linphone_factory_create_error_info
(
factory
);
LinphoneErrorInfo
*
reason_ei
=
linphone_factory_create_error_info
(
factory
);
linphone_error_info_set
(
ei
,
"SIP"
,
LinphoneReasonUnknown
,
603
,
"Decline"
,
NULL
);
//ordre des arguments à vérifier
linphone_error_info_set
(
reason_ei
,
"hardware"
,
LinphoneReasonUnknown
,
66
,
"J'ai plus de batterie"
,
NULL
);
linphone_error_info_set_sub_error_info
(
ei
,
reason_ei
);
BC_ASSERT_TRUE
(
wait_for
(
caller_mgr
->
lc
,
callee_mgr
->
lc
,
&
callee_mgr
->
stat
.
number_of_LinphoneCallIncomingReceived
,
1
));
BC_ASSERT_PTR_NOT_NULL
(
in_call
=
linphone_core_get_current_call
(
callee_mgr
->
lc
));
linphone_call_ref
(
out_call
);
BC_ASSERT_TRUE
(
wait_for
(
caller_mgr
->
lc
,
callee_mgr
->
lc
,
&
callee_mgr
->
stat
.
number_of_LinphoneCallIncomingReceived
,
1
));
BC_ASSERT_PTR_NOT_NULL
(
in_call
=
linphone_core_get_current_call
(
callee_mgr
->
lc
));
...
...
@@ -1212,20 +1217,29 @@ static void call_declined_with_error(void) {
linphone_call_ref
(
in_call
);
linphone_call_decline_with_error
(
in_call
,
ei
);
// linphone_call_terminate(in_call);
BC_ASSERT_TRUE
(
wait_for
(
caller_mgr
->
lc
,
callee_mgr
->
lc
,
&
callee_mgr
->
stat
.
number_of_LinphoneCallReleased
,
1
));
BC_ASSERT_TRUE
(
wait_for
(
caller_mgr
->
lc
,
callee_mgr
->
lc
,
&
caller_mgr
->
stat
.
number_of_LinphoneCallReleased
,
1
));
BC_ASSERT_EQUAL
(
callee_mgr
->
stat
.
number_of_LinphoneCallEnd
,
1
,
int
,
"%d"
);
BC_ASSERT_EQUAL
(
caller_mgr
->
stat
.
number_of_LinphoneCallEnd
,
1
,
int
,
"%d"
);
BC_ASSERT_TRUE
(
wait_for
(
caller_mgr
->
lc
,
callee_mgr
->
lc
,
&
callee_mgr
->
stat
.
number_of_LinphoneCallEnd
,
1
));
BC_ASSERT_TRUE
(
wait_for
(
callee_mgr
->
lc
,
caller_mgr
->
lc
,
&
caller_mgr
->
stat
.
number_of_LinphoneCallEnd
,
1
));
rcvd_ei
=
linphone_call_get_error_info
(
out_call
);
sub_rcvd_ei
=
linphone_error_info_get_sub
(
rcvd_ei
);
BC_ASSERT_STRING_EQUAL
(
linphone_error_info_get_phrase
(
rcvd_ei
),
"Decline"
);
BC_ASSERT_STRING_EQUAL
(
linphone_error_info_get_protocol
(
rcvd_ei
),
"SIP"
);
BC_ASSERT_STRING_EQUAL
(
linphone_error_info_get_phrase
(
sub_rcvd_ei
),
"J'ai plus de batterie"
);
BC_ASSERT_STRING_EQUAL
(
linphone_error_info_get_protocol
(
sub_rcvd_ei
),
"hardware"
);
BC_ASSERT_EQUAL
(
linphone_call_get_reason
(
in_call
),
LinphoneReasonDeclined
,
int
,
"%d"
);
BC_ASSERT_EQUAL
(
linphone_call_log_get_status
(
linphone_call_get_call_log
(
in_call
)),
LinphoneCallDeclined
,
int
,
"%d"
);
BC_ASSERT_EQUAL
(
linphone_call_get_reason
(
out_call
),
LinphoneReasonDeclined
,
int
,
"%d"
);
BC_ASSERT_EQUAL
(
linphone_call_log_get_status
(
linphone_call_get_call_log
(
out_call
)),
LinphoneCallDeclined
,
int
,
"%d"
);
BC_ASSERT_TRUE
(
wait_for
(
caller_mgr
->
lc
,
callee_mgr
->
lc
,
&
callee_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_call_unref
(
in_call
);
}
linphone_call_unref
(
out_call
);
//
linphone_error_info_unref(reason_ei);
linphone_error_info_unref
(
reason_ei
);
linphone_error_info_unref
(
ei
);
linphone_core_manager_destroy
(
callee_mgr
);
...
...
@@ -1778,6 +1792,7 @@ static void call_callee_with_custom_header_or_sdp_cb(LinphoneCore *lc, LinphoneC
static
void
call_callee_with_custom_header_or_sdp_attributes
(
void
)
{
int
result
;
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
*
call_caller
=
NULL
,
*
call_callee
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment