From b048b02732cbfcfbb95bb8e16dec71aca0e977f4 Mon Sep 17 00:00:00 2001
From: Claudius 'keldu' Holeksa <mail@keldu.de>
Date: Wed, 16 Oct 2024 18:51:50 +0200
Subject: Reworked abstraction for network

---
 modules/io/examples/echo_client.cpp |  6 +++---
 modules/io/examples/echo_server.cpp | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/io/examples')

diff --git a/modules/io/examples/echo_client.cpp b/modules/io/examples/echo_client.cpp
index e827ce0..69d91a2 100644
--- a/modules/io/examples/echo_client.cpp
+++ b/modules/io/examples/echo_client.cpp
@@ -30,8 +30,8 @@ int main(){
 		keep_running = false;
 	}).detach();
 
-	saw::own<saw::network_address> net_addr = nullptr;
-	saw::own<saw::async_io_stream> async_rmt = nullptr;
+	saw::own<saw::network_address<saw::net::Os>> net_addr = nullptr;
+	saw::own<saw::async_io_stream<saw::net::Os>> async_rmt = nullptr;
 
 	std::array<uint8_t, 32> read_data;
 	uint64_t read_bytes = 0;
@@ -39,7 +39,7 @@ int main(){
 	network.resolve_address(saw::echo_address, saw::echo_port).then([&](auto addr){
 		net_addr = std::move(addr);
 		network.connect(*net_addr).then([&](auto rmt_srv){
-			async_rmt = saw::heap<saw::async_io_stream>(std::move(rmt_srv));
+			async_rmt = saw::heap<saw::async_io_stream<saw::net::Os>>(std::move(rmt_srv));
 			async_rmt->write(&message_content[0], message_content.size());
 
 			async_rmt->read(&read_data[0], message_content.size(), read_data.size()-1);
diff --git a/modules/io/examples/echo_server.cpp b/modules/io/examples/echo_server.cpp
index 4336048..0b0ea1b 100644
--- a/modules/io/examples/echo_server.cpp
+++ b/modules/io/examples/echo_server.cpp
@@ -4,7 +4,7 @@
 
 #include "echo.hpp"
 
-saw::error_or<void> handle_echo_write(saw::io_stream& rmt_clt, saw::message& state, uint64_t tbw){
+saw::error_or<void> handle_echo_write(saw::io_stream<saw::net::Os>& rmt_clt, saw::message& state, uint64_t tbw){
 	auto eov = rmt_clt.write(&state.data[state.already_written], tbw);
 	if(eov.is_error()){
 		return std::move(eov.get_error());
@@ -19,7 +19,7 @@ saw::error_or<void> handle_echo_write(saw::io_stream& rmt_clt, saw::message& sta
 	return saw::void_t{};
 }
 
-void handle_echo_message(saw::io_stream& rmt_clt, bool& keep_running, saw::message& state){
+void handle_echo_message(saw::io_stream<saw::net::Os>& rmt_clt, bool& keep_running, saw::message& state){
 	rmt_clt.read_ready().then([&](){
 		for(;;){
 			uint64_t tbr = state.data.size() < state.already_read ? 0: state.data.size() - state.already_read;
@@ -113,9 +113,9 @@ int main(){
 	}).detach();
 
 	auto& network = aio.io->get_network();
-	saw::own<saw::network_address> addr = nullptr;
-	saw::own<saw::server> srv = nullptr;
-	saw::own<saw::io_stream> remote_client = nullptr;
+	saw::own<saw::network_address<saw::net::Os>> addr = nullptr;
+	saw::own<saw::server<saw::net::Os>> srv = nullptr;
+	saw::own<saw::io_stream<saw::net::Os>> remote_client = nullptr;
 
 	saw::message msg_state;
 
-- 
cgit v1.2.3