summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudius 'keldu' Holeksa <mail@keldu.de>2024-10-17 19:18:14 +0200
committerClaudius 'keldu' Holeksa <mail@keldu.de>2024-10-17 19:18:14 +0200
commit225134d485ec3795e839ea9bbafdae214771f340 (patch)
treefaf4348234b1116f7d2ac0a592d4cf588a60eb1c
parent0d6300c7aec4f7a3f665b5db76aad9bf20fd55cf (diff)
Moved files to correct folders and changed example slightly
-rw-r--r--modules/io-tls/SConstruct6
-rw-r--r--modules/io-tls/c++/tls.cpp (renamed from modules/io-tls/tls.cpp)0
-rw-r--r--modules/io-tls/c++/tls.hpp (renamed from modules/io-tls/tls.hpp)0
-rw-r--r--modules/io-tls/examples/tls_client.cpp11
4 files changed, 15 insertions, 2 deletions
diff --git a/modules/io-tls/SConstruct b/modules/io-tls/SConstruct
index 103ccec..e3a5648 100644
--- a/modules/io-tls/SConstruct
+++ b/modules/io-tls/SConstruct
@@ -54,7 +54,11 @@ env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
CXX=['c++'],
CPPDEFINES=['SAW_UNIX'],
CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
- LIBS=['gnutls','forstio-io'])
+ LIBS=[
+ 'gnutls'
+ ,'forstio-core'
+ ,'forstio-io'
+ ])
env.__class__.add_source_files = add_kel_source_files
env.Tool('compilation_db');
env.cdb = env.CompilationDatabase('compile_commands.json');
diff --git a/modules/io-tls/tls.cpp b/modules/io-tls/c++/tls.cpp
index 1c42215..1c42215 100644
--- a/modules/io-tls/tls.cpp
+++ b/modules/io-tls/c++/tls.cpp
diff --git a/modules/io-tls/tls.hpp b/modules/io-tls/c++/tls.hpp
index c5c3da1..c5c3da1 100644
--- a/modules/io-tls/tls.hpp
+++ b/modules/io-tls/c++/tls.hpp
diff --git a/modules/io-tls/examples/tls_client.cpp b/modules/io-tls/examples/tls_client.cpp
index 798c626..e2ce4a5 100644
--- a/modules/io-tls/examples/tls_client.cpp
+++ b/modules/io-tls/examples/tls_client.cpp
@@ -1,12 +1,21 @@
#include "../c++/tls.hpp"
+#include <iostream>
+
saw::error_or<void> real_main(){
using namespace saw;
auto eo_aio = setup_async_io();
if(eo_aio.is_error()){
- return eo_aio.get_error();
+ return std::move(eo_aio.get_error());
}
auto& aio = eo_aio.get_value();
+
+ auto eo_tls_net = setup_tls_network(aio.io->get_network());
+ if(eo_tls_net.is_error()){
+ return std::move(eo_tls_net.get_error());
+ }
+ auto& tls_net = eo_tls_net.get_value();
+
return make_void();
}