Fix unix networking

.gitignore

@@ -26,3 +26,4 @@ lambda_sfi.hpp
 *.tar
 *.gz
 *.tgz
+*.so

core/compression/compression.hpp

@@ -1,7 +1,8 @@
 #ifndef __LIB_MADDSUA_LAMBDA_EXTRA_COMPRESSION__
 #define __LIB_MADDSUA_LAMBDA_EXTRA_COMPRESSION__
 
-#include <stdint.h>
+#include <cstdint>
+#include <cstddef>
 #include <vector>
 
 namespace Lambda::Compress {

core/network/sysnetw.hpp

@@ -16,8 +16,6 @@
 		#include <ws2tcpip.h>
 		#include <stdexcept>
 
-		#define LNE_TIMEDOUT	WSAETIMEDOUT
-
 		inline bool wsaWakeUp() {
 
 			static bool wsaInitCalled = false;
@@ -40,7 +38,6 @@
 		#include <arpa/inet.h>
 		#include <cerrno>
 
-		#define LNE_TIMEDOUT	ETIMEDOUT
 		#define INVALID_SOCKET	(-1)
 
 		#define closesocket(socketHandle) (close(socketHandle))

core/network/tcp/connection.cpp

@@ -1,9 +1,19 @@
 #include "./connection.hpp"
 #include "../sysnetw.hpp"
 
+#include <algorithm>
+
 using namespace Lambda::Network;
 using namespace Lambda::Network::TCP;
 
+static const std::initializer_list<int> blockingEndedCodes = {
+	#ifdef _WIN32
+		WSAETIMEDOUT
+	#else
+		EAGAIN, ETIMEDOUT, EWOULDBLOCK
+	#endif
+};
+
 Connection::Connection(
 	SockHandle handleInit,
 	const ConnectionInfo& infoInit
@@ -73,10 +83,9 @@ std::vector<uint8_t> Connection::read(size_t expectedSize) {
 
 	std::lock_guard<std::mutex> lock(this->m_readMutex);
 
-	std::vector<uint8_t> chunk;
-	chunk.resize(expectedSize);
+	auto chunk = std::vector<uint8_t>(expectedSize);
 
-	auto bytesReceived = recv(this->hSocket, (char*)chunk.data(), chunk.size(), 0);
+	auto bytesReceived = recv(this->hSocket, reinterpret_cast<char*>(chunk.data()), chunk.size(), 0);
 
 	if (bytesReceived == 0) {
 
@@ -87,20 +96,20 @@ std::vector<uint8_t> Connection::read(size_t expectedSize) {
 
 		auto apiError = Errors::getApiError();
 
-		switch (apiError) {
-
-			case LNE_TIMEDOUT: {
-
-				if (this->flags.closeOnTimeout) {
-					this->end();
-				}
+		//	I could use std::any_of here,
+		//	but that syntax sugar seems out of place here
+		for (const auto code : blockingEndedCodes) {
+
+			if (apiError != code) continue;
 
-				return {};
+			if (this->flags.closeOnTimeout) {
+				this->end();
 			}
 
-			default:
-				throw Lambda::APIError(apiError, "network error while receiving data");
-		}	
+			return {};
+		}
+
+		throw Lambda::APIError(apiError, "network error while receiving data");
 	}
 
 	chunk.resize(bytesReceived);
@@ -109,18 +118,28 @@ std::vector<uint8_t> Connection::read(size_t expectedSize) {
 	return chunk;
 }
 
-void Connection::setTimeouts(uint32_t value, SetTimeoutsDirection direction) {
+void Connection::setTimeouts(uint32_t valueMs, SetTimeoutsDirection direction) {
+
+	#ifdef _WIN32
+		const auto timeoutValue = valueMs;
+	#else
+		timeval timeoutValue;
+		timeoutValue.tv_sec = valueMs / 1000;
+		timeoutValue.tv_usec = 0;
+	#endif
+
+	const auto timeouValuePtr = reinterpret_cast<const char*>(&timeoutValue);
 
 	if (direction != SetTimeoutsDirection::Receive) {
-		if (setsockopt(hSocket, SOL_SOCKET, SO_SNDTIMEO, (const char*)&value, sizeof(value)))
+		if (setsockopt(hSocket, SOL_SOCKET, SO_SNDTIMEO, timeouValuePtr, sizeof(timeoutValue)))
 			throw Lambda::APIError("failed to set socket TX timeout");
-		this->m_info.timeouts.send = value;
+		this->m_info.timeouts.send = valueMs;
 	}
 
 	if (direction != SetTimeoutsDirection::Send) {
-		if (setsockopt(hSocket, SOL_SOCKET, SO_RCVTIMEO, (const char*)&value, sizeof(value)))
+		if (setsockopt(hSocket, SOL_SOCKET, SO_RCVTIMEO, timeouValuePtr, sizeof(timeoutValue)))
 			throw Lambda::APIError("failed to set socket RX timeout");
-		this->m_info.timeouts.receive = value;
+		this->m_info.timeouts.receive = valueMs;
 	}
 }
 

core/network/tcp/connection.hpp

@@ -33,8 +33,8 @@ namespace Lambda::Network::TCP {
 			void end() noexcept;
 			bool active() const noexcept;
 
-			void setTimeouts(uint32_t value, SetTimeoutsDirection direction);
-			void setTimeouts(uint32_t value);
+			void setTimeouts(uint32_t valueMs, SetTimeoutsDirection direction);
+			void setTimeouts(uint32_t valueMs);
 
 			static const uint32_t TimeoutMs = 15000;
 			static const uint32_t ReadChunkSize = 2048;

core/polyfill/polyfill.hpp

@@ -4,6 +4,7 @@
 #include <vector>
 #include <string>
 #include <cstring>
+#include <ctime>
 
 namespace Lambda {
 

core/server/instance.cpp

@@ -109,7 +109,9 @@ void LambdaInstance::start() {
 		}
 	});
 
-	syncout.log("[Service] Started server at http://localhost:" + std::to_string(this->config.service.port) + '/');
+	if (config.loglevel.startMessage) {
+		syncout.log("[Service] Started server at http://localhost:" + std::to_string(this->config.service.port) + '/');
+	}
 }
 
 void LambdaInstance::shutdownn() {

core/server/server.hpp

@@ -19,6 +19,7 @@ namespace Lambda {
 		bool connections = true;
 		bool requests = true;
 		bool timestamps = false;
+		bool startMessage = true;
 	};
 
 	enum struct ErrorResponseType {