Implemented message numbers search on server-side

Author: drclaws

client/MainConsole.cpp

@@ -139,7 +139,7 @@ namespace simpleApp
                     switch (currentState)
                     {
                     case console_state::msg_input:
-                        /* code */
+                        
                         break;
 
                     default:

server/SessionTcp.cpp

@@ -89,11 +89,11 @@ namespace simpleApp
             return session_result(session_status::proceed_wrong_header);
         }
 
-        uint8_t buff[MESSAGE_MAX_BUFFER];
+        char buff[MESSAGE_MAX_BUFFER - sizeof(msg_headers)];
 
-        auto sendLen = proceedMsg(buffer, len, buff);
+        auto sendLen = proceedMsg(reinterpret_cast<char*>(buffer + static_cast<ptrdiff_t>(sizeof(msg_headers))), len - sizeof(msg_headers), buff);
 
-        if (send(this->_socket, buff, sendLen, 0) == -1)
+        if (this->sendMessage(msg_headers::server_msg, buff, sendLen) == -1)
             return session_result(session_status::proceed_send_fail, errno);
 
         return session_result(session_status::proceed_msg_send);

server/SessionUdp.cpp

@@ -256,11 +256,11 @@ namespace simpleApp
                 }
             else if (header == msg_headers::client_msg)
             {
-                uint8_t buff[MESSAGE_MAX_BUFFER];
-                    
-                auto sendLen = proceedMsg(msgBuff, len, buff);
-
-                if (send(this->_socket, buff, sendLen, 0) == -1)
+                char buff[MESSAGE_MAX_BUFFER - sizeof(msg_headers)];
+                
+                auto sendLen = proceedMsg(reinterpret_cast<char*>(msgBuff + static_cast<ptrdiff_t>(sizeof(msg_headers))), len - sizeof(msg_headers), buff);
+                
+                if (this->sendMessage(msg_headers::server_msg, buff, sendLen) == -1)
                     return session_result(session_status::proceed_send_fail, errno);
                 return session_result(session_status::proceed_msg_send);
             }

server/message.cpp

@@ -2,22 +2,38 @@
 
 #include <string>
 #include <cstring>
+#include <regex>
 
 #include <simple_lib/common.h>
 
 namespace simpleApp
 {
-    size_t proceedMsg(uint8_t* in, size_t len, uint8_t* out)
+    int proceedMsg(char* in, size_t len, char* out)
     {
-        // TODO replace this with required logic
-        const msg_headers buffHeader = msg_headers::server_msg;
-        const char* msg = "DELIVERED";
-        const size_t size = sizeof("DELIVERED");
+        auto msgReceived = std::string(in, len);
+        bool isFound = false;
+        unsigned long value = 0;
 
-        
-        std::memcpy(out, &buffHeader, sizeof(buffHeader));
-        std::memcpy(out + static_cast<ptrdiff_t>(sizeof(buffHeader)), msg, size);
+        const std::regex r("[0123456789]+");
 
-        return sizeof(buffHeader) + size;
+        for (std::sregex_iterator it = std::sregex_iterator(msgReceived.begin(), msgReceived.end(), r); 
+                it != std::sregex_iterator(); it++)
+        {
+            isFound = true;
+            std::smatch match;
+            match = *it;
+            value += std::stoi(match.str());
+        }
+        if (isFound)
+        {
+            auto line = std::to_string(value);
+            std::memcpy(out, line.c_str(), line.size());
+            return line.size();
+        }
+        else
+        {
+            std::memcpy(out, in, len);
+            return len;
+        }
     }
 }

server/message.h

@@ -5,5 +5,5 @@
 
 namespace simpleApp
 {
-    size_t proceedMsg(uint8_t* in, size_t len, uint8_t* out);
+    int proceedMsg(char* in, size_t len, char* out);
 }