mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

ported to mingw

Browse source
This commit is contained in:
Simon Morlat 2012-01-30 22:21:30 +01:00
parent f91ef73346
commit 3c805758e8
6 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -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 \

3
coreapi/Makefile.am
View file

@ -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

22
coreapi/TunnelManager.cc
View file

@ -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;
NativeSocket udp_fd=(NativeSocket)eXosip_get_udp_socket();
NativeSocket controlfd=(NativeSocket)eXosip_get_control_fd();
/*
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;
}
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){

3
coreapi/TunnelManager.hh
View file

@ -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"
}

3
coreapi/linphone_tunnel.cc
View file

@ -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"

2
tunnel

@ -1 +1 @@
Subproject commit 3c19ce5fd922b926c1ee16a90633986c6e585af3
Subproject commit 7ab47085cf698660e9fe17c2c4f3255cd5d5a8a5