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

Commit of the new UDP Connection methods and

Browse source 
the rewrite of the retroshare core networking stack.

This check-in commits the changes to the pqi code, 
and provides the majority of the improvements.

(1) Introduced new interfaces for DHT and UPnP abstraction: p3dhtmgr.h, p3upnpmgr.h
(2) Introduces abstraction for Authentication: p3authmgr.h
(3) New Connection Manager to coordinate networking code: p3connmgr.h
(4) New Configuration Manager: p3cfgmgr.h

This library has been significantly modified to support DHT synced connections
to enable connections between Firewalled Friends. The connection code has
been rewritten within a new framework, which should make extensions easier to code.

Also removed significant amount of old code relating to Tunnels, Channels etc.
This will be recycled later as higher level services that should not be
part of the core networking library.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-25 06:36:40 +00:00
parent de0ce110b9
commit 6435357c07
63 changed files with 8336 additions and 10839 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libretroshare/src/pqi/pqiperson.h
View file

@ -31,23 +31,9 @@
#include "pqi/pqi.h"
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
#include "pqi/xpgpcert.h"
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
#include "pqi/sslcert.h"
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
#include <list>
class pqiperson;
class sslroot;
static const int CONNECT_RECEIVED = 1;
static const int CONNECT_SUCCESS = 2;
@ -77,7 +63,7 @@ public:
virtual ~pqiconnect() { return; }
// presents a virtual NetInterface -> passes to ni.
virtual int connectattempt() { return ni -> connectattempt(); }
virtual int connect(struct sockaddr_in raddr) { return ni->connect(raddr); }
virtual int listen() { return ni -> listen(); }
virtual int stoplistening() { return ni -> stoplistening(); }
virtual int reset() { return ni -> reset(); }
@ -104,19 +90,20 @@ protected:
};
class pqipersongrp;
class pqiperson: public PQInterface
{
public:
pqiperson(cert *c, std::string id);
pqiperson(std::string id, pqipersongrp *ppg);
virtual ~pqiperson(); // must clean up children.
// control of the connection.
int reset();
int autoconnect(bool);
int connect(uint32_t type, struct sockaddr_in raddr);
// add in connection method.
int addChildInterface(pqiconnect *pqi);
int addChildInterface(uint32_t type, pqiconnect *pqi);
// The PQInterface interface.
virtual int SendItem(RsItem *);
@ -124,7 +111,6 @@ virtual RsItem *GetItem();
virtual int status();
virtual int tick();
virtual cert * getContact();
// overloaded callback function for the child - notify of a change.
int notifyEvent(NetInterface *ni, int event);
@ -135,23 +121,18 @@ virtual void setMaxRate(bool in, float val);
private:
std::list<pqiconnect *> kids;
cert *sslcert;
std::map<uint32_t, pqiconnect *> kids;
bool active;
pqiconnect *activepqi;
bool inConnectAttempt;
int waittimes;
sslroot *sroot;
private: /* Helper functions */
int connectWait();
int connectSuccess();
int listen();
int stoplistening();
int connectattempt(pqiconnect *last);
pqipersongrp *pqipg; /* parent for callback */
};