From 5d8156ea4c34f9a3cb986da16a71faebfb2add6b Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Tue, 2 Jun 2020 18:52:39 +0200
Subject: [HICN-622] Add stop() functionality to http proxy.

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I9091cd8ef0f9da869b886541a0116adf3f30e6b9
Signed-off-by: Angelo Mantellini <angelo.mantellini@cisco.com>
---
 apps/http-proxy/src/forwarder_interface.cc | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'apps/http-proxy/src/forwarder_interface.cc')

diff --git a/apps/http-proxy/src/forwarder_interface.cc b/apps/http-proxy/src/forwarder_interface.cc
index 105d5a8e9..d80939b8b 100644
--- a/apps/http-proxy/src/forwarder_interface.cc
+++ b/apps/http-proxy/src/forwarder_interface.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "forwarder_interface.h"
+#include <hicn/http-proxy/forwarder_interface.h>
 
 #include <arpa/inet.h>
 #include <hicn/transport/utils/log.h>
@@ -41,16 +41,18 @@ int ForwarderInterface::connectToForwarder() {
 }
 
 void ForwarderInterface::close() {
-  internal_ioservice_.post([this]() {
-    work_.reset();
-    if (sock_) {
-      hc_sock_free(sock_);
-      sock_ = nullptr;
-    }
-  });
+  if (!closed_) {
+    internal_ioservice_.post([this]() {
+      work_.reset();
+      if (sock_) {
+        hc_sock_free(sock_);
+        sock_ = nullptr;
+      }
+    });
 
-  if (thread_->joinable()) {
-    thread_->join();
+    if (thread_->joinable()) {
+      thread_->join();
+    }
   }
 }
 
-- 
cgit 1.2.3-korg