From 545abfe5eb973c83ee38a799add02605c05af26d Mon Sep 17 00:00:00 2001 From: Claudius 'keldu' Holeksa Date: Mon, 21 Oct 2024 16:21:35 +0200 Subject: Compiles now, but tls server broken --- modules/io-tls/examples/SConscript | 4 +- modules/io-tls/examples/tls_echo.hpp | 16 +++ modules/io-tls/examples/tls_echo_server.cpp | 182 +++++++++++++++++++++++++++- 3 files changed, 194 insertions(+), 8 deletions(-) create mode 100644 modules/io-tls/examples/tls_echo.hpp (limited to 'modules/io-tls/examples') diff --git a/modules/io-tls/examples/SConscript b/modules/io-tls/examples/SConscript index d904d96..3024e7c 100644 --- a/modules/io-tls/examples/SConscript +++ b/modules/io-tls/examples/SConscript @@ -20,12 +20,12 @@ env.headers += examples_env.headers; objects_static = [] examples_env.tls_client = examples_env.Program('#bin/tls_client_https_keldu_de', ['tls_client.cpp', env.library_static]); -#examples_env.tls_server = examples_env.Program('#bin/tls_server', ['tls_server.cpp', env.library_static]); +examples_env.tls_echo_server = examples_env.Program('#bin/tls_echo_server', ['tls_echo_server.cpp', env.library_static]); # Set Alias env.examples = [ examples_env.tls_client -#, examples_env.tls_server +, examples_env.tls_echo_server ]; env.Alias('examples', env.examples); diff --git a/modules/io-tls/examples/tls_echo.hpp b/modules/io-tls/examples/tls_echo.hpp new file mode 100644 index 0000000..8ecd5cc --- /dev/null +++ b/modules/io-tls/examples/tls_echo.hpp @@ -0,0 +1,16 @@ +#pragma once + +#include +#include + +namespace saw { +struct message { + std::array data; + uint64_t already_read = 0; + uint64_t already_written = 0; +}; + +constexpr std::string echo_address = "::1"; +constexpr uint16_t echo_port = 4332; + +} diff --git a/modules/io-tls/examples/tls_echo_server.cpp b/modules/io-tls/examples/tls_echo_server.cpp index 7ceacb5..b491af6 100644 --- a/modules/io-tls/examples/tls_echo_server.cpp +++ b/modules/io-tls/examples/tls_echo_server.cpp @@ -2,13 +2,10 @@ #include "../c++/tls.hpp" -saw::error_or real_main(){ - using namespace saw; - +#include +#include "tls_echo.hpp" - - return make_void(); -} +saw::error_or real_main(); int main(){ auto eov = real_main(); @@ -19,3 +16,176 @@ int main(){ } return 0; } + +saw::error_or handle_echo_write(saw::io_stream>& 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()); + } + + auto val = eov.get_value(); + state.already_written += val; + if(state.already_written > state.already_read){ + exit(-1); + } + + return saw::void_t{}; +} + +void handle_echo_message(saw::io_stream>& 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; + if(tbr == 0){ + exit(-1); + } + auto eov = rmt_clt.read(&state.data[state.already_read], tbr); + + if(eov.is_error()){ + auto& err = eov.get_error(); + if(err.is_critical()){ + std::cerr< state.data.size()){ + state.already_read = state.data.size(); + } + if(trigger_write){ + auto eov = handle_echo_write(rmt_clt, state, state.already_read - state.already_written); + if(eov.is_error()){ + auto& err = eov.get_error(); + if(err.is_critical()){ + std::cerr<<"After triggered write: "< real_main(){ + using namespace saw; + + auto eo_aio = saw::setup_async_io(); + if(eo_aio.is_error()){ + auto& err = eo_aio.get_error(); + return std::move(err); + } + auto& aio = eo_aio.get_value(); + /** + * Make the event loop the current event loop on this thread + */ + saw::wait_scope wait_scope{aio.event_loop}; + + bool keep_running = true; + aio.event_port.on_signal(saw::Signal::Terminate).then([&keep_running](){ + keep_running = false; + }).detach(); + + auto& int_network = aio.io->get_network(); + + auto eo_tls_net = saw::setup_tls_network(int_network); + if(eo_tls_net.is_error()){ + return std::move(eo_tls_net.get_error()); + } + + auto& tls_net = eo_tls_net.get_value(); + auto& network = *tls_net; + saw::own>> addr = nullptr; + saw::own>> srv = nullptr; + saw::own>> remote_client = nullptr; + + saw::message msg_state; + + std::cout<<"Starting to resolve address"< error_or { + std::cout<<"Resolved address"<accept().then([&](auto client) -> saw::error_or{ + + if(!remote_client){ + std::cout<<"Accepted client"<(); + }).detach(); + }else{ + keep_running = false; + } + }).detach([&](auto err) { + std::cout<<"Failed to resolve address: "<