diff --git a/task_5/main.cpp b/task_5/main.cpp index 262da1d..dd0eb73 100644 --- a/task_5/main.cpp +++ b/task_5/main.cpp @@ -1,8 +1,6 @@ #include "socket_up.h" #include "socket_handler.h" -const int BUFFER_SIZE = 2048; - int main() { #ifdef _WIN32 SOCKET listen_socket = SocketUp::config_socket_windows(); diff --git a/task_5/socket_handler.cpp b/task_5/socket_handler.cpp index 24ee598..1f168fd 100644 --- a/task_5/socket_handler.cpp +++ b/task_5/socket_handler.cpp @@ -10,10 +10,10 @@ const int BUFFER_SIZE = 4096; int SocketHandler::working_with_client_windows(SOCKET listen_socket) { while (1) { // 6. Принятие входящего соединения - sockaddr_in clientAddr; - int clientAddrSize = sizeof(clientAddr); - SOCKET clientSocket = accept(listen_socket, (struct sockaddr*)&clientAddr, &clientAddrSize); - if (clientSocket == INVALID_SOCKET) { + sockaddr_in client_addr; + int client_addr_size = sizeof(client_addr); + SOCKET client_socket = accept(listen_socket, (struct sockaddr*)&client_addr, &client_addr_size); + if (client_socket == INVALID_SOCKET) { std::cerr << "Accept failed with error: " << WSAGetLastError() << "\n"; continue; } @@ -21,9 +21,9 @@ int SocketHandler::working_with_client_windows(SOCKET listen_socket) { // 7. получение данных от юзера char buffer[BUFFER_SIZE] = {0}; - int bytesReceived = recv(clientSocket, buffer, BUFFER_SIZE, 0); - if (bytesReceived > 0) { - std::string request(buffer, bytesReceived); + int bytes_received = recv(client_socket, buffer, BUFFER_SIZE, 0); + if (bytes_received > 0) { + std::string request(buffer, bytes_received); std::cout << "Received request:\n" << request << "\n"; // Обработка запроса @@ -31,9 +31,9 @@ int SocketHandler::working_with_client_windows(SOCKET listen_socket) { std::cout << "Response:\n" << response << "\n\n"; // Отправка ответа - send(clientSocket, response.c_str(), response.size(), 0); + send(client_socket, response.c_str(), response.size(), 0); } - closesocket(clientSocket); + closesocket(client_socket); } return 0; } @@ -44,10 +44,10 @@ int SocketHandler::working_with_client_windows(SOCKET listen_socket) { int SocketHandler::working_with_client_unix(int listen_socket) { while (1) { // Принятие соединения - sockaddr_in clientAddr; - socklen_t clientAddrSize = sizeof(clientAddr); - int clientSocket = accept(listen_socket, (struct sockaddr*)&clientAddr, &clientAddrSize); - if (clientSocket == -1) { + sockaddr_in client_addr; + socklen_t client_addr_size = sizeof(client_addr); + int client_socket = accept(listen_socket, (struct sockaddr*)&client_addr, &client_addr_size); + if (client_socket == -1) { perror("Accept failed"); continue; } @@ -55,18 +55,18 @@ int SocketHandler::working_with_client_unix(int listen_socket) { // Чтение данных char buffer[BUFFER_SIZE] = {0}; - ssize_t bytesReceived = read(clientSocket, buffer, BUFFER_SIZE); - if (bytesReceived > 0) { - std::string request(buffer, bytesReceived); + ssize_t bytes_received = read(client_socket, buffer, BUFFER_SIZE); + if (bytes_received > 0) { + std::string request(buffer, bytes_received); std::cout << "Received request:\n" << request << "\n"; std::string response = RouteHandler::get_response_by_request(request); std::cout << "Response:\n" << response << "\n\n"; // Отправка ответа - send(clientSocket, response.c_str(), response.size(), 0); + send(client_socket, response.c_str(), response.size(), 0); } - close(clientSocket); + close(client_socket); } } diff --git a/task_5/socket_up.cpp b/task_5/socket_up.cpp index 72a361c..c90adf1 100644 --- a/task_5/socket_up.cpp +++ b/task_5/socket_up.cpp @@ -8,8 +8,8 @@ SOCKET SocketUp::config_socket_windows() { // 1. Инициализация Winsock - WSADATA wsaData; - if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) { + WSADATA wsa_data; + if (WSAStartup(MAKEWORD(2, 2), &wsa_data) != 0) { std::cerr << "WSAStartup failed with error: " << WSAGetLastError() << "\n"; return 1; } @@ -23,14 +23,14 @@ SOCKET SocketUp::config_socket_windows() { } // 3. Настройка адреса сокета - sockaddr_in serverAddr; - memset(&serverAddr, 0, sizeof(serverAddr)); - serverAddr.sin_family = AF_INET; - serverAddr.sin_port = htons(8080); // Порт для привязки - serverAddr.sin_addr.s_addr = INADDR_ANY; // Привязка к любому интерфейсу + sockaddr_in server_addr; + memset(&server_addr, 0, sizeof(server_addr)); + server_addr.sin_family = AF_INET; + server_addr.sin_port = htons(8080); // Порт для привязки + server_addr.sin_addr.s_addr = INADDR_ANY; // Привязка к любому интерфейсу // 4. Привязка сокета к адресу - if (bind(listen_socket, (struct sockaddr*)&serverAddr, sizeof(serverAddr)) == SOCKET_ERROR) { + if (bind(listen_socket, (struct sockaddr*)&server_addr, sizeof(server_addr)) == SOCKET_ERROR) { std::cerr << "Bind failed with error: " << WSAGetLastError() << "\n"; closesocket(listen_socket); WSACleanup(); @@ -48,13 +48,6 @@ SOCKET SocketUp::config_socket_windows() { return listen_socket; - - // 8. Закрытие клиентского сокета - // closesocket(clientSocket); - - // // 9. Закрытие серверного сокета и завершение Winsock - // closesocket(listen_socket); - // WSACleanup(); return 0; } @@ -68,13 +61,13 @@ int SocketUp::config_socket_unix() { } - sockaddr_in serverAddr; - memset(&serverAddr, 0, sizeof(serverAddr)); - serverAddr.sin_family = AF_INET; - serverAddr.sin_port = htons(8080); // Порт для привязки - serverAddr.sin_addr.s_addr = INADDR_ANY; // Привязка к любому интерфейсу + sockaddr_in server_addr; + memset(&server_addr, 0, sizeof(server_addr)); + server_addr.sin_family = AF_INET; + server_addr.sin_port = htons(8080); // Порт для привязки + server_addr.sin_addr.s_addr = INADDR_ANY; // Привязка к любому интерфейсу - if (bind(server_socket, (struct sockaddr*)&serverAddr, sizeof(serverAddr)) == -1) { + if (bind(server_socket, (struct sockaddr*)&server_addr, sizeof(server_addr)) == -1) { perror("Bind failed"); close(server_socket); return 1;