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
470227cf
Commit
470227cf
authored
Oct 07, 2013
by
Simon Morlat
Browse files
fix ICE crash
fix potential crash when opening property box
parent
8bd7346e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
coreapi/callbacks.c
coreapi/callbacks.c
+1
-2
coreapi/misc.c
coreapi/misc.c
+6
-0
gtk/propertybox.c
gtk/propertybox.c
+3
-2
No files found.
coreapi/callbacks.c
View file @
470227cf
...
...
@@ -121,8 +121,7 @@ void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMedia
}
ms_message
(
"No need to restart streams, SDP is unchanged."
);
return
;
}
else
{
}
else
{
if
(
md_changed
&
SAL_MEDIA_DESCRIPTION_NETWORK_CHANGED
)
{
ms_message
(
"Network parameters have changed, update them."
);
linphone_core_update_streams_destinations
(
lc
,
call
,
oldmd
,
new_md
);
...
...
coreapi/misc.c
View file @
470227cf
...
...
@@ -962,6 +962,12 @@ void linphone_core_update_ice_from_remote_media_description(LinphoneCall *call,
ice_check_list_set_state
(
cl
,
ICL_Failed
);
}
else
if
(
stream
->
rtp_port
==
0
)
{
ice_session_remove_check_list
(
call
->
ice_session
,
cl
);
#ifdef VIDEO_ENABLED
if
(
stream
->
type
==
SalVideo
&&
call
->
videostream
){
video_stream_stop
(
call
->
videostream
);
call
->
videostream
=
NULL
;
}
#endif
}
else
{
if
((
stream
->
ice_pwd
[
0
]
!=
'\0'
)
&&
(
stream
->
ice_ufrag
[
0
]
!=
'\0'
))
ice_check_list_set_remote_credentials
(
cl
,
stream
->
ice_ufrag
,
stream
->
ice_pwd
);
...
...
gtk/propertybox.c
View file @
470227cf
...
...
@@ -1051,6 +1051,7 @@ void linphone_gtk_fill_video_renderers(GtkWidget *pb){
MSList
*
l
=
ms_filter_lookup_by_interface
(
MSFilterVideoDisplayInterface
);
MSList
*
elem
;
int
i
;
int
active
=-
1
;
const
char
*
current_renderer
=
linphone_core_get_video_display_filter
(
lc
);
GtkListStore
*
store
;
GtkCellRenderer
*
renderer
=
gtk_cell_renderer_text_new
();
...
...
@@ -1067,10 +1068,10 @@ void linphone_gtk_fill_video_renderers(GtkWidget *pb){
gtk_list_store_append
(
store
,
&
iter
);
gtk_list_store_set
(
store
,
&
iter
,
0
,
desc
->
name
,
1
,
desc
->
text
,
-
1
);
if
(
current_renderer
&&
strcmp
(
current_renderer
,
desc
->
name
)
==
0
)
gtk_combo_box_set_active
(
GTK_COMBO_BOX
(
combo
),
i
)
;
active
=
i
;
}
ms_list_free
(
l
);
if
(
active
!=-
1
)
gtk_combo_box_set_active
(
GTK_COMBO_BOX
(
combo
),
active
);
}
void
linphone_gtk_show_parameters
(
void
){
...
...
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