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
92c21608
Commit
92c21608
authored
Dec 22, 2011
by
Sylvain Berfini
🐮
Browse files
Merge branch 'master' of git.linphone.org:linphone
parents
1b0d05f0
77cad2f0
Changes
10
Hide whitespace changes
Inline
Side-by-side
coreapi/Makefile.am
View file @
92c21608
...
...
@@ -6,7 +6,11 @@ EXTRA_DIST=linphonecore_jni.cc
## Process this file with automake to produce Makefile.in
linphone_includedir
=
$(includedir)
/linphone
linphone_include_HEADERS
=
linphonecore.h linphonefriend.h linphonecore_utils.h ../config.h lpconfig.h sipsetup.h
linphone_include_HEADERS
=
linphonecore.h linphonefriend.h linphonecore_utils.h ../config.h lpconfig.h sipsetup.h
if
BUILD_TUNNEL
linphone_include_HEADERS
+=
linphone_tunnel.h
endif
INCLUDES
=
\
-I
$(top_srcdir)
...
...
@@ -36,11 +40,10 @@ liblinphone_la_SOURCES=\
siplogin.c
\
lsd.c linphonecore_utils.h
\
ec-calibrator.c
\
conference.c
\
linphone_tunnel_manager.h
conference.c
if
BUILD_TUNNEL
liblinphone_la_SOURCES
+=
TunnelManager.cc TunnelManager.hh linphone_tunnel
_manager
.cc
liblinphone_la_SOURCES
+=
TunnelManager.cc TunnelManager.hh linphone_tunnel.cc
endif
...
...
coreapi/TunnelManager.cc
View file @
92c21608
...
...
@@ -190,6 +190,9 @@ void TunnelManager::start() {
const
ServerAddr
&
addr
=*
it
;
mTunnelClient
->
addServer
(
addr
.
mAddr
.
c_str
(),
addr
.
mPort
);
}
if
(
!
mHttpUserName
.
empty
())
{
mTunnelClient
->
setHttpProxyAuthInfo
(
mHttpUserName
.
c_str
(),
mHttpPasswd
.
c_str
());
}
}
mTunnelClient
->
start
();
...
...
@@ -426,7 +429,9 @@ void TunnelManager::autoDetect() {
}
void
TunnelManager
::
setHttpProxyAuthInfo
(
const
char
*
username
,
const
char
*
passwd
)
{
mTunnelClient
->
setHttpProxyAuthInfo
(
username
,
passwd
);
mHttpUserName
=
username
?
username
:
""
;
mHttpPasswd
=
passwd
?
passwd
:
""
;
if
(
mTunnelClient
)
mTunnelClient
->
setHttpProxyAuthInfo
(
username
,
passwd
);
}
LinphoneCore
*
TunnelManager
::
getLinphoneCore
(){
...
...
coreapi/TunnelManager.hh
View file @
92c21608
...
...
@@ -11,6 +11,7 @@
#ifndef __TUNNEL_CLIENT_MANAGER_H__
#define __TUNNEL_CLIENT_MANAGER_H__
#include <list>
#include <string>
#include "linphonecore.h"
#include "tunnel/client.hh"
extern
"C"
{
...
...
@@ -156,6 +157,8 @@ class UdpMirrorClient;
static
Mutex
sMutex
;
bool
mAutoDetectStarted
;
LinphoneRtpTransportFactories
mTransportFactories
;
std
::
string
mHttpUserName
;
std
::
string
mHttpPasswd
;
};
/**
...
...
coreapi/linphone_tunnel
_manager
.cc
→
coreapi/linphone_tunnel.cc
View file @
92c21608
/***************************************************************************
* linphone_tunnel
_manager
.cc
* linphone_tunnel.cc
*
* Fri Dec 9, 2011
* Copyright 2011 Belledonne Communications
...
...
@@ -24,92 +24,92 @@
*/
#include "linphone_tunnel
_manager
.h"
#include "linphone_tunnel.h"
#include "TunnelManager.hh"
#include "linphonecore.h"
#include "private.h"
#include "lpconfig.h"
static
inline
belledonnecomm
::
TunnelManager
*
bcTunnel
(
LinphoneTunnel
Manager
*
tunnel
){
static
inline
belledonnecomm
::
TunnelManager
*
bcTunnel
(
LinphoneTunnel
*
tunnel
){
return
(
belledonnecomm
::
TunnelManager
*
)
tunnel
;
}
extern
"C"
LinphoneTunnel
Manager
*
linphone_core_tunnel_new
(
LinphoneCore
*
lc
){
LinphoneTunnel
Manager
*
tunnel
=
(
LinphoneTunnel
Manager
*
)
new
belledonnecomm
::
TunnelManager
(
lc
);
extern
"C"
LinphoneTunnel
*
linphone_core_tunnel_new
(
LinphoneCore
*
lc
){
LinphoneTunnel
*
tunnel
=
(
LinphoneTunnel
*
)
new
belledonnecomm
::
TunnelManager
(
lc
);
return
tunnel
;
}
LinphoneTunnel
Manager
*
linphone_tunnel
_get
(
LinphoneCore
*
lc
){
LinphoneTunnel
*
linphone_
core_get_
tunnel
(
LinphoneCore
*
lc
){
return
lc
->
tunnel
;
}
void
linphone_tunnel_destroy
(
LinphoneTunnel
Manager
*
tunnel
){
void
linphone_tunnel_destroy
(
LinphoneTunnel
*
tunnel
){
delete
bcTunnel
(
tunnel
);
}
void
linphone_tunnel_add_server
(
LinphoneTunnel
Manager
*
tunnel
,
const
char
*
host
,
int
port
){
void
linphone_tunnel_add_server
(
LinphoneTunnel
*
tunnel
,
const
char
*
host
,
int
port
){
bcTunnel
(
tunnel
)
->
addServer
(
host
,
port
);
}
void
linphone_tunnel_add_server_and_mirror
(
LinphoneTunnel
Manager
*
tunnel
,
const
char
*
host
,
int
port
,
int
remote_udp_mirror
,
int
delay
){
void
linphone_tunnel_add_server_and_mirror
(
LinphoneTunnel
*
tunnel
,
const
char
*
host
,
int
port
,
int
remote_udp_mirror
,
int
delay
){
bcTunnel
(
tunnel
)
->
addServer
(
host
,
port
,
remote_udp_mirror
,
delay
);
}
void
linphone_tunnel_clean_servers
(
LinphoneTunnel
Manager
*
tunnel
){
void
linphone_tunnel_clean_servers
(
LinphoneTunnel
*
tunnel
){
bcTunnel
(
tunnel
)
->
cleanServers
();
}
void
linphone_tunnel_enable
(
LinphoneTunnel
Manager
*
tunnel
,
bool_t
enabled
){
void
linphone_tunnel_enable
(
LinphoneTunnel
*
tunnel
,
bool_t
enabled
){
bcTunnel
(
tunnel
)
->
enable
(
enabled
);
}
bool_t
linphone_tunnel_enabled
(
LinphoneTunnel
Manager
*
tunnel
){
bool_t
linphone_tunnel_enabled
(
LinphoneTunnel
*
tunnel
){
return
bcTunnel
(
tunnel
)
->
isEnabled
();
}
void
linphone_tunnel_enable_logs
(
LinphoneTunnel
Manager
*
tunnel
,
bool_t
enabled
){
void
linphone_tunnel_enable_logs
(
LinphoneTunnel
*
tunnel
,
bool_t
enabled
){
bcTunnel
(
tunnel
)
->
enableLogs
(
enabled
);
}
void
linphone_tunnel_enable_logs_with_handler
(
LinphoneTunnel
Manager
*
tunnel
,
bool_t
enabled
,
LogHandler
logHandler
){
void
linphone_tunnel_enable_logs_with_handler
(
LinphoneTunnel
*
tunnel
,
bool_t
enabled
,
LogHandler
logHandler
){
bcTunnel
(
tunnel
)
->
enableLogs
(
enabled
,
logHandler
);
}
void
linphone_tunnel_set_http_proxy_auth_info
(
LinphoneTunnel
Manager
*
tunnel
,
const
char
*
username
,
const
char
*
passwd
){
void
linphone_tunnel_set_http_proxy_auth_info
(
LinphoneTunnel
*
tunnel
,
const
char
*
username
,
const
char
*
passwd
){
bcTunnel
(
tunnel
)
->
setHttpProxyAuthInfo
(
username
,
passwd
);
}
void
linphone_tunnel_reconnect
(
LinphoneTunnel
Manager
*
tunnel
){
void
linphone_tunnel_reconnect
(
LinphoneTunnel
*
tunnel
){
bcTunnel
(
tunnel
)
->
reconnect
();
}
void
linphone_tunnel_auto_detect
(
LinphoneTunnel
Manager
*
tunnel
){
void
linphone_tunnel_auto_detect
(
LinphoneTunnel
*
tunnel
){
bcTunnel
(
tunnel
)
->
autoDetect
();
}
static
inline
_LpConfig
*
config
(
LinphoneTunnel
Manager
*
tunnel
){
static
inline
_LpConfig
*
config
(
LinphoneTunnel
*
tunnel
){
return
((
belledonnecomm
::
TunnelManager
*
)
tunnel
)
->
getLinphoneCore
()
->
config
;
}
/**
* Set tunnel server addresses. "host1:port1 host2:port2 host3:port3"
**/
void
linphone_tunnel_set_server_addresses
(
LinphoneTunnel
Manager
*
tunnel
,
const
char
*
addresses
){
void
linphone_tunnel_set_server_addresses
(
LinphoneTunnel
*
tunnel
,
const
char
*
addresses
){
lp_config_set_string
(
config
(
tunnel
),
"tunnel"
,
"server_addresses"
,
addresses
);
}
/**
* Get tunnel server addresses. "host1:port1 host2:port2 host3:port3"
**/
const
char
*
linphone_tunnel_get_server_addresses
(
LinphoneTunnel
Manager
*
tunnel
){
const
char
*
linphone_tunnel_get_server_addresses
(
LinphoneTunnel
*
tunnel
){
return
lp_config_get_string
(
config
(
tunnel
),
"tunnel"
,
"server_addresses"
,
NULL
);
}
/**
* Set tunnel state.
**/
void
linphone_tunnel_set_state
(
LinphoneTunnel
Manager
*
tunnel
,
LinphoneTunnelState
state
){
void
linphone_tunnel_set_state
(
LinphoneTunnel
*
tunnel
,
LinphoneTunnelState
state
){
switch
(
state
)
{
case
LinphoneTunnelEnabled
:
lp_config_set_string
(
config
(
tunnel
),
"tunnel"
,
"tunnel_state"
,
"enabled"
);
...
...
@@ -126,7 +126,7 @@ void linphone_tunnel_set_state(LinphoneTunnelManager *tunnel, LinphoneTunnelStat
/**
* Get tunnel state.
**/
LinphoneTunnelState
linphone_tunnel_get_state
(
LinphoneTunnel
Manager
*
tunnel
){
LinphoneTunnelState
linphone_tunnel_get_state
(
LinphoneTunnel
*
tunnel
){
const
char
*
state
=
lp_config_get_string
(
config
(
tunnel
),
"tunnel"
,
"tunnel_state"
,
"disabled"
);
if
(
0
==
strcmp
(
"enabled"
,
state
)){
return
LinphoneTunnelEnabled
;
...
...
coreapi/linphone_tunnel
_manager
.h
→
coreapi/linphone_tunnel.h
View file @
92c21608
/***************************************************************************
* linphone_tunnel
_manager
.h
* linphone_tunnel.h
*
* Fri Dec 9, 2011
* Copyright 2011 Belledonne Communications
...
...
@@ -33,22 +33,18 @@ extern "C"
{
#endif
typedef
struct
LinphoneTunnelManager
LinphoneTunnelManager
;
typedef
void
(
*
LogHandler
)(
int
log_level
,
const
char
*
str
,
va_list
l
);
LinphoneTunnelManager
*
linphone_tunnel_get
(
LinphoneCore
*
lc
);
void
linphone_tunnel_destroy
(
LinphoneTunnelManager
*
tunnel
);
void
linphone_tunnel_add_server
(
LinphoneTunnelManager
*
tunnel
,
const
char
*
host
,
int
port
);
void
linphone_tunnel_add_server_and_mirror
(
LinphoneTunnelManager
*
tunnel
,
const
char
*
host
,
int
port
,
int
remote_udp_mirror
,
int
delay
);
void
linphone_tunnel_clean_servers
(
LinphoneTunnelManager
*
tunnel
);
void
linphone_tunnel_enable
(
LinphoneTunnelManager
*
tunnel
,
bool_t
enabled
);
bool_t
linphone_tunnel_enabled
(
LinphoneTunnelManager
*
tunnel
);
void
linphone_tunnel_enable_logs
(
LinphoneTunnelManager
*
tunnel
,
bool_t
enabled
);
void
linphone_tunnel_enable_logs_with_handler
(
LinphoneTunnelManager
*
tunnel
,
bool_t
enabled
,
LogHandler
logHandler
);
void
linphone_tunnel_reconnect
(
LinphoneTunnelManager
*
tunnel
);
void
linphone_tunnel_auto_detect
(
LinphoneTunnelManager
*
tunnel
);
void
linphone_tunnel_set_http_proxy_auth_info
(
const
char
*
username
,
const
char
*
passwd
);
void
linphone_tunnel_add_server
(
LinphoneTunnel
*
tunnel
,
const
char
*
host
,
int
port
);
void
linphone_tunnel_add_server_and_mirror
(
LinphoneTunnel
*
tunnel
,
const
char
*
host
,
int
port
,
int
remote_udp_mirror
,
int
delay
);
void
linphone_tunnel_clean_servers
(
LinphoneTunnel
*
tunnel
);
void
linphone_tunnel_enable
(
LinphoneTunnel
*
tunnel
,
bool_t
enabled
);
bool_t
linphone_tunnel_enabled
(
LinphoneTunnel
*
tunnel
);
void
linphone_tunnel_enable_logs
(
LinphoneTunnel
*
tunnel
,
bool_t
enabled
);
void
linphone_tunnel_enable_logs_with_handler
(
LinphoneTunnel
*
tunnel
,
bool_t
enabled
,
LogHandler
logHandler
);
void
linphone_tunnel_reconnect
(
LinphoneTunnel
*
tunnel
);
void
linphone_tunnel_auto_detect
(
LinphoneTunnel
*
tunnel
);
void
linphone_tunnel_set_http_proxy_auth_info
(
LinphoneTunnel
*
tunnel
,
const
char
*
username
,
const
char
*
passwd
);
/**
...
...
@@ -63,22 +59,22 @@ typedef enum _LinphoneTunnelState{
/**
* Set tunnel addresses.
**/
void
linphone_tunnel_set_server_addresses
(
LinphoneTunnel
Manager
*
tunnel
,
const
char
*
lists
);
void
linphone_tunnel_set_server_addresses
(
LinphoneTunnel
*
tunnel
,
const
char
*
lists
);
/**
* Get tunnel addresses.
**/
const
char
*
linphone_tunnel_get_server_addresses
(
LinphoneTunnel
Manager
*
tunnel
);
const
char
*
linphone_tunnel_get_server_addresses
(
LinphoneTunnel
*
tunnel
);
/**
* Set tunnel state.
**/
void
linphone_tunnel_set_state
(
LinphoneTunnel
Manager
*
tunnel
,
LinphoneTunnelState
state
);
void
linphone_tunnel_set_state
(
LinphoneTunnel
*
tunnel
,
LinphoneTunnelState
state
);
/**
* Get tunnel state.
**/
LinphoneTunnelState
linphone_tunnel_get_state
(
LinphoneTunnel
Manager
*
tunnel
);
LinphoneTunnelState
linphone_tunnel_get_state
(
LinphoneTunnel
*
tunnel
);
#ifdef __cplusplus
...
...
coreapi/linphonecore.c
View file @
92c21608
...
...
@@ -998,7 +998,7 @@ static void misc_config_read (LinphoneCore *lc) {
}
#ifdef TUNNEL_ENABLED
static
void
tunnel_add_servers_from_config
(
LinphoneTunnel
Manager
*
tunnel
,
const
char
*
confaddress
){
static
void
tunnel_add_servers_from_config
(
LinphoneTunnel
*
tunnel
,
const
char
*
confaddress
){
char
*
addresses
=
(
char
*
)
ms_strdup
(
confaddress
);
char
*
str1
;
for
(
str1
=
addresses
;;
str1
=
NULL
){
...
...
coreapi/linphonecore.h
View file @
92c21608
...
...
@@ -344,16 +344,6 @@ typedef enum _LinphoneRegistrationState{
*/
const
char
*
linphone_registration_state_to_string
(
LinphoneRegistrationState
cs
);
/**
* True if tunnel support was compiled.
*/
bool_t
linphone_core_tunnel_available
();
/**
* Update tunnel using configuration.
*/
void
linphone_core_update_tunnel
(
LinphoneCore
*
lc
);
LinphoneProxyConfig
*
linphone_proxy_config_new
(
void
);
int
linphone_proxy_config_set_server_addr
(
LinphoneProxyConfig
*
obj
,
const
char
*
server_addr
);
int
linphone_proxy_config_set_identity
(
LinphoneProxyConfig
*
obj
,
const
char
*
identity
);
...
...
@@ -1084,6 +1074,21 @@ void linphone_core_set_media_encryption_mandatory(LinphoneCore *lc, bool_t m);
*/
void
linphone_core_init_default_params
(
LinphoneCore
*
lc
,
LinphoneCallParams
*
params
);
/**
* True if tunnel support was compiled.
*/
bool_t
linphone_core_tunnel_available
();
/**
* Update tunnel using configuration.
*/
void
linphone_core_update_tunnel
(
LinphoneCore
*
lc
);
typedef
struct
LinphoneTunnel
LinphoneTunnel
;
/**
* get tunnel instance if available
*/
LinphoneTunnel
*
linphone_core_get_tunnel
(
LinphoneCore
*
lc
);
#ifdef __cplusplus
}
#endif
...
...
coreapi/linphonecore_jni.cc
View file @
92c21608
...
...
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <ortp/zrtp.h>
#ifdef TUNNEL_ENABLED
#include "linphone_tunnel
_manager
.h"
#include "linphone_tunnel.h"
#endif
extern
"C"
{
...
...
@@ -1599,7 +1599,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setMaxCalls(JNIEnv *env,
extern
"C"
void
Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
pCore
,
jstring
jHost
,
jint
port
,
jint
mirror
,
jint
delay
)
{
#ifdef TUNNEL_ENABLED
LinphoneTunnel
Manager
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
LinphoneTunnel
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
const
char
*
cHost
=
env
->
GetStringUTFChars
(
jHost
,
NULL
);
linphone_tunnel_add_server_and_mirror
(
tunnel
,
cHost
,
port
,
mirror
,
delay
);
env
->
ReleaseStringUTFChars
(
jHost
,
cHost
);
...
...
@@ -1608,28 +1608,28 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror
extern
"C"
void
Java_org_linphone_core_LinphoneCoreImpl_tunnelAutoDetect
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
pCore
)
{
#ifdef TUNNEL_ENABLED
LinphoneTunnel
Manager
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
LinphoneTunnel
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
linphone_tunnel_auto_detect
(
tunnel
);
#endif
}
extern
"C"
void
Java_org_linphone_core_LinphoneCoreImpl_tunnelCleanServers
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
pCore
)
{
#ifdef TUNNEL_ENABLED
LinphoneTunnel
Manager
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
LinphoneTunnel
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
linphone_tunnel_clean_servers
(
tunnel
);
#endif
}
extern
"C"
void
Java_org_linphone_core_LinphoneCoreImpl_tunnelEnable
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
pCore
,
jboolean
enable
)
{
#ifdef TUNNEL_ENABLED
LinphoneTunnel
Manager
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
LinphoneTunnel
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
linphone_tunnel_enable
(
tunnel
,
enable
);
#endif
}
extern
"C"
void
Java_org_linphone_core_LinphoneCoreImpl_tunnelEnableLogs
(
JNIEnv
*
env
,
jobject
thiz
,
jlong
pCore
,
jboolean
enable
)
{
#ifdef TUNNEL_ENABLED
LinphoneTunnel
Manager
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
LinphoneTunnel
*
tunnel
=
((
LinphoneCore
*
)
pCore
)
->
tunnel
;
if
(
!
tunnel
)
return
;
linphone_tunnel_enable_logs
(
tunnel
,
enable
);
#endif
}
...
...
coreapi/private.h
View file @
92c21608
...
...
@@ -28,7 +28,7 @@
extern
"C"
{
#endif
#include "linphonecore.h"
#include "linphone_tunnel
_manager
.h"
#include "linphone_tunnel.h"
#include "linphonecore_utils.h"
#include "sal.h"
...
...
@@ -476,11 +476,12 @@ struct _LinphoneCore
int
device_rotation
;
bool_t
ringstream_autorelease
;
int
max_calls
;
LinphoneTunnel
Manager
*
tunnel
;
LinphoneTunnel
*
tunnel
;
};
LinphoneTunnelManager
*
linphone_core_tunnel_new
(
LinphoneCore
*
lc
);
LinphoneTunnel
*
linphone_core_tunnel_new
(
LinphoneCore
*
lc
);
void
linphone_tunnel_destroy
(
LinphoneTunnel
*
tunnel
);
bool_t
linphone_core_can_we_add_call
(
LinphoneCore
*
lc
);
int
linphone_core_add_call
(
LinphoneCore
*
lc
,
LinphoneCall
*
call
);
int
linphone_core_del_call
(
LinphoneCore
*
lc
,
LinphoneCall
*
call
);
...
...
@@ -544,6 +545,8 @@ void __linphone_core_invalidate_registers(LinphoneCore* lc);
#endif
void
call_logs_write_to_config_file
(
LinphoneCore
*
lc
);
#ifdef __cplusplus
}
#endif
...
...
gtk/propertybox.c
View file @
92c21608
...
...
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "linphone.h"
#include "linphone_tunnel
_manager
.h"
#include "linphone_tunnel.h"
typedef
enum
{
CAP_IGNORE
,
...
...
@@ -1004,7 +1004,7 @@ void linphone_gtk_edit_tunnel_closed(GtkWidget *button){
}
#ifdef TUNNEL_ENABLED
static
void
tunnel_get_server_host_and_port
(
LinphoneTunnel
Manager
*
tunnel
,
char
*
host
,
int
size
,
int
*
port
){
static
void
tunnel_get_server_host_and_port
(
LinphoneTunnel
*
tunnel
,
char
*
host
,
int
size
,
int
*
port
){
char
*
colon
;
char
*
addresses
=
(
char
*
)
ms_strdup
(
linphone_tunnel_get_server_addresses
(
tunnel
));
char
*
str1
=
addresses
;
...
...
@@ -1023,7 +1023,7 @@ void linphone_gtk_edit_tunnel(GtkButton *button){
#ifdef TUNNEL_ENABLED
LinphoneCore
*
lc
=
linphone_gtk_get_core
();
GtkWidget
*
w
=
linphone_gtk_create_window
(
"tunnel_config"
);
LinphoneTunnel
Manager
*
tunnel
=
linphone_tunnel
_get
(
lc
);
LinphoneTunnel
*
tunnel
=
linphone_
core_get_
tunnel
(
lc
);
char
host
[
50
]
=
{
'\0'
};
int
port
=
0
;
tunnel_get_server_host_and_port
(
tunnel
,
host
,
sizeof
(
host
),
&
port
);
...
...
@@ -1050,7 +1050,7 @@ void linphone_gtk_tunnel_ok(GtkButton *button){
LinphoneCore
*
lc
=
linphone_gtk_get_core
();
GtkWidget
*
w
=
gtk_widget_get_toplevel
(
GTK_WIDGET
(
button
));
char
address
[
50
]
=
{
'\0'
};
LinphoneTunnel
Manager
*
tunnel
=
linphone_tunnel
_get
(
lc
);
LinphoneTunnel
*
tunnel
=
linphone_
core_get_
tunnel
(
lc
);
gint
port
=
(
gint
)
gtk_spin_button_get_value
(
GTK_SPIN_BUTTON
(
linphone_gtk_get_widget
(
w
,
"port"
)));
gboolean
enabled
=
gtk_toggle_button_get_active
(
GTK_TOGGLE_BUTTON
(
linphone_gtk_get_widget
(
w
,
"radio_enable"
)));
...
...
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