potential bugfix: reverse tunnel timeout for avoiding dead threads

opencv-motion-detect/evdaemon.cpp

@@ -337,7 +337,7 @@ private:
                             }
                         }
                         else {
-                            sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v));   
+                            sendCmd2Peer(k, EV_MSG_META_VALUE_CMD_STOP, to_string(v));
                         }
                     }
                     else {
@@ -472,12 +472,12 @@ private:
         int minLen = std::min(body[1].size(), this->daemonId.size());
         if(memcmp((void*)(body[1].data()), this->daemonId.data(), minLen) != 0) {
             // message to other peer
-            
+
             // check if target is evcloudsvc
             if(peerId == "evcloudsvc") {
                 zmqhelper::z_send(pDealer, peerId, body[2], body[3]);
             }
-            else{
+            else {
                 vector<vector<uint8_t> >v = {body[1], body[0], body[2], body[3]};
                 if(peerData["status"].count(peerId) != 0 && peerData["status"][peerId] != 0 && this->peerData["status"][peerId][peerId] != -1) {
                     spdlog::info("evdaemon {} route msg from {} to {}", devSn, selfId, peerId);
@@ -545,7 +545,8 @@ private:
     }
 
 
-    int manageReverseTun(bool bStart, json &tunCfg) {
+    int manageReverseTun(bool bStart, json &tunCfg)
+    {
         int ret = 0;
         if(tunCfg.count("port") == 0 || tunCfg.count("host") == 0 || tunCfg.count("user") == 0 || tunCfg.count("password") == 0) {
             spdlog::error("evcdaemon {} invalid reverse tunnel settings, shall have host, port, user, password fields");
@@ -554,10 +555,10 @@ private:
         thread th;
         string host = tunCfg["host"], user = tunCfg["user"], password = tunCfg["password"];
         int port = tunCfg["port"];
-        th = thread([host, port, user, password](){
+        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();
 
@@ -631,7 +632,8 @@ private:
                             if(v.size() == 1) {
                                 if(data["metaValue"] == EV_MSG_META_VALUE_CMD_REVESETUN) {
                                     manageReverseTun(true, data["data"]);
-                                }else{
+                                }
+                                else {
                                     spdlog::info("evdaemon {} received msg {} from cloud to itself. but has no implementation for", devSn, data.dump());
                                 }
                             }
@@ -690,7 +692,8 @@ private:
         return 0;
     }
 
-    void setUpDealer(){
+    void setUpDealer()
+    {
         lock_guard<mutex> lg(mutHeartBeat);
         if(pDealer != nullptr) {
             int i = 0;
@@ -906,8 +909,8 @@ public:
         thCloud.detach();
         spdlog::info("evdaemon {} cloud message processor had setup {}", devSn, cloudAddr);
 
-        thHeartBeat = thread([this](){
-            while(true){
+        thHeartBeat = thread([this]() {
+            while(true) {
                 {
                     lock_guard<mutex> lg(this->mutHeartBeat);
                     if(this->pDealer != nullptr)

opencv-motion-detect/evmgr.cpp

@@ -141,10 +141,11 @@ error_exit:
                 auto body = z_recv_multiple(pDealer,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple cloud msg: {}", this->devSn, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleCloudMsg(body);
-                } 
+                }
             }
         });
         thCloudMsgHandler.detach();
@@ -187,7 +188,7 @@ error_exit:
                 peerData["status"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
                 spdlog::info("evmgr {} peer connected: {}", devSn, selfId);
                 eventConn = true;
-                
+
                 if(cachedMsg.count(selfId) != 0) {
                     spdlog::info("evmgr {}, send cached msg to {}", devSn, selfId);
                     while(!cachedMsg[selfId].empty()) {
@@ -198,7 +199,7 @@ error_exit:
                         if(ret < 0) {
                             spdlog::error("evmgr {} failed to send multiple: {}", devSn, zmq_strerror(zmq_errno()));
                         }
-                    }      
+                    }
                 }
             }
             else {

opencv-motion-detect/evmlmotion.cpp

@@ -484,7 +484,7 @@ private:
                     pFrame->key_frame,
                     pFrame->coded_picture_number
                 );
-                
+
                 static long long called = 0;
                 static int factor = 0;
                 called++;
@@ -493,12 +493,13 @@ private:
                     // lock the value
                     factor = int(int(this->pps) / this->detPara.fpsProc); // regulator to 0 if it was set inresonably high
                 }
-                
-                if(factor != 0 ){
+
+                if(factor != 0 ) {
                     if(called % factor == 0) {
                         proc = true;
                         //factor = 0; // reset it open to change
-                    }else{
+                    }
+                    else {
                         proc = false;
                     }
                 }
@@ -508,14 +509,15 @@ private:
                         spdlog::info("evmlmotion {} pps {}, fpsFactor {}, called {}, lag {}, skip processing", this->selfId, this->pps, factor, called, this->pktLag);
                     }
                     // detectMotion(pCodecContext->pix_fmt, pFrame, false);
-                }else{
-                    if((called % (180*4)) == 0){
+                }
+                else {
+                    if((called % (180*4)) == 0) {
                         spdlog::info("evmlmotion {} pps {}, fpsFactor {}, called {}, lag {}", this->selfId, this->pps, factor, called, this->pktLag);
                     }
                     detectMotion(pCodecContext->pix_fmt, pFrame, detect);
                     factor = 0; // refresh to latest value
                 }
-                
+
                 break;
             }
         }
@@ -816,7 +818,8 @@ protected:
                 meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_ERROR;
                 z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
                 spdlog::error(msg);
-            }else{
+            }
+            else {
                 if(!bStatsSent) {
                     bStatsSent = true;
                     string msg = fmt::format("evmlmotion {} successfully decode packet", selfId);
@@ -844,7 +847,7 @@ protected:
                 // if(pktCnt % (180 * 5) == 0) {
                 //     spdlog::info("evmlmotion {} metering: 18 packet in {}ms, pps: {}, lag:{}", selfId, delta, pps, pktLag);
                 // }
-                
+
                 pktCntLast = pktCnt;
                 start = now;
             }
@@ -901,7 +904,8 @@ public:
                 auto body = z_recv_multiple(pDaemon,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple cloud msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleCloudMsg(body);
                 }
@@ -915,7 +919,8 @@ public:
                 auto body = z_recv_multiple(pDealer,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple edge msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleEdgeMsg(body);
                 }
@@ -955,7 +960,7 @@ public:
             zmq_close(pDaemon);
             pDaemon = nullptr;
         }
-        
+
         if(pDaemonCtx != nullptr) {
             zmq_ctx_destroy(pDaemonCtx);
             pDaemonCtx = nullptr;

opencv-motion-detect/evpuller.cpp

@@ -327,7 +327,8 @@ protected:
             spdlog::error(msg);
             // TODO: message report to cloud
             exit(1);
-        }else{
+        }
+        else {
             string msg = fmt::format("evpuller {} successfully openned input stream {}", selfId, urlIn);
             json meta;
             json data;
@@ -411,7 +412,7 @@ protected:
             pktCnt++;
             packet.stream_index = streamList[packet.stream_index];
             // skip first 5 packets avoid pusher and slicer exception
-            if(pktCnt <= 5){
+            if(pktCnt <= 5) {
                 if(pktCnt == 5) {
                     // serialize formatctx to bytes
                     // be attention to the scope of lock guard!
@@ -501,7 +502,8 @@ public:
                 auto body = z_recv_multiple(pDealer,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple cloud msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     string msg;
                     for(auto &v: body) {
@@ -512,7 +514,7 @@ public:
                     spdlog::info("evpuller {} received edge msg: {}", selfId, msg);
                     this->handleEdgeMsg(body);
                 }
-                
+
             }
         });
         thEdgeMsgHandler.detach();
@@ -524,7 +526,8 @@ public:
                 auto body = z_recv_multiple(pDaemon,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple edge msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleCloudMsg(body);
                 }
@@ -562,7 +565,7 @@ public:
             zmq_close(pDaemon);
             pDaemon = nullptr;
         }
-        
+
         if(pDaemonCtx != nullptr) {
             zmq_ctx_destroy(pDaemonCtx);
             pDaemonCtx = nullptr;

opencv-motion-detect/evpusher.cpp

@@ -306,8 +306,7 @@ private:
         AVDictionary *pOptsRemux = nullptr;
         string proto = urlOut.substr(0, 4);
         int cnt = 0;
-        while(ret < 0)
-        {
+        while(ret < 0) {
             if(cnt > 3) {
                 string msg = fmt::format("evpusher {} failed to write output header \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret));
                 json meta;
@@ -405,7 +404,8 @@ private:
                     z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
                     spdlog::error(msg);
                     exit(1);
-                }else{
+                }
+                else {
                     string msg = fmt::format("evpusher {} successfully open output \"{}\"", selfId, urlOut);
                     json meta;
                     json data;
@@ -424,7 +424,7 @@ private:
             }
 
             ret = avformat_write_header(pAVFormatRemux, &pOptsRemux);
-            if (ret < 0) { 
+            if (ret < 0) {
                 // TODO: report message to cloud
                 string msg = fmt::format("evpusher {} failed to write stream \"{}\": {}, {}", selfId, urlOut, ret, av_err2str(ret));
                 spdlog::error(msg);
@@ -447,7 +447,7 @@ private:
         meta["type"] = EV_MSG_META_TYPE_REPORT;
         meta["value"] = EV_MSG_META_VALUE_REPORT_LEVEL_INFO;
         z_send(pDaemon, "evcloudsvc", meta.dump(), data.dump());
-    
+
         return ret;
     }
 
@@ -557,8 +557,9 @@ protected:
                     pktCnt = 0;
                     continue;
                 }
-            }else{
-                if(!bStatsSent){
+            }
+            else {
+                if(!bStatsSent) {
                     bStatsSent = true;
                     string msg = fmt::format("evpusher {} start pushing {}", selfId, urlOut);
                     json meta;
@@ -626,10 +627,11 @@ public:
                 auto body = z_recv_multiple(pDaemon,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple cloud msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleCloudMsg(body);
-                }    
+                }
             }
         });
         thCloudMsgHandler.detach();
@@ -640,10 +642,11 @@ public:
                 auto body = z_recv_multiple(pDealer,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple edge msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleEdgeMsg(body);
-                }     
+                }
             }
         });
         thEdgeMsgHandler.detach();
@@ -688,7 +691,7 @@ public:
             zmq_ctx_destroy(pDaemonCtx);
             pDaemonCtx = nullptr;
         }
-        
+
 
         freeStream();
     }

opencv-motion-detect/evslicer.cpp

@@ -613,7 +613,8 @@ protected:
                         pktCnt = 0;
                         break;
                     }
-                }else{
+                }
+                else {
                     if(!bStatsSent) {
                         bStatsSent = true;
                         string msg = fmt::format("evslicer {} starting write file", selfId);
@@ -911,11 +912,12 @@ public:
                 auto body = z_recv_multiple(pDealer,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple edge msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     handleEdgeMsg(body);
                 }
-                
+
             }
         });
         thEdgeMsgHandler.detach();
@@ -926,7 +928,8 @@ public:
                 auto body = z_recv_multiple(pDaemon,false);
                 if(body.size() == 0) {
                     spdlog::error("evslicer {} failed to receive multiple cloud msg: {}", selfId, zmq_strerror(zmq_errno()));
-                }else{
+                }
+                else {
                     // full proto msg received.
                     this->handleCloudMsg(body);
                 }

opencv-motion-detect/reverse_tun.hpp

@@ -119,6 +119,9 @@ int createReverseTun(string host, int port, string user, string _password)
         closeFun(); return -1;
     }
 
+    // bugfix: timeout
+    libssh2_session_set_timeout( session, 15 * 1000);
+
     /* At this point we havn't yet authenticated.  The first thing to do
      * is check the hostkey's fingerprint against our known hosts Your app
      * may have it hard coded, may go to a file, may present it to the