Client code cleanup

Author: elementallyXD

client.cpp

@@ -1,18 +1,18 @@
 #include "client.h"
 
-void client::ConnectToServer(std::string& host, std::string& port)
+void client::ConnectToServer(const std::string& host, const std::string& port)
 {
 	std::cout << "\tCONNECTING TO " << host << ":" << port << std::endl;
 	ep = boost::asio::connect(socket_, resolver.resolve(host, port));
-	std::cout << "\tSUCCESSFULLY CONNECTED" << std::endl;
+	std::cout << "\tSUCCESSFULLY CONNECTED\n" << std::endl;
 }
 
-void client::Send(std::vector<std::string>& message)
+void client::Send(const std::vector<std::string>& message)
 {
 	char* buf = request;
 	for (size_t i = 0; i < message.size(); ++i)
 	{
-		for (char c = 0; c < std::strlen(message[i].c_str()); c++)
+		for (size_t c = 0; c < std::strlen(message[i].c_str()); c++)
 			*buf++ = message[i][c];
 		*buf++ = ' ';
 	}
@@ -36,5 +36,5 @@ void client::GetReply()
 	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;
+	std::cout << std::endl << std::endl;
 }

client.h

@@ -1,6 +1,4 @@
 #pragma once
-#include <cstdlib>
-#include <cstring>
 #include <iostream>
 #include <boost/asio.hpp>
 
@@ -16,8 +14,8 @@ class client
 	{
 	}
 
-	void ConnectToServer(std::string& host, std::string& port);
-	void Send(std::vector<std::string>& message);
+	void ConnectToServer(const std::string& host, const std::string& port);
+	void Send(const std::vector<std::string>& message);
 	void GetReply();
 
 	~client() noexcept
@@ -42,7 +40,7 @@ class client
 	tcp::resolver resolver;
 	tcp::endpoint ep;
 
-	char request[max_length];
+	char request[max_length] = {0};
 	size_t request_length;
 };
 

main_client.cpp

@@ -11,13 +11,14 @@ using namespace cli;
 int main(void)
 {
     client client;
+    bool connected = false;
     auto rootMenu = std::make_unique< Menu >("CLIENT");
 
     rootMenu->Insert(
         "connect",
-        [&](std::ostream& out, std::string host_port)
+        [&](std::ostream& out, const std::string& host_port)
         {
-            if (host_port != "")
+            if (!host_port.empty())
             {
                 try
                 {
@@ -33,11 +34,11 @@ int main(void)
                                 result_vect[0],    // host
                                 result_vect[1]     // port
                             );
-                            //flag connected or not
+                            connected = true;
                         }
                         else
                         {
-                            std::cout << "\tUNABLE TO CONNECT" << std::endl;
+                            std::cout << "\tUNABLE TO CONNECT\n" << std::endl;
                             throw std::runtime_error("\tError: Invalid Port. Port must be greter than 0 and less than 65536\n");
                         }
                     }
@@ -60,15 +61,19 @@ int main(void)
 
     rootMenu->Insert(
         "send",
-        [&client](std::ostream& out, std::vector<std::string> msg)
+        [&client, &connected](std::ostream& out, const std::vector<std::string>& msg)
         {
-            if (msg[0] != "")
+            if (msg.size() > 0)
             {
                 try
                 {
-                    //flag check
-                    client.Send(msg);
-                    client.GetReply();
+                    if (connected) {
+                        client.Send(msg);
+                        client.GetReply();
+                    }
+                    else {
+                        out << "\tYou need to connect to the server! Use: \"connect <string>\"" << "\n";
+                    }
                 }
                 catch (const std::exception& ex)
                 {