Chg: update image tag in helm values to v3.2.0-RC1

Signed-off-by: Ivan Chvets <ivan.chvets@kinarasystems.com>

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owgw:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
-    tag: master
+    tag: v3.2.0-RC1
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

src/AP_WS_Connection.cpp

@@ -561,14 +561,14 @@ namespace OpenWifi {
 	void AP_WS_Connection::OnSocketShutdown(
 		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ShutdownNotification> &pNf) {
 		poco_trace(Logger_, fmt::format("SOCKET-SHUTDOWN({}): Closing.", CId_));
-		std::lock_guard	G(ConnectionMutex_);
+//		std::lock_guard	G(ConnectionMutex_);
 		return EndConnection();
 	}
 
 	void AP_WS_Connection::OnSocketError(
 		[[maybe_unused]] const Poco::AutoPtr<Poco::Net::ErrorNotification> &pNf) {
 		poco_trace(Logger_, fmt::format("SOCKET-ERROR({}): Closing.", CId_));
-		std::lock_guard	G(ConnectionMutex_);
+//		std::lock_guard	G(ConnectionMutex_);
 		return EndConnection();
 	}
 
@@ -652,10 +652,9 @@ namespace OpenWifi {
 
 				case Poco::Net::WebSocket::FRAME_OP_TEXT: {
 					poco_trace(Logger_,
-						fmt::format("FRAME({}): Frame received (length={}, flags={}). Msg={}",
-									CId_, IncomingSize, flags, IncomingFrame.begin()));
+							   fmt::format("FRAME({}): Frame received (length={}, flags={}). Msg={}",
+										   CId_, IncomingSize, flags, IncomingFrame.begin()));
 
-					
 					Poco::JSON::Parser parser;
 					auto ParsedMessage = parser.parse(IncomingFrame.begin());
 					auto IncomingJSON = ParsedMessage.extract<Poco::JSON::Object::Ptr>();

src/AP_WS_Server.cpp

@@ -57,9 +57,8 @@ namespace OpenWifi {
 			if (request.find("Upgrade") != request.end() &&
 				Poco::icompare(request["Upgrade"], "websocket") == 0) {
 				Utils::SetThreadName("ws:conn-init");
-				//session_id_++;
-				auto new_session_id =  session_id_.fetch_add(1, std::memory_order_seq_cst) + 1;
-				return new AP_WS_RequestHandler(Logger_, new_session_id);
+				session_id_++;
+				return new AP_WS_RequestHandler(Logger_, session_id_);
 			} else {
 				return nullptr;
 			}
@@ -515,27 +514,10 @@ namespace OpenWifi {
 			Connection = SessionHint->second;
 			Sessions_[sessionHash].erase(SessionHint);
 		}
-		std::atomic_bool duplicate_session = false;
-		{
-			auto deviceHash = MACHash::Hash(SerialNumber);
-			std::lock_guard DeviceLock(SerialNumbersMutex_[deviceHash]);
-			auto DeviceHint = SerialNumbers_[deviceHash].find(SerialNumber);
-            if (DeviceHint == SerialNumbers_[deviceHash].end()) {
-                // No duplicate connection go ahead and add new connection
-		        SerialNumbers_[deviceHash][SerialNumber] = Connection;
-            }
-            else {
-                // Mark a duplicate session
-                duplicate_session = true;
-				poco_information(Logger(), fmt::format("[session ID: {}] Found a duplicate connection for device serial: {}", session_id, Utils::IntToSerialNumber(SerialNumber)));
-            }
-		}
-		if (duplicate_session.load()){
-            // This is only called if we have a duplicate session
-            // We remove the new incoming session that we just added a few lines above, forcing the destructor for this new session while not impacting the pointers to the old session.
-            std::lock_guard SessionLock(SessionMutex_[sessionHash]);
-			Sessions_[sessionHash].erase(session_id);
-        }
+
+		auto deviceHash = MACHash::Hash(SerialNumber);
+		std::lock_guard DeviceLock(SerialNumbersMutex_[deviceHash]);
+		SerialNumbers_[deviceHash][SerialNumber] = Connection;
 	}
 
 	bool AP_WS_Server::EndSession(uint64_t session_id, uint64_t SerialNumber) {

src/CapabilitiesCache.h

@@ -111,7 +111,7 @@ namespace OpenWifi {
 				i >> cache;
 
 				for (const auto &[Type, Platform] : cache.items()) {
-					Platforms_[Type] = Poco::toLower(Platform.get<std::string>());
+					Platforms_[Type] = Poco::toLower(to_string(Platform));
 				}
 			} catch (...) {
 			}

src/framework/ConfigurationValidator.cpp

@@ -376,21 +376,18 @@ static std::string DefaultAPSchema = R"foo(
             "properties": {
                 "port-mirror": {
                     "description": "Enable mirror of traffic from multiple minotor ports to a single analysis port.",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "monitor-ports": {
-                                "description": "The list of ports that we want to mirror.",
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
-                                }
-                            },
-                            "analysis-port": {
-                                "description": "The port that mirror'ed packets should be sent to.",
+                    "type": "object",
+                    "properties": {
+                        "monitor-ports": {
+                            "description": "The list of ports that we want to mirror.",
+                            "type": "array",
+                            "items": {
                                 "type": "string"
                             }
+                        },
+                        "analysis-port": {
+                            "description": "The port that mirror'ed packets should be sent to.",
+                            "type": "string"
                         }
                     }
                 },