Final fixed.

Changed logo text of control info.
Message proceeding now understands signed numbers.
Fixed reconnection select.

Author: drclaws

client/MainConsole.cpp

@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <unistd.h>
+#include <limits>
 
 #include "SessionClient.hpp"
 #include "SessionTcp.hpp"
@@ -70,22 +71,18 @@ namespace simpleApp
                     delete currentSession;
                     currentSession = nullptr;
                 }
-                std::cout << "Select protocol: [u]dp or [t]cp" << std::endl << 
-                    " >> " << std::flush;
+                std::cout << std::endl << "Select protocol: [u]dp or [t]cp" << std::endl;
                 break;
 
             case console_state::address_input:
-                std::cout << "Input server IP-address" << std::endl <<
-                    " >> " << std::flush;
+                std::cout << std::endl << "Input server IP-address" << std::endl;
                 break;
             case console_state::connected:
-                std::cout << "Connected. Input message" << std::endl <<
-                    " >> " << std::flush;
+                std::cout << std::endl << "Connected. Input message" << std::endl;
                 break;
             }
 
-            // TODO clean stdin
-
+            std::cout << " >> " << std::flush;
             currentState = newState;
         };
 
@@ -113,8 +110,7 @@ namespace simpleApp
 
             int selectResult = select(largerFd + 1, &fd_in, 0, 0, &tv);
 
-            // TODO link with break event
-            if (selectResult == -1)
+            if (selectResult == -1 && errno != EINTR)
             {
                 std::cout << std::endl << "Select failed with code " << errno << std::endl;
                 if (currentSession != nullptr)
@@ -145,7 +141,6 @@ namespace simpleApp
                     }
                 }
 
-                // Something came to socket without request
                 if (FD_ISSET(currentSession->getSocket(), &fd_in))
                 {
                     auto result = currentSession->proceed();
@@ -189,12 +184,17 @@ namespace simpleApp
 
             if (FD_ISSET(this->breakEventFd, &fd_in))
             {
+                eventfd_t decrement = 1;
+                eventfd_read(this->breakEventFd, &decrement);
+
+                std::cout << std::endl;
+
                 if (currentState == console_state::protocol_selection)
                     isExit = true;
                 else
+                {
                     switchState(console_state::protocol_selection);
-                
-                std::cout << std::endl;
+                }
 
                 continue;
             }

client/main.cpp

@@ -21,7 +21,7 @@ void onBreak(int s)
 
 int main(int argc, char** argv)
 {
-    std::cout << "Welcome to the Simple Client! For exit press Ctrl+C" << std::endl;
+    std::cout << "Welcome to the Simple Client! Press Ctrl+C to exit or set new connection" << std::endl;
 
     if (simpleApp::set_nonblock(STDIN_FILENO) == -1)
     {

server/Server.cpp

@@ -321,7 +321,7 @@ namespace simpleApp
 
                             std::string msg = "Stop event happened";
 
-                            if (eventfd_read(this->stopEventFd, static_cast<eventfd_t *>(&decrement)) == -1)
+                            if (eventfd_read(this->stopEventFd, &decrement) == -1)
                             {
                                 msg += std::string("\nStop event decrementation failed with code ") +
                                     std::to_string(errno) + ". Server will stop anyway";

server/message.cpp

@@ -12,9 +12,9 @@ namespace simpleApp
     {
         auto msgReceived = std::string(in, len);
         bool isFound = false;
-        unsigned long value = 0;
+        int value = 0;
 
-        const std::regex r("[0123456789]+");
+        const std::regex r("(\\-|\\+)?[0123456789]+");
 
         for (std::sregex_iterator it = std::sregex_iterator(msgReceived.begin(), msgReceived.end(), r); 
                 it != std::sregex_iterator(); it++)