Communication: Allow redirection of reads

communication/communication.cpp

@@ -72,6 +72,14 @@ bool Communication::sendCommand(Command cmd, std::vector<uint8_t> arguments) {
 	return sendPacket(packet);
 }
 
+bool Communication::redirectRead(std::function<void(std::vector<uint8_t>&&)> redirectTo) {
+	if(redirectingRead)
+		return false;
+	redirectionFn = redirectTo;
+	redirectingRead = true;
+	return true;
+}
+
 bool Communication::getSettingsSync(std::vector<uint8_t>& data, std::chrono::milliseconds timeout) {
 	std::shared_ptr<Message> msg = waitForMessageSync([this]() {
 		return sendCommand(Command::ReadSettings, { 0, 0, 0, 1 /* Get Global Settings */, 0, 1 /* Subversion 1 */ });
@@ -181,6 +189,9 @@ void Communication::readTask() {
 	while(!closing) {
 		readBytes.clear();
 		if(driver->readWait(readBytes)) {
+			if(redirectingRead) {
+				redirectionFn(std::move(readBytes));
+			} else {
 				if(packetizer->input(readBytes)) {
 					for(const auto& packet : packetizer->output()) {
 						std::shared_ptr<Message> msg;
@@ -193,3 +204,4 @@ void Communication::readTask() {
 			}
 		}
 	}
+}

include/icsneo/communication/communication.h

@@ -42,6 +42,8 @@ public:
 	virtual void joinThreads();
 	bool rawWrite(const std::vector<uint8_t>& bytes) { return driver->write(bytes); }
 	virtual bool sendPacket(std::vector<uint8_t>& bytes);
+	bool redirectRead(std::function<void(std::vector<uint8_t>&&)> redirectTo);
+	void clearRedirectRead() { redirectingRead = false; }
 
 	void setWriteBlocks(bool blocks) { driver->writeBlocks = blocks; }
 
@@ -76,6 +78,8 @@ protected:
 	std::mutex messageCallbacksLock;
 	std::map<int, MessageCallback> messageCallbacks;
 	std::atomic<bool> closing{false};
+	std::atomic<bool> redirectingRead{false};
+	std::function<void(std::vector<uint8_t>&&)> redirectionFn;
 
 	void dispatchMessage(const std::shared_ptr<Message>& msg);