Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bug causing some GXS sync tunnels to remain unused and prevent new tunnels to be created

Browse source
This commit is contained in:
csoler 2018-10-28 17:29:35 +01:00
parent b603b9b4c7
commit 20391371c7
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libretroshare/src/gxs/rsgxsnettunnel.cc
View file

@ -30,7 +30,7 @@
#include "gxs/rsnxs.h" #include "gxs/rsnxs.h"
#include "rsgxsnettunnel.h" #include "rsgxsnettunnel.h"
// #define DEBUG_RSGXSNETTUNNEL 1 //#define DEBUG_RSGXSNETTUNNEL 1
#define GXS_NET_TUNNEL_NOT_IMPLEMENTED() { std::cerr << __PRETTY_FUNCTION__ << ": not yet implemented." << std::endl; } #define GXS_NET_TUNNEL_NOT_IMPLEMENTED() { std::cerr << __PRETTY_FUNCTION__ << ": not yet implemented." << std::endl; }
#define GXS_NET_TUNNEL_DEBUG() std::cerr << time(NULL) << " : GXS_NET_TUNNEL: " << __FUNCTION__ << " : " #define GXS_NET_TUNNEL_DEBUG() std::cerr << time(NULL) << " : GXS_NET_TUNNEL: " << __FUNCTION__ << " : "
@ -325,8 +325,6 @@ bool RsGxsNetTunnelService::sendTunnelData(uint16_t /* service_id */,unsigned ch
return false ; return false ;
} }
it->second.last_contact = time(NULL) ;
// 2 - encrypt and send the item. // 2 - encrypt and send the item.
RsTurtleGenericDataItem *encrypted_turtle_item = NULL ; RsTurtleGenericDataItem *encrypted_turtle_item = NULL ;
@ -578,7 +576,13 @@ void RsGxsNetTunnelService::receiveTurtleData(const RsTurtleGenericTunnelItem *i
if(it == mTurtle2GxsPeer.end()) if(it == mTurtle2GxsPeer.end())
{ {
GXS_NET_TUNNEL_ERROR() << "item received by GxsNetTunnel for vpid " << turtle_virtual_peer_id << " but this vpid is unknown!" << std::endl; GXS_NET_TUNNEL_ERROR() << "item received by GxsNetTunnel for vpid " << turtle_virtual_peer_id << " but this vpid is unknown! Removing this vpid from group " << group_id << std::endl;
// this situation is inconsistent: the first item that should go through the tunnel is a virtual peer info, so if we don't have one, it means that
// this virtual peer is dead. We should therefore remove it from the list of vpids for this group.
mGroups[group_id].virtual_peers.erase(turtle_virtual_peer_id) ;
free(data); free(data);
return; return;
} }
@ -593,8 +597,6 @@ void RsGxsNetTunnelService::receiveTurtleData(const RsTurtleGenericTunnelItem *i
free(data); free(data);
return; return;
} }
it2->second.vpid_status = RsGxsNetTunnelVirtualPeerInfo::RS_GXS_NET_TUNNEL_VP_STATUS_ACTIVE ; // status of the peer
it2->second.last_contact = time(NULL); // last time some data was sent/recvd
if(service_id != it2->second.service_id && service_id != RS_SERVICE_GXS_TYPE_GXSID) if(service_id != it2->second.service_id && service_id != RS_SERVICE_GXS_TYPE_GXSID)
{ {
@ -602,6 +604,10 @@ void RsGxsNetTunnelService::receiveTurtleData(const RsTurtleGenericTunnelItem *i
free(data); free(data);
return ; return ;
} }
it2->second.vpid_status = RsGxsNetTunnelVirtualPeerInfo::RS_GXS_NET_TUNNEL_VP_STATUS_ACTIVE ; // status of the peer
it2->second.last_contact = time(NULL); // last time some data was sent/recvd from this peer
mGroups[group_id].last_contact = time(NULL); // last time some data as received for this group
#ifdef DEBUG_RSGXSNETTUNNEL #ifdef DEBUG_RSGXSNETTUNNEL
GXS_NET_TUNNEL_DEBUG() << "item contains generic data for VPID " << gxs_vpid << ". service_id = " << std::hex << service_id << std::dec << ". Storing in incoming list" << std::endl; GXS_NET_TUNNEL_DEBUG() << "item contains generic data for VPID " << gxs_vpid << ". service_id = " << std::hex << service_id << std::dec << ". Storing in incoming list" << std::endl;

2
libretroshare/src/retroshare/rsgxsdistsync.h
View file

@ -68,7 +68,7 @@ struct RsGxsNetTunnelGroupInfo
GroupPolicy group_policy ; GroupPolicy group_policy ;
GroupStatus group_status ; GroupStatus group_status ;
rstime_t last_contact ; rstime_t last_contact ;
RsFileHash hash ; RsFileHash hash ;
uint16_t service_id ; uint16_t service_id ;