From 2ef3d5b1a96c809ee72e7e89af45788eea25e372 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Mon, 5 Apr 2021 11:09:34 +0530
Subject: [PATCH 01/14] transport close fix

---
 .../include/marlin/stream/StreamTransport.hpp | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index 24f70639..c011aa38 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -1416,7 +1416,7 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 	) {
 		uint64_t range = *iter;
 
-		uint64_t low = high - range;
+		int low = high - range;
 
 		// Short circuit on gap range
 		if(gap) {
@@ -1480,6 +1480,10 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 						*this,
 						std::move(iter->data)
 					);
+
+					if(stream.data_queue.size() == 0)
+						break;
+
 				}
 
 				if(fully_acked) {
@@ -1529,6 +1533,10 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 
 				return;
 			}
+
+			if (sent_packets.size() == 0)
+				break;			
+
 		}
 
 		high = low;
@@ -2124,6 +2132,9 @@ int StreamTransport<DelegateType, DatagramTransport>::send(
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::close(uint16_t reason) {
+	if( !is_active() )
+		return;
+
 	// Preserve conn ids so retries work
 	auto src_conn_id = this->src_conn_id;
 	auto dst_conn_id = this->dst_conn_id;
@@ -2142,6 +2153,9 @@ void StreamTransport<DelegateType, DatagramTransport>::close(uint16_t reason) {
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::close_timer_cb() {
+	if ( !is_active() )
+		return;
+
 	if(state_timer_interval >= 8000) { // Abort on too many retries
 		SPDLOG_DEBUG(
 			"Stream transport {{ Src: {}, Dst: {} }}: Close timeout",
@@ -2175,6 +2189,8 @@ double StreamTransport<DelegateType, DatagramTransport>::get_rtt() {
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::skip_timer_cb(RecvStream& stream) {
+	if ( !is_active() )
+		return;
 	if(stream.state_timer_interval >= 64000) { // Abort on too many retries
 		stream.state_timer_interval = 0;
 		SPDLOG_DEBUG(
@@ -2227,6 +2243,8 @@ void StreamTransport<DelegateType, DatagramTransport>::skip_stream(
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::flush_timer_cb(SendStream& stream) {
+	if ( !is_active() )
+		return;	
 	if(stream.state_timer_interval >= 64000) { // Abort on too many retries
 		stream.state_timer_interval = 0;
 		SPDLOG_DEBUG(

From 146366ce2574c450efbcbc3f486c3737f931750e Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Mon, 5 Apr 2021 11:13:23 +0530
Subject: [PATCH 02/14] transport simulator fix

---
 .../include/marlin/simulator/transport/SimulatedTransport.hpp  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp b/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp
index 4c3b2c0a..9b2605a8 100644
--- a/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp
+++ b/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp
@@ -116,7 +116,8 @@ void SimulatedTransport<
 	NetworkInterfaceType,
 	DelegateType
 >::close(uint16_t reason) {
-	delegate->did_close(*this, reason);
+	
+	delegate->close(reason);
 	transport_manager.erase(dst_addr);
 }
 

From bbba090ea5b8688a245e32a1781acb07ae661300 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Mon, 5 Apr 2021 12:17:31 +0530
Subject: [PATCH 03/14] example build fix

---
 simulator/examples/transport.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/simulator/examples/transport.cpp b/simulator/examples/transport.cpp
index d1d4c60f..057bd58b 100644
--- a/simulator/examples/transport.cpp
+++ b/simulator/examples/transport.cpp
@@ -51,6 +51,10 @@ struct Delegate {
 		SPDLOG_INFO("Did close");
 	}
 
+	void close(uint16_t reason){
+		SPDLOG_INFO("Close {}", reason);
+	}
+
 	bool should_accept(SocketAddress const&) {
 		return true;
 	}

From caf7c60475a0d9466281a0be9be5c9f63cd4a0b0 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Wed, 7 Apr 2021 10:41:40 +0530
Subject: [PATCH 04/14] rewrite

---
 CMakeLists.txt                                |   1 +
 simulator/examples/transport.cpp              |  14 +--
 .../transport/SimulatedTransport.hpp          |   3 +-
 stream/CMakeLists.txt                         |   3 +
 stream/examples/.stream_simulated.cpp.swp     | Bin 0 -> 20480 bytes
 stream/examples/stream_simulated.cpp          |  25 +++--
 stream/include/marlin/stream/Messages.hpp     |   2 +-
 .../include/marlin/stream/StreamTransport.hpp |  23 ++++-
 .../stream/protocol/.RecvStream.hpp.swp       | Bin 0 -> 12288 bytes
 .../stream/protocol/.SendStream.hpp.swp       | Bin 0 -> 12288 bytes
 utils/CMakeLists.txt                          |  87 ++++++++++++++++++
 utils/include/marlin/utils/logs.hpp           |  12 +++
 12 files changed, 144 insertions(+), 26 deletions(-)
 create mode 100644 stream/examples/.stream_simulated.cpp.swp
 create mode 100644 stream/include/marlin/stream/protocol/.RecvStream.hpp.swp
 create mode 100644 stream/include/marlin/stream/protocol/.SendStream.hpp.swp
 create mode 100644 utils/CMakeLists.txt
 create mode 100644 utils/include/marlin/utils/logs.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2abb0192..a66937aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,3 +48,4 @@ add_subdirectory(rlpx)
 add_subdirectory(integrations/eth)
 add_subdirectory(integrations/bsc)
 add_subdirectory(integrations/near)
+add_subdirectory(utils)
diff --git a/simulator/examples/transport.cpp b/simulator/examples/transport.cpp
index 057bd58b..41a17e71 100644
--- a/simulator/examples/transport.cpp
+++ b/simulator/examples/transport.cpp
@@ -25,7 +25,10 @@ struct Delegate {
 		if(Simulator::default_instance.current_tick() > 10) {
 			transport.close();
 		} else {
-			transport.send(Buffer({0,0,0,0,0,0,0,0,0,0}, 10));
+			auto buf = Buffer(1350);
+			std::memset(buf.data(), 0, 1350);
+			transport.send(std::move(buf));
+			//transport.send(Buffer({0,0,0,0,0,0,0,0,0,0}, 10));
 		}
 	}
 
@@ -44,17 +47,15 @@ struct Delegate {
 
 	void did_dial(TransportType& transport) {
 		SPDLOG_INFO("Did dial");
-		transport.send(Buffer({0,0,0,0,0,0,0,0,0,0}, 10));
+		auto buf = Buffer(1350);
+		std::memset(buf.data(), 0, 1350);
+		transport.send(std::move(buf));
 	}
 
 	void did_close(TransportType&, uint16_t) {
 		SPDLOG_INFO("Did close");
 	}
 
-	void close(uint16_t reason){
-		SPDLOG_INFO("Close {}", reason);
-	}
-
 	bool should_accept(SocketAddress const&) {
 		return true;
 	}
@@ -65,6 +66,7 @@ struct Delegate {
 };
 
 int main() {
+
 	auto& simulator = Simulator::default_instance;
 	NetworkConditioner nc;
 	Network<NetworkConditioner> network(nc);
diff --git a/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp b/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp
index 9b2605a8..4c3b2c0a 100644
--- a/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp
+++ b/simulator/include/marlin/simulator/transport/SimulatedTransport.hpp
@@ -116,8 +116,7 @@ void SimulatedTransport<
 	NetworkInterfaceType,
 	DelegateType
 >::close(uint16_t reason) {
-	
-	delegate->close(reason);
+	delegate->did_close(*this, reason);
 	transport_manager.erase(dst_addr);
 }
 
diff --git a/stream/CMakeLists.txt b/stream/CMakeLists.txt
index 282bca74..7c692321 100644
--- a/stream/CMakeLists.txt
+++ b/stream/CMakeLists.txt
@@ -32,6 +32,9 @@ target_link_libraries(stream INTERFACE sodium::sodium)
 # marlin::asyncio
 target_link_libraries(stream INTERFACE marlin::asyncio)
 
+# marlin::utils
+target_link_libraries(stream INTERFACE marlin::utils)
+
 # spdlog
 target_link_libraries(stream INTERFACE spdlog::spdlog_header_only)
 
diff --git a/stream/examples/.stream_simulated.cpp.swp b/stream/examples/.stream_simulated.cpp.swp
new file mode 100644
index 0000000000000000000000000000000000000000..1096c922ae340a724ac50279c41988957348a958
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/stream/examples/stream_simulated.cpp b/stream/examples/stream_simulated.cpp
index fbaf9e95..fd5fe3ea 100644
--- a/stream/examples/stream_simulated.cpp
+++ b/stream/examples/stream_simulated.cpp
@@ -59,30 +59,28 @@ struct Delegate {
 	}
 
 	void did_send(TransportType &transport, Buffer &&packet [[maybe_unused]]) {
-		// SPDLOG_INFO(
-		// 	"Transport {{ Src: {}, Dst: {} }}: Did send packet: {} bytes",
-		// 	transport.src_addr.to_string(),
-		// 	transport.dst_addr.to_string(),
-		// 	packet.size()
-		// );
+		 SPDLOG_INFO(
+		 	"Transport {{ Src: {}, Dst: {} }}: Did send packet: {} bytes",
+		 	transport.src_addr.to_string(),
+		 	transport.dst_addr.to_string(),
+		 	packet.size()
+		 );
 		did_dial(transport);
 	}
 
 	void did_dial(TransportType &transport) {
-		if(count > 0xfff) {
+		if(count > 10) {
+			transport.close();
 			return;
 		}
-		if((count & 0xff) == 0) {
-			SPDLOG_INFO("Checkpoint: {}", count);
-		}
 		++count;
 
-		auto buf = Buffer(m_SIZE);
-		std::memset(buf.data(), 0, m_SIZE);
+		auto buf = Buffer(1350);
+		std::memset(buf.data(), 0, 1350);
 
 		// SPDLOG_INFO("Did dial");
 
-		transport.send(std::move(buf));
+		transport.send(std::move(buf), 1);
 	}
 
 	void did_close(TransportType &, uint16_t) {}
@@ -114,6 +112,7 @@ struct Delegate {
 };
 
 int main() {
+	spdlog::set_level(spdlog::level::debug);
 	Simulator& simulator = Simulator::default_instance;
 	NetworkConditioner nc;
 	NetworkType network(nc);
diff --git a/stream/include/marlin/stream/Messages.hpp b/stream/include/marlin/stream/Messages.hpp
index 9af6eb8d..e9465ece 100644
--- a/stream/include/marlin/stream/Messages.hpp
+++ b/stream/include/marlin/stream/Messages.hpp
@@ -372,7 +372,7 @@ struct CLOSEWrapper {
 
 	/// Construct a CLOSE message
 	CLOSEWrapper() : base(12) {
-		base.set_payload({0, 12});
+		base.set_payload({0, 10});
 	}
 
 	/// Validate the CLOSE message
diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index c011aa38..a42f9086 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -15,6 +15,7 @@
 #include <marlin/asyncio/core/EventLoop.hpp>
 #include <marlin/asyncio/core/Timer.hpp>
 #include <marlin/core/TransportManager.hpp>
+#include <marlin/utils/logs.hpp>
 
 #include "protocol/SendStream.hpp"
 #include "protocol/RecvStream.hpp"
@@ -330,6 +331,7 @@ void StreamTransport<DelegateType, DatagramTransport>::reset() {
 	for(auto& [_, stream] : send_streams) {
 		(void)_;
 		stream.state_timer.stop();
+		stream.data_queue.clear();
 	}
 	send_streams.clear();
 	for(auto& [_, stream] : recv_streams) {
@@ -1481,9 +1483,11 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 						std::move(iter->data)
 					);
 
-					if(stream.data_queue.size() == 0)
-						break;
-
+					if(stream.data_queue.size() == 0){
+							break;
+					}
+					
+					MARLIN_LOG_DEBUG("3rd Loop {} {}", stream.data_queue.size(), iter->data.size());
 				}
 
 				if(fully_acked) {
@@ -1797,6 +1801,7 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_FLUSHCONF(
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::send_CLOSE(uint16_t reason) {
+	MARLIN_LOG_DEBUG_0();
 	transport.send(
 		CLOSE()
 		.set_src_conn_id(src_conn_id)
@@ -1809,6 +1814,8 @@ template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::did_recv_CLOSE(
 	CLOSE &&packet
 ) {
+	MARLIN_LOG_DEBUG("{}",this->src_addr.to_string());
+
 	if(!packet.validate()) {
 		return;
 	}
@@ -1858,6 +1865,8 @@ void StreamTransport<DelegateType, DatagramTransport>::send_CLOSECONF(
 	uint32_t src_conn_id,
 	uint32_t dst_conn_id
 ) {
+	MARLIN_LOG_DEBUG_0();
+
 	transport.send(
 		CLOSECONF()
 		.set_src_conn_id(src_conn_id)
@@ -1869,6 +1878,8 @@ template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::did_recv_CLOSECONF(
 	CLOSECONF &&packet
 ) {
+	MARLIN_LOG_DEBUG("{}",this->src_addr.to_string());
+
 	if(!packet.validate()) {
 		return;
 	}
@@ -1932,6 +1943,7 @@ void StreamTransport<DelegateType, DatagramTransport>::did_close(
 	BaseTransport &,
 	uint16_t reason
 ) {
+	this->close(reason);
 	delegate->did_close(*this, reason);
 	transport_manager.erase(dst_addr);
 }
@@ -1989,7 +2001,10 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv(
 		// FLUSHCONF
 		case 9: did_recv_FLUSHCONF(std::move(packet));
 		break;
-		// UNKNOWN
+		case 10: did_recv_CLOSE(std::move(packet));
+		break;
+		case 11: did_recv_CLOSECONF(std::move(packet));
+		break;		// UNKNOWN
 		default: SPDLOG_TRACE("UNKNOWN <<< {}", dst_addr.to_string());
 		break;
 	}
diff --git a/stream/include/marlin/stream/protocol/.RecvStream.hpp.swp b/stream/include/marlin/stream/protocol/.RecvStream.hpp.swp
new file mode 100644
index 0000000000000000000000000000000000000000..e391426c3d08ce69a845f45283fe5d135a4cec8f
GIT binary patch
literal 12288
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
E0@x&f4*&oF

literal 0
HcmV?d00001

diff --git a/stream/include/marlin/stream/protocol/.SendStream.hpp.swp b/stream/include/marlin/stream/protocol/.SendStream.hpp.swp
new file mode 100644
index 0000000000000000000000000000000000000000..caa7b489bb636e794dc10112dc3ef5243d56182a
GIT binary patch
literal 12288
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
Hj>!KFOg^oL

literal 0
HcmV?d00001

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
new file mode 100644
index 00000000..a274491d
--- /dev/null
+++ b/utils/CMakeLists.txt
@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+project(utils VERSION 0.0.1 LANGUAGES CXX)
+
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+    add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_INFO)
+else()
+    add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG)
+endif()
+
+include(GNUInstallDirs)
+
+IF(APPLE)
+    # Fix linking on 10.14+. See https://stackoverflow.com/questions/54068035
+    LINK_DIRECTORIES(/usr/local/lib)
+ENDIF()
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+add_library(utils INTERFACE)
+add_library(marlin::utils ALIAS utils)
+
+target_include_directories(utils
+        INTERFACE
+        $<INSTALL_INTERFACE:include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        )
+target_compile_features(utils INTERFACE cxx_std_17)
+
+# spdlog
+target_link_libraries(utils INTERFACE spdlog::spdlog_header_only)
+
+# abseil
+# target_link_libraries(utils INTERFACE absl::flash_hash_map)
+
+install(TARGETS utils
+        EXPORT marlin-utils-export
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+##########################################################
+# Export
+##########################################################
+
+install(EXPORT marlin-utils-export
+        FILE
+        	MarlinUtilsTargets.cmake
+        NAMESPACE
+        	marlin::
+        DESTINATION
+        	${CMAKE_INSTALL_LIBDIR}/cmake/marlinUtils
+        )
+
+install(FILES
+        ${CMAKE_CURRENT_LIST_DIR}/cmake/MarlinUtilsConfig.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/marlinUtils
+        )
+
+##########################################################
+# Tests
+##########################################################
+
+#enable_testing()
+
+#set(TEST_SOURCES
+#        test/testAckRanges.cpp
+#        test/testCongestion.cpp
+#        )
+
+#add_custom_target(stream_tests)
+#foreach(TEST_SOURCE ${TEST_SOURCES})
+#    get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
+#    add_executable(${TEST_NAME} ${TEST_SOURCE})
+#    target_link_libraries(${TEST_NAME} PUBLIC GTest::GTest GTest::Main stream)
+#    target_compile_options(${TEST_NAME} PRIVATE -Werror -Wall -Wextra -pedantic-errors)
+#    target_compile_features(${TEST_NAME} PRIVATE cxx_std_17)
+#    add_test(${TEST_NAME} ${TEST_NAME})
+
+#    add_dependencies(stream_tests ${TEST_NAME})
+#endforeach(TEST_SOURCE)
+
+##########################################################
+# All
+##########################################################
+
diff --git a/utils/include/marlin/utils/logs.hpp b/utils/include/marlin/utils/logs.hpp
new file mode 100644
index 00000000..26bc1abe
--- /dev/null
+++ b/utils/include/marlin/utils/logs.hpp
@@ -0,0 +1,12 @@
+#include <spdlog/spdlog.h>
+
+#define MARLIN_LOG_DEBUG(fmt, ...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(),"{}:{} {}() ###: " fmt, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#define MARLIN_LOG_DEBUG_0(fmt) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(),"{}:{} {}() !!!. " fmt,  __FILE__, __LINE__, __FUNCTION__)
+
+#define MARLIN_LOG_TRACE(fmt, ...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(),"{}:{} {}() ###: " fmt, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#define MARLIN_LOG_TRACE_0(fmt) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(),"{}:{} {}() !!!. " fmt,  __FILE__, __LINE__, __FUNCTION__)
+
+#define MARLIN_LOG_INFO(fmt, ...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(),"{}:{} {}() ###: " fmt, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#define MARLIN_LOG_INFO_0(fmt) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(),"{}:{} {}() !!!. " fmt,  __FILE__, __LINE__, __FUNCTION__)
+
+

From e770eb9e5343e040425860988b203e8418c5b527 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Wed, 7 Apr 2021 10:45:20 +0530
Subject: [PATCH 05/14] rewrite close

---
 stream/examples/.stream_simulated.cpp.swp       | Bin 20480 -> 0 bytes
 .../marlin/stream/protocol/.RecvStream.hpp.swp  | Bin 12288 -> 0 bytes
 .../marlin/stream/protocol/.SendStream.hpp.swp  | Bin 12288 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 stream/examples/.stream_simulated.cpp.swp
 delete mode 100644 stream/include/marlin/stream/protocol/.RecvStream.hpp.swp
 delete mode 100644 stream/include/marlin/stream/protocol/.SendStream.hpp.swp

diff --git a/stream/examples/.stream_simulated.cpp.swp b/stream/examples/.stream_simulated.cpp.swp
deleted file mode 100644
index 1096c922ae340a724ac50279c41988957348a958..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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

diff --git a/stream/include/marlin/stream/protocol/.RecvStream.hpp.swp b/stream/include/marlin/stream/protocol/.RecvStream.hpp.swp
deleted file mode 100644
index e391426c3d08ce69a845f45283fe5d135a4cec8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
E0@x&f4*&oF

diff --git a/stream/include/marlin/stream/protocol/.SendStream.hpp.swp b/stream/include/marlin/stream/protocol/.SendStream.hpp.swp
deleted file mode 100644
index caa7b489bb636e794dc10112dc3ef5243d56182a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
Hj>!KFOg^oL


From cbdfd6f277b3ac2eaf37f2dd91c23c77a4e4cafb Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 11:59:53 +0530
Subject: [PATCH 06/14] clean transport close diff

---
 CMakeLists.txt                            |  1 -
 simulator/examples/transport.cpp          | 10 +--
 stream/CMakeLists.txt                     |  3 -
 stream/examples/stream_simulated.cpp      | 29 ++++----
 stream/include/marlin/stream/Messages.hpp |  2 +-
 utils/CMakeLists.txt                      | 87 -----------------------
 utils/include/marlin/utils/logs.hpp       | 12 ----
 7 files changed, 20 insertions(+), 124 deletions(-)
 delete mode 100644 utils/CMakeLists.txt
 delete mode 100644 utils/include/marlin/utils/logs.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a66937aa..2abb0192 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,4 +48,3 @@ add_subdirectory(rlpx)
 add_subdirectory(integrations/eth)
 add_subdirectory(integrations/bsc)
 add_subdirectory(integrations/near)
-add_subdirectory(utils)
diff --git a/simulator/examples/transport.cpp b/simulator/examples/transport.cpp
index 41a17e71..d1d4c60f 100644
--- a/simulator/examples/transport.cpp
+++ b/simulator/examples/transport.cpp
@@ -25,10 +25,7 @@ struct Delegate {
 		if(Simulator::default_instance.current_tick() > 10) {
 			transport.close();
 		} else {
-			auto buf = Buffer(1350);
-			std::memset(buf.data(), 0, 1350);
-			transport.send(std::move(buf));
-			//transport.send(Buffer({0,0,0,0,0,0,0,0,0,0}, 10));
+			transport.send(Buffer({0,0,0,0,0,0,0,0,0,0}, 10));
 		}
 	}
 
@@ -47,9 +44,7 @@ struct Delegate {
 
 	void did_dial(TransportType& transport) {
 		SPDLOG_INFO("Did dial");
-		auto buf = Buffer(1350);
-		std::memset(buf.data(), 0, 1350);
-		transport.send(std::move(buf));
+		transport.send(Buffer({0,0,0,0,0,0,0,0,0,0}, 10));
 	}
 
 	void did_close(TransportType&, uint16_t) {
@@ -66,7 +61,6 @@ struct Delegate {
 };
 
 int main() {
-
 	auto& simulator = Simulator::default_instance;
 	NetworkConditioner nc;
 	Network<NetworkConditioner> network(nc);
diff --git a/stream/CMakeLists.txt b/stream/CMakeLists.txt
index 7c692321..282bca74 100644
--- a/stream/CMakeLists.txt
+++ b/stream/CMakeLists.txt
@@ -32,9 +32,6 @@ target_link_libraries(stream INTERFACE sodium::sodium)
 # marlin::asyncio
 target_link_libraries(stream INTERFACE marlin::asyncio)
 
-# marlin::utils
-target_link_libraries(stream INTERFACE marlin::utils)
-
 # spdlog
 target_link_libraries(stream INTERFACE spdlog::spdlog_header_only)
 
diff --git a/stream/examples/stream_simulated.cpp b/stream/examples/stream_simulated.cpp
index fd5fe3ea..ed8e3969 100644
--- a/stream/examples/stream_simulated.cpp
+++ b/stream/examples/stream_simulated.cpp
@@ -59,31 +59,36 @@ struct Delegate {
 	}
 
 	void did_send(TransportType &transport, Buffer &&packet [[maybe_unused]]) {
-		 SPDLOG_INFO(
-		 	"Transport {{ Src: {}, Dst: {} }}: Did send packet: {} bytes",
-		 	transport.src_addr.to_string(),
-		 	transport.dst_addr.to_string(),
-		 	packet.size()
-		 );
+		// SPDLOG_INFO(
+		// 	"Transport {{ Src: {}, Dst: {} }}: Did send packet: {} bytes",
+		// 	transport.src_addr.to_string(),
+		// 	transport.dst_addr.to_string(),
+		// 	packet.size()
+		// );
 		did_dial(transport);
 	}
 
 	void did_dial(TransportType &transport) {
-		if(count > 10) {
+		if(count > 0xfff) {
 			transport.close();
 			return;
 		}
+		if((count & 0xff) == 0) {
+			SPDLOG_INFO("Checkpoint: {}", count);
+		}
 		++count;
 
-		auto buf = Buffer(1350);
-		std::memset(buf.data(), 0, 1350);
+		auto buf = Buffer(m_SIZE);
+		std::memset(buf.data(), 0, m_SIZE);
 
 		// SPDLOG_INFO("Did dial");
 
-		transport.send(std::move(buf), 1);
+		transport.send(std::move(buf));
 	}
 
-	void did_close(TransportType &, uint16_t) {}
+	void did_close(TransportType &, uint16_t) {
+		SPDLOG_INFO("Transport Closed");
+	}
 
 	bool should_accept(SocketAddress const &) {
 		return true;
@@ -112,7 +117,7 @@ struct Delegate {
 };
 
 int main() {
-	spdlog::set_level(spdlog::level::debug);
+	
 	Simulator& simulator = Simulator::default_instance;
 	NetworkConditioner nc;
 	NetworkType network(nc);
diff --git a/stream/include/marlin/stream/Messages.hpp b/stream/include/marlin/stream/Messages.hpp
index e9465ece..9af6eb8d 100644
--- a/stream/include/marlin/stream/Messages.hpp
+++ b/stream/include/marlin/stream/Messages.hpp
@@ -372,7 +372,7 @@ struct CLOSEWrapper {
 
 	/// Construct a CLOSE message
 	CLOSEWrapper() : base(12) {
-		base.set_payload({0, 10});
+		base.set_payload({0, 12});
 	}
 
 	/// Validate the CLOSE message
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
deleted file mode 100644
index a274491d..00000000
--- a/utils/CMakeLists.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
-project(utils VERSION 0.0.1 LANGUAGES CXX)
-
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_INFO)
-else()
-    add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_DEBUG)
-endif()
-
-include(GNUInstallDirs)
-
-IF(APPLE)
-    # Fix linking on 10.14+. See https://stackoverflow.com/questions/54068035
-    LINK_DIRECTORIES(/usr/local/lib)
-ENDIF()
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-
-add_library(utils INTERFACE)
-add_library(marlin::utils ALIAS utils)
-
-target_include_directories(utils
-        INTERFACE
-        $<INSTALL_INTERFACE:include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        )
-target_compile_features(utils INTERFACE cxx_std_17)
-
-# spdlog
-target_link_libraries(utils INTERFACE spdlog::spdlog_header_only)
-
-# abseil
-# target_link_libraries(utils INTERFACE absl::flash_hash_map)
-
-install(TARGETS utils
-        EXPORT marlin-utils-export
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
-install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-##########################################################
-# Export
-##########################################################
-
-install(EXPORT marlin-utils-export
-        FILE
-        	MarlinUtilsTargets.cmake
-        NAMESPACE
-        	marlin::
-        DESTINATION
-        	${CMAKE_INSTALL_LIBDIR}/cmake/marlinUtils
-        )
-
-install(FILES
-        ${CMAKE_CURRENT_LIST_DIR}/cmake/MarlinUtilsConfig.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/marlinUtils
-        )
-
-##########################################################
-# Tests
-##########################################################
-
-#enable_testing()
-
-#set(TEST_SOURCES
-#        test/testAckRanges.cpp
-#        test/testCongestion.cpp
-#        )
-
-#add_custom_target(stream_tests)
-#foreach(TEST_SOURCE ${TEST_SOURCES})
-#    get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
-#    add_executable(${TEST_NAME} ${TEST_SOURCE})
-#    target_link_libraries(${TEST_NAME} PUBLIC GTest::GTest GTest::Main stream)
-#    target_compile_options(${TEST_NAME} PRIVATE -Werror -Wall -Wextra -pedantic-errors)
-#    target_compile_features(${TEST_NAME} PRIVATE cxx_std_17)
-#    add_test(${TEST_NAME} ${TEST_NAME})
-
-#    add_dependencies(stream_tests ${TEST_NAME})
-#endforeach(TEST_SOURCE)
-
-##########################################################
-# All
-##########################################################
-
diff --git a/utils/include/marlin/utils/logs.hpp b/utils/include/marlin/utils/logs.hpp
deleted file mode 100644
index 26bc1abe..00000000
--- a/utils/include/marlin/utils/logs.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <spdlog/spdlog.h>
-
-#define MARLIN_LOG_DEBUG(fmt, ...) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(),"{}:{} {}() ###: " fmt, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
-#define MARLIN_LOG_DEBUG_0(fmt) SPDLOG_LOGGER_DEBUG(spdlog::default_logger_raw(),"{}:{} {}() !!!. " fmt,  __FILE__, __LINE__, __FUNCTION__)
-
-#define MARLIN_LOG_TRACE(fmt, ...) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(),"{}:{} {}() ###: " fmt, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
-#define MARLIN_LOG_TRACE_0(fmt) SPDLOG_LOGGER_TRACE(spdlog::default_logger_raw(),"{}:{} {}() !!!. " fmt,  __FILE__, __LINE__, __FUNCTION__)
-
-#define MARLIN_LOG_INFO(fmt, ...) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(),"{}:{} {}() ###: " fmt, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
-#define MARLIN_LOG_INFO_0(fmt) SPDLOG_LOGGER_INFO(spdlog::default_logger_raw(),"{}:{} {}() !!!. " fmt,  __FILE__, __LINE__, __FUNCTION__)
-
-

From 813018c2747c52e07e57eb18a1b1f2ff610d30b6 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 12:03:21 +0530
Subject: [PATCH 07/14] StreamTransport changes without close message number
 change

---
 stream/include/marlin/stream/StreamTransport.hpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index a42f9086..76816452 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -15,7 +15,6 @@
 #include <marlin/asyncio/core/EventLoop.hpp>
 #include <marlin/asyncio/core/Timer.hpp>
 #include <marlin/core/TransportManager.hpp>
-#include <marlin/utils/logs.hpp>
 
 #include "protocol/SendStream.hpp"
 #include "protocol/RecvStream.hpp"
@@ -27,7 +26,6 @@ namespace stream {
 
 /// Timeout when no acks are received, used by the TLP timer
 #define DEFAULT_TLP_INTERVAL 1000
-/// Bytes that can be sent in a given batch, used by the packet pacing mechanism
 #define DEFAULT_PACING_LIMIT 400000
 /// Bytes that can be sent in a single packet to prevent fragmentation, accounts for header overheads
 #define DEFAULT_FRAGMENT_SIZE 1350
@@ -1487,7 +1485,6 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 							break;
 					}
 					
-					MARLIN_LOG_DEBUG("3rd Loop {} {}", stream.data_queue.size(), iter->data.size());
 				}
 
 				if(fully_acked) {
@@ -1801,7 +1798,7 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_FLUSHCONF(
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::send_CLOSE(uint16_t reason) {
-	MARLIN_LOG_DEBUG_0();
+	SPDLOG_DEBUG("{}", __FUNCTION__);
 	transport.send(
 		CLOSE()
 		.set_src_conn_id(src_conn_id)
@@ -1814,7 +1811,7 @@ template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::did_recv_CLOSE(
 	CLOSE &&packet
 ) {
-	MARLIN_LOG_DEBUG("{}",this->src_addr.to_string());
+	SPDLOG_DEBUG("{} {}", __FUNCTION__,this->src_addr.to_string());
 
 	if(!packet.validate()) {
 		return;
@@ -1865,7 +1862,7 @@ void StreamTransport<DelegateType, DatagramTransport>::send_CLOSECONF(
 	uint32_t src_conn_id,
 	uint32_t dst_conn_id
 ) {
-	MARLIN_LOG_DEBUG_0();
+	SPDLOG_DEBUG("{}",__FUNCTION__);
 
 	transport.send(
 		CLOSECONF()
@@ -1878,7 +1875,7 @@ template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::did_recv_CLOSECONF(
 	CLOSECONF &&packet
 ) {
-	MARLIN_LOG_DEBUG("{}",this->src_addr.to_string());
+	SPDLOG_DEBUG("{} {}", __FUNCTION__, this->src_addr.to_string());
 
 	if(!packet.validate()) {
 		return;
@@ -2001,7 +1998,7 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv(
 		// FLUSHCONF
 		case 9: did_recv_FLUSHCONF(std::move(packet));
 		break;
-		case 10: did_recv_CLOSE(std::move(packet));
+		case 12: did_recv_CLOSE(std::move(packet));
 		break;
 		case 11: did_recv_CLOSECONF(std::move(packet));
 		break;		// UNKNOWN

From 17a7504347946d35bae8d254fb89507f08be8f97 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 12:06:32 +0530
Subject: [PATCH 08/14] redo comment deletion

---
 stream/include/marlin/stream/StreamTransport.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index 76816452..1d9959cd 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -26,6 +26,7 @@ namespace stream {
 
 /// Timeout when no acks are received, used by the TLP timer
 #define DEFAULT_TLP_INTERVAL 1000
+/// Bytes that can be sent in a given batch, used by the packet pacing mechanism
 #define DEFAULT_PACING_LIMIT 400000
 /// Bytes that can be sent in a single packet to prevent fragmentation, accounts for header overheads
 #define DEFAULT_FRAGMENT_SIZE 1350

From e995462098290be23a8fbff8a3f3e20bbe55e262 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 12:21:38 +0530
Subject: [PATCH 09/14] size checks redundant

---
 stream/include/marlin/stream/StreamTransport.hpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index 1d9959cd..1f62638a 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -1476,16 +1476,12 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 						fully_acked = false;
 						break;
 					}
-
+					// TODO: Handle delegate->did_send return type for connection continuation
 					delegate->did_send(
 						*this,
 						std::move(iter->data)
 					);
 
-					if(stream.data_queue.size() == 0){
-							break;
-					}
-					
 				}
 
 				if(fully_acked) {
@@ -1536,9 +1532,6 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 				return;
 			}
 
-			if (sent_packets.size() == 0)
-				break;			
-
 		}
 
 		high = low;

From 99577d355e70d5155e6d87f74ba815ba925e95fc Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 12:25:09 +0530
Subject: [PATCH 10/14] redundant example changes removed

---
 stream/examples/stream_simulated.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stream/examples/stream_simulated.cpp b/stream/examples/stream_simulated.cpp
index ed8e3969..b52fa4c6 100644
--- a/stream/examples/stream_simulated.cpp
+++ b/stream/examples/stream_simulated.cpp
@@ -70,7 +70,6 @@ struct Delegate {
 
 	void did_dial(TransportType &transport) {
 		if(count > 0xfff) {
-			transport.close();
 			return;
 		}
 		if((count & 0xff) == 0) {

From 095226f764e36bfe47974ff1bdcf7fc04b61845a Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Thu, 8 Apr 2021 12:27:33 +0530
Subject: [PATCH 11/14] redundant reset changes removed

---
 stream/include/marlin/stream/StreamTransport.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index 1f62638a..94479e2e 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -330,7 +330,6 @@ void StreamTransport<DelegateType, DatagramTransport>::reset() {
 	for(auto& [_, stream] : send_streams) {
 		(void)_;
 		stream.state_timer.stop();
-		stream.data_queue.clear();
 	}
 	send_streams.clear();
 	for(auto& [_, stream] : recv_streams) {

From f8604226b400a8c34fcdfb2acefbbfbfef225c63 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Tue, 20 Apr 2021 10:58:08 +0530
Subject: [PATCH 12/14] uint ACK ranges check fix

---
 stream/include/marlin/stream/StreamTransport.hpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index 94479e2e..306e81be 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -1416,7 +1416,7 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 	) {
 		uint64_t range = *iter;
 
-		int low = high - range;
+		uint64_t low = high - range;
 
 		// Short circuit on gap range
 		if(gap) {
@@ -1424,6 +1424,13 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_ACK(
 			continue;
 		}
 
+		//TODO: if either of high, low+1 are negative throw encoding error
+		//  https://tools.ietf.org/html/draft-ietf-quic-transport-34#section-19.3.1
+		//Tips	  https://wesmckinney.com/blog/avoid-unsigned-integers/
+		if ( low+1 > high){
+			break;
+		}
+
 		// Get packets within range [low+1, high]
 		auto low_iter = sent_packets.lower_bound(low + 1);
 		auto high_iter = sent_packets.upper_bound(high);
@@ -1933,7 +1940,6 @@ void StreamTransport<DelegateType, DatagramTransport>::did_close(
 	BaseTransport &,
 	uint16_t reason
 ) {
-	this->close(reason);
 	delegate->did_close(*this, reason);
 	transport_manager.erase(dst_addr);
 }

From 3eeab6916539bb9b921ffc75ae8d969e7649cf91 Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Wed, 21 Apr 2021 10:52:01 +0530
Subject: [PATCH 13/14] remove debug adds

---
 stream/include/marlin/stream/StreamTransport.hpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/stream/include/marlin/stream/StreamTransport.hpp b/stream/include/marlin/stream/StreamTransport.hpp
index 306e81be..62c07914 100644
--- a/stream/include/marlin/stream/StreamTransport.hpp
+++ b/stream/include/marlin/stream/StreamTransport.hpp
@@ -1798,7 +1798,6 @@ void StreamTransport<DelegateType, DatagramTransport>::did_recv_FLUSHCONF(
 
 template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::send_CLOSE(uint16_t reason) {
-	SPDLOG_DEBUG("{}", __FUNCTION__);
 	transport.send(
 		CLOSE()
 		.set_src_conn_id(src_conn_id)
@@ -1811,8 +1810,6 @@ template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::did_recv_CLOSE(
 	CLOSE &&packet
 ) {
-	SPDLOG_DEBUG("{} {}", __FUNCTION__,this->src_addr.to_string());
-
 	if(!packet.validate()) {
 		return;
 	}
@@ -1862,8 +1859,6 @@ void StreamTransport<DelegateType, DatagramTransport>::send_CLOSECONF(
 	uint32_t src_conn_id,
 	uint32_t dst_conn_id
 ) {
-	SPDLOG_DEBUG("{}",__FUNCTION__);
-
 	transport.send(
 		CLOSECONF()
 		.set_src_conn_id(src_conn_id)
@@ -1875,8 +1870,6 @@ template<typename DelegateType, template<typename> class DatagramTransport>
 void StreamTransport<DelegateType, DatagramTransport>::did_recv_CLOSECONF(
 	CLOSECONF &&packet
 ) {
-	SPDLOG_DEBUG("{} {}", __FUNCTION__, this->src_addr.to_string());
-
 	if(!packet.validate()) {
 		return;
 	}

From 914bcf0d36e20fcd450bf7aa41e4dde9c1dc4ece Mon Sep 17 00:00:00 2001
From: KotaHemanthIITD <4825491-KotaHemanthIITD@users.noreply.gitlab.com>
Date: Wed, 21 Apr 2021 10:58:24 +0530
Subject: [PATCH 14/14] remove unnecessary changes

---
 stream/examples/stream_simulated.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/stream/examples/stream_simulated.cpp b/stream/examples/stream_simulated.cpp
index b52fa4c6..fbaf9e95 100644
--- a/stream/examples/stream_simulated.cpp
+++ b/stream/examples/stream_simulated.cpp
@@ -85,9 +85,7 @@ struct Delegate {
 		transport.send(std::move(buf));
 	}
 
-	void did_close(TransportType &, uint16_t) {
-		SPDLOG_INFO("Transport Closed");
-	}
+	void did_close(TransportType &, uint16_t) {}
 
 	bool should_accept(SocketAddress const &) {
 		return true;
@@ -116,7 +114,6 @@ struct Delegate {
 };
 
 int main() {
-	
 	Simulator& simulator = Simulator::default_instance;
 	NetworkConditioner nc;
 	NetworkType network(nc);