added interface to get statistics about GxsNetTunnel

libretroshare/src/gxs/rsgxsnettunnel.cc

@@ -39,6 +39,8 @@
 static const uint32_t RS_GXS_NET_TUNNEL_MAX_ALLOWED_HITS_GROUP_DATA    =   1;
 static const uint32_t RS_GXS_NET_TUNNEL_MAX_ALLOWED_HITS_GROUP_SEARCH  = 100;
 
+RsGxsDistSync *rsGxsDistSync = NULL;
+
 RsGxsNetTunnelService::RsGxsNetTunnelService(): mGxsNetTunnelMtx("GxsNetTunnel")
 {
 #warning this is for testing only. In the final version this needs to be initialized with some random content, saved and re-used for a while (e.g. 1 month)
@@ -1145,6 +1147,12 @@ void RsGxsNetTunnelService::receiveSearchResult(TurtleSearchRequestId request_id
 	GXS_NET_TUNNEL_ERROR() << ": deserialized item is of unknown type. Dropping!" << std::endl;
 }
 
+void RsGxsNetTunnelService::getStatistics( std::map<RsGxsGroupId,RsGxsNetTunnelGroupInfo>& groups,std::map<RsGxsNetTunnelVirtualPeerId, RsGxsNetTunnelVirtualPeerInfo>& virtual_peers,Bias20Bytes& bias      ) const
+{
+    groups = mGroups ;
+    virtual_peers = mVirtualPeers ;
+    bias = mRandomBias ;
+}
 
 
 

libretroshare/src/gxs/rsgxsnettunnel.h

@@ -27,7 +27,8 @@
 
 #include <map>
 
-#include <turtle/p3turtle.h>
+#include "turtle/p3turtle.h"
+#include "retroshare/rsgxsdistsync.h"
 
 /*!
  * \brief The RsGxsNetTunnelService class takes care of requesting tunnels to the turtle router, through which it is possible to sync
@@ -102,59 +103,10 @@
 //        and there is no way to prevent it. We therefore rely on GXS data integrity system to prevent this to happen.
 //
 
-typedef RsPeerId RsGxsNetTunnelVirtualPeerId ;
-
 class RsGxsNetTunnelItem ;
 class RsNetworkExchangeService ;
 
-struct RsGxsNetTunnelVirtualPeerInfo
+class RsGxsNetTunnelService: public RsTurtleClientService, public RsTickingThread, public p3Config, public RsGxsDistSync
-{
-	enum {   RS_GXS_NET_TUNNEL_VP_STATUS_UNKNOWN   = 0x00,		// unknown status.
-		     RS_GXS_NET_TUNNEL_VP_STATUS_TUNNEL_OK = 0x01,		// tunnel has been established and we're waiting for virtual peer id
-		     RS_GXS_NET_TUNNEL_VP_STATUS_ACTIVE    = 0x02		// virtual peer id is known. Data can transfer.
-	     };
-
-	RsGxsNetTunnelVirtualPeerInfo() : vpid_status(RS_GXS_NET_TUNNEL_VP_STATUS_UNKNOWN), last_contact(0),side(0) { memset(encryption_master_key,0,32) ; }
-	virtual ~RsGxsNetTunnelVirtualPeerInfo(){}
-
-	uint8_t vpid_status ;					// status of the peer
-	time_t  last_contact ;					// last time some data was sent/recvd
-	uint8_t side ;	                        // client/server
-	uint8_t encryption_master_key[32];
-
-	TurtleVirtualPeerId	turtle_virtual_peer_id ;  // turtle peer to use when sending data to this vpid.
-
-	RsGxsGroupId group_id ;					// group that virtual peer is providing
-	uint16_t service_id ; 					// this is used for checkng consistency of the incoming data
-};
-
-struct RsGxsNetTunnelGroupInfo
-{
-	enum GroupStatus {
-		    RS_GXS_NET_TUNNEL_GRP_STATUS_UNKNOWN            = 0x00,	// unknown status
-		    RS_GXS_NET_TUNNEL_GRP_STATUS_IDLE               = 0x01,	// no virtual peers requested, just waiting
-		    RS_GXS_NET_TUNNEL_GRP_STATUS_VPIDS_AVAILABLE    = 0x02	// some virtual peers are available. Data can be read/written
-	};
-
-	enum GroupPolicy {
-		    RS_GXS_NET_TUNNEL_GRP_POLICY_UNKNOWN            = 0x00,	// nothing has been set
-		    RS_GXS_NET_TUNNEL_GRP_POLICY_PASSIVE            = 0x01,	// group is available for server side tunnels, but does not explicitely request tunnels
-		    RS_GXS_NET_TUNNEL_GRP_POLICY_ACTIVE             = 0x02,	// group will only explicitely request tunnels if none available
-		    RS_GXS_NET_TUNNEL_GRP_POLICY_REQUESTING         = 0x03,	// group explicitely requests tunnels
-    };
-
-	RsGxsNetTunnelGroupInfo() : group_policy(RS_GXS_NET_TUNNEL_GRP_POLICY_PASSIVE),group_status(RS_GXS_NET_TUNNEL_GRP_STATUS_IDLE),last_contact(0) {}
-
-	GroupPolicy    group_policy ;
-	GroupStatus    group_status ;
-	time_t         last_contact ;
-	TurtleFileHash hash ;
-	uint16_t       service_id ;
-
-	std::set<TurtleVirtualPeerId> virtual_peers ; // list of which virtual peers provide this group. Can me more than 1.
-};
-
-class RsGxsNetTunnelService: public RsTurtleClientService, public RsTickingThread, public p3Config
 {
 public:
 	  RsGxsNetTunnelService() ;
@@ -257,6 +209,12 @@ public:
 	  bool saveList(bool& cleanup, std::list<RsItem*>& save);
 	  bool loadList(std::list<RsItem *> &load);
 
+      // Overloads RsGxsDistSync
+
+	  void getStatistics(std::map<RsGxsGroupId,RsGxsNetTunnelGroupInfo>& groups,             // groups on the client and server side
+	  		std::map<RsGxsNetTunnelVirtualPeerId, RsGxsNetTunnelVirtualPeerInfo>& virtual_peers,     // current virtual peers, which group they provide, and how to talk to them through turtle
+		    Bias20Bytes& bias) const;
+
 protected:
 	  // interaction with turtle router
 

libretroshare/src/libretroshare.pro

@@ -137,6 +137,7 @@ PUBLIC_HEADERS =	retroshare/rsdisc.h \
 					retroshare/rsconfig.h \
 					retroshare/rsversion.h \
 					retroshare/rsservicecontrol.h \
+					retroshare/rsgxsdistsync.h 
 
 HEADERS += plugins/pluginmanager.h \
 		plugins/dlfcn_win32.h \

libretroshare/src/rsserver/rsinit.cc

@@ -62,6 +62,7 @@
 #include <fcntl.h>
 
 #include "gxstunnel/p3gxstunnel.h"
+#include "retroshare/rsgxsdistsync.h"
 #include "file_sharing/p3filelists.h"
 
 #define ENABLE_GROUTER
@@ -1283,6 +1284,7 @@ int RsServer::StartupRetroShare()
 
 #ifdef RS_USE_GXS_DISTANT_SYNC
 	RsGxsNetTunnelService *mGxsNetTunnel = new RsGxsNetTunnelService ;
+    rsGxsDistSync = mGxsNetTunnel ;
 #else
 	RsGxsNetTunnelService *mGxsNetTunnel = NULL ;
 #endif