Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 00:27:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add the tunneling connection. Warning, encryption is not implemented yet for tunnel connection, use only for testing.

Browse source 
Redesign the udp connection
Remove the rsiface duplicates from retroshare-gui.
Add some randomness in timings for connect manager

Merge branch 'connectionTunneling'

Conflicts:
	libretroshare/src/libretroshare.pro
	libretroshare/src/pqi/p3connmgr.cc
	retroshare-gui/src/RetroShare.pro
	retroshare-gui/src/rsiface/rsfiles.h
	retroshare-gui/src/rsiface/rstypes.h

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-13 21:59:26 +00:00
parent 1d567a7faa
commit fdb3673ce2
56 changed files with 2420 additions and 3394 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/rsserver/rsinit.cc
View file

@ -1421,7 +1421,7 @@ std::string RsInit::getHomePath()
}
out << "fltkserver::getHomePath() -> " << home << std::endl;
std::cerr << out;
std::cerr << out.str();
// convert to FLTK desired format.
home = make_path_unix(home);
@ -1827,6 +1827,7 @@ RsTurtle *rsTurtle = NULL ;
#include "services/p3status.h"
#include "services/p3Qblog.h"
#include "turtle/p3turtle.h"
#include "services/p3tunnel.h"
#include <list>
#include <string>
@ -1976,6 +1977,10 @@ int RsServer::StartupRetroShare()
msgSrv = new p3MsgService(mConnMgr);
chatSrv = new p3ChatService(mConnMgr);
p3tunnel *tn = new p3tunnel(mAuthMgr,mConnMgr, pqih);
pqih -> addService(tn);
mConnMgr->setP3tunnel(tn);
p3turtle *tr = new p3turtle(mConnMgr,ftserver) ;
rsTurtle = tr ;
pqih -> addService(tr);