44
55#if defined(OS_WINDOWS)
66# include <winsock2.h>
7- # include <ws2tcpip.h> // for socklen_t
7+ # include <ws2tcpip.h> // for socklen_t
88#elif defined(OS_LINUX)
99# include <sys/socket.h>
1010# include <netinet/in.h>
@@ -69,13 +69,12 @@ export namespace CppUtils::Network
6969 class Socket
7070 {
7171 public:
72+ #if defined(OS_WINDOWS)
73+ using NativeSocket = SOCKET;
74+ #elif defined(OS_LINUX)
75+ using NativeSocket = int;
76+ #endif
7277
73- #if defined(OS_WINDOWS)
74- using NativeSocket = SOCKET;
75- #elif defined(OS_LINUX)
76- using NativeSocket = int;
77- #endif
78-
7978 enum class Domain : int
8079 {
8180 IPV4 = AF_INET,
@@ -183,7 +182,7 @@ export namespace CppUtils::Network
183182 int flags = ::fcntl(m_socket, F_GETFL, 0);
184183 if (flags == -1)
185184 throw std::runtime_error{"CppUtils::Network::Socket::isBlocking: Failed to get socket flags"};
186- return not (flags & O_NONBLOCK);
185+ return not(flags & O_NONBLOCK);
187186#endif
188187 }
189188
@@ -199,9 +198,9 @@ export namespace CppUtils::Network
199198 timeValue.tv_usec = std::chrono::duration_cast<std::chrono::microseconds>(timeout % 1s).count();
200199
201200#ifdef OS_WINDOWS
202- // TODO make implementation for windows
203- // @see https://stackoverflow.com/questions/72759272/how-to-deal-with-socket-in-select-method
204- auto result = -1;
201+ // TODO make implementation for windows
202+ // @see https://stackoverflow.com/questions/72759272/how-to-deal-with-socket-in-select-method
203+ auto result = -1;
205204#else
206205 auto result = select(m_socket + 1, &readSet, nullptr, nullptr, &timeValue);
207206#endif
@@ -214,9 +213,9 @@ export namespace CppUtils::Network
214213 inline auto setSocketOption(NativeSocket socket, int level, int option, const void* value, std::size_t valueSize) const noexcept -> bool
215214 {
216215#if defined(OS_WINDOWS)
217- return not ::setsockopt(socket, level, option, reinterpret_cast<const char*>(value), static_cast<int>(valueSize));
216+ return not::setsockopt(socket, level, option, reinterpret_cast<const char*>(value), static_cast<int>(valueSize));
218217#else
219- return not ::setsockopt(socket, level, option, value, static_cast<socklen_t>(valueSize));
218+ return not::setsockopt(socket, level, option, value, static_cast<socklen_t>(valueSize));
220219#endif
221220 }
222221
@@ -281,7 +280,7 @@ export namespace CppUtils::Network
281280 {
282281 for (auto totalSent = 0uz; totalSent < std::size(data);)
283282#ifdef OS_WINDOWS
284- if (auto bytesSent = ::send(m_socket, std::bit_cast<const char *>(std::data(data)) + totalSent, static_cast<int>(std::size(data) - totalSent), 0);
283+ if (auto bytesSent = ::send(m_socket, std::bit_cast<const char*>(std::data(data)) + totalSent, static_cast<int>(std::size(data) - totalSent), 0);
285284#else
286285 if (auto bytesSent = ::send(m_socket, std::data(data) + totalSent, std::size(data) - totalSent, 0);
287286#endif
@@ -358,7 +357,7 @@ export namespace CppUtils::Network
358357 for (auto totalBytesReceived = 0uz; totalBytesReceived < bufferSize;)
359358 {
360359#if defined(OS_WINDOWS)
361- auto bytesReceived = ::recv(m_socket, std::bit_cast<char *>(std::data(buffer)) + totalBytesReceived, static_cast<int>(bufferSize - totalBytesReceived), 0);
360+ auto bytesReceived = ::recv(m_socket, std::bit_cast<char*>(std::data(buffer)) + totalBytesReceived, static_cast<int>(bufferSize - totalBytesReceived), 0);
362361#else
363362 auto bytesReceived = ::recv(m_socket, std::data(buffer) + totalBytesReceived, bufferSize - totalBytesReceived, 0);
364363#endif
0 commit comments