Follow framework

Author: VolkerChristian

ClientContext.cpp

@@ -6,8 +6,8 @@
 #include <log/Logger.h>
 #include <string>
 
-ClientContext::ClientContext(core::socket::SocketConnection* socketConnection)
-    : core::socket::SocketContext(socketConnection)
+ClientContext::ClientContext(core::socket::stream::SocketConnection* socketConnection)
+    : core::socket::stream::SocketContext(socketConnection)
     , keyboardReader(new KeyboardReader(this, [this](std::string text) -> void {
         sendToPeer(text);
     })) {
@@ -28,7 +28,11 @@ void ClientContext::onDisconnected() {
     }
 }
 
-std::size_t ClientContext::onReceiveFromPeer() {
+bool ClientContext::onSignal(int signum) {
+    return true;
+}
+
+std::size_t ClientContext::onReceivedFromPeer() {
     char buffer[1024];
 
     std::size_t numBytesRead = readFromPeer(buffer, 1024);
@@ -42,6 +46,6 @@ void ClientContext::keyboardReaderAway() {
     keyboardReader = nullptr;
 }
 
-core::socket::SocketContext* ClientContextFactory::create(core::socket::SocketConnection* socketConnection) {
+core::socket::stream::SocketContext* ClientContextFactory::create(core::socket::stream::SocketConnection* socketConnection) {
     return new ClientContext(socketConnection);
 }

ClientContext.h

@@ -1,32 +1,34 @@
 #ifndef CLIENTCONTEXT_H
 #define CLIENTCONTEXT_H
 
-#include <core/socket/SocketContext.h>
-#include <core/socket/SocketContextFactory.h>
+#include <core/socket/stream/SocketContext.h>
+#include <core/socket/stream/SocketContextFactory.h>
 
 class KeyboardReader;
-namespace core::socket {
+namespace core::socket::stream {
     class SocketConnection;
 }
 
-class ClientContext : public core::socket::SocketContext {
+class ClientContext : public core::socket::stream::SocketContext {
 public:
-    explicit ClientContext(core::socket::SocketConnection* socketConnection);
+    explicit ClientContext(core::socket::stream::SocketConnection* socketConnection);
     ~ClientContext();
 
     void keyboardReaderAway();
 
 private:
     void onConnected() override;
     void onDisconnected() override;
-    std::size_t onReceiveFromPeer() override;
+    [[nodiscard]] bool onSignal(int signum) override;
+
+    std::size_t onReceivedFromPeer() override;
 
     KeyboardReader* keyboardReader = nullptr;
 };
 
-class ClientContextFactory : public core::socket::SocketContextFactory {
+class ClientContextFactory : public core::socket::stream::SocketContextFactory {
 private:
-    core::socket::SocketContext* create(core::socket::SocketConnection* socketConnection) override;
+    core::socket::stream::SocketContext* create(core::socket::stream::SocketConnection* socketConnection) override;
 };
 
 #endif // CLIENTCONTEXT_H

KeyboardReader.cpp

@@ -8,10 +8,14 @@
 #include <unistd.h>
 
 KeyboardReader::KeyboardReader(ClientContext* clientContext, const std::function<void(std::string)>& callBack)
-    : core::eventreceiver::ReadEventReceiver("KeyboardReader")
+    : core::eventreceiver::ReadEventReceiver("KeyboardReader", 0)
     , callBack(callBack)
     , clientContext(clientContext) {
-    enable(STDIN_FILENO);
+    if (enable(STDIN_FILENO)) {
+        std::cout << "KeyboardReader enabled";
+    } else {
+        std::cout << "KeyboardReader not enabled";
+    }
 }
 
 KeyboardReader::~KeyboardReader() {

ServerContext.cpp

@@ -5,8 +5,8 @@
 #include <iostream>
 #include <string> // for string
 
-ServerContext::ServerContext(core::socket::SocketConnection* socketConnection)
-    : core::socket::SocketContext(socketConnection) {
+ServerContext::ServerContext(core::socket::stream::SocketConnection* socketConnection)
+    : core::socket::stream::SocketContext(socketConnection) {
 }
 
 void ServerContext::onConnected() {
@@ -19,7 +19,11 @@ void ServerContext::onDisconnected() {
     ChatApp::instance().removeServerContext(this);
 }
 
-std::size_t ServerContext::onReceiveFromPeer() {
+bool ServerContext::onSignal(int signum) {
+    return true;
+}
+
+std::size_t ServerContext::onReceivedFromPeer() {
     char buffer[1024];
 
     std::size_t numBytesRead = readFromPeer(buffer, 1023);
@@ -32,6 +36,6 @@ std::size_t ServerContext::onReceiveFromPeer() {
     return numBytesRead;
 }
 
-core::socket::SocketContext* ServerContextFactory::create(core::socket::SocketConnection* socketConnection) {
+core::socket::stream::SocketContext* ServerContextFactory::create(core::socket::stream::SocketConnection* socketConnection) {
     return new ServerContext(socketConnection);
 }

ServerContext.h

@@ -1,29 +1,29 @@
 #ifndef SERVERCONTEXT_H
 #define SERVERCONTEXT_H
 
-#include <core/socket/SocketContext.h> // IWYU pragma: export
-#include <core/socket/SocketContextFactory.h>
+#include <core/socket/stream/SocketContext.h> // IWYU pragma: export
+#include <core/socket/stream/SocketContextFactory.h>
 
 // IWYU pragma: no_include <SocketContext.h>
 
 namespace core::socket {
     class SocketConnection;
 }
 
-class ServerContext : public core::socket::SocketContext {
+class ServerContext : public core::socket::stream::SocketContext {
 public:
-    explicit ServerContext(core::socket::SocketConnection* socketConnection);
+    explicit ServerContext(core::socket::stream::SocketConnection* socketConnection);
 
 private:
     void onConnected() override;
-
     void onDisconnected() override;
+    [[nodiscard]] bool onSignal(int signum) override;
 
-    std::size_t onReceiveFromPeer() override;
+    std::size_t onReceivedFromPeer() override;
 };
 
-class ServerContextFactory : public core::socket::SocketContextFactory {
-    core::socket::SocketContext* create(core::socket::SocketConnection* socketConnection);
+class ServerContextFactory : public core::socket::stream::SocketContextFactory {
+    core::socket::stream::SocketContext* create(core::socket::stream::SocketConnection* socketConnection);
 };
 
 #endif // SERVERCONTEXT_H

client.cpp

@@ -33,12 +33,6 @@ int main(int argc, char* argv[]) {
     using ClientTLS = net::in::stream::tls::SocketClient<ClientContextFactory>;
     using SocketConnectionTLS = ClientTLS::SocketConnection;
 
-    std::map<std::string, std::any> options;
-    options["CertChain"] = "/home/voc/projects/ServerClient/Client-End-Entity.pem";
-    options["CertChainKey"] = "/home/voc/projects/ServerClient/Client-End-Entity-Key.pem";
-    options["Password"] = "pentium5";
-    options["CaFile"] = "/home/voc/projects/ServerClient/VolkerChristianRootCA.pem";
-
     ClientTLS clienttls(
         [](SocketConnectionTLS* socketConnection) -> void {
             VLOG(0) << "OnConnect from: " << socketConnection->getRemoteAddress().toString();
@@ -48,8 +42,13 @@ int main(int argc, char* argv[]) {
         },
         [](SocketConnectionTLS* socketConnection) -> void {
             VLOG(0) << "OnDisconnect from: " << socketConnection->getRemoteAddress().toString();
-        },
-        options);
+        });
+
+    clienttls.getConfig()
+        .setCertChain("/home/voc/projects/ServerClient/Client-End-Entity.pem")
+        .setCertKey("/home/voc/projects/ServerClient/Client-End-Entity-Key.pem")
+        .setCertKeyPassword("pentium5")
+        .setCaCertFile("/home/voc/projects/ServerClient/VolkerChristianRootCA.pem");
 
     clienttls.connect("localhost", 8082, [](const ClientTLS::SocketAddress& socketAddress, int errnum) -> void {
         if (errnum < 0) {

server.cpp

@@ -37,12 +37,6 @@ int main(int argc, char* argv[]) {
     using ServerTLS = net::in::stream::tls::SocketServer<ServerContextFactory>;
     using SocketConnectionTLS = net::in::stream::tls::SocketServer<ServerContextFactory>::SocketConnection;
 
-    std::map<std::string, std::any> options;
-    options["CertChain"] = "/home/voc/projects/ServerClient/WebServerCertificateChain.pem";
-    options["CertChainKey"] = "/home/voc/projects/ServerClient/Volker_Christian_-_WEB-Cert.pem";
-    options["Password"] = "pentium5";
-    options["CaFile"] = "/home/voc/projects/ServerClient/Client-Root-CA.crt";
-
     ServerTLS servertls(
         [](SocketConnectionTLS* socketConnection) -> void {
             VLOG(0) << "OnConnect from: " << socketConnection->getRemoteAddress().toString();
@@ -52,8 +46,13 @@ int main(int argc, char* argv[]) {
         },
         [](SocketConnectionTLS* socketConnection) -> void {
             VLOG(0) << "OnDisconnect from: " << socketConnection->getRemoteAddress().toString();
-        },
-        options);
+        });
+
+    servertls.getConfig()
+        .setCertChain("/home/voc/projects/ServerClient/WebServerCertificateChain.pem")
+        .setCertKey("/home/voc/projects/ServerClient/Volker_Christian_-_WEB-Cert.pem")
+        .setCertKeyPassword("pentium5")
+        .setCaCertFile("/home/voc/projects/ServerClient/Client-Root-CA.crt");
 
     servertls.listen(8082, 5, [](const ServerTLS::SocketAddress& socketAddress, int errnum) -> void {
         if (errnum < 0) {
@@ -79,7 +78,7 @@ int main(int argc, char* argv[]) {
             VLOG(0) << "OnDisconnect from: " << socketConnection->getRemoteAddress().toString();
         });
 
-    server6.listen(8081, 5, [](const Server6::SocketAddress& socketAddress, int errnum) -> void {
+    server6.listen(8081, 5, [](const Server6::SocketAddress& socketAddress, core::socket::State errnum) -> void {
         if (errnum < 0) {
             PLOG(ERROR) << "OnError";
         } else if (errnum > 0) {
@@ -103,7 +102,7 @@ int main(int argc, char* argv[]) {
             VLOG(0) << "OnDisconnect from: " << socketConnection->getRemoteAddress().toString();
         });
 
-    serverUn.listen("/tmp/testsocket", 5, [](const SocketConnectionUn::SocketAddress& socketAddress, int errnum) -> void {
+    serverUn.listen("/tmp/testsocket", 5, [](const ServerUn::SocketAddress& socketAddress, core::socket::State errnum) -> void {
         if (errnum < 0) {
             PLOG(ERROR) << "OnError";
         } else if (errnum > 0) {