Change structure of code base

include/maze.hpp

@@ -30,9 +30,5 @@ class Maze{
         bool is_wall(int, int) const;
 
         void set_moves_left(int);
-        
-		//void generate_maze();
-		//void print_maze_info();
-        //void play_game();
 };
 #endif

include/server.hpp

@@ -16,11 +16,12 @@ const int MAX_CLIENTS = 512;
 class Server {
 private:
     bool service_mode;
+    int server_fd;
     void handle_client(int client_socket, bool _mode); // Принимает клиентский сокет
     bool check_status(Maze& maze);
 public:
-    Server() : service_mode(false){};
+    Server(const std::string& h = "localhost", const unsigned short p = 1024u, bool service_mode = false);
-    void start(const std::string& h = "localhost", const unsigned short p = 1024u); // Запуск сервера
+    void start(); // Запуск сервера
 };
 
 #endif

src/client/client.cpp

@@ -31,7 +31,7 @@ void Client::run(const std::string& h, const unsigned short p) {
     if (host_name == nullptr) {
         throw std::runtime_error("Error in gethostbyname");
     }
-
+    
     serv_addr.sin_port = htons(p);
     memcpy(&serv_addr.sin_addr.s_addr, host_name->h_addr, host_name->h_length);
 
@@ -44,9 +44,10 @@ void Client::run(const std::string& h, const unsigned short p) {
     std::string player_name;
     std::getline(std::cin, player_name);
 
-    if (ping(serv_addr)) {
+    if (!ping(serv_addr)) {
         throw std::runtime_error("Connection lost!");
     }
+
     // Отправка имени игрока на сервер
     send(sock, player_name.c_str(), player_name.size(), 0);
 }

src/server/server.cpp

@@ -1,5 +1,28 @@
 #include "server.hpp"
 
+Server::Server(const std::string& h, const unsigned short p, bool service_mode){
+    // Создание сокета.
+    server_fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (server_fd < 0) {
+        throw std::runtime_error("[MultiprocessEchoServer::MultiprocessEchoServer] socket(2) call error");
+    }
+    // Подготовка сетевого адреса для связывания.
+    sockaddr_in server_address;
+    memset(reinterpret_cast<char*>(&server_address), '\0', sizeof(server_address));
+    server_address.sin_family = AF_INET;
+    hostent* host_name;
+    host_name = gethostbyname(h.c_str()); // Преобразование названия хоста в IP-адрес.
+    if (host_name == nullptr) {
+        throw std::runtime_error("[MultiprocessEchoServer::MultiprocessEchoServer] gethostbyname(3) call error");
+    }
+    server_address.sin_port = htons(p);
+    memcpy(&server_address.sin_addr.s_addr, host_name->h_addr, host_name->h_length);
+    if (bind(server_fd, reinterpret_cast<const sockaddr*>(&server_address), sizeof(server_address)) != 0) {
+        throw std::runtime_error("[MultiprocessEchoServer::MultiprocessEchoServer] bind(2) call error");
+    }
+    std::cout << "Сервер запущен на хосте " << h << " на порту " << p << std::endl;
+}
+
 bool Server::check_status(Maze &maze) {
     return (!maze.test_mode && maze.get_moves_left() > 0);
 }
@@ -104,36 +127,18 @@ void Server::handle_client(int client_socket, bool mode) {
     std::cout << "Игрок " << player_name << " отключился.\n";
 }
 
-void Server::start(const std::string& h, const unsigned short p) {
+void Server::start() {
-    int server_fd, new_socket;
+    int new_socket;
-    struct sockaddr_in address;
-
-    if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) == 0) {
-        throw std::runtime_error("Error in socket");
-    }
-
-    address.sin_family = AF_INET;
-    hostent* host_name;
-    host_name = gethostbyname(h.c_str()); // Преобразование названия хоста в IP-адрес.
-    if (host_name == nullptr) {
-        throw std::runtime_error("Error in gethostbyname");
-    }
-    address.sin_port = htons(p);
-    memcpy(&address.sin_addr.s_addr, host_name->h_addr, host_name->h_length);
-
-    if (bind(server_fd, (struct sockaddr*)&address, sizeof(address)) != 0) {
-        throw std::runtime_error("Error in bind");
-    }
 
     if (listen(server_fd, MAX_CLIENTS) < 0) {
         throw std::runtime_error("Error in listen");
     }
 
-    std::cout << "Сервер запущен на хосте " << h << " на порту " << p << std::endl;
+    sockaddr address;
-
     int addrlen = sizeof(address);
+    socklen_t address_size = sizeof(address);
     while (true) {
-        if ((new_socket = accept(server_fd, (struct sockaddr*)&address, (socklen_t*)&addrlen)) < 0) {
+        if ((new_socket = accept(server_fd, (struct sockaddr*)&address, &address_size)) < 0) {
             throw std::runtime_error("Error in accept");
         }
 

src/server/server_main.cpp

@@ -3,9 +3,10 @@
 int main(int argc, char **argv) {
     int opt;
     std::string host = "localhost";
+    bool service_mode = false;
     short unsigned port = 1024u;
 
-    while ((opt = getopt(argc, argv, "h:p:")) != -1) {
+    while ((opt = getopt(argc, argv, "h:p:s:")) != -1) {
         switch (opt) {
             case 'h':
                 host = optarg;
@@ -13,14 +14,16 @@ int main(int argc, char **argv) {
             case 'p':
                 port = static_cast<unsigned short>(atoi(optarg));
                 break;
+            case 's':
+                service_mode = true;
             default:
                 break;
         }
     }
 
     try {
-        Server server;
+        Server server(host, port, service_mode);
-        server.start(host, port);
+        server.start();
     } catch (const std::runtime_error& e){
         std::cerr << "Client application error: " << e.what() << std::endl;
         return 1;