Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblinphone
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
10
Issues
10
List
Board
Labels
Milestones
Merge Requests
25
Merge Requests
25
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
liblinphone
Commits
52226a4b
Commit
52226a4b
authored
Dec 01, 2013
by
Simon Morlat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GTK app: enable TLS transport if tls is requested on a proxy config.
parent
8ffa2c38
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
linphonecore.c
coreapi/linphonecore.c
+0
-4
propertybox.c
gtk/propertybox.c
+13
-1
No files found.
coreapi/linphonecore.c
View file @
52226a4b
...
@@ -2412,11 +2412,7 @@ static MSList *make_routes_for_proxy(LinphoneProxyConfig *proxy, const LinphoneA
...
@@ -2412,11 +2412,7 @@ static MSList *make_routes_for_proxy(LinphoneProxyConfig *proxy, const LinphoneA
if
(
transport
){
if
(
transport
){
SalAddress
*
route
=
sal_address_new
(
NULL
);
SalAddress
*
route
=
sal_address_new
(
NULL
);
sal_address_set_domain
(
route
,
sal_address_get_domain
((
SalAddress
*
)
dest
));
sal_address_set_domain
(
route
,
sal_address_get_domain
((
SalAddress
*
)
dest
));
#ifdef USE_BELLESIP
sal_address_set_port
(
route
,
sal_address_get_port
((
SalAddress
*
)
dest
));
sal_address_set_port
(
route
,
sal_address_get_port
((
SalAddress
*
)
dest
));
#else
sal_address_set_port_int
(
route
,
sal_address_get_port_int
((
SalAddress
*
)
dest
));
#endif
sal_address_set_transport_name
(
route
,
transport
);
sal_address_set_transport_name
(
route
,
transport
);
ret
=
ms_list_append
(
ret
,
route
);
ret
=
ms_list_append
(
ret
,
route
);
}
}
...
...
gtk/propertybox.c
View file @
52226a4b
...
@@ -750,9 +750,11 @@ void linphone_gtk_proxy_cancel(GtkButton *button){
...
@@ -750,9 +750,11 @@ void linphone_gtk_proxy_cancel(GtkButton *button){
}
}
void
linphone_gtk_proxy_ok
(
GtkButton
*
button
){
void
linphone_gtk_proxy_ok
(
GtkButton
*
button
){
LinphoneCore
*
lc
=
linphone_gtk_get_core
();
GtkWidget
*
w
=
gtk_widget_get_toplevel
(
GTK_WIDGET
(
button
));
GtkWidget
*
w
=
gtk_widget_get_toplevel
(
GTK_WIDGET
(
button
));
LinphoneProxyConfig
*
cfg
=
(
LinphoneProxyConfig
*
)
g_object_get_data
(
G_OBJECT
(
w
),
"config"
);
LinphoneProxyConfig
*
cfg
=
(
LinphoneProxyConfig
*
)
g_object_get_data
(
G_OBJECT
(
w
),
"config"
);
int
index
=
gtk_combo_box_get_active
(
GTK_COMBO_BOX
(
linphone_gtk_get_widget
(
w
,
"transport"
)));
int
index
=
gtk_combo_box_get_active
(
GTK_COMBO_BOX
(
linphone_gtk_get_widget
(
w
,
"transport"
)));
LinphoneTransportType
tport
=
(
LinphoneTransportType
)
index
;
gboolean
was_editing
=
TRUE
;
gboolean
was_editing
=
TRUE
;
if
(
!
cfg
){
if
(
!
cfg
){
...
@@ -765,7 +767,6 @@ void linphone_gtk_proxy_ok(GtkButton *button){
...
@@ -765,7 +767,6 @@ void linphone_gtk_proxy_ok(GtkButton *button){
gtk_entry_get_text
(
GTK_ENTRY
(
linphone_gtk_get_widget
(
w
,
"proxy"
))))
==
0
){
gtk_entry_get_text
(
GTK_ENTRY
(
linphone_gtk_get_widget
(
w
,
"proxy"
))))
==
0
){
if
(
index
!=-
1
){
if
(
index
!=-
1
){
/*make sure transport was added to proxy address*/
/*make sure transport was added to proxy address*/
LinphoneTransportType
tport
=
(
LinphoneTransportType
)
index
;
LinphoneAddress
*
laddr
=
linphone_address_new
(
linphone_proxy_config_get_addr
(
cfg
));
LinphoneAddress
*
laddr
=
linphone_address_new
(
linphone_proxy_config_get_addr
(
cfg
));
if
(
laddr
){
if
(
laddr
){
if
(
linphone_address_get_transport
(
laddr
)
!=
tport
){
if
(
linphone_address_get_transport
(
laddr
)
!=
tport
){
...
@@ -792,6 +793,17 @@ void linphone_gtk_proxy_ok(GtkButton *button){
...
@@ -792,6 +793,17 @@ void linphone_gtk_proxy_ok(GtkButton *button){
linphone_proxy_config_enable_register
(
cfg
,
linphone_proxy_config_enable_register
(
cfg
,
gtk_toggle_button_get_active
(
gtk_toggle_button_get_active
(
GTK_TOGGLE_BUTTON
(
linphone_gtk_get_widget
(
w
,
"register"
))));
GTK_TOGGLE_BUTTON
(
linphone_gtk_get_widget
(
w
,
"register"
))));
/* check if tls was asked but is not enabled in transport configuration*/
if
(
tport
==
LinphoneTransportTls
){
LCSipTransports
tports
;
linphone_core_get_sip_transports
(
lc
,
&
tports
);
if
(
tports
.
tls_port
==
LC_SIP_TRANSPORT_DISABLED
){
tports
.
tls_port
=
LC_SIP_TRANSPORT_RANDOM
;
}
linphone_core_set_sip_transports
(
lc
,
&
tports
);
}
if
(
was_editing
){
if
(
was_editing
){
if
(
linphone_proxy_config_done
(
cfg
)
==-
1
)
if
(
linphone_proxy_config_done
(
cfg
)
==-
1
)
return
;
return
;
...
...
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