better non-blocking, better accept error handling

include/Socket.hpp

@@ -51,4 +51,6 @@ class Socket
 	void redirectToError(int error_code);
 	void sendData(Response &response);
 	void sendData(std::string data);
+
+	void setNonBlocking();
 };

src/Server.cpp

@@ -81,7 +81,8 @@ void Server::acceptNewConnections()
 {
 	if (!_listening_socket.states.read)
 		return;
-	while (true)
+	int max_iterations = 10;
+	while (max_iterations > 0)
 	{
 		struct sockaddr_in client_addr;
 		socklen_t addrlen = sizeof(struct sockaddr_in);
@@ -90,9 +91,14 @@ void Server::acceptNewConnections()
 		{
 			Logger::Log(LogLevel::INFO, "New client connected");
 			_sockets.emplace_back(client_fd, Socket(_config, client_fd));
+			max_iterations--;
 		}
 		else
+		{
+			if (errno != EAGAIN && errno != EWOULDBLOCK) // i believe accept is not an i/o operation
+				Logger::Log(LogLevel::ERROR, "Accept error: " + std::string(strerror(errno)));
 			break;
+		}
 	}
 }
 

src/Socket.cpp

@@ -40,13 +40,7 @@ Socket::Socket(Config &config) : _config(config)
 		}
 
 		Logger::Log(LogLevel::INFO, "Socket " + std::to_string(_socket_fd) + " connected!");
-
-		// set non-blocking
-		int flags = fcntl(_socket_fd, F_GETFL, 0);
-		if (flags == -1)
-			throw std::runtime_error("Failed to get socket " + std::to_string(_socket_fd) + " flags");
-		if (fcntl(_socket_fd, F_SETFL, flags | O_NONBLOCK) == -1)
-			throw std::runtime_error("Failed to set non-blocking mode on socket " + std::to_string(_socket_fd));
+		setNonBlocking();
 	}
 	catch(const std::exception &e)
 	{
@@ -57,6 +51,7 @@ Socket::Socket(Config &config) : _config(config)
 Socket::Socket(Config &config, int fd) : _config(config)
 {
 	_socket_fd = fd;
+	setNonBlocking();
 	Logger::Log(LogLevel::INFO, "Running Client Connection Socket " + std::to_string(_socket_fd) + "...");
 }
 
@@ -98,12 +93,10 @@ void Socket::sendData(std::string data)
 	else
 		Logger::Log(LogLevel::INFO, "Data sent!");
 }
-
 void Socket::sendData(Response &response)
 {
 	sendData(response.getRawPacket());
 }
-
 std::string Socket::receiveData()
 {
 	std::string data;
@@ -137,7 +130,6 @@ void Socket::sendRedirect(const std::string& new_url)
 	sendData(responsePacket);
 	Logger::Log(LogLevel::INFO, "Redirected client to " + new_url);
 }
-
 void Socket::redirectToError(int error_code)
 {
 	// 1. Noel's memery
@@ -234,3 +226,12 @@ void Socket::redirectToError(int error_code)
 	Logger::Log(LogLevel::INFO, "Redirecting client to " + website + " with code " + std::to_string(error_code) + ".");
 	sendRedirect(website);
 }
+
+void Socket::setNonBlocking()
+{
+	int flags = fcntl(_socket_fd, F_GETFL, 0);
+	if (flags == -1)
+		throw std::runtime_error("Failed to get socket " + std::to_string(_socket_fd) + " flags");
+	if (fcntl(_socket_fd, F_SETFL, flags | O_NONBLOCK) == -1)
+		throw std::runtime_error("Failed to set non-blocking mode on socket " + std::to_string(_socket_fd));
+}

todo.md

@@ -11,3 +11,4 @@
 - [ ] run testers and check that they run through. A
 	- not actually required but maybe it finds somethign deasastrous, evals might use them as well
 - [ ] go through eval sheet A
+- [ ] test using siege A