From 3a95041815774b57def321264041282f6cb7d60a Mon Sep 17 00:00:00 2001 From: whaffman Date: Tue, 14 Oct 2025 18:47:09 +0200 Subject: [PATCH] formating --- webserv/client/Client.cpp | 1 + webserv/client/Client.hpp | 5 ++--- webserv/main.cpp | 1 + webserv/server/Server.cpp | 4 ++-- webserv/server/Server.hpp | 5 +++-- webserv/socket/ASocket.cpp | 14 ++++++++++---- webserv/socket/CGISocket.cpp | 4 +++- webserv/socket/CGISocket.hpp | 2 +- webserv/socket/ClientSocket.cpp | 4 +++- webserv/socket/ClientSocket.hpp | 2 +- webserv/socket/ServerSocket.cpp | 21 ++++++++++----------- webserv/socket/ServerSocket.hpp | 2 +- 12 files changed, 38 insertions(+), 27 deletions(-) diff --git a/webserv/client/Client.cpp b/webserv/client/Client.cpp index 0123762..1e1ac5b 100644 --- a/webserv/client/Client.cpp +++ b/webserv/client/Client.cpp @@ -1,4 +1,5 @@ #include + #include // for HttpHeaders #include // for Log, LOCATION #include // for Router diff --git a/webserv/client/Client.hpp b/webserv/client/Client.hpp index 7ac63ca..32b6622 100644 --- a/webserv/client/Client.hpp +++ b/webserv/client/Client.hpp @@ -2,14 +2,13 @@ // #include -#include "webserv/socket/ClientSocket.hpp" - #include // for ServerConfig #include // for OK #include // for HttpRequest #include // for HttpResponse #include -#include // for Socket +#include // for ClientSocket +#include #include // for size_t #include // for uint8_t diff --git a/webserv/main.cpp b/webserv/main.cpp index b45db68..5e8c4d5 100644 --- a/webserv/main.cpp +++ b/webserv/main.cpp @@ -6,6 +6,7 @@ #include // for ios_base #include // for allocator, basic_string, char_traits, operator+, string +#include // for vector int main(int argc, char **argv) { diff --git a/webserv/server/Server.cpp b/webserv/server/Server.cpp index 07dfb96..b1e6e85 100644 --- a/webserv/server/Server.cpp +++ b/webserv/server/Server.cpp @@ -1,10 +1,10 @@ -#include "webserv/socket/ASocket.hpp" +#include #include // for Client #include // for ConfigManager #include // for ServerConfig #include // for Log, LOCATION -#include +#include #include // for ClientSocket #include // for ServerSocket diff --git a/webserv/server/Server.hpp b/webserv/server/Server.hpp index 7bf2c03..034ce73 100644 --- a/webserv/server/Server.hpp +++ b/webserv/server/Server.hpp @@ -1,11 +1,10 @@ #pragma once -#include "webserv/socket/ASocket.hpp" - #include #include #include // for ServerConfig #include // for Router +#include #include // for ServerSocket #include // for uint32_t @@ -17,6 +16,8 @@ class Client; class ConfigManager; class ServerConfig; +class ASocket; +class ServerSocket; class Server { diff --git a/webserv/socket/ASocket.cpp b/webserv/socket/ASocket.cpp index 0e4d6ff..36334a6 100644 --- a/webserv/socket/ASocket.cpp +++ b/webserv/socket/ASocket.cpp @@ -1,9 +1,15 @@ -#include // for Log, LOCATION #include -#include // For fcntl() -#include -#include // For close() +#include // for Log, LOCATION + +#include // for runtime_error +#include // for basic_string +#include // for generic_category, system_error + +#include // for errno +#include // for fcntl, F_SETFL, O_NONBLOCK +#include // for recv, send +#include // for close ASocket::ASocket(int fd) : fd_(fd) { diff --git a/webserv/socket/CGISocket.cpp b/webserv/socket/CGISocket.cpp index 2daa441..89da2b6 100644 --- a/webserv/socket/CGISocket.cpp +++ b/webserv/socket/CGISocket.cpp @@ -1,6 +1,8 @@ -#include #include +#include // for LOCATION, Log +#include // for ASocket + CGISocket::CGISocket(int fd) : ASocket(fd) { Log::trace(LOCATION); diff --git a/webserv/socket/CGISocket.hpp b/webserv/socket/CGISocket.hpp index 6f18b80..4b01334 100644 --- a/webserv/socket/CGISocket.hpp +++ b/webserv/socket/CGISocket.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include // for ASocket #include #include diff --git a/webserv/socket/ClientSocket.cpp b/webserv/socket/ClientSocket.cpp index 48a6a65..f7669ed 100644 --- a/webserv/socket/ClientSocket.cpp +++ b/webserv/socket/ClientSocket.cpp @@ -1,6 +1,8 @@ -#include #include +#include // for LOCATION, Log +#include // for ASocket + ClientSocket::ClientSocket(int fd) : ASocket(fd) { Log::trace(LOCATION); diff --git a/webserv/socket/ClientSocket.hpp b/webserv/socket/ClientSocket.hpp index 2506ea0..e27b7ed 100644 --- a/webserv/socket/ClientSocket.hpp +++ b/webserv/socket/ClientSocket.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include // for ASocket #include #include diff --git a/webserv/socket/ServerSocket.cpp b/webserv/socket/ServerSocket.cpp index 7d6d414..50aef59 100644 --- a/webserv/socket/ServerSocket.cpp +++ b/webserv/socket/ServerSocket.cpp @@ -1,17 +1,16 @@ -#include "webserv/socket/ASocket.hpp" -#include "webserv/socket/ClientSocket.hpp" - -#include #include -#include -#include +#include // for Log, LOCATION +#include // for ASocket +#include // for ClientSocket -#include // For inet_addr -#include // For fcntl()" -#include // For sockaddr_in -#include -#include // For close() +#include // for allocator, make_unique, unique_ptr +#include // for runtime_error + +#include // for htons, inet_addr +#include // for sockaddr_in, in_addr +#include // for AF_INET, accept, bind, listen, setsockopt, socket, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR +#include // for close ServerSocket::ServerSocket() : ASocket(socket(AF_INET, SOCK_STREAM, 0)) { diff --git a/webserv/socket/ServerSocket.hpp b/webserv/socket/ServerSocket.hpp index 311a161..69af39f 100644 --- a/webserv/socket/ServerSocket.hpp +++ b/webserv/socket/ServerSocket.hpp @@ -1,7 +1,7 @@ #pragma once -#include "webserv/socket/ClientSocket.hpp" #include +#include #include // for unique_ptr #include // for string