Port code from prior PR (#1746), code cleanups

include/spdlog/details/udp_client.h

@@ -0,0 +1,85 @@
+// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+#ifdef _WIN32
+#error include udp_client-windows.h instead
+#endif
+
+// udp client helper
+#include <spdlog/common.h>
+#include <spdlog/details/os.h>
+
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <netinet/udp.h>
+
+#include <string>
+
+namespace spdlog {
+namespace details {
+class udp_client
+{
+    int socket_ = -1;
+    struct sockaddr_in sockAddr_;
+public:
+
+    bool init(const std::string &host, uint16_t port)
+    {
+        socket_ = socket(PF_INET, SOCK_DGRAM, 0);
+        if (socket_ < 0)
+        {
+            throw_spdlog_ex("error: Create Socket Failed!");
+            return false;
+        }
+
+        sockAddr_.sin_family = AF_INET;
+        sockAddr_.sin_port = htons(port);
+        inet_aton(host.c_str(), &sockAddr_.sin_addr);
+
+        memset(sockAddr_.sin_zero, 0x00, sizeof(sockAddr_.sin_zero));
+        return true;
+    }
+
+    bool is_init() const
+    {
+        return socket_ != -1;
+    }
+
+    void close()
+    {
+        if (is_init())
+        {
+            ::close(socket_);
+            socket_ = -1;
+        }
+    }
+
+    int fd() const
+    {
+        return socket_;
+    }
+
+    ~udp_client()
+    {
+        close();
+    }
+
+    // Send exactly n_bytes of the given data.
+    // On error close the connection and throw.
+    void send(const char *data, size_t n_bytes)
+    {
+        ssize_t toslen = 0;
+        socklen_t tolen = sizeof(struct sockaddr);
+        if (( toslen = sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&sockAddr_, tolen)) == -1)
+        {
+            throw_spdlog_ex("sendto(2) failed", errno);
+            close();
+        }
+    }
+};
+} // namespace details
+} // namespace spdlog

include/spdlog/details/udp_client_windows.h

@@ -0,0 +1,117 @@
+// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+// tcp client helper
+#include <spdlog/common.h>
+#include <spdlog/details/os.h>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <windows.h>
+#include <ws2tcpip.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string>
+
+#pragma comment(lib, "Ws2_32.lib")
+#pragma comment(lib, "Mswsock.lib")
+#pragma comment(lib, "AdvApi32.lib")
+
+namespace spdlog {
+namespace details {
+class udp_client
+{
+    SOCKET socket_ = INVALID_SOCKET;
+    sockaddr_in addr_ = { 0 };
+
+    static bool winsock_initialized_()
+    {
+        SOCKET s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        if (s == INVALID_SOCKET)
+        {
+            return false;
+        }
+        else
+        {
+            closesocket(s);
+            return true;
+        }
+    }
+
+    static void init_winsock_()
+    {
+        WSADATA wsaData;
+        auto rv = WSAStartup(MAKEWORD(2, 2), &wsaData);
+        if (rv != 0)
+        {
+            throw_winsock_error_("WSAStartup failed", ::WSAGetLastError());
+        }
+    }
+
+    static void throw_winsock_error_(const std::string &msg, int last_error)
+    {
+        char buf[512];
+        ::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL);
+
+        throw_spdlog_ex(fmt::format("udp_sink - {}: {}", msg, buf));
+    }
+
+public:
+    bool is_init() const
+    {
+        return socket_ != INVALID_SOCKET;
+    }
+
+    bool init(const std::string &host, uint16_t port)
+    {
+        // initialize winsock if needed
+        if (!winsock_initialized_())
+        {
+            init_winsock_();
+        }
+
+        if (is_init())
+        {
+            close();
+        }
+
+        addr_.sin_family = AF_INET;
+        addr_.sin_port = htons(port);
+        InetPton(AF_INET, TEXT(host.c_str()), &addr_.sin_addr.s_addr);
+        return true;
+    }
+
+    void close()
+    {
+        ::closesocket(socket_);
+        socket_ = INVALID_SOCKET;
+        WSACleanup();
+    }
+
+    SOCKET fd() const
+    {
+        return socket_;
+    }
+
+    ~udp_client()
+    {
+        close();
+    }
+
+    void send(const char *data, size_t n_bytes)
+    {
+        if ((sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&addr_, sizeof(struct sockaddr))) == -1)
+        {
+            throw_spdlog_ex("sendto(2) failed", errno);
+            close();
+        }
+    }
+};
+} // namespace details
+} // namespace spdlog
+
+#endif