Code cleanup

Author: elementallyXD

Makefile

@@ -1,6 +1,6 @@
 CC=g++
 CFLAGS=-Wall -Wextra -c -Wfloat-equal -Wundef -Wcast-align -Wwrite-strings -Wlogical-op -Wmissing-declarations -Wredundant-decls -Wshadow -Woverloaded-virtual
-BOOSTFLAGS=-lboost_system -lboost_thread -lpthread -pthread -lboost_program_options -std=c++14
+BOOSTFLAGS=-lboost_system -lboost_thread -lpthread -std=c++14
 
 EXECUTABLE_S=server
 EXECUTABLE_C=client

main_client.cpp

@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
         /*EXIT*/
         //return 0;
     }
-    catch (std::exception& e)
+    catch (const std::exception& e)
     {
         std::cerr << "CLIENT> Exception: " << e.what() << "\n";
     }

main_server.cpp

@@ -7,9 +7,7 @@ using namespace cli;
 
 int main(void)
 {
-    try
-    {
-        boost::asio::io_context io_context;
+        boost::asio::io_service io_service;
         unsigned int port;
         bool set_port = false;
 
@@ -20,14 +18,21 @@ int main(void)
             { 
                 if (set_port) 
                 {
-                    server s(io_context, port);
-                    std::cout << "\tSERVER STARTED ON " << port << std::endl;
-                    if(io_context.stopped())
-                        io_context.restart();
-                    io_context.run();
+                    try
+                    {
+                        server s(io_service, port);
+                        std::cout << "\tSERVER STARTED ON " << port << std::endl;
+                        if(io_service.stopped())
+                            io_service.restart();
+                        io_service.run();
+                    }
+                    catch (const std::exception& e)
+                    {
+                        std::cerr << "SERVER> Exception: " << e.what() << "\n";
+                    }
                 }
                 else {
-                    out << "You must set port for server. Use: \"setPort <value>\"" << "\n";
+                    out << "You must set port for server. Use: \"setPort <int>\"" << "\n";
                 }
             },
             "Start server");
@@ -54,9 +59,16 @@ int main(void)
             [&](std::ostream& out) 
             { 
                 if (set_port){
-                    if (!io_context.stopped())
-                        io_context.stop();
-                    out << "\tSTOPED ON PORT " << port << std::endl;
+                    try
+                    {
+                        if (!io_service.stopped())
+                            io_service.stop();
+                        out << "\tSTOPED ON PORT " << port << std::endl;
+                    }
+                    catch (const std::exception& e)
+                    {
+                        std::cerr << "SERVER> Exception: " << e.what() << "\n";
+                    }
                 }
                 else {
                     out << "You don't specify the port or don't start the server." << "\n";
@@ -65,21 +77,16 @@ int main(void)
             "Stop server");
 
         Cli cli(std::move(rootMenu));
-        cli.ExitAction([&io_context](auto& out) 
+        cli.ExitAction([&io_service](auto& out)
         { 
-            if (!io_context.stopped())
-                io_context.stop();
+            if (!io_service.stopped())
+                io_service.stop();
 
             out << "\tEXIT. Goodbye!\n"; 
         });
 
         CliFileSession input(cli);
         input.Start();
-    }
-    catch (std::exception& e)
-    {
-        std::cerr << "SERVER> Exception: " << e.what() << "\n";
-    }
 
     return 0;
 }

server.h

@@ -1,8 +1,6 @@
 #pragma once
-#include <cstdlib>
+
 #include <iostream>
-#include <memory>
-#include <utility>
 #include <boost/asio.hpp>
 
 using boost::asio::ip::tcp;
@@ -48,9 +46,9 @@ class session : public std::enable_shared_from_this<session>
 class server
 {
 public:
-    server(boost::asio::io_context& io_context, const unsigned int port) : 
+    server(boost::asio::io_service& io_service, const unsigned int port) :
         ep(tcp::v4(), port),
-        acceptor_(io_context, ep),
+        acceptor_(io_service, ep),
         session_id(0)
     {
         do_accept();