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

progress in grouter code

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-12-22 17:04:13 +00:00
parent dbfe3f6c51
commit fd994a546b
6 changed files with 270 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libretroshare/src/grouter/p3grouter.h
View file

@ -53,6 +53,23 @@ class GRouterPublishedKeyInfo
time_t validity_time ;
};
struct FriendTrialRecord
{
SSLIdType friend_id ; // id of the friend
time_t time_stamp ; // time of the last tried
};
class GRouterRoutingInfo
{
public:
RsGRouterGenericDataItem *data_item ;
uint32_t status_flags ; // pending, waiting, etc.
std::list<FriendTrialRecord> tried_friends ; // list of friends to which the item was sent ordered with time.
SSLIdType origin ; // which friend sent us that item
time_t received_time ; // time at which the item was received
};
class p3GRouter: public RsGRouter, public p3Service, public p3Config
{
public:
@ -88,6 +105,11 @@ class p3GRouter: public RsGRouter, public p3Service, public p3Config
//
void sendData(const GRouterKeyId& destination, void *& item_data,uint32_t item_size) ;
// Sends an ACK to the origin of the msg. This is used to notify for
// unfound route, or message correctly received, depending on the particular situation.
//
void sendACK(const SSLIdType& peer,GRouterMsgPropagationId mid, uint32_t flags) ;
//===================================================//
// Interface with RsGRouter //
//===================================================//
@ -123,7 +145,7 @@ class p3GRouter: public RsGRouter, public p3Service, public p3Config
private:
void autoWash() ;
void routeObjects() ;
void routePendingObjects() ;
void handleIncoming() ;
void publishKeys() ;
void debugDump() ;
@ -155,10 +177,11 @@ class p3GRouter: public RsGRouter, public p3Service, public p3Config
GRouterMatrix _routing_matrix ;
// Stores the routing events.
// - pending items
// - ongoing requests, waiting for return ACK
// - pending items
// Both a stored in 2 different lists, to allow a more efficient handling.
//
GRouterCache _routing_cache ;
std::map<GRouterMsgPropagationId, GRouterRoutingInfo> _pending_messages;// pending messages
// Stores the keys which identify the router's node. For each key, a structure holds:
// - the client service