added sorting of peers (part 2/2)

libretroshare/src/friend_server/fsclient.cc

@@ -148,9 +148,9 @@ bool FsClient::sendItem(const std::string& address,uint16_t port,RsItem *item,st
         p.tick(); // ticks bio
 
         RsItem *item = GetItem();
-
+#ifdef DEBUG_FSCLIENT
         RsDbg() << "Ticking for response...";
-
+#endif
         if(item)
         {
             response.push_back(item);

libretroshare/src/pqi/pqistreamer.cc

@@ -376,9 +376,9 @@ int	pqistreamer::queue_outpqi_locked(RsItem *pqi,uint32_t& pktsize)
     	if(ptr == NULL)
             return 0 ;
 
-//#ifdef DEBUG_PQISTREAMER
+#ifdef DEBUG_PQISTREAMER
 	std::cerr << "pqistreamer::queue_outpqi() serializing packet with packet size : " << pktsize << std::endl;
-//#endif
+#endif
 
         /*******************************************************************************************/
     	// keep info for stats for a while. Only keep the items for the last two seconds. sec n is ongoing and second n-1

retroshare-friendserver/src/friendserver.cc

@@ -84,6 +84,13 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
         sr_item->friend_invites = computeListOfFriendInvites(item->n_requested_friends,pi->first,pi->second.pgp_fingerprint);
         sr_item->PeerId(item->PeerId());
 
+        // Update the have_added_as_friend for the list of each peer. We do that before sending because sending destroys
+        // the item.
+
+        for(auto& it:mCurrentClientPeers)
+            it.second.have_added_this_peer[computePeerDistance(it.second.pgp_fingerprint,pi->second.pgp_fingerprint)] = pi->first;
+
+        // Send the item.
         mni->SendItem(sr_item);
 
         // Update the list of closest peers for all peers currently in the database.
@@ -102,8 +109,6 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
     }
 
     // Close client connection from server side, to tell the client that nothing more is coming.
-    //RsDbg() << "Closing client connection." ;
-    //mni->closeConnection(item->PeerId());
 
     RsDbg() << "Sending end-of-stream item to " << item->PeerId() ;
 
@@ -112,6 +117,9 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
     status_item->PeerId(item->PeerId());
 
     mni->SendItem(status_item);
+
+    RsDbg() << "Closing client connection." ;
+    mni->closeConnection(item->PeerId());
 }
 
 std::map<std::string, bool> FriendServer::computeListOfFriendInvites(uint32_t nb_reqs_invites, const RsPeerId &pid, const RsPgpFingerprint &fpr)
@@ -239,14 +247,25 @@ void FriendServer::handleClientRemove(const RsFriendServerClientRemoveItem *item
 
     RsDbg() << "  Nonce is correct: " << std::hex << item->nonce << std::dec << ". Removing peer " << item->peer_id ;
 
-    mCurrentClientPeers.erase(it);
+    removePeer(item->peer_id);
+}
 
-    // Also remove that peer from all n-closest lists
+void FriendServer::removePeer(const RsPeerId& peer_id)
+{
+    auto it = mCurrentClientPeers.find(peer_id);
+
+    if(it != mCurrentClientPeers.end())
+        mCurrentClientPeers.erase(it);
 
     for(auto& it:mCurrentClientPeers)
+    {
+        // Also remove that peer from all n-closest lists
+
         for(auto pit(it.second.closest_peers.begin());pit!=it.second.closest_peers.end();)
-            if(pit->second == item->peer_id)
+            if(pit->second == peer_id)
             {
+                RsDbg() << "  Removing from n-closest peers of peer " << pit->first ;
+
                 auto tmp(pit);
                 ++tmp;
                 it.second.closest_peers.erase(pit);
@@ -254,6 +273,22 @@ void FriendServer::handleClientRemove(const RsFriendServerClientRemoveItem *item
             }
             else
                 ++pit;
+
+        // Also remove that peer from peers that have accepted each peer
+
+        for(auto fit(it.second.have_added_this_peer.begin());fit!=it.second.have_added_this_peer.end();)
+            if(fit->second == peer_id)
+            {
+                RsDbg() << "  Removing from have_added_as_friend peers of peer " << fit->first ;
+
+                auto tmp(fit);
+                ++tmp;
+                it.second.closest_peers.erase(fit);
+                fit=tmp;
+            }
+            else
+                ++fit;
+    }
 }
 
 PeerInfo::PeerDistance FriendServer::computePeerDistance(const RsPgpFingerprint& p1,const RsPgpFingerprint& p2)
@@ -295,17 +330,17 @@ void FriendServer::autoWash()
     rstime_t now = time(nullptr);
     RsDbg() << "autoWash..." ;
 
+    std::list<RsPeerId> to_remove;
+
     for(std::map<RsPeerId,PeerInfo>::iterator it(mCurrentClientPeers.begin());it!=mCurrentClientPeers.end();)
         if(it->second.last_connection_TS + MAXIMUM_PEER_INACTIVE_DELAY < now)
         {
             RsDbg() << "Removing client peer " << it->first << " because it's inactive for more than " << MAXIMUM_PEER_INACTIVE_DELAY << " seconds." ;
-            auto tmp = it;
-            ++tmp;
-            mCurrentClientPeers.erase(it);
-            it = tmp;
+            to_remove.push_back(it->first);
         }
-        else
-            ++it;
+
+    for(auto peer_id:to_remove)
+        removePeer(peer_id);
 
     RsDbg() << "done." ;
 }

retroshare-friendserver/src/friendserver.h

@@ -40,6 +40,7 @@ struct PeerInfo
     uint64_t last_nonce;
 
     std::map<PeerDistance,RsPeerId> closest_peers;
+    std::map<PeerDistance,RsPeerId> have_added_this_peer;
 };
 
 class FriendServer : public RsTickingThread
@@ -61,6 +62,9 @@ private:
     // Updates for each peer in the database, the list of closest peers w.r.t. some arbitrary distance.
     void updateClosestPeers(const RsPeerId& pid,const RsPgpFingerprint& fpr);
 
+    // removes a single peer from all lists.
+    void removePeer(const RsPeerId& peer_id);
+
     // Adds the incoming peer data to the list of current clients and returns the
     std::map<RsPeerId,PeerInfo>::iterator handleIncomingClientData(const std::string& pgp_public_key_b64,const std::string& short_invite_b64);
 

retroshare-friendserver/src/network.cc

@@ -103,7 +103,7 @@ void FsNetworkInterface::threadTick()
             to_close.push_back(it.first);
 
     for(const auto& pid:to_close)
-        closeConnection(pid);
+        locked_closeConnection(pid);
 
     std::this_thread::sleep_for(std::chrono::milliseconds(200));
 }
@@ -224,6 +224,10 @@ void FsNetworkInterface::closeConnection(const RsPeerId& peer_id)
 {
     RS_STACK_MUTEX(mFsNiMtx);
 
+    locked_closeConnection(peer_id);
+}
+void FsNetworkInterface::locked_closeConnection(const RsPeerId& peer_id)
+{
     RsDbg() << "Closing connection to virtual peer " << peer_id ;
 
     const auto& it = mConnections.find(peer_id);

retroshare-friendserver/src/network.h

@@ -48,7 +48,6 @@ public:
 
     // basic functionality
 
-    void closeConnection(const RsPeerId& peer_id);
     void debugPrint();
 
     // Implements PQInterface
@@ -57,12 +56,15 @@ public:
     int  SendItem(RsItem *item) override;
     RsItem *GetItem() override;
 
+    void closeConnection(const RsPeerId& peer_id);
+
     // Implements RsTickingThread
 
     void threadTick() override;
 
 protected:
     bool checkForNewConnections();
+    void locked_closeConnection(const RsPeerId& peer_id);
 
 private:
     RsMutex mFsNiMtx;