From a658af4e705155ab4c0f9a9c92af71ba9cbfbf93 Mon Sep 17 00:00:00 2001
From: Grzegorz Rychlik <Grzegorz.Rychlik@f-secure.com>
Date: Wed, 19 Feb 2020 09:59:07 +0100
Subject: [PATCH] Better channel IO testing

---
 Src/ChannelLinter/ChannelLinter.cpp     | 45 +++++++++++++++++++++----
 Src/ChannelLinter/ChannelLinterMain.cpp |  7 +++-
 Src/ChannelLinter/README.md             |  2 +-
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/Src/ChannelLinter/ChannelLinter.cpp b/Src/ChannelLinter/ChannelLinter.cpp
index dafbbf9..233a43e 100644
--- a/Src/ChannelLinter/ChannelLinter.cpp
+++ b/Src/ChannelLinter/ChannelLinter.cpp
@@ -78,13 +78,20 @@ namespace MWR::C3::Linter
 	{
 		std::shared_ptr<MockDeviceBridge> channel;
 		if (m_Config.ShouldCreateChannel())
+		{
+			std::cout << "Creating channel ... " << std::flush;
 			channel = MakeChannel(*m_Config.m_ChannelArguments);
+			std::cout << "OK" << std::endl;
+		}
 
 		if (m_Config.m_TestChannelIO)
 		{
 			assert(channel); // First channel should already be created
+			std::cout << "Creating complementary channel ... " << std::flush;
 			auto complementaryArgs = GetComplementaryChannelArgs();
 			auto complementaryChannel = MakeChannel(complementaryArgs);
+			std::cout << "OK" << std::endl;
+
 			TestChannelIO(channel, complementaryChannel);
 		}
 
@@ -97,7 +104,6 @@ namespace MWR::C3::Linter
 
 	std::shared_ptr<MWR::C3::Linter::MockDeviceBridge> ChannelLinter::MakeChannel(StringVector const& channnelArguments) const
 	{
-		std::cout << "Create channel " << std::endl;
 		Form form(m_ChannelCapability.at("/create/arguments"_json_pointer));
 		auto createParams = form.Fill(channnelArguments);
 		auto blob = MWR::C3::Core::Profiler::TranslateArguments(createParams);
@@ -116,11 +122,38 @@ namespace MWR::C3::Linter
 		assert(channel);
 		assert(complementary);
 
-		auto data = ByteVector(ByteView(MWR::Utils::GenerateRandomString(64)));
-		channel->GetDevice()->OnSendToChannelInternal(data);
-		auto received = std::static_pointer_cast<C3::AbstractChannel>(complementary->GetDevice())->OnReceiveFromChannelInternal();
-		if (data != received.at(0))
-			throw std::exception("Data sent and received mismatch");
+		for (size_t packetLen : { 8, 64, 1024, 1024 * 1024})
+		{
+			std::cout << "Testing channel with " << packetLen << " bytes of data ... " << std::flush;
+			auto data = ByteVector(ByteView(MWR::Utils::GenerateRandomString(packetLen)));
+
+			// call send and receive interleaved
+			size_t sentTotal = 0;
+			ByteVector received;
+			ByteView sendView{ data };
+			while (sentTotal != packetLen && received.size() != packetLen)
+			{
+				if (sentTotal != packetLen)
+				{
+					auto sent = channel->GetDevice()->OnSendToChannelInternal(sendView);
+					sendView.remove_prefix(sent);
+					sentTotal += sent;
+				}
+
+				std::this_thread::sleep_for(channel->GetDevice()->GetUpdateDelay());
+
+				if (received.size() != packetLen)
+				{
+					auto receivedPackets = std::static_pointer_cast<C3::AbstractChannel>(complementary->GetDevice())->OnReceiveFromChannelInternal();
+					for (auto&& packet : receivedPackets)
+						received.Concat(packet);
+				}
+			}
+
+			if (data != received)
+				throw std::exception("Data sent and received mismatch");
+			std::cout << "OK" << std::endl;
+		}
 	}
 
 	void ChannelLinter::TestCommand(std::shared_ptr<MockDeviceBridge> const& channel)
diff --git a/Src/ChannelLinter/ChannelLinterMain.cpp b/Src/ChannelLinter/ChannelLinterMain.cpp
index a92d6e1..644fe23 100644
--- a/Src/ChannelLinter/ChannelLinterMain.cpp
+++ b/Src/ChannelLinter/ChannelLinterMain.cpp
@@ -11,7 +11,12 @@ try
 	using namespace MWR;
 	C3::Linter::ArgumentParser argParser(argc, argv);
 	auto const& config = argParser.GetConfig();
-	C3::Linter::ChannelLinter(config).Process();
+	std::cout << "Channel: " << config.m_ChannelName << std::endl;
+	auto channelLinter = C3::Linter::ChannelLinter(config);
+	std::cout << config.m_ChannelName << "'s Capability json verified OK." << std::endl;
+
+	channelLinter.Process();
+	return 0;
 }
 catch (std::exception& e)
 {
diff --git a/Src/ChannelLinter/README.md b/Src/ChannelLinter/README.md
index 24e8cb4..4d395ff 100644
--- a/Src/ChannelLinter/README.md
+++ b/Src/ChannelLinter/README.md
@@ -4,7 +4,7 @@ Standalone tool to ease the development and debugging of channels.
 
 ## Usage
 
-This tool provides console frontend for real channel usage
+This tool provides console frontend for channel usage
 
 1. Parse the json returned from `GetCapability()` and validate it against C3 rules:
     `-n ChannelName`