MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 08:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mqtt

Browse Source
This commit is contained in:
Jonathan Naylor
2024-08-28 16:51:00 +01:00
parent d9e2f52ae6 aa03a96925
commit 6ac37bb0d1
3 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
UDPSocket.cpp
View File

@@ -30,7 +30,11 @@
CUDPSocket::CUDPSocket(const std::string& address, unsigned short port) :
m_localAddress(address),
m_localPort(port),
#if defined(_WIN32) || defined(_WIN64)
m_fd(INVALID_SOCKET),
#else
m_fd(-1),
#endif
m_af(AF_UNSPEC)
{
}
@@ -38,7 +42,11 @@ m_af(AF_UNSPEC)
CUDPSocket::CUDPSocket(unsigned short port) :
m_localAddress(),
m_localPort(port),
#if defined(_WIN32) || defined(_WIN64)
m_fd(INVALID_SOCKET),
#else
m_fd(-1),
#endif
m_af(AF_UNSPEC)
{
}
@@ -91,7 +99,9 @@ int CUDPSocket::lookup(const std::string& hostname, unsigned short port, sockadd
return err;
}
::memcpy(&addr, res->ai_addr, address_length = res->ai_addrlen);
address_length = (unsigned int)res->ai_addrlen;
::memcpy(&addr, res->ai_addr, address_length);
::freeaddrinfo(res);
@@ -154,7 +164,11 @@ bool CUDPSocket::open(const sockaddr_storage& address)
bool CUDPSocket::open()
{
#if defined(_WIN32) || defined(_WIN64)
assert(m_fd == INVALID_SOCKET);
#else
assert(m_fd == -1);
#endif
sockaddr_storage addr;
unsigned int addrlen;
@@ -215,7 +229,14 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag
{
assert(buffer != NULL);
assert(length > 0U);
assert(m_fd >= 0);
#if defined(_WIN32) || defined(_WIN64)
if (m_fd == INVALID_SOCKET)
return 0;
#else
if (m_fd == -1)
return 0;
#endif
// Check that the readfrom() won't block
struct pollfd pfd;
@@ -276,7 +297,11 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const s
{
assert(buffer != NULL);
assert(length > 0U);
#if defined(_WIN32) || defined(_WIN64)
assert(m_fd != INVALID_SOCKET);
#else
assert(m_fd >= 0);
#endif
bool result = false;
@@ -307,13 +332,16 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const s
void CUDPSocket::close()
{
if (m_fd >= 0) {
#if defined(_WIN32) || defined(_WIN64)
if (m_fd != INVALID_SOCKET) {
::closesocket(m_fd);
m_fd = INVALID_SOCKET;
}
#else
if (m_fd >= 0) {
::close(m_fd);
#endif
m_fd = -1;
}
#endif
}