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
3f7577a6
Commit
3f7577a6
authored
Aug 26, 2015
by
Simon Morlat
Browse files
fix potential bug because internal_call_update flag was never reset.
parent
e76c7b9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
coreapi/TunnelManager.hh
coreapi/TunnelManager.hh
+1
-1
coreapi/callbacks.c
coreapi/callbacks.c
+4
-3
No files found.
coreapi/TunnelManager.hh
View file @
3f7577a6
...
...
@@ -56,7 +56,7 @@ namespace belledonnecomm {
* @param ip tunnel server ip address
* @param port tunnel server tls port, recommended value is 443
* @param udpMirrorPort remote port on the tunnel server side used to test udp reachability
* @param delay udp packet round trip delay in ms considered as acceptable. recomm
a
nded value is 1000 ms.
* @param delay udp packet round trip delay in ms considered as acceptable. recomm
e
nded value is 1000 ms.
*/
void
addServer
(
const
char
*
ip
,
int
port
,
unsigned
int
udpMirrorPort
,
unsigned
int
delay
);
/**
...
...
coreapi/callbacks.c
View file @
3f7577a6
...
...
@@ -495,13 +495,16 @@ static void call_accepted(SalOp *op){
SalMediaDescription
*
md
,
*
rmd
;
bool_t
update_state
=
TRUE
;
if
(
call
==
NULL
){
if
(
call
==
NULL
){
ms_warning
(
"No call to accept."
);
return
;
}
rmd
=
sal_call_get_remote_media_description
(
op
);
/*set privacy*/
call
->
current_params
->
privacy
=
(
LinphonePrivacyMask
)
sal_op_get_privacy
(
call
->
op
);
/*reset the internal call update flag, so it doesn't risk to be copied and used in further re-INVITEs*/
if
(
call
->
params
->
internal_call_update
)
call
->
params
->
internal_call_update
=
FALSE
;
/* Handle remote ICE attributes if any. */
if
(
call
->
ice_session
!=
NULL
&&
rmd
)
{
...
...
@@ -580,8 +583,6 @@ static void call_accepted(SalOp *op){
}
}
linphone_core_update_streams
(
lc
,
call
,
md
);
/*also reflect the change if the "wished" params, in order to avoid to propose SAVP or video again
* further in the call, for example during pause,resume, conferencing reINVITEs*/
linphone_call_fix_call_parameters
(
call
);
if
(
!
call
->
current_params
->
in_conference
)
lc
->
current_call
=
call
;
...
...
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