From 2fab33d37f73f160c10e04e3eaa7014d106f7a27 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 25 Aug 2018 20:52:06 +0200
Subject: [PATCH] fixed a few bugs in ban file list management

---
 libretroshare/src/file_sharing/p3filelists.cc | 25 +++++++++++++------
 libretroshare/src/file_sharing/p3filelists.h  |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc
index 87f03f05a..156490e18 100644
--- a/libretroshare/src/file_sharing/p3filelists.cc
+++ b/libretroshare/src/file_sharing/p3filelists.cc
@@ -566,7 +566,7 @@ bool p3FileDatabase::loadList(std::list<RsItem *>& load)
         if(fb)
         {
             mPrimaryBanList = fb->primary_banned_files_list ;
-            mBannedFilesChanged = true;
+            mBannedFileListNeedsUpdate = true;
             mLastPrimaryBanListChangeTimeStamp = time(NULL);
         }
 
@@ -1918,6 +1918,7 @@ bool p3FileDatabase::banFile(const RsFileHash& real_file_hash, const std::string
 			mBannedFileList.insert(hash_of_hash) ;
 
 			mLastPrimaryBanListChangeTimeStamp = time(NULL);
+            mBannedFileListNeedsUpdate = true ;
 		}
 	}
 
@@ -1933,6 +1934,7 @@ bool p3FileDatabase::unbanFile(const RsFileHash& real_file_hash)
 		RS_STACK_MUTEX(mFLSMtx) ;
 		mPrimaryBanList.erase(real_file_hash) ;
 		mLastPrimaryBanListChangeTimeStamp = time(NULL);
+        mBannedFileListNeedsUpdate = true ;
     }
 
     IndicateConfigChanged();
@@ -1977,7 +1979,7 @@ void p3FileDatabase::setTrustFriendNodesForBannedFiles(bool b)
 	if(b != mTrustFriendNodesForBannedFiles)
     {
 		IndicateConfigChanged();
-        mBannedFilesChanged = true;
+        mBannedFileListNeedsUpdate = true;
     }
 
 	RS_STACK_MUTEX(mFLSMtx) ;
@@ -1991,7 +1993,7 @@ void p3FileDatabase::checkSendBannedFilesInfo()
     // 1 - compare records to list of online friends, send own info of not already
 
 #ifdef DEBUG_CONTENT_FILTERING
-    P3FILELISTS_DEBUG() << "  Checking banned file list: " << std::endl;
+    P3FILELISTS_DEBUG() << "  Checking banned files information: " << std::endl;
 #endif
 
     time_t now = time(NULL);
@@ -2039,12 +2041,12 @@ void p3FileDatabase::checkSendBannedFilesInfo()
 
     // 3 - update list of banned hashes if it has changed somehow
 
-    if(mBannedFilesChanged)
+    if(mBannedFileListNeedsUpdate)
     {
         mBannedFileList.clear();
 
 #ifdef DEBUG_CONTENT_FILTERING
-		P3FILELISTS_DEBUG() << "    Creating banned file list: " << std::endl;
+		P3FILELISTS_DEBUG() << "  Creating local banned file list: " << std::endl;
 #endif
         // Add all H(H(f)) from friends
 
@@ -2075,15 +2077,22 @@ void p3FileDatabase::checkSendBannedFilesInfo()
 #endif
 		}
 
-        mBannedFilesChanged = false ;
+        mBannedFileListNeedsUpdate = false ;
     }
+
+#ifdef DEBUG_CONTENT_FILTERING
+	P3FILELISTS_DEBUG() << " Final list of locally banned hashes contains: " << mBannedFileList.size() << " elements." << std::endl;
+#endif
 }
 
 void p3FileDatabase::locked_sendBanInfo(const RsPeerId& peer)
 {
-    RsFileListsBannedHashesItem *item = NULL;
+    RsFileListsBannedHashesItem *item = new RsFileListsBannedHashesItem ;
 	uint32_t session_id = RSRandom::random_u32();
 
+    item->session_id = session_id ;
+	item->PeerId(peer);
+
 	for(auto it(mPrimaryBanList.begin());it!=mPrimaryBanList.end();++it)
 	{
 		RsFileHash hash_of_hash ;
@@ -2139,6 +2148,6 @@ void p3FileDatabase::handleBannedFilesInfo(RsFileListsBannedHashesItem *item)
 
     // 3 - tell the updater that the banned file list has changed
 
-    mBannedFilesChanged = true ;
+    mBannedFileListNeedsUpdate = true ;
 }
 
diff --git a/libretroshare/src/file_sharing/p3filelists.h b/libretroshare/src/file_sharing/p3filelists.h
index 0c9424c2f..a8ac377ea 100644
--- a/libretroshare/src/file_sharing/p3filelists.h
+++ b/libretroshare/src/file_sharing/p3filelists.h
@@ -269,7 +269,7 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
         std::map<RsPeerId,PeerBannedFilesEntry> mPeerBannedFiles ;   // records of which files other peers ban, stored as H(H(f))
 		std::set<RsFileHash> mBannedFileList ;	// list of banned hashes. This include original hashs and H(H(f)) when coming from friends.
         bool mTrustFriendNodesForBannedFiles ;
-        bool mBannedFilesChanged;
+        bool mBannedFileListNeedsUpdate;
         time_t mLastPrimaryBanListChangeTimeStamp;
 
         void locked_sendBanInfo(const RsPeerId& pid);