cleanup

src/ProtoConv/FrameChecker.h

@@ -19,14 +19,11 @@
 
 #include <asio.hpp>
 
-typedef asio::basic_streambuf<std::allocator<char>> buf_t;
+using buf_t = asio::basic_streambuf<std::allocator<char>>;
 
-class FrameChecker
+struct FrameChecker
 {
-public:
-	FrameChecker();
 	virtual ~FrameChecker() = default;
-
 	virtual size_t CheckFrame(const buf_t& readbuf) = 0;
 };
 

src/ProtoConv/NullFrameChecker.h

@@ -1,9 +1,6 @@
-/*	opendatacon
+/*	MiniPlex
  *
- *	Copyright (c) 2014:
- *
- *		DCrip3fJguWgVCLrZFfA7sIGgvx1Ou3fHfCxnrz4svAi
- *		yxeOtDhDCXf1Z4ApgXvX5ahqQmzRfJ2DoX8S05SqHA==
+ *	Copyright (c) 2023: Neil Stephens
  *
  *	Licensed under the Apache License, Version 2.0 (the "License");
  *	you may not use this file except in compliance with the License.
@@ -17,12 +14,7 @@
  *	See the License for the specific language governing permissions and
  *	limitations under the License.
  */
-/*
- * NullFrameChecker.h
- *
- *  Created on: 18/12/2023
- *      Author: Neil Stephens
- */
+
 #ifndef NULLFRAMECHECKER_H
 #define NULLFRAMECHECKER_H
 
@@ -31,8 +23,11 @@
 class NullFrameChecker : public FrameChecker
 {
 public:
-	NullFrameChecker();
-	size_t CheckFrame(const buf_t& readbuf) override;
+	inline size_t CheckFrame(const buf_t& readbuf) override
+	{
+		//Don't check anything. Everything is a valid 'frame'.
+		return readbuf.size();
+	}
 };
 
 #endif // NULLFRAMECHECKER_H

src/ProtoConv/ProtoConv.cpp

@@ -135,8 +135,8 @@ void ProtoConv::RcvStreamHandler(buf_t& buf)
 		// The C++20 way causes a malloc error when asio tries to copy a handler with this style shared_ptr
 		//auto pForwardBuf = std::make_shared<uint8_t[]>(n);
 		// Use the old way instead - only difference should be the control block is allocated separately
-		auto pForwardBuf = std::shared_ptr<char>(new char[frame_len],[](char* p){delete[] p;});
-		const size_t ncopied = buf.sgetn(pForwardBuf.get(),frame_len);
+		auto pForwardBuf = std::shared_ptr<uint8_t>(new uint8_t[frame_len],[](uint8_t* p){delete[] p;});
+		const size_t ncopied = buf.sgetn(reinterpret_cast<char*>(pForwardBuf.get()),frame_len);
 		if(ncopied != frame_len)
 		{
 			spdlog::get("ProtoConv")->warn("RcvStreamHandler(): Failed to copy whole frame to datagram buffer. Frame size {}, copied {}.",frame_len,ncopied);

src/ProtoConv/ProtoConv.h

@@ -25,7 +25,7 @@
 #include <memory>
 #include <deque>
 
-typedef asio::basic_streambuf<std::allocator<char>> buf_t;
+using buf_t = asio::basic_streambuf<std::allocator<char>>;
 
 struct CmdArgs;
 

src/ProtoConv/TCPSocketManager.h

@@ -52,7 +52,7 @@ inline std::string GetHandlerID()
 	return std::to_string(thread_id)+":"+std::to_string(++thread_handler_id);
 }
 
-typedef asio::basic_streambuf<std::allocator<char>> buf_t;
+using buf_t = asio::basic_streambuf<std::allocator<char>>;
 
 //buffer to track a data container
 class shared_const_buffer: public asio::const_buffer