potential bugfix: reverse tunnel timeout for avoiding dead threads

opencv-motion-detect/evcloudsvc.cpp

@@ -87,7 +87,8 @@ private:
         if(ret <0 || relBund.size() == 0) {
             this->releaseBundle["bundles"] = json();
             this->releaseBundle["activeIdx"] = -1;
-        }else{
+        }
+        else {
             this->releaseBundle = relBund;
         }
     }
@@ -101,7 +102,7 @@ private:
         string meta = j.dump();
         vector<vector<uint8_t> > v = {str2body(sn), str2body(devSn), str2body(meta), str2body(cfg)};
 
-        // if(peerData["status"].count(sn) == 0||peerData["status"][sn] == 0) {
+        // if(peerData["online"].count(sn) == 0||peerData["online"][sn] == 0) {
         //     spdlog::warn("evcloudsvc {} cached config to {}", devSn, sn);
         //     lock_guard<mutex> lock(cacheLock);
         //     cachedMsg[sn].push(v);
@@ -377,11 +378,11 @@ private:
         bool ret = false;
         int state = zmq_socket_get_peer_state(pRouter, selfId.data(), selfId.size());
         spdlog::info("evcloudsvc peer {} state: {}", selfId, state);
-        if(peerData["status"].count(selfId) == 0 || peerData["status"][selfId] == 0) {
-            peerData["status"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
+        if(peerData["online"].count(selfId) == 0 || peerData["online"][selfId] == 0) {
+            peerData["online"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
             spdlog::info("evcloudsvc peer connected: {}", selfId);
             ret = true;
-            spdlog::debug("evcloudsvc update status of {} to 1 and send config", selfId);
+            spdlog::debug("evcloudsvc update online status of {} to 1 and send config", selfId);
             json data = getConfigForDevice(selfId);
             if(data["code"] != 0) {
                 json resp;
@@ -395,7 +396,7 @@ private:
             }
         }
         else {
-            peerData["status"][selfId] = 0;
+            peerData["online"][selfId] = 0;
             spdlog::warn("{} peer disconnected: {}", devSn, selfId);
         }
         return ret;
@@ -439,14 +440,14 @@ private:
         meta = body2str(body[2]);
         selfId = body2str(body[0]);
         peerId = body2str(body[1]);
-        // update status;
-        this->peerData["status"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
+        // update online status;
+        this->peerData["online"][selfId] = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
         int minLen = std::min(body[1].size(), devSn.size());
         if(memcmp((void*)(body[1].data()), devSn.data(), minLen) != 0) {
             // message to other peer
-            // check peer status
+            // check peer online status
             vector<vector<uint8_t> >v = {body[1], body[0], body[2], body[3]};
-            if(peerData["status"].count(peerId)!= 0 && peerData["status"][peerId] != 0) {
+            if(peerData["online"].count(peerId)!= 0 && peerData["online"][peerId] != 0) {
                 spdlog::info("{} route msg from {} to {}", devSn, selfId, peerId);
                 ret = z_send_multiple(pRouter, v);
                 if(ret < 0) {
@@ -508,15 +509,17 @@ private:
                 }
             }
             else {
-                try{
+                try {
                     json jmeta = json::parse(meta);
                     if(jmeta["type"] == EV_MSG_META_TYPE_REPORT) {
                         // TODO: handle report msg
                         spdlog::warn("{} received report msg from {}: {}", devSn, selfId, body2str(body[3]));
-                    }else{
+                    }
+                    else {
                         spdlog::warn("{} received unknown msg {} from {}", devSn, meta, selfId);
                     }
-                } catch(exception &e) {
+                }
+                catch(exception &e) {
                     spdlog::warn("{} received unknown msg {} from {}", devSn, meta, selfId);
                 }
             }
@@ -572,9 +575,10 @@ private:
             }
 
             auto now = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
-            if(peerData["status"].count(sn) != 0 && ((now - peerData["status"][sn].get<decltype(now)>()) < 60) ){
+            if(peerData["online"].count(sn) != 0 && ((now - peerData["online"][sn].get<decltype(now)>()) < 60) ) {
                 ret["online"] = true;
-            }else{
+            }
+            else {
                 ret["online"] = false;
             }
         }
@@ -615,7 +619,7 @@ private:
                 }
 
                 body["sender"] = devSn;
-                if(peerData["status"].count(v[0]) == 0 || peerData["status"][v[0]] == 0) {
+                if(peerData["online"].count(v[0]) == 0 || peerData["online"][v[0]] == 0) {
                     spdlog::warn("evcloudsvc sent msg {} to {}, but it was offline", body.dump(), v[0]);
                 }
                 else {
@@ -663,10 +667,12 @@ private:
         int stackId = -1;
         if(bid.empty()) {
             ret = this->releaseBundle;
-        }else{
-            try{
+        }
+        else {
+            try {
                 stackId = stoi(bid);
-            }catch(exception &e) {
+            }
+            catch(exception &e) {
                 stackId = -1;
             }
 
@@ -676,7 +682,8 @@ private:
                 if(stackId >=0 && idx >= 0) {
                     // idx style
                     ret = bunds[idx];
-                }else{
+                }
+                else {
                     // releaseId style
                     for(auto &r: bunds) {
                         if(r["releaseId"] == bid) {
@@ -691,7 +698,8 @@ private:
         return ret;
     }
 
-    string enableRelease(string bid, bool enable){
+    string enableRelease(string bid, bool enable)
+    {
         string ret;
         int stackId = -1;
         bool handled = false;
@@ -703,15 +711,18 @@ private:
                     handled = true;
                     // TODO: send release to edge
                 }
-            }else{
+            }
+            else {
                 if(this->releaseBundle["bundles"].size() <= 1) {
                     ret = "no release to disable. (maybe only one or none release bundle configured)";
                 }
             }
-        }else{
-            try{
+        }
+        else {
+            try {
                 stackId = stoi(bid);
-            }catch(exception &e) {
+            }
+            catch(exception &e) {
                 isNumber = false;
             }
             if(this->releaseBundle.size() != 0 && this->releaseBundle.count("bundles") != 0) {
@@ -726,20 +737,24 @@ private:
                     if(this->releaseBundle["activeIdx"] == idx) {
                         if(enable) {
                             spdlog::info("evcloudsvc release {} is already in active. nop.", idx);
-                        }else{
+                        }
+                        else {
                             return enableRelease(to_string(idx - 1), true);
                             // TODO: send release to edge
                         }
-                    }else{
+                    }
+                    else {
                         if(enable) {
                             this->releaseBundle["activeIdx"] = idx;
                             handled = true;
                             // TODO: send release to edge
-                        }else{
+                        }
+                        else {
                             ret = "this release is not in active. nop.";
                         }
                     }
-                }else{
+                }
+                else {
                     // releaseId style
                     int idx = 0;
                     for(auto &r: bunds) {
@@ -755,17 +770,20 @@ private:
         return ret;
     }
 
-    string delReleaseBundle(string bid) {
+    string delReleaseBundle(string bid)
+    {
         string ret;
         int stackId = -1;
         bool handled = false;
         bool isNumber = true;
         if(bid.empty()) {
             ret = "empty release bundle id";
-        }else{
-            try{
+        }
+        else {
+            try {
                 stackId = stoi(bid);
-            }catch(exception &e) {
+            }
+            catch(exception &e) {
                 isNumber = false;
             }
 
@@ -779,9 +797,10 @@ private:
                     }
 
                     spdlog::info("idx: {}", idx);
-                    if(idx == this->releaseBundle["activeIdx"].get<int>()){
+                    if(idx == this->releaseBundle["activeIdx"].get<int>()) {
                         ret = "can't delete active release bundle";
-                    }else{
+                    }
+                    else {
                         bunds.erase(idx);
                         if(idx < this->releaseBundle["activeIdx"].get<int>()) {
                             this->releaseBundle["activeIdx"] = this->releaseBundle["activeIdx"].get<int>() -1;
@@ -789,7 +808,7 @@ private:
                         handled = true;
                     }
                 }
-                else{
+                else {
                     // releaseId style
                     int idx = 0;
                     for(auto r: bunds) {
@@ -819,7 +838,8 @@ private:
         string ret;
         if(bundle.count("releaseId") == 0) {
             ret = "no releaseId field";
-        }else {
+        }
+        else {
             for(auto &b: this->releaseBundle["bundles"]) {
                 if(b["releaseId"] == bundle["releaseId"]) {
                     ret = "releaseId already exist: " + b.dump();
@@ -849,7 +869,8 @@ private:
         return ret;
     }
 
-    json getClusterInfo(set<string> sns) {
+    json getClusterInfo(set<string> sns)
+    {
         json ret;
         ret["code"] = 0;
         ret["msg"] = "ok";
@@ -865,9 +886,10 @@ private:
             auto conf = getConfigForDevice(k);
             auto now = chrono::duration_cast<chrono::seconds>(chrono::system_clock::now().time_since_epoch()).count();
 
-            if(peerData["status"].count(k) != 0 && ((now - peerData["status"][k].get<decltype(now)>()) < 60) ){
+            if(peerData["online"].count(k) != 0 && ((now - peerData["online"][k].get<decltype(now)>()) < 60) ) {
                 conf["online"] = true;
-            }else{
+            }
+            else {
                 conf["online"] = false;
             }
             ret["data"][k] = conf;
@@ -1033,8 +1055,8 @@ public:
                     this->configMap.erase(sn);
                 if(this->peerData["config"].contains(sn))
                     this->peerData["config"].erase(sn);
-                if(this->peerData["status"].contains(sn))
-                    this->peerData["status"].erase(sn);
+                if(this->peerData["online"].contains(sn))
+                    this->peerData["online"].erase(sn);
 
                 spdlog::info("evcloudsvc removed sn: {}", sn);
                 LVDB::setValue(this->configMap, KEY_CONFIG_MAP);
@@ -1054,7 +1076,8 @@ public:
                 if(bundle.size() == 0) {
                     ret["code"] = 1;
                     ret["msg"] = "not found";
-                }else{
+                }
+                else {
                     ret["data"] = bundle;
                 }
             }
@@ -1076,7 +1099,7 @@ public:
             try {
                 auto body = json::parse(req.body);
                 auto s = this->addReleaseBundle(body);
-                if(!s.empty()){
+                if(!s.empty()) {
                     ret["code"] = 1;
                     ret["msg"] = s;
                 }
@@ -1123,6 +1146,7 @@ public:
         this->peerData["info"] = json();
         this->peerData["info"]["ips"] = json();
         this->peerData["config"] = json();
+        this->peerData["online"] = json();
         this->peerData["status"] = json();
 
         spdlog::info("evcloudsvc boot");

opencv-motion-detect/evdaemon.cpp

@@ -477,7 +477,7 @@ private:
             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,7 +555,7 @@ 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);
         });
 
@@ -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,7 +141,8 @@ 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);
                 }

opencv-motion-detect/evmlmotion.cpp

@@ -494,11 +494,12 @@ private:
                     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,8 +509,9 @@ 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);
@@ -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);
@@ -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);
                 }

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) {
@@ -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);
                 }

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;
@@ -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,7 +627,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);
                 }
@@ -640,7 +642,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);
                 }

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,7 +912,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.
                     handleEdgeMsg(body);
                 }
@@ -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