ShaYmez
/
P25Clients
mirror of https://github.com/ShaYmez/P25Clients.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make Windows work.

This commit is contained in:
Jonathan Naylor 2020-09-20 21:49:25 +01:00
parent f68d1adb1b
commit e57360c969
9 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P25Gateway/P25Gateway.cpp
View File

@ -85,10 +85,12 @@ int main(int argc, char** argv)
CP25Gateway::CP25Gateway(const std::string& file) : CP25Gateway::CP25Gateway(const std::string& file) :
m_conf(file) m_conf(file)
{ {
CUDPSocket::startup();
} }
CP25Gateway::~CP25Gateway() CP25Gateway::~CP25Gateway()
{ {
CUDPSocket::shutdown();
} }
void CP25Gateway::run() void CP25Gateway::run()

26
P25Gateway/UDPSocket.cpp
View File

@ -37,12 +37,6 @@ m_address_save(address),
m_port_save(port), m_port_save(port),
m_counter(0U) 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++) { for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = ""; m_address[i] = "";
m_port[i] = 0U; m_port[i] = 0U;
@ -56,12 +50,6 @@ m_address_save(),
m_port_save(port), m_port_save(port),
m_counter(0U) 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++) { for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = ""; m_address[i] = "";
m_port[i] = 0U; m_port[i] = 0U;
@ -72,6 +60,20 @@ m_counter(0U)
CUDPSocket::~CUDPSocket() 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) #if defined(_WIN32) || defined(_WIN64)
::WSACleanup(); ::WSACleanup();
#endif #endif

4
P25Gateway/UDPSocket.h
View File

@ -60,8 +60,12 @@ public:
void close(); void close();
void close(const unsigned int index); 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);
static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); 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 match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
static bool isNone(const sockaddr_storage& addr); static bool isNone(const sockaddr_storage& addr);

4
P25Parrot/P25Parrot.cpp
View File

@ -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 * 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 * 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) : CP25Parrot::CP25Parrot(unsigned int port) :
m_port(port) m_port(port)
{ {
CUDPSocket::startup();
} }
CP25Parrot::~CP25Parrot() CP25Parrot::~CP25Parrot()
{ {
CUDPSocket::shutdown();
} }
void CP25Parrot::run() void CP25Parrot::run()

26
P25Parrot/UDPSocket.cpp
View File

@ -37,12 +37,6 @@ m_address_save(address),
m_port_save(port), m_port_save(port),
m_counter(0U) 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++) { for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = ""; m_address[i] = "";
m_port[i] = 0U; m_port[i] = 0U;
@ -56,12 +50,6 @@ m_address_save(),
m_port_save(port), m_port_save(port),
m_counter(0U) 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++) { for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = ""; m_address[i] = "";
m_port[i] = 0U; m_port[i] = 0U;
@ -72,6 +60,20 @@ m_counter(0U)
CUDPSocket::~CUDPSocket() 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) #if defined(_WIN32) || defined(_WIN64)
::WSACleanup(); ::WSACleanup();
#endif #endif

4
P25Parrot/UDPSocket.h
View File

@ -60,8 +60,12 @@ public:
void close(); void close();
void close(const unsigned int index); 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);
static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); 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 match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
static bool isNone(const sockaddr_storage& addr); static bool isNone(const sockaddr_storage& addr);

2
P25Reflector/P25Reflector.cpp
View File

@ -82,10 +82,12 @@ CP25Reflector::CP25Reflector(const std::string& file) :
m_conf(file), m_conf(file),
m_repeaters() m_repeaters()
{ {
CUDPSocket::startup();
} }
CP25Reflector::~CP25Reflector() CP25Reflector::~CP25Reflector()
{ {
CUDPSocket::shutdown();
} }
void CP25Reflector::run() void CP25Reflector::run()

26
P25Reflector/UDPSocket.cpp
View File

@ -37,12 +37,6 @@ m_address_save(address),
m_port_save(port), m_port_save(port),
m_counter(0U) 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++) { for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = ""; m_address[i] = "";
m_port[i] = 0U; m_port[i] = 0U;
@ -56,12 +50,6 @@ m_address_save(),
m_port_save(port), m_port_save(port),
m_counter(0U) 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++) { for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = ""; m_address[i] = "";
m_port[i] = 0U; m_port[i] = 0U;
@ -72,6 +60,20 @@ m_counter(0U)
CUDPSocket::~CUDPSocket() 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) #if defined(_WIN32) || defined(_WIN64)
::WSACleanup(); ::WSACleanup();
#endif #endif

4
P25Reflector/UDPSocket.h
View File

@ -60,8 +60,12 @@ public:
void close(); void close();
void close(const unsigned int index); 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);
static int lookup(const std::string& hostName, unsigned int port, sockaddr_storage& address, unsigned int& address_length, struct addrinfo& hints); 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 match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IMT_ADDRESS_AND_PORT);
static bool isNone(const sockaddr_storage& addr); static bool isNone(const sockaddr_storage& addr);