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

UDPSocket renewal

Browse Source 
Currently there is six variations of (IPv4) UDPSocket.cpp.

- FMClients, NXDNClients, P25Clients, YSFClients(YSFParrot)
	use ::fprintf() for logging

- YSFClients(YSFReflector)
	use LogError() and LogInfo() for logging
	special open(string &bindaddr) function

- YSFClients(YSFGateway), DAPNETGateway
	use LogError() and LogInfo() for logging

- P25Clients, DMRGateway
	use LogError() for logging
	no LogInfo("Opening UDP port on") message

- NXDNClients
	use LogError() for logging
	no LogInfo("Opening UDP port on") message
	add #include <ifaddrs.h>

- MMDVMHost
	use LogError() for logging
	no LogInfo("Opening UDP port on") message
	no assert(!address.empty()) at constructor

to avoid explosion, commonized them.

	switch ::fprintf()/LogError by #define HAVE_LOG_H
	always display LogInfo("Opening UDP port on") message
	delete #include <ifaddrs.h>, this is not needed
	no assert(!address.empty()) at constructor

and to support YSFReflector, add multiple socket support.
default is #define UDP_SOCKET_MAX 1 so normally this feature is disabled.

added these functions.

	CUDPSocket()	(constructor without any parameters)
	open(index, af, addr, port)
	close(index)

CUDPSocket() means CUDPSocket(address = "", port = 0)
index selects socket, address and port is defined at open.

to have compatibility for old codes, these function works as

	CUDPSocket(addr, port)	store addr and port to index #0
	CUDPSocket(port)	store addr = "" and port to index #0
	open()		open with addr and port of index #0, AF_UNSPEC
	open(af)	open with addr and port of index #0, specified af
	close()		close *all* sockets

read/write operation is for all opened sockets.
This commit is contained in:
SASANO Takayoshi
2020-09-06 12:09:37 +09:00
parent 34db212360
commit 457be810a3
3 changed files with 128 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -11,6 +11,7 @@ LIBS = -lpthread
#CFLAGS = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread #CFLAGS = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread
#LIBS = -lpthread -lgps #LIBS = -lpthread -lgps
CFLAGS += -DHAVE_LOG_H
LDFLAGS = -g LDFLAGS = -g
OBJECTS = \ OBJECTS = \

169
UDPSocket.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2016 by Jonathan Naylor G4KLX * Copyright (C) 2006-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
@@ -17,7 +17,6 @@
*/ */
#include "UDPSocket.h" #include "UDPSocket.h"
#include "Log.h"
#include <cassert> #include <cassert>
@@ -26,11 +25,14 @@
#include <cstring> #include <cstring>
#endif #endif
#if defined(HAVE_LOG_H)
#include "Log.h"
#else
#define LogError(fmt, ...) ::fprintf(stderr, fmt "\n", ## __VA_ARGS__)
#define LogInfo(fmt, ...) ::fprintf(stderr, fmt "\n", ## __VA_ARGS__)
#endif
CUDPSocket::CUDPSocket(const std::string& address, unsigned int port) : CUDPSocket::CUDPSocket(const std::string& address, unsigned int port)
m_address(address),
m_port(port),
m_fd(-1)
{ {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
WSAData data; WSAData data;
@@ -38,19 +40,26 @@ m_fd(-1)
if (wsaRet != 0) if (wsaRet != 0)
LogError("Error from WSAStartup"); LogError("Error from WSAStartup");
#endif #endif
for (int i = 0; i < UDP_SOCKET_MAX; i++) {
m_address[i] = "";
m_port[i] = 0U;
m_af[i] = 0U;
m_fd[i] = -1;
} }
CUDPSocket::CUDPSocket(unsigned int port) : m_address[0] = address;
m_address(), m_port[0] = port;
m_port(port), m_counter = 0U;
m_fd(-1) }
CUDPSocket::CUDPSocket(unsigned int port)
{ {
#if defined(_WIN32) || defined(_WIN64) CUDPSocket("", port);
WSAData data; }
int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
if (wsaRet != 0) CUDPSocket::CUDPSocket()
LogError("Error from WSAStartup"); {
#endif CUDPSocket("", 0U);
} }
CUDPSocket::~CUDPSocket() CUDPSocket::~CUDPSocket()
@@ -149,12 +158,17 @@ bool CUDPSocket::isnone(const sockaddr_storage &addr)
bool CUDPSocket::open() bool CUDPSocket::open()
{ {
return open(AF_UNSPEC); return open(0, AF_UNSPEC, m_address[0], m_port[0]);
} }
bool CUDPSocket::open(const unsigned int af) bool CUDPSocket::open(const unsigned int af)
{ {
int err; return open(0, af, m_address[0], m_port[0]);
}
bool CUDPSocket::open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned int port)
{
int err, fd;
sockaddr_storage addr; sockaddr_storage addr;
unsigned int addrlen; unsigned int addrlen;
struct addrinfo hints; struct addrinfo hints;
@@ -164,14 +178,14 @@ bool CUDPSocket::open(const unsigned int af)
hints.ai_family = af; hints.ai_family = af;
/* to determine protocol family, call lookup() first. */ /* to determine protocol family, call lookup() first. */
err = lookup(m_address, m_port, addr, addrlen, hints); err = lookup(address, port, addr, addrlen, hints);
if (err) { if (err) {
LogError("The local address is invalid - %s", m_address.c_str()); LogError("The local address is invalid - %s", address.c_str());
return false; return false;
} }
m_fd = ::socket(addr.ss_family, SOCK_DGRAM, 0); fd = ::socket(addr.ss_family, SOCK_DGRAM, 0);
if (m_fd < 0) { if (fd < 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Cannot create the UDP socket, err: %lu", ::GetLastError()); LogError("Cannot create the UDP socket, err: %lu", ::GetLastError());
#else #else
@@ -180,9 +194,14 @@ bool CUDPSocket::open(const unsigned int af)
return false; return false;
} }
if (m_port > 0U) { m_address[index] = address;
m_port[index] = port;
m_af[index] = addr.ss_family;
m_fd[index] = fd;
if (port > 0U) {
int reuse = 1; int reuse = 1;
if (::setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) { if (::setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Cannot set the UDP socket option, err: %lu", ::GetLastError()); LogError("Cannot set the UDP socket option, err: %lu", ::GetLastError());
#else #else
@@ -191,7 +210,7 @@ bool CUDPSocket::open(const unsigned int af)
return false; return false;
} }
if (::bind(m_fd, (sockaddr*)&addr, addrlen) == -1) { if (::bind(fd, (sockaddr*)&addr, addrlen) == -1) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Cannot bind the UDP address, err: %lu", ::GetLastError()); LogError("Cannot bind the UDP address, err: %lu", ::GetLastError());
#else #else
@@ -199,6 +218,8 @@ bool CUDPSocket::open(const unsigned int af)
#endif #endif
return false; return false;
} }
LogInfo("Opening UDP port on %u", port);
} }
return true; return true;
@@ -210,30 +231,43 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag
assert(length > 0U); assert(length > 0U);
// Check that the readfrom() won't block // Check that the readfrom() won't block
fd_set readFds; int i, n;
FD_ZERO(&readFds); struct pollfd pfd[UDP_SOCKET_MAX];
#if defined(_WIN32) || defined(_WIN64) for (i = n = 0; i < UDP_SOCKET_MAX; i++) {
FD_SET((unsigned int)m_fd, &readFds); if (m_fd[i] >= 0) {
#else pfd[n].fd = m_fd[i];
FD_SET(m_fd, &readFds); pfd[n].events = POLLIN;
#endif n++;
}
}
// no socket descriptor to receive
if (n == 0)
return 0;
// Return immediately // Return immediately
timeval tv; #if defined(_WIN32) || defined(_WIN64)
tv.tv_sec = 0L; int ret = WSAPoll(pfd, n, 0);
tv.tv_usec = 0L; #else
int ret = ::poll(pfd, n, 0);
int ret = ::select(m_fd + 1, &readFds, NULL, NULL, &tv); #endif
if (ret < 0) { if (ret < 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Error returned from UDP select, err: %lu", ::GetLastError()); LogError("Error returned from UDP poll, err: %lu", ::GetLastError());
#else #else
LogError("Error returned from UDP select, err: %d", errno); LogError("Error returned from UDP poll, err: %d", errno);
#endif #endif
return -1; return -1;
} }
if (ret == 0) int index;
for (i = 0; i < n; i++) {
// round robin
index = (i + m_counter) % n;
if (pfd[index].revents & POLLIN)
break;
}
if (i == n)
return 0; return 0;
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@@ -243,9 +277,9 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag
#endif #endif
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
int len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); int len = ::recvfrom(pfd[index].fd, (char*)buffer, length, 0, (sockaddr *)&address, &size);
#else #else
ssize_t len = ::recvfrom(m_fd, (char*)buffer, length, 0, (sockaddr *)&address, &size); ssize_t len = ::recvfrom(pfd[index].fd, (char*)buffer, length, 0, (sockaddr *)&address, &size);
#endif #endif
if (len <= 0) { if (len <= 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
@@ -256,6 +290,7 @@ int CUDPSocket::read(unsigned char* buffer, unsigned int length, sockaddr_storag
return -1; return -1;
} }
m_counter++;
address_length = size; address_length = size;
return len; return len;
} }
@@ -265,36 +300,52 @@ bool CUDPSocket::write(const unsigned char* buffer, unsigned int length, const s
assert(buffer != NULL); assert(buffer != NULL);
assert(length > 0U); assert(length > 0U);
bool result = false;
for (int i = 0; i < UDP_SOCKET_MAX; i++) {
if (m_fd[i] < 0 || m_af[i] != address.ss_family)
continue;
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
int ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&address, address_length); int ret = ::sendto(m_fd[i], (char *)buffer, length, 0, (sockaddr *)&address, address_length);
#else #else
ssize_t ret = ::sendto(m_fd, (char *)buffer, length, 0, (sockaddr *)&address, address_length); ssize_t ret = ::sendto(m_fd[i], (char *)buffer, length, 0, (sockaddr *)&address, address_length);
#endif #endif
if (ret < 0) { if (ret < 0) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LogError("Error returned from sendto, err: %lu", ::GetLastError()); LogError("Error returned from sendto, err: %lu", ::GetLastError());
#else #else
LogError("Error returned from sendto, err: %d", errno); LogError("Error returned from sendto, err: %d", errno);
#endif #endif
return false; } else {
#if defined(_WIN32) || defined(_WIN64)
if (ret == int(length))
result = true;
#else
if (ret == ssize_t(length))
result = true;
#endif
}
} }
#if defined(_WIN32) || defined(_WIN64) return result;
if (ret != int(length))
return false;
#else
if (ret != ssize_t(length))
return false;
#endif
return true;
} }
void CUDPSocket::close() void CUDPSocket::close()
{ {
#if defined(_WIN32) || defined(_WIN64) for (int i = 0; i < UDP_SOCKET_MAX; i++)
::closesocket(m_fd); close(m_fd[i]);
#else }
::close(m_fd);
#endif void CUDPSocket::close(const unsigned int index)
{
if (m_fd[index] >= 0) {
#if defined(_WIN32) || defined(_WIN64)
::closesocket(m_fd[index]);
#else
::close(m_fd[index]);
#endif
m_fd[index] = -1;
}
} }

18
UDPSocket.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2011,2013,2015,2016 by Jonathan Naylor G4KLX * Copyright (C) 2009-2011,2013,2015,2016,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
@@ -26,6 +26,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <poll.h>
#include <unistd.h> #include <unistd.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@@ -35,19 +36,26 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#if !defined(UDP_SOCKET_MAX)
#define UDP_SOCKET_MAX 1
#endif
class CUDPSocket { class CUDPSocket {
public: public:
CUDPSocket(const std::string& address, unsigned int port = 0U); CUDPSocket(const std::string& address, unsigned int port = 0U);
CUDPSocket(unsigned int port = 0U); CUDPSocket(unsigned int port = 0U);
CUDPSocket();
~CUDPSocket(); ~CUDPSocket();
bool open(); bool open();
bool open(const unsigned int af); bool open(const unsigned int af);
bool open(const unsigned int index, const unsigned int af, const std::string& address, const unsigned int port);
int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length); int read(unsigned char* buffer, unsigned int length, sockaddr_storage& address, unsigned int &address_length);
bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length); bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& address, unsigned int address_length);
void close(); void close();
void close(const unsigned int index);
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);
@@ -56,9 +64,11 @@ public:
static bool isnone(const sockaddr_storage &addr); static bool isnone(const sockaddr_storage &addr);
private: private:
std::string m_address; std::string m_address[UDP_SOCKET_MAX];
unsigned short m_port; unsigned short m_port[UDP_SOCKET_MAX];
int m_fd; unsigned int m_af[UDP_SOCKET_MAX];
int m_fd[UDP_SOCKET_MAX];
unsigned int m_counter;
}; };
#endif #endif