Added CLI menu for client. Now the client can send a message consisting of several words.

Author: elementallyXD

client.cpp

@@ -1,29 +1,27 @@
 #include "client.h"
 
-void client::ConnectToServer(char* host, char* port) 
+void client::ConnectToServer(std::string& host, std::string& port)
 {
-	const unsigned int port_number = std::atoi(port);
-	std::cout << "CONNECT TO " << host << ":" << port_number << std::endl;
-	if (port_number > 0 && port_number < 65536) 
-	{
-		ep = boost::asio::connect(socket_, resolver.resolve(host, port));
-		std::cout << "SUCCESSFULLY CONNECTED" << std::endl;
-	}
-	else {
-		std::cout << "UNABLE TO CONNECT" << std::endl;
-		throw std::runtime_error("Error: Invalid Port. Port must be greter than 0 and less than 65536\n");
-	}
+	std::cout << "\tCONNECTING TO " << host << ":" << port << std::endl;
+	ep = boost::asio::connect(socket_, resolver.resolve(host, port));
+	std::cout << "\tSUCCESSFULLY CONNECTED" << std::endl;
 }
 
-void client::Send() 
+void client::Send(std::vector<std::string>& message)
 {
-	std::cout << "CLIENT> SEND MSG: ";
-	std::cin.getline(request, max_length);
-	
+	char* buf = request;
+	for (size_t i = 0; i < message.size(); ++i)
+	{
+		for (char c = 0; c < std::strlen(message[i].c_str()); c++)
+			*buf++ = message[i][c];
+		*buf++ = ' ';
+	}
+	*buf++ = '\0';
+
 	request_length = std::strlen(request);
 	boost::asio::write(socket_, boost::asio::buffer(request, request_length));
-	
-	std::cout << "CLIENT> MSG SEND TO " << ep.address() << ":" << ep.port() << "\tDATA: " << request << std::endl;
+
+	std::cout << "\tCLIENT MSG SEND TO " << ep.address() << ":" << ep.port() << "\tDATA: " << request << std::endl;
 }
 
 void client::GetReply()
@@ -35,7 +33,8 @@ void client::GetReply()
 		boost::asio::buffer(reply, request_length)
 	);
 
-	std::cout << "CLIENT> REPLY: ";
+	memset(request, 0, sizeof request);
+	std::cout << "\tSERVER REPLY FROM " << ep.address() << ":" << ep.port() << "\tDATA: ";
 	std::cout.write(reply, reply_length);
 	std::cout << std::endl;
 }

client.h

@@ -10,14 +10,14 @@ class client
 {
 public:
 	client() :
-		socket_(io_context),
-		resolver(io_context),
+		socket_(io_service),
+		resolver(io_service),
 		request_length(0)
 	{
 	}
 
-	void ConnectToServer(char* host, char* port);
-	void Send();
+	void ConnectToServer(std::string& host, std::string& port);
+	void Send(std::vector<std::string>& message);
 	void GetReply();
 
 	~client() noexcept
@@ -36,14 +36,14 @@ class client
 
 private:
 	enum { max_length = 1024 };
-	boost::asio::io_context io_context;
-	
+	boost::asio::io_service io_service;
+
 	tcp::socket socket_;
 	tcp::resolver resolver;
 	tcp::endpoint ep;
 
 	char request[max_length];
-	size_t request_length;	
+	size_t request_length;
 };
 
 

main_client.cpp

@@ -1,35 +1,95 @@
 #include "client.h"
 
-int main(int argc, char* argv[])
+#include <cli/cli.h>
+#include <cli/clifilesession.h>
+
+#include <boost/algorithm/string.hpp> // split
+#include <boost/lexical_cast.hpp>     // lexical_cast
+
+using namespace cli;
+
+int main(void)
 {
-    try
-    {
-        if (argc != 3)
+    client client;
+    auto rootMenu = std::make_unique< Menu >("CLIENT");
+
+    rootMenu->Insert(
+        "connect",
+        [&](std::ostream& out, std::string host_port)
+        {
+            if (host_port != "")
+            {
+                try
+                {
+                    std::vector<std::string> result_vect;
+                    boost::split(result_vect, host_port, boost::is_any_of(":"));
+
+                    if (result_vect.size() == 2)
+                    {
+                        int port = boost::lexical_cast<int>(result_vect[1].c_str());
+                        if (port > 0 && port < 65536)
+                        {
+                            client.ConnectToServer(
+                                result_vect[0],    // host
+                                result_vect[1]     // port
+                            );
+                            //flag connected or not
+                        }
+                        else
+                        {
+                            std::cout << "\tUNABLE TO CONNECT" << std::endl;
+                            throw std::runtime_error("\tError: Invalid Port. Port must be greter than 0 and less than 65536\n");
+                        }
+                    }
+                    else
+                    {
+                        out << "\tConnect string wrong! Use: \"connect <string>\"" << std::endl;
+                    }
+                }
+                catch (const std::exception& ex)
+                {
+                    out << "CLIENT> Connect exception: " << ex.what() << "\n";
+                }
+            }
+            else
+            {
+                out << "\tConnect string must be not empty! Use: \"connect <string>\"" << std::endl;
+            }
+        },
+        "Connect to Server");
+
+    rootMenu->Insert(
+        "send",
+        [&client](std::ostream& out, std::vector<std::string> msg)
         {
-            std::cerr << "CLIENT> Usage: ./client <host> <port>\n";
-            return 1;
-        }
-
-        /*HELP*/
-
-        /*CONNECT TO SERVER*/
-        client client;
-        client.ConnectToServer(
-            argv[1],    // host
-            argv[2]     // port
-        );
-
-        /*SEND*/
-        client.Send();
-        client.GetReply();
-
-        /*EXIT*/
-        //return 0;
-    }
-    catch (const std::exception& e)
-    {
-        std::cerr << "CLIENT> Exception: " << e.what() << "\n";
-    }
+            if (msg[0] != "")
+            {
+                try
+                {
+                    //flag check
+                    client.Send(msg);
+                    client.GetReply();
+                }
+                catch (const std::exception& ex)
+                {
+                    out << "CLIENT> Send exception: " << ex.what() << "\n";
+                }
+            }
+            else
+            {
+                out << "\tMessage string must be not empty! Use: \"send <string>\"" << std::endl;
+            }
+        },
+        "Send message");
+
+    Cli cli(std::move(rootMenu));
+    cli.ExitAction([](auto& out)
+        {
+            out << "\tEXIT. Goodbye!\n";
+        });
+
+    CliFileSession input(cli);
+    input.Start();
 
     return 0;
-}
+}