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
3c805758
Commit
3c805758
authored
Jan 30, 2012
by
Simon Morlat
Browse files
ported to mingw
parent
f91ef733
Changes
6
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
3c805758
...
...
@@ -94,6 +94,10 @@ if BUILD_ZRTP
WINBINDIST_FILES
+=
./bin/libzrtpcpp.dll ./bin/msys-1.0.dll ./bin/msys-crypto-1.0.0.dll
endif
if
BUILD_TUNNEL
WINBINDIST_FILES
+=
./bin/libtunnel-0.dll
endif
other-cherrypick
:
cd
$(GTK_PREFIX)
&&
\
for
file
in
$(WINBINDIST_FILES)
;
do
\
...
...
coreapi/Makefile.am
View file @
3c805758
...
...
@@ -56,9 +56,6 @@ liblinphone_la_LIBADD= \
$(ORTP_LIBS)
$(OPENSSL_LIBS)
\
$(TUNNEL_LIBS)
if
BUILD_WIN32
liblinphone_la_LIBADD
+=
$(top_builddir)
/oRTP/src/libortp.la
endif
if
BUILD_TESTS
noinst_PROGRAMS
=
test_lsd test_ecc
...
...
coreapi/TunnelManager.cc
View file @
3c805758
...
...
@@ -68,23 +68,9 @@ int TunnelManager::eXosipSelect(int max_fds, fd_set *s1, fd_set *s2, fd_set *s3,
TunnelManager
*
lTunnelMgr
=
(
TunnelManager
*
)
userdata
;
if
(
tv
!=
0
&&
tv
->
tv_sec
){
/*this is the select from udp.c, the one that is interesting to us*/
int
i
;
int
udp_fd
=
eXosip_get_udp_socket
();
int
controlfd
=-
1
;
/*
Find the udp fd and the control fd
*/
for
(
i
=
0
;
i
<
max_fds
;
++
i
){
if
(
FD_ISSET
(
i
,
s1
)
&&
i
!=
udp_fd
){
controlfd
=
i
;
break
;
}
}
if
(
controlfd
==-
1
){
ms_error
(
"Could not find control fd !"
);
return
-
1
;
}
NativeSocket
udp_fd
=
(
NativeSocket
)
eXosip_get_udp_socket
();
NativeSocket
controlfd
=
(
NativeSocket
)
eXosip_get_control_fd
();
FD_ZERO
(
s1
);
gettimeofday
(
&
begin
,
NULL
);
do
{
...
...
@@ -157,7 +143,7 @@ void TunnelManager::setCallback(StateCallback cb, void *userdata) {
static
void
sCloseRtpTransport
(
RtpTransport
*
t
,
void
*
userData
){
TunnelSocket
*
s
=
(
TunnelSocket
*
)
userData
;
TunnelManager
::
TunnelManager
*
manager
=
(
TunnelManager
::
TunnelManager
*
)
s
->
getUserPointer
();
TunnelManager
*
manager
=
(
TunnelManager
*
)
s
->
getUserPointer
();
manager
->
closeRtpTransport
(
t
,
s
);
}
void
TunnelManager
::
closeRtpTransport
(
RtpTransport
*
t
,
TunnelSocket
*
s
){
...
...
@@ -166,7 +152,7 @@ void TunnelManager::closeRtpTransport(RtpTransport *t, TunnelSocket *s){
}
static
RtpTransport
*
sCreateRtpTransport
(
void
*
userData
,
int
port
){
return
((
TunnelManager
::
TunnelManager
*
)
userData
)
->
createRtpTransport
(
port
);
return
((
TunnelManager
*
)
userData
)
->
createRtpTransport
(
port
);
}
RtpTransport
*
TunnelManager
::
createRtpTransport
(
int
port
){
...
...
coreapi/TunnelManager.hh
View file @
3c805758
...
...
@@ -12,8 +12,9 @@
#define __TUNNEL_CLIENT_MANAGER_H__
#include <list>
#include <string>
#include "linphonecore.h"
#include "tunnel/client.hh"
#include "linphonecore.h"
extern
"C"
{
#include "eXosip2/eXosip_transport_hook.h"
}
...
...
coreapi/linphone_tunnel.cc
View file @
3c805758
...
...
@@ -23,9 +23,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "linphone_tunnel.h"
#include "TunnelManager.hh"
#include "linphone_tunnel.h"
#include "linphonecore.h"
#include "private.h"
#include "lpconfig.h"
...
...
tunnel
@
7ab47085
Subproject commit
3c19ce5fd922b926c1ee16a90633986c6e585af3
Subproject commit
7ab47085cf698660e9fe17c2c4f3255cd5d5a8a5
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