proxy client: lock while canceling requests

include/opendht/dht_proxy_client.h

@@ -319,10 +319,6 @@ private:
      * cancel all Listeners
      */
     void cancelAllListeners();
-    /**
-     * cancel all Operations
-     */
-    void cancelAllOperations();
 
     std::atomic_bool isDestroying_ {false};
 

src/dht_proxy_client.cpp

@@ -154,12 +154,16 @@ DhtProxyClient::stop()
 {
     isDestroying_ = true;
     resolver_.reset();
-    cancelAllOperations();
     cancelAllListeners();
     if (infoState_)
         infoState_->cancel = true;
+    {
+        std::lock_guard<std::mutex> lock(requestLock_);
         for (auto& request : requests_)
             request.second->cancel();
+    }
+    if (not httpContext_.stopped())
+        httpContext_.stop();
     if (httpClientThread_.joinable())
         httpClientThread_.join();
     requests_.clear();
@@ -183,13 +187,6 @@ DhtProxyClient::getLocalById(const InfoHash& k, Value::Id id) const {
     return s->second.ops.get(id);
 }
 
-void
-DhtProxyClient::cancelAllOperations()
-{
-    if (!httpContext_.stopped())
-        httpContext_.stop();
-}
-
 void
 DhtProxyClient::cancelAllListeners()
 {