new branch: ipcSn as part of gid. (NOT required, since iid can be used to…

new branch: ipcSn as part of gid. (NOT required, since iid can be used to identify different instance)

opencv-motion-detect/evdaemon.cpp

@@ -380,7 +380,7 @@ private:
             bool eventConn = false;
             // XTF2BJR9:evslicer:1
             auto sp = strutils::split(selfId, ':');
-            if(sp.size() != 3) {
+            if(sp.size() != 4 && sp[1] != "evmgr") {
                 spdlog::warn("evdaemon {} inproper peer id: {}", devSn, selfId);
                 return -1;
             }

opencv-motion-detect/evmgr.cpp

@@ -182,7 +182,7 @@ error_exit:
             bool eventConn = false;
             // XTF2BJR9:evslicer:1
             auto sp = strutils::split(selfId, ':');
-            if(sp.size() != 3) {
+            if(sp.size() != 4 && sp[1] != "evmgr") {
                 spdlog::warn("evmg {} inproper peer id: {}", devSn, selfId);
                 return -1;
             }

opencv-motion-detect/evmlmotion.cpp

@@ -216,12 +216,12 @@ private:
             }
             // TODO: currently just take the first puller, but should test connectivity
             json evpuller = ipc["modules"]["evpuller"][0];
-            pullerGid = evpuller["sn"].get<string>() + ":evpuller:" + to_string(evpuller["iid"]);
+            pullerGid = evpuller["sn"].get<string>() + ":" + ipcSn + ":evpuller:" + to_string(evpuller["iid"]);
             mgrSn = evmgr["sn"];
 
             // TODO: connect to the first slicer
             json evslicer = ipc["modules"]["evslicer"][0];
-            slicerGid = evslicer["sn"].get<string>()+":evslicer:" + to_string(evslicer["iid"]);
+            slicerGid = evslicer["sn"].get<string>()+ ":" + ipcSn + ":evslicer:" + to_string(evslicer["iid"]);
 
             int portPub = 5556;
             if(evpuller.count("portPub") != 0 && evpuller["portPub"].is_number_integer()) {

opencv-motion-detect/evpusher.cpp

@@ -87,7 +87,7 @@ private:
 
             // TODO: currently just take the first puller, but should test connectivity
             json evpuller = ipc["modules"]["evpuller"][0];
-            pullerGid = evpuller["sn"].get<string>() + ":evpuller:" + to_string(evpuller["iid"]);
+            pullerGid = evpuller["sn"].get<string>() + ":" + ipcSn + ":evpuller:" + to_string(evpuller["iid"]);
             mgrSn = evmgr["sn"];
 
             int portPub = 5556;

opencv-motion-detect/evslicer.cpp

@@ -269,7 +269,7 @@ private:
             this->videoFileServerApi += this->ipcSn;
 
             json evpuller = ipc["modules"]["evpuller"][0];
-            pullerGid = evpuller["sn"].get<string>() + ":evpuller:" + to_string(evpuller["iid"]);
+            pullerGid = evpuller["sn"].get<string>() + ":" + ipcSn + ":evpuller:" + to_string(evpuller["iid"]);
             mgrSn = evmgr["sn"];
 
             if(evslicer.count("path") == 0) {