ringaccount: protect pending messages access

Change-Id: If2f26577d1e48812bb0b49e00bcd716e5b73fa7f
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>

src/ringdht/ringaccount.cpp

@@ -2279,9 +2279,12 @@ RingAccount::doRegister_()
         dht_.listen<dht::ImMessage>(
             inboxDeviceKey,
             [this,inboxDeviceKey](dht::ImMessage&& v) {
+                {
+                    std::lock_guard<std::mutex> lock(messageMutex_);
                     auto res = treatedMessages_.insert(v.id);
                     if (!res.second)
                         return true;
+                }
                 saveTreatedMessages();
                 onPeerMessage(v.from, [this, v, inboxDeviceKey](const std::shared_ptr<dht::crypto::Certificate>&,
                                                                         const dht::InfoHash& peer_account)
@@ -2689,19 +2692,27 @@ RingAccount::saveTreatedCalls() const
 void
 RingAccount::loadTreatedMessages()
 {
+    std::lock_guard<std::mutex> lock(messageMutex_);
     treatedMessages_ = loadIdList(cachePath_+DIR_SEPARATOR_STR "treatedMessages");
 }
 
 void
 RingAccount::saveTreatedMessages() const
 {
-    fileutils::check_dir(cachePath_.c_str());
-    saveIdList(cachePath_+DIR_SEPARATOR_STR "treatedMessages", treatedMessages_);
+    ThreadPool::instance().run([w = weak()](){
+        if (auto sthis = w.lock()) {
+            auto& this_ = *sthis;
+            std::lock_guard<std::mutex> lock(this_.messageMutex_);
+            fileutils::check_dir(this_.cachePath_.c_str());
+            saveIdList(this_.cachePath_+DIR_SEPARATOR_STR "treatedMessages", this_.treatedMessages_);
+        }
+    });
 }
 
 bool
 RingAccount::isMessageTreated(unsigned int id)
 {
+    std::lock_guard<std::mutex> lock(messageMutex_);
     auto res = treatedMessages_.insert(id);
     if (res.second) {
         saveTreatedMessages();
@@ -3387,8 +3398,11 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string,
     // Find listening devices for this account
     forEachDevice(toH, [confirm,token,payloads,now](const std::shared_ptr<RingAccount>& this_, const dht::InfoHash& dev)
     {
+        {
+            std::lock_guard<std::mutex> lock(this_->messageMutex_);
             auto e = this_->sentMessages_.emplace(token, PendingMessage {});
             e.first->second.to = dev;
+        }
 
         auto h = dht::InfoHash::get("inbox:"+dev.toString());
         std::weak_ptr<RingAccount> w = this_;
@@ -3398,6 +3412,9 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string,
                 // check expected message confirmation
                 if (msg.id != token)
                     return true;
+
+                {
+                    std::lock_guard<std::mutex> lock(this_.messageMutex_);
                     auto e = this_.sentMessages_.find(msg.id);
                     if (e == this_.sentMessages_.end() or e->second.to != msg.from) {
                         RING_DBG() << "[Account " << this_.getAccountID() << "] [message " << token << "] Message not found";
@@ -3410,7 +3427,7 @@ RingAccount::sendTextMessage(const std::string& to, const std::map<std::string,
                     auto res = this_.treatedMessages_.insert(msg.id);
                     if (!res.second)
                         return true;
-
+                }
                 this_.saveTreatedMessages();
 
                 // report message as confirmed received

src/ringdht/ringaccount.h

@@ -519,6 +519,7 @@ class RingAccount : public SIPAccountBase {
         std::set<dht::Value::Id> treatedCalls_ {};
         mutable std::mutex callsMutex_ {};
 
+        mutable std::mutex messageMutex_ {};
         std::map<dht::Value::Id, PendingMessage> sentMessages_;
         std::set<dht::Value::Id> treatedMessages_ {};