Handle scenario where 3+ readable events including continuation frames all resulted in a final frame of 0 length

Signed-off-by: Carsten Schafer <Carsten.Schafer@kinarasystems.com>

Author: Carsten Schafer

src/AP_WS_Connection.cpp

@@ -605,10 +605,16 @@ namespace OpenWifi {
 	void AP_WS_Connection::ProcessWSFinalPayload() {
 		auto IncomingSize = IncomingFrame_.size();
 
+		if (IncomingSize == 0) {
+			poco_warning(Logger_,
+						 fmt::format("ProcessWSFrame({}): Final Acc. Frame received but empty",
+									 CId_));
+			return;
+		}
 		IncomingFrame_.append(0);
 
 		poco_trace(Logger_,
-				   fmt::format("ProcessWSFrame({}): Final Frame received (len={}, Msg={}",
+				   fmt::format("ProcessWSFrame({}): Final Acc. Frame received (len={}, Msg={}",
 							   CId_, IncomingSize, IncomingFrame_.begin()));
 
 		Poco::JSON::Parser parser;
@@ -676,7 +682,7 @@ namespace OpenWifi {
 			State_.MessageCount++;
 			State_.LastContact = Utils::Now();
 			poco_trace(Logger_,
-					   fmt::format("FRAME({}): Frame {} rx (len={}, flags={}, acc.len={})",
+					   fmt::format("FRAME({}): Frame rx (op={} len={}, flags={}, acc.len={})",
 								   CId_, Op, IncomingSize, flags, IncomingFrame_.size()));
 
 			switch (Op) {
@@ -698,7 +704,8 @@ namespace OpenWifi {
 						PingDetails.set("locale", State_.locale);
 						PingObject.set(uCentralProtocol::PING, PingDetails);
 						poco_trace(Logger_,fmt::format("Sending PING for {}", SerialNumber_));
-						KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_,PingObject);
+						KafkaManager()->PostMessage(KafkaTopics::CONNECTION, SerialNumber_,
+													PingObject);
 					}
 					return;
 				} break;
@@ -721,7 +728,8 @@ namespace OpenWifi {
 				case Poco::Net::WebSocket::FRAME_OP_TEXT: {
 					poco_trace(Logger_,
 							   fmt::format("TEXT({}): Frame received (len={}, flags={}). Msg={}",
-										   CId_, IncomingSize, flags, CurrentFrame.begin()));
+										   CId_, IncomingSize, flags,
+										   CurrentFrame.begin() == nullptr ? "" : CurrentFrame.begin()));
 				} break;
 
 				case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
@@ -738,7 +746,7 @@ namespace OpenWifi {
 				}
 			}
 
-			// Check for final frame and process accumlated payload
+			// Check for final frame and process accumulated payload
 			if (!KillConnection && (flags & Poco::Net::WebSocket::FRAME_FLAG_FIN) != 0) {
 				ProcessWSFinalPayload();
 			}

src/FileUploader.cpp

@@ -315,4 +315,4 @@ namespace OpenWifi {
 		poco_notice(Logger(), "Stopped...");
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/framework/MicroService.cpp

@@ -295,7 +295,6 @@ namespace OpenWifi {
 
 			auto Level = Poco::Logger::parseLevel(
 				MicroService::instance().ConfigGetString("logging.level", "debug"));
-			//Level = Poco::Logger::parseLevel("trace"); // TODO: remove this
 			Poco::Logger::root().setLevel(Level);
 			if (!DisableWebSocketLogging) {
 				static const UI_WebSocketClientServer::NotificationTypeIdVec Notifications = {

src/framework/utils.cpp

@@ -943,7 +943,6 @@ namespace OpenWifi::Utils {
 
         return naptrRecords;
     }
-#endif
 
     std::vector<SrvRecord> getSRVRecords(const std::string& domain) {
         std::vector<SrvRecord> srvRecords;
@@ -981,6 +980,7 @@ namespace OpenWifi::Utils {
 
         return srvRecords;
     }
+#endif
 
 
 } // namespace OpenWifi::Utils

src/storage/storage_command.cpp

@@ -664,12 +664,14 @@ namespace OpenWifi {
 				Insert.execute();
 				Sess.commit();
 			} else {
-				poco_warning(Logger(), fmt::format("File {} is too large.", UUID));
+				poco_warning(Logger(),
+					fmt::format("File {} is too large ({} >= {} max bytes).",
+						UUID, Size, FileUploader()->MaxSize()));
 			}
 
 			// update CommandList here to ensure that file us uploaded
-                        Sess.begin();
-                        Poco::Data::Statement Statement(Sess);
+			Sess.begin();
+			Poco::Data::Statement Statement(Sess);
 			std::string StatementStr;
 			StatementStr =
 				"UPDATE CommandList SET WaitingForFile=?, AttachDate=?, AttachSize=? WHERE UUID=?";