From e57360c9698444a6ad2f6aeb746620ef2328ce56 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 20 Sep 2020 21:49:25 +0100 Subject: [PATCH] Make Windows work. --- P25Gateway/P25Gateway.cpp | 2 ++ P25Gateway/UDPSocket.cpp | 26 ++++++++++++++------------ P25Gateway/UDPSocket.h | 4 ++++ P25Parrot/P25Parrot.cpp | 4 +++- P25Parrot/UDPSocket.cpp | 26 ++++++++++++++------------ P25Parrot/UDPSocket.h | 4 ++++ P25Reflector/P25Reflector.cpp | 2 ++ P25Reflector/UDPSocket.cpp | 26 ++++++++++++++------------ P25Reflector/UDPSocket.h | 4 ++++ 9 files changed, 61 insertions(+), 37 deletions(-) diff --git a/P25Gateway/P25Gateway.cpp b/P25Gateway/P25Gateway.cpp index 6029836..5431353 100644 --- a/P25Gateway/P25Gateway.cpp +++ b/P25Gateway/P25Gateway.cpp @@ -85,10 +85,12 @@ int main(int argc, char** argv) CP25Gateway::CP25Gateway(const std::string& file) : m_conf(file) { + CUDPSocket::startup(); } CP25Gateway::~CP25Gateway() { + CUDPSocket::shutdown(); } void CP25Gateway::run() diff --git a/P25Gateway/UDPSocket.cpp b/P25Gateway/UDPSocket.cpp index 382925f..3f6192a 100644 --- a/P25Gateway/UDPSocket.cpp +++ b/P25Gateway/UDPSocket.cpp @@ -37,12 +37,6 @@ m_address_save(address), m_port_save(port), m_counter(0U) { -#if defined(_WIN32) || defined(_WIN64) - WSAData data; - int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); - if (wsaRet != 0) - LogError("Error from WSAStartup"); -#endif for (int i = 0; i < UDP_SOCKET_MAX; i++) { m_address[i] = ""; m_port[i] = 0U; @@ -56,12 +50,6 @@ m_address_save(), m_port_save(port), m_counter(0U) { -#if defined(_WIN32) || defined(_WIN64) - WSAData data; - int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); - if (wsaRet != 0) - LogError("Error from WSAStartup"); -#endif for (int i = 0; i < UDP_SOCKET_MAX; i++) { m_address[i] = ""; m_port[i] = 0U; @@ -72,6 +60,20 @@ m_counter(0U) CUDPSocket::~CUDPSocket() { +} + +void CUDPSocket::startup() +{ +#if defined(_WIN32) || defined(_WIN64) + WSAData data; + int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); + if (wsaRet != 0) + LogError("Error from WSAStartup"); +#endif +} + +void CUDPSocket::shutdown() +{ #if defined(_WIN32) || defined(_WIN64) ::WSACleanup(); #endif diff --git a/P25Gateway/UDPSocket.h b/P25Gateway/UDPSocket.h index 3f5585b..6e3846c 100644 --- a/P25Gateway/UDPSocket.h +++ b/P25Gateway/UDPSocket.h @@ -60,8 +60,12 @@ public: void close(); void close(const unsigned int index); + static void startup(); + static void shutdown(); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length); static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); + static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT); static bool isNone(const sockaddr_storage& addr); diff --git a/P25Parrot/P25Parrot.cpp b/P25Parrot/P25Parrot.cpp index ab3bee8..d73e12a 100644 --- a/P25Parrot/P25Parrot.cpp +++ b/P25Parrot/P25Parrot.cpp @@ -1,5 +1,5 @@ /* -* Copyright (C) 2016,2018 by Jonathan Naylor G4KLX +* Copyright (C) 2016,2018,2020 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,10 +50,12 @@ int main(int argc, char** argv) CP25Parrot::CP25Parrot(unsigned int port) : m_port(port) { + CUDPSocket::startup(); } CP25Parrot::~CP25Parrot() { + CUDPSocket::shutdown(); } void CP25Parrot::run() diff --git a/P25Parrot/UDPSocket.cpp b/P25Parrot/UDPSocket.cpp index 382925f..3f6192a 100644 --- a/P25Parrot/UDPSocket.cpp +++ b/P25Parrot/UDPSocket.cpp @@ -37,12 +37,6 @@ m_address_save(address), m_port_save(port), m_counter(0U) { -#if defined(_WIN32) || defined(_WIN64) - WSAData data; - int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); - if (wsaRet != 0) - LogError("Error from WSAStartup"); -#endif for (int i = 0; i < UDP_SOCKET_MAX; i++) { m_address[i] = ""; m_port[i] = 0U; @@ -56,12 +50,6 @@ m_address_save(), m_port_save(port), m_counter(0U) { -#if defined(_WIN32) || defined(_WIN64) - WSAData data; - int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); - if (wsaRet != 0) - LogError("Error from WSAStartup"); -#endif for (int i = 0; i < UDP_SOCKET_MAX; i++) { m_address[i] = ""; m_port[i] = 0U; @@ -72,6 +60,20 @@ m_counter(0U) CUDPSocket::~CUDPSocket() { +} + +void CUDPSocket::startup() +{ +#if defined(_WIN32) || defined(_WIN64) + WSAData data; + int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); + if (wsaRet != 0) + LogError("Error from WSAStartup"); +#endif +} + +void CUDPSocket::shutdown() +{ #if defined(_WIN32) || defined(_WIN64) ::WSACleanup(); #endif diff --git a/P25Parrot/UDPSocket.h b/P25Parrot/UDPSocket.h index 3f5585b..6e3846c 100644 --- a/P25Parrot/UDPSocket.h +++ b/P25Parrot/UDPSocket.h @@ -60,8 +60,12 @@ public: void close(); void close(const unsigned int index); + static void startup(); + static void shutdown(); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length); static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); + static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT); static bool isNone(const sockaddr_storage& addr); diff --git a/P25Reflector/P25Reflector.cpp b/P25Reflector/P25Reflector.cpp index e311901..477ff9f 100644 --- a/P25Reflector/P25Reflector.cpp +++ b/P25Reflector/P25Reflector.cpp @@ -82,10 +82,12 @@ CP25Reflector::CP25Reflector(const std::string& file) : m_conf(file), m_repeaters() { + CUDPSocket::startup(); } CP25Reflector::~CP25Reflector() { + CUDPSocket::shutdown(); } void CP25Reflector::run() diff --git a/P25Reflector/UDPSocket.cpp b/P25Reflector/UDPSocket.cpp index 382925f..3f6192a 100644 --- a/P25Reflector/UDPSocket.cpp +++ b/P25Reflector/UDPSocket.cpp @@ -37,12 +37,6 @@ m_address_save(address), m_port_save(port), m_counter(0U) { -#if defined(_WIN32) || defined(_WIN64) - WSAData data; - int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); - if (wsaRet != 0) - LogError("Error from WSAStartup"); -#endif for (int i = 0; i < UDP_SOCKET_MAX; i++) { m_address[i] = ""; m_port[i] = 0U; @@ -56,12 +50,6 @@ m_address_save(), m_port_save(port), m_counter(0U) { -#if defined(_WIN32) || defined(_WIN64) - WSAData data; - int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); - if (wsaRet != 0) - LogError("Error from WSAStartup"); -#endif for (int i = 0; i < UDP_SOCKET_MAX; i++) { m_address[i] = ""; m_port[i] = 0U; @@ -72,6 +60,20 @@ m_counter(0U) CUDPSocket::~CUDPSocket() { +} + +void CUDPSocket::startup() +{ +#if defined(_WIN32) || defined(_WIN64) + WSAData data; + int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data); + if (wsaRet != 0) + LogError("Error from WSAStartup"); +#endif +} + +void CUDPSocket::shutdown() +{ #if defined(_WIN32) || defined(_WIN64) ::WSACleanup(); #endif diff --git a/P25Reflector/UDPSocket.h b/P25Reflector/UDPSocket.h index 3f5585b..6e3846c 100644 --- a/P25Reflector/UDPSocket.h +++ b/P25Reflector/UDPSocket.h @@ -60,8 +60,12 @@ public: void close(); void close(const unsigned int index); + static void startup(); + static void shutdown(); + static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length); static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); + static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT); static bool isNone(const sockaddr_storage& addr);