feature: reverse debug tunnel

opencv-motion-detect/evdaemon.cpp

@@ -547,8 +547,13 @@ private:
             return -1;
         }
         thread th;
-        auto port = createReverseTun(tunCfg["host"], tunCfg["port"], tunCfg["user"], tunCfg["password"], th);
-        spdlog::info("evdaemon {} created reverse tun to {}:{}", devSn, tunCfg["host"].get<string>(), port);
+        string host = tunCfg["host"], user = tunCfg["user"], password = tunCfg["password"];
+        int port = tunCfg["port"];
+        th = thread([host, port, user, password](){
+            createReverseTun(host, port, user, password);
+        });
+        
+        spdlog::info("evdaemon {} created reverse tun to {}:{}", devSn, tunCfg["host"].get<string>(), tunCfg["port"].get<int>());
         th.detach();
 
         return ret;

opencv-motion-detect/reverse_tun.hpp

@@ -35,7 +35,7 @@ enum {
 };
 
 
-int createReverseTun(string host, int port, string user, string _password, thread &thWorker)
+int createReverseTun(string host, int port, string user, string _password)
 {
     int remote_listenport = -1;
     const char *server_ip = host.c_str();
@@ -56,7 +56,6 @@ int createReverseTun(string host, int port, string user, string _password, threa
     fd_set fds;
     struct timeval tv;
     ssize_t len, wr;
-    char buf[10240]; // 10K
     string msg = "Fingerprint: ";
     int sock = -1, forwardsock = -1;
 
@@ -211,9 +210,12 @@ int createReverseTun(string host, int port, string user, string _password, threa
     /* Must use non-blocking IO hereafter due to the current libssh2 API */
     libssh2_session_set_blocking(session, 0);
 
-    thWorker = thread([&]() {
     bool hasError = false;
+    char buf[10240]; // 10K
     while(1) {
+        if(hasError) {
+            break;
+        }
         FD_ZERO(&fds);
         FD_SET(forwardsock, &fds);
         tv.tv_sec = 0;
@@ -269,17 +271,18 @@ int createReverseTun(string host, int port, string user, string _password, threa
             }
 
             if(libssh2_channel_eof(channel)) {
-                    spdlog::error("tun the remote client at {}:{} disconnected!",
+                spdlog::info("tun the remote client at {}:{} disconnected!",
                                 remote_listenhost, remote_listenport);
+                hasError = true;
                 break;
             }
         }
     }
 
     closeFun();
-    });
     
-    return remote_listenport;
+
+    return 0;//remote_listenport;
 }
 
 #endif
\ No newline at end of file