lib/tcp_socket.hpp

@@ -25,8 +25,6 @@ class client;
  * Server klasa za TCP/IP soket
  * Instanca se incijalizira kada pokrećemo server
 */
-// template<typename... Args>
-
 
 class server {
     public:
@@ -34,17 +32,16 @@ class server {
     struct sockaddr_in addr;
     SSL_CTX* securefds = NULL;
 
-    server (const ushort port, const uint queue = 1000, SSL_CTX* _securefds = NULL);
+    server (const ushort port, const uint limit = 1000, SSL_CTX* _securefds = NULL);
     ~server ();
 
     // one klijent
-    client* cli = NULL;
-    // template<typename... Args>
-    void sync(const uint timeout = 100, void (*func)(Args ...vars));   
+    client* cli;
+    void accept(const uint timeout = 100);   
 
-    // vector<thread> thr;
-    // vector<client*> clis;
-    // void async(const uint limit, void (*handlecli)(Args ...args) , const uint timeout = 100);
+    vector<thread> thr;
+    vector<client*> clis;
+    void asyncli(const uint limit, void (*handlecli)(client*) , const uint timeout = 100);
 
 };
 

src/tcp_socket.cpp

@@ -4,8 +4,8 @@
  * 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) {
-    securefds = _securefds;         
+server::server (const ushort port, const uint limit, SSL_CTX* _securefds) {
+    securefds = _securefds;
 
     addr.sin_family = AF_INET;
     addr.sin_addr.s_addr = INADDR_ANY;
@@ -26,42 +26,33 @@ server::server (const ushort port, const uint queue, SSL_CTX* _securefds) {
         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 ");
     }
 
 }
 
-template<typename... Args>
-void server::sync(const uint timeout, void (*func)(Args ...vars)) {
-    do {
-        if (cli != NULL) {
-            cli->~client();
-            cli = NULL;
-        }
-        cli = new client(this, timeout, securefds);
-        // callback
-        func();
-    } while (true);
+void server::accept(const uint timeout) {
+    cli = new client(this, timeout, securefds);
 }
 
-// template<typename... Args>
-// void server::async(const uint limit, void (*handlecli)(Args ...args), const uint timeout) {
-//     do {
-//         for (uint i=0; i<limit; i++) {
-//             clis.push_back(new client(this, timeout, securefds));
-//             thr.push_back(thread(handlecli, args...));
-//         }
 
-//         for (uint i=0; i<limit; i++) {
-//             thr[i].join();
-//             clis[i]->~client();
-//         }
-//         thr.clear();
-//         clis.clear();
+void server::asyncli(const uint limit, void (*handlecli)(client*), const uint timeout) {
+    do {
+        thr.clear();
+        clis.clear();
+        for (uint i=0; i<limit; i++) {
+            clis.push_back(new client(this, timeout, securefds));
+            thr.push_back(thread(handlecli, clis[clis.size()-1]));
+        }
 
-//     } while (true);
-// }
+        for (uint i=0; i<limit; i++) {
+            thr[i].join();
+            clis[i]->~client();
+        }
+
+    } while (true);
+}
 
 
 /**

test/server.cpp

@@ -41,13 +41,7 @@ int main() {
 
 
         server myserver(5000, 100);
-        // myserver.async(8, [](client *cli) {
-        //     cout << "Klijent " << cli->ipv4 << endl;
-        //     string fromclient = cli->pull();
-        //     cout << "S klijenta " << fromclient << endl;
-        //     cli->push(fromclient);
-        // }, 200);
-        myserver.sync(8, [](client *cli) {
+        myserver.asyncli(8, [](client *cli) {
             cout << "Klijent " << cli->ipv4 << endl;
             string fromclient = cli->pull();
             cout << "S klijenta " << fromclient << endl;