Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-18 02:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Major changes to the networking core of retroshare to introduce the new serialiser.

Browse source 
- Added new serialiser (PQItem -> RsItem), removed old one.
- switched packet sorting from ChanId (array of ids) to PeerId (string)
- introduced cleaner service interface (pqiservice).
- moved p3disc to service interface.
- modified streamers to use the new serialiser.
- moved msg/chat to service interface.
- removed old source code. (supernode / p3loopback).

I've disabled UDP connections / Proxy and Channels for the moment.
The code it still here, but is not compiled. The Proxy and Channels 
will become services, and the UDP connections will be reworked 
in the near future.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@274 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2007-12-12 01:29:14 +00:00
parent 07d33009b9
commit 2c9c31eaf0
36 changed files with 866 additions and 8116 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* "$Id: pqiperson.h,v 1.7 2007-02-18 21:46:49 rmf24 Exp $"
* libretroshare/src/pqi pqiperson.h
*
* 3P/PQI network interface for RetroShare.
*
@ -60,9 +60,9 @@ static const int CONNECT_FAILED = 5;
class pqiconnect: public pqistreamer, public NetInterface
{
public:
pqiconnect(NetBinInterface *ni_in)
:pqistreamer(ni_in, 0), // pqistreamer will cleanup NetInterface.
NetInterface(NULL, NULL), // No need for callback.
pqiconnect(RsSerialiser *rss, NetBinInterface *ni_in)
:pqistreamer(rss, ni_in->PeerId(), ni_in, 0), // pqistreamer will cleanup NetInterface.
NetInterface(NULL, ni_in->PeerId()), // No need for callback.
ni(ni_in)
{
if (!ni_in)
@ -84,15 +84,15 @@ virtual int reset() { return ni -> reset(); }
virtual int disconnect() { return ni -> reset(); }
// get the contact from the net side!
virtual Person *getContact()
virtual std::string PeerId()
{
if (ni)
{
return ni->getContact();
return ni->PeerId();
}
else
{
return PQInterface::getContact();
return PQInterface::PeerId();
}
}
@ -108,7 +108,7 @@ protected:
class pqiperson: public PQInterface
{
public:
pqiperson(cert *c);
pqiperson(cert *c, std::string id);
virtual ~pqiperson(); // must clean up children.
// control of the connection.
@ -119,8 +119,8 @@ int autoconnect(bool);
int addChildInterface(pqiconnect *pqi);
// The PQInterface interface.
virtual int SendItem(PQItem *);
virtual PQItem *GetItem();
virtual int SendItem(RsItem *);
virtual RsItem *GetItem();
virtual int status();
virtual int tick();
@ -135,8 +135,6 @@ virtual void setMaxRate(bool in, float val);
private:
// outgoing PQItems can be queued (nothing else).
std::list<PQItem *> togo;
std::list<pqiconnect *> kids;
cert *sslcert;
bool active;