Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-16 01:54:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- added functions to add/remove virtual peers in turtle client service

Browse source 
- removed all explicit connections between turtle and FT
- added tunnel and invitation management in p3ChatServer (still needs PGP encryption)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-04-10 08:52:52 +00:00
parent e9a51455eb
commit f12ad9583d
8 changed files with 191 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/turtle/p3turtle.h
View file

@ -216,7 +216,7 @@ class TurtleHashInfo
class p3turtle: public p3Service, public RsTurtle, public p3Config
{
public:
p3turtle(p3LinkMgr *lm,ftServer *m);
p3turtle(p3LinkMgr *lm) ;
// Enables/disable the service. Still ticks, but does nothing. Default is true.
//
@ -352,7 +352,6 @@ class p3turtle: public p3Service, public RsTurtle, public p3Config
/// specific routing functions for handling particular packets.
void handleRecvGenericTunnelItem(RsTurtleGenericTunnelItem *item);
void handleRecvGenericDataItem(RsTurtleGenericDataItem *item);
bool getTunnelServiceInfo(TurtleTunnelId, std::string& virtual_peer_id, std::string& hash, RsTurtleClientService*&) ;
// following functions should go to ftServer
@ -376,8 +375,6 @@ class p3turtle: public p3Service, public RsTurtle, public p3Config
/* data */
p3LinkMgr *mLinkMgr;
ftServer *_ft_server ;
ftController *_ft_controller ;
RsTurtleSerialiser *_serialiser ;
mutable RsMutex mTurtleMtx;