.vscode/settings.json

@@ -44,8 +44,6 @@
         "stdexcept": "cpp",
         "streambuf": "cpp",
         "cinttypes": "cpp",
-        "typeinfo": "cpp",
+        "typeinfo": "cpp"
-        "thread": "cpp",
-        "chrono": "cpp"
     }
 }

.vscode/tasks.json

@@ -6,11 +6,11 @@
             "command": "/usr/bin/g++",
             "args": [
                 "-g",
-                "${fileDirname}/server.cpp",
+                "${fileDirname}/client.cpp",
                 "${fileDirname}/../src/*.cpp",
                 // "${fileDirname}../include/*/src/*.cpp",
                 "-o",
-                "${fileDirname}/server.o",
+                "${fileDirname}/client.o",
                 "-lssl",
                 "-lcrypto"
             ],

lib/ip.hpp

@@ -4,16 +4,9 @@
 #include <iostream>
 #include <string>
 #include <string.h>
-
-#if __linux__
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
-#elif _WIN32
-    // #include <sstream>
-    #include <WinSock.h>
-    #include <ws2tcpip.h>
-#endif
 
 using namespace std;
 

lib/tcp_socket.hpp

@@ -3,40 +3,16 @@
 
 #include <iostream>
 #include <string>
-#include <vector>
-#include <thread>
-#include <mutex>
 #include <string.h>
-#include <errno.h>
-#include <chrono>
-#include <stdexcept>
-
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#define SOCKET_TIMEOUT 1000;    // timeout u us
-
-#if __linux__
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
-#elif _WIN32
+#include <openssl/ssl.h>
-    #include <WinSock.h>
+#include <openssl/err.h>
-    #include <ws2tcpip.h>
-    #pragma comment(lib,"ws2_32.lib")
-    #define ushort u_short
-    #define uint u_int
-#endif
 
 #include "ip.hpp"
 
 using namespace std;
-using namespace chrono;
-
-class client;
-// class secure;
-// class server;
-
 
 /**
  * Server klasa za TCP/IP soket
@@ -45,22 +21,12 @@ class client;
 
 class server {
     public:
-    #if __linux__
     int sock;
-    #elif _WIN32
-        WSADATA wsa;
-        SOCKET sock;
-    #endif
     struct sockaddr_in addr;
-    SSL_CTX* securefds = NULL;
-    vector<thread> thr;
 
-    server (const ushort port, const uint queue = 1000, SSL_CTX* _securefds = NULL);
+    server (const ushort port, const uint limit = 1000);
     ~server ();
 
-    void sync(void (*handlecli)(client&), const uint timeout = 100);
-    void async(const uint limit, void (*handlecli)(client&), const uint timeout = 100);
-
 };
 
 /**
@@ -85,52 +51,40 @@ class secure {
 
 class client {
     public:
-    // zajedničke
+    int sock;
-    #if __linux__
-        int conn; // mijenja sock
-    #elif _WIN32
-        WSADATA wsa;
-        SOCKET conn; // mijenja sock
-    #endif
     struct sockaddr_in addr;
     SSL* ssl = NULL;
-    uint _timeout = 100; // timeout u ms
-    // server s klijentima
-    const server* srv;
-    // klijent sa serverom
-    string ipv4;
-    string ipv6;
 
-    // konstruktor za klijente bez servera
     client (const string address, const ushort port, const uint timeout = 100, SSL_CTX* securefds = NULL);
-    // konstruktor za klijente sa serverom
-    client (const server *_srv, const uint timeout = 100, SSL_CTX* securefds = NULL);
     ~client ();
-    bool push (const string msg);
+    bool tell (const string msg);
-    string pull (size_t byte_limit = 1024);
+    string obey (size_t byte_limit = 1024);
 };
 
 
-class ConnectionException : public exception {
+/**
-public:
+ * Klasa za inicijalizaciju dolaznih veza
-    ConnectionException(const string& message, const string& data, const bool& interrupted = false): message_(message), data_(data), interrupted_(interrupted) {}
+ * Definira se na serverskom tipu aplikacija i predstavlja identifikator klijenta
+*/
 
-    virtual const char* what() const noexcept {
+class comming {
-        return message_.c_str();
+    public:
-    }
+    const server *srv;
+    struct sockaddr_in addr;
+    int conn;
+    string ipv4;
+    string ipv6;
+    SSL* ssl = NULL;
 
-    const string& getData() const {
+    comming(const server *_srv, const uint timeout = 100, SSL_CTX* securefds = NULL);
-        return data_;
+    ~comming();
-    }
+    bool tell (const string msg);
+    string obey (size_t byte_limit = 1024);
 
-    const bool& isInterrupted() const {
-        return interrupted_;
-    }
 
-private:
-    string message_;
-    string data_;
-    bool interrupted_;
 };
 
+
+
+
 #endif

src/tcp_socket.cpp

@@ -4,19 +4,12 @@
  * Kontrustruktor varijable tipa server, prima port i limit za ograničenje liste klijenata na čekanju
 */
 
-server::server (const ushort port, const uint queue, SSL_CTX* _securefds) {
+server::server (const ushort port, const uint limit) {
-    securefds = _securefds;         
 
     addr.sin_family = AF_INET;
     addr.sin_addr.s_addr = INADDR_ANY;
     addr.sin_port = htons(port);
 
-    #if _WIN32
-        if (WSAStartup(MAKEWORD(2,2),&wsa) != 0) {
-            throw string("[ERROR] WSA Startup. Detail: " + to_string(WSAGetLastError()));
-        }
-    #endif
-
     sock = socket(AF_INET, SOCK_STREAM, 0); 
     if (sock <= 0) {  
         throw string("[ERROR] Unable to open TCP socket ");
@@ -24,69 +17,20 @@ server::server (const ushort port, const uint queue, SSL_CTX* _securefds) {
     }
 
     int opt=1;
-    #if __linux__
     if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt))) {
         throw string("[ERROR] Unable to set REUSEADDR or REUSEPORT on socket ");
     }
-    #elif _WIN32
-        if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt))) {
-            throw string("[ERROR] Unable to set REUSEADDR or REUSEPORT on socket ");
-        }
-    #endif
-    
 
     if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < 0) {
         throw string("[ERROR] Unable to bind socket ");
     }
 
-    if (listen(sock, queue) < 0) {
+    if (listen(sock, limit) < 0) {
         throw string("[ERROR] It is not possible to set the allowed number of waiting clients ");
     }
 
 }
 
-/**
- * Metoda za sinkroni rad s klijentima, prima pokazivač na funkciju i timeout;
- * Funkcija handlecli prima referencu tipa client - važno za definiranje funkcija koje se šalju;
- * Nije moguće proslijediti druge parametre;
-*/
-
-void server::sync(void (*handlecli)(client&), const uint timeout) {
-    do {
-        client cli(this, timeout, securefds);
-        handlecli(cli);
-    } while (true);
-}
-
-/**
- * Metoda za asinkdorni rad s klijentima, prima limit, pokazivač na funkciju i timeout;
- * Funkcija handlecli prima referencu tipa client - važno za definiranje funkcija koje se šalju;
- * Nije moguće proslijediti druge parametre;
-*/
-
-void server::async(const uint limit, void (*handlecli)(client&), const uint timeout) {
-    for (uint i=0; i<limit; i++) {
-        thr.push_back(thread([&](){
-            client *cli = new client(this, timeout, securefds);
-            while (true) {
-                try {
-                    handlecli(*cli);
-                } catch (const ConnectionException err) {
-                    if (err.isInterrupted()) {
-                        cli->~client();
-                        cli = new client(this, timeout, securefds);
-                    }                    
-                }
-            }
-        }));
-    }
-
-    for (uint i=0; i<limit; i++) {
-        thr[i].join();
-    }
-}
-
-
 /**
  * Destruktor varijable tipa server
 */
@@ -98,21 +42,10 @@ server::~server () {
         throw string("[ERROR] The socket is already closed "); 
     }
 
-    else {
+    else if (close(sock) != 0) {
-
-        #if __linux__
-            if (close(sock) != 0) {
-                throw string("[ERROR] Unable to close socket ");
-            }
-        #elif _WIN32
-            if (closesocket(sock) != 0) {
         throw string("[ERROR] Unable to close socket ");
     }
-            WSACleanup();
-        #endif
 
-
-    }
 }
 
 /**
@@ -176,16 +109,9 @@ secure::~secure () {
 */
 
 client::client(const string address, const ushort port, const uint timeout, SSL_CTX* securefds) {
-    _timeout = timeout;
-
-    #if _WIN32
-        if (WSAStartup(MAKEWORD(2,2),&wsa) != 0) {
-            throw string("[ERROR] Unable to set WinSock " + to_string(WSAGetLastError()));
-        }
-    #endif
 
-    conn = socket(AF_INET, SOCK_STREAM, 0);
+    sock = socket(AF_INET, SOCK_STREAM, 0);
-	if (conn < 0) {
+	if (sock < 0) {
         throw string("[ERROR] Unable to open TCP socket ");
 	}
 
@@ -195,31 +121,24 @@ client::client(const string address, const ushort port, const uint timeout, SSL_
 	addr.sin_addr.s_addr = inet_addr(_address.c_str());
 	addr.sin_port = htons(port);
 
-    if (connect(conn, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) != 0) {
+    if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) != 0) {
         throw string("Unable to connect to server ");
     }
 
-    #if __linux__
     struct timeval tv;
-        tv.tv_sec = 0;
+    tv.tv_sec = timeout/1000;
-        tv.tv_usec = SOCKET_TIMEOUT;
+    tv.tv_usec = (timeout%1000)*1000;
 
-        if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
+    if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
-            throw string("[ERROR] Unable to set timeout ");
-        }
-    #elif _WIN32
-        DWORD tv = timeout;
-        if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv))) {
         throw string("[ERROR] Unable to set timeout ");
     }
-    #endif
 
     if (securefds) {
         ssl = SSL_new(securefds);
         if (!ssl) {
             throw string("[ERROR] Creating SSL object ");
         }
-        SSL_set_fd(ssl, conn);
+        SSL_set_fd(ssl, sock);
 
         // Perform the SSL handshake
         if (SSL_connect(ssl) <= 0) {
@@ -231,6 +150,65 @@ client::client(const string address, const ushort port, const uint timeout, SSL_
 
 }
 
+
+/**
+ * Destruktor varijable tipa client
+*/
+
+client::~client () {
+
+    if (ssl) {
+        SSL_shutdown(ssl);
+        SSL_free(ssl);
+    }
+
+    if (sock <= 0) {
+        throw string("[ERROR] The socket is already closed "); 
+    }
+
+    else if (close(sock) != 0) {
+        throw string("[ERROR] Unable to close socket ");
+    }
+
+}
+
+/**
+ * Metoda klase client za slanje podataka preko soketa
+ * Prima string koji će biti poslan
+ * Vraća logički statu poređenja psolanih karaktera i karaktera u stringu
+*/
+
+
+bool client::tell (const string msg) {
+    size_t sended = 0;
+    if (ssl) {
+       sended = SSL_write(ssl, msg.c_str(), msg.length());
+    }
+    else {
+        sended = write(sock, msg.c_str(), msg.length());
+    }
+    return sended == msg.length();
+}
+
+/**
+ * Metoda klase client za primanje poruke preko soketa
+ * Prima dozvoljeni broj karaktera koji će primiti
+ * Vraća string primljene poruke
+*/
+
+string client::obey (size_t byte_limit) {
+   char res[byte_limit] = {0};
+
+    if (ssl) {
+        SSL_read(ssl, res, byte_limit);
+    }
+    else {
+        read(sock , res, byte_limit);
+    }
+
+    return string(res);
+}
+
 /**
  * Konstruktor varijable tipa commint
  * Prima pokazivač na inicijaliziranu varijablu tipa, port, 
@@ -239,30 +217,22 @@ client::client(const string address, const ushort port, const uint timeout, SSL_
 */
 
 
-client::client(const server *_srv, const uint timeout, SSL_CTX* securefds) {
+comming::comming(const server *_srv, const uint timeout, SSL_CTX* securefds) {
     srv = _srv;
     socklen_t len = sizeof(struct sockaddr_in);
-    _timeout = timeout;
 
     if ((conn = accept(srv->sock, (struct sockaddr *)&(srv->addr), (socklen_t*)&len)) < 0) {
         throw string("[ERROR] Unable to accept client connection ");
     }
 
-    #if __linux__
     struct timeval tv;
-        tv.tv_sec = 0;
+    tv.tv_sec = timeout/1000;
-        tv.tv_usec = SOCKET_TIMEOUT;
+    tv.tv_usec = (timeout%1000)*1000;
 
     if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval))) {
         throw string("[ERROR] Unable to set timeout ");
     }
-    #elif _WIN32
-        DWORD tv = timeout;
 
-        if (setsockopt(conn, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv))) {
-            throw string("[ERROR] Unable to set timeout ");
-        }
-    #endif
 
     if (securefds) {
         ssl = SSL_new(securefds);
@@ -289,12 +259,11 @@ client::client(const server *_srv, const uint timeout, SSL_CTX* securefds) {
 
 }
 
-
 /**
- * Destruktor varijable tipa client
+ * Destruktor varijable tipa comming
 */
 
-client::~client () {
+comming::~comming() {
 
     if (ssl) {
         SSL_shutdown(ssl);
@@ -305,105 +274,43 @@ client::~client () {
         throw string("[ERROR] The socket is already closed "); 
     }
 
-    else {
+    else if (close(conn) != 0) {
-        #if __linux__
-            if (close(conn) != 0) {
         throw string("[ERROR] Unable to close socket ");
     }
-        #elif _WIN32
-            if (closesocket(conn) != 0) {
-                throw string("[ERROR] Unable to close socket ");
-            }
-            //WSACleanup();
-        #endif
-    }
-
 }
 
 /**
- * Metoda klase client za slanje podataka preko soketa
+ * Metoda klase comming za slanje podataka preko soketa
  * Prima string koji će biti poslan
  * Vraća logički statu poređenja psolanih karaktera i karaktera u stringu
 */
 
-
+bool comming::tell (const string msg) {
-bool client::push(const string msg) {
+    ssize_t sended = 0;
-    size_t total_sent = 0;
-    size_t msg_length = msg.length();
-
-    while (total_sent < msg_length) {
-        size_t sent = 0;
-
     if (ssl) {
-            sent = SSL_write(ssl, msg.c_str() + total_sent, msg_length - total_sent);
+       sended = SSL_write(ssl, msg.c_str(), msg.length());
-        } else {
-            sent = send(conn, msg.c_str() + total_sent, msg_length - total_sent, 0);
     }
-
+    else {
-        if (sent == -1) {
+        sended = write(conn, msg.c_str(), msg.length());
-            throw string("[ERRNO] (push) - Error code: " + to_string(errno) + " Detail: " + strerror(errno));
     }
-
+    return sended == msg.length();
-        total_sent += sent;
 }
 
-    return true;
-}
 
 /**
- * Metoda klase client za primanje poruke preko soketa
+ * Metoda klase comming za primanje poruke preko soketa
  * Prima dozvoljeni broj karaktera koji će primiti
  * Vraća string primljene poruke
- * 
- * Funkcija baca izuzetke koji se moraju uhvatiti za pravilno rukovođenje vezom
- * Potrebno je i baciti dalje taj izuzetak ukoliko se koriste server async metode
- * PRILOG
- * ----------------------------------------------------------------
- *          try {
-                fromclient = cli.pull();
-            }
-            catch(const ConnectionException except) {
-                if (except.isInterrupted()) {
-                    throw except;
-                }
-                else {
-                    cout << "[EXCEPT] " << except.what() << endl;
-                    fromclient = except.getData();
-                }
-            } 
- * -----------------------------------------------------------------
- * 
 */
 
-string client::pull(size_t byte_limit) {
+string comming::obey (size_t byte_limit) {
     char res[byte_limit] = {0};
-    size_t total_received = 0;
-    auto start = high_resolution_clock::now();
-
-    while (total_received < byte_limit) {
-        ssize_t received = 0;
 
     if (ssl) {
-            received = SSL_read(ssl, res + total_received, byte_limit - total_received);
+        SSL_read(ssl, res, byte_limit);
-        } else {
-            received = recv(conn, res + total_received, byte_limit - total_received, 0);
-        }
-
-        cout << "Primljeno " << received << endl;
-
-        if (received == -1) {
-            throw ConnectionException(strerror(errno), string(res, total_received));
-        } else if (received == 0) {
-            throw ConnectionException("The socket is broken", string(res), true);
-        }
-
-        total_received += received;
-
-        auto cycle = high_resolution_clock::now();
-        if (duration_cast<milliseconds>(cycle - start).count() > _timeout) {
-            cout << "TIMEOUT" << endl;
-            throw ConnectionException("Timeout", string(res));
     }
+    else {
+        read(conn , res, byte_limit);
     }
 
     return string(res);

test/client.cpp

@@ -1,79 +1,28 @@
 #include <iostream>
-#include <string>
-#include <chrono>
 
 #include "../lib/tcp_socket.hpp"
 
 using namespace std;
-using namespace chrono;
 
 int main() {
 
     try {
 
-        // uint n = 10000;
+        secure crypto;
+        cout << "init cert " << endl;
 
-        // vector<thread> thr;
+        client myserver("127.0.0.1", 5000, 5000, crypto.fds);
-        // for (uint i=0; i<n; i++) {
-        //     thr.push_back(thread([](uint a){
-        //         client myserver("127.0.0.1", 5000, 500);
-        //         string sends = "Hello world " + to_string(a);
-        //         myserver.push(sends);
-        //         cout << myserver.pull() << endl;                
-        //     }, i));
-        // }
-
-        // for (uint i=0; i<n; i++) {
-        //     thr[i].join();
-        // } 
-
-        // secure crypto;
-        // cout << "init cert " << endl;
-
-        // client myserver("127.0.0.1", 5000, 5000, crypto.fds);
-        // client myserver("localhost", 8000, 5000, crypto.fds);
         // client myserver("localhost", 5000);
-        // cout << "init client " << endl;
+        cout << "init client " << endl;
-
-
-        // string sends = "Hello world!";
-        // cout << myserver.push(sends) << " " << sends.length() << endl;
-        // cout << "wait client " << endl;
-
-        // cout << myserver.pull();
-
-auto t1 = high_resolution_clock::now();
-            client mycli("127.0.0.1", 5000);
-            auto t2 = high_resolution_clock::now();
-            cout << "Connecting : " << duration_cast<microseconds>(t2 - t1).count() << endl;
-
 
 
-        while (true) {
+        string sends = "Hello world!";
+        cout << myserver.tell(sends) << " " << sends.length() << endl;
+        cout << "wait client " << endl;
 
+        cout << myserver.obey();
 
-            
-            
-            auto t3 = high_resolution_clock::now();
-            mycli.push("Helooo");
-            auto t4 = high_resolution_clock::now();
-            cout << "Send : " << duration_cast<microseconds>(t4 - t3).count() << endl;
-            auto t5 = high_resolution_clock::now();
-            string msg;
-            try {
-                msg = mycli.pull();
-            } catch (const ConnectionException err) {
-                cout << err.what() << endl;
-                msg = err.getData();
-            }
-            cout << msg << endl;
-            auto t6 = high_resolution_clock::now();
-            cout << "Recive : " << duration_cast<microseconds>(t6 - t5).count() << endl;
-            // break;
     }
-
-    }
-    
     catch (const string err) {
         cout << err << endl;
     }

test/compile-client.ps1

@@ -1 +0,0 @@
-g++ client.cpp ../src/* -o client.exe -lssl -lcrypto -lws2_32

test/compile-server.ps1

@@ -1 +0,0 @@
-g++ server.cpp ../src/* -o server.exe -lssl -lcrypto -lws2_32

test/server.cpp

@@ -1,45 +1,26 @@
 #include <iostream>
-#include <chrono>
-
 
 #include "../lib/tcp_socket.hpp"
 
 using namespace std;
-using namespace chrono;
-
 
 int main() {
     try{
-        // cout << "init cert " << endl;
+        cout << "init server " << endl;
-        // secure crypto ("../example/cert.pem", "../example/privkey.pem");
+        server myserver(5000);
-        // cout << "init server " << endl;
+        cout << "init cert " << endl;
-        // server myserver(5000, 100, crypto.fds);
+        secure crypto ("../example/cert.pem", "../example/privkey.pem");
-        // cout << "init cert " << endl;
+        cout << "init client " << endl;
-        // secure crypto ("../example/cert.pem", "../example/privkey.pem");
-        // cout << "init server " << endl;
-        // server myserver(8000, 100, crypto.fds);
-        
-        // cout << "init client " << endl;
 
-        // // client myclient(&myserver, 100, crypto.fds);
+        comming myclient(&myserver, 100, crypto.fds);
-        // // comming myclient(&myserver, 100);
+        // comming myclient(&myserver, 100);
-        // myserver.accept();
+        cout << "wait client " << myclient.ipv4 << endl;
-        // // cout << "wait client " << myclient.ipv4 << endl;
-        // cout << "wait client " << myserver.cli->ipv4 << endl;
 
-        // string fromclient =  myserver.cli->pull();
+        string fromclient =  myclient.obey();
-        // // string fromclient =  myclient.pull();
+        cout << "tell client " << fromclient << endl;
-        // cout << "tell client " << fromclient << endl;
-        // // usleep(600*1000);
-        // sleep(5);
-        // myserver.cli->push(fromclient);
-        // string fromclient =  myserver.cli->pull();
-        // string fromclient =  myclient.pull();
-        // cout << "tell client " << fromclient << endl;
         // usleep(600*1000);
-        //sleep(5);
+        sleep(5);
-        // myserver.cli->push(fromclient);
+        myclient.tell(fromclient);
-        // myclient.push(fromclient);
         // myclient.~comming();
 
         // while (true) {
@@ -52,46 +33,6 @@ int main() {
         // }
 
         // sleep(80);
-
-        cout << "init server " << endl;
-        server myserver(5000, 100);
-        cout << "init client " << endl;
-        myserver.async(8, [](client &cli) {
-            auto t3 = high_resolution_clock::now();
-            string fromclient;
-            try {
-                fromclient = cli.pull();
-            }
-            catch(const ConnectionException except) {
-                if (except.isInterrupted()) {
-                    throw except;
-                }
-                else {
-                    cout << "[EXCEPT] " << except.what() << endl;
-                    fromclient = except.getData();
-                }
-            } 
-            auto t4 = high_resolution_clock::now();
-            cout << "Recive : " << duration_cast<microseconds>(t4 - t3).count() << endl;
-            
-            cout << "> " << fromclient << endl;
-            auto t5 = high_resolution_clock::now();
-            cli.push(fromclient);
-             auto t6 = high_resolution_clock::now();
-            cout << "Response : " << duration_cast<microseconds>(t6 - t5).count() << endl;
-
-        });
-
-        // string teststr = " Idemooo";
-
-        // myserver.sync([](client &cli) {
-        //     cout << "Klijent " << cli.ipv4 << endl;
-        //     string fromclient = cli.pull();
-        //     cout << "S klijenta " << fromclient << endl;
-        //     // fromclient += teststr;
-        //     cli.push(fromclient);
-        // });
-
     }
     catch(const string err) {
         cout << err << endl;