mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-07-09 18:45:22 +02:00
New custom network lib + half finished rigctl server
This commit is contained in:
Ryzerth
@ -1,2 +1,381 @@
|
||||
#pragma once
|
||||
#include <utils/networking.h>
|
||||
#include <assert.h>
|
||||
|
||||
namespace net {
|
||||
|
||||
#ifdef _WIN32
|
||||
extern bool winsock_init = false;
|
||||
#endif
|
||||
|
||||
ConnClass::ConnClass(Socket sock) {
|
||||
_sock = sock;
|
||||
connectionOpen = true;
|
||||
readWorkerThread = std::thread(&ConnClass::readWorker, this);
|
||||
writeWorkerThread = std::thread(&ConnClass::writeWorker, this);
|
||||
}
|
||||
|
||||
ConnClass::~ConnClass() {
|
||||
ConnClass::close();
|
||||
}
|
||||
|
||||
void ConnClass::close() {
|
||||
std::lock_guard lck(closeMtx);
|
||||
// Set stopWorkers to true
|
||||
{
|
||||
std::lock_guard lck1(readQueueMtx);
|
||||
std::lock_guard lck2(writeQueueMtx);
|
||||
stopWorkers = true;
|
||||
}
|
||||
|
||||
// Notify the workers of the change
|
||||
readQueueCnd.notify_all();
|
||||
writeQueueCnd.notify_all();
|
||||
|
||||
if (connectionOpen) {
|
||||
#ifdef _WIN32
|
||||
closesocket(_sock);
|
||||
#else
|
||||
::close(_sock);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Wait for the theads to terminate
|
||||
if (readWorkerThread.joinable()) { readWorkerThread.join(); }
|
||||
if (writeWorkerThread.joinable()) { writeWorkerThread.join(); }
|
||||
|
||||
{
|
||||
std::lock_guard lck(connectionOpenMtx);
|
||||
connectionOpen = false;
|
||||
}
|
||||
connectionOpenCnd.notify_all();
|
||||
}
|
||||
|
||||
bool ConnClass::isOpen() {
|
||||
return connectionOpen;
|
||||
}
|
||||
|
||||
void ConnClass::waitForEnd() {
|
||||
std::unique_lock lck(readQueueMtx);
|
||||
connectionOpenCnd.wait(lck, [this](){ return !connectionOpen; });
|
||||
}
|
||||
|
||||
int ConnClass::read(int count, uint8_t* buf) {
|
||||
assert(connectionOpen);
|
||||
std::lock_guard lck(readMtx);
|
||||
#ifdef _WIN32
|
||||
int ret = recv(_sock, (char*)buf, count, 0);
|
||||
#else
|
||||
int ret = ::read(_sock, buf, count);
|
||||
#endif
|
||||
if (ret <= 0) {
|
||||
{
|
||||
std::lock_guard lck(connectionOpenMtx);
|
||||
connectionOpen = false;
|
||||
}
|
||||
connectionOpenCnd.notify_all();
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool ConnClass::write(int count, uint8_t* buf) {
|
||||
assert(connectionOpen);
|
||||
std::lock_guard lck(writeMtx);
|
||||
#ifdef _WIN32
|
||||
int ret = send(_sock, (char*)buf, count, 0);
|
||||
#else
|
||||
int ret = ::write(_sock, buf, count);
|
||||
#endif
|
||||
if (ret <= 0) {
|
||||
{
|
||||
std::lock_guard lck(connectionOpenMtx);
|
||||
connectionOpen = false;
|
||||
}
|
||||
connectionOpenCnd.notify_all();
|
||||
}
|
||||
return (ret > 0);
|
||||
}
|
||||
|
||||
void ConnClass::readAsync(int count, uint8_t* buf, void (*handler)(int count, uint8_t* buf, void* ctx), void* ctx) {
|
||||
assert(connectionOpen);
|
||||
// Create entry
|
||||
ConnReadEntry entry;
|
||||
entry.count = count;
|
||||
entry.buf = buf;
|
||||
entry.handler = handler;
|
||||
entry.ctx = ctx;
|
||||
|
||||
// Add entry to queue
|
||||
{
|
||||
std::lock_guard lck(readQueueMtx);
|
||||
readQueue.push_back(entry);
|
||||
}
|
||||
|
||||
// Notify read worker
|
||||
readQueueCnd.notify_all();
|
||||
}
|
||||
|
||||
void ConnClass::writeAsync(int count, uint8_t* buf) {
|
||||
assert(connectionOpen);
|
||||
// Create entry
|
||||
ConnWriteEntry entry;
|
||||
entry.count = count;
|
||||
entry.buf = buf;
|
||||
|
||||
// Add entry to queue
|
||||
{
|
||||
std::lock_guard lck(writeQueueMtx);
|
||||
writeQueue.push_back(entry);
|
||||
}
|
||||
|
||||
// Notify write worker
|
||||
writeQueueCnd.notify_all();
|
||||
}
|
||||
|
||||
void ConnClass::readWorker() {
|
||||
while (true) {
|
||||
// Wait for wakeup and exit if it's for terminating the thread
|
||||
std::unique_lock lck(readQueueMtx);
|
||||
readQueueCnd.wait(lck, [this](){ return (readQueue.size() > 0 || stopWorkers); });
|
||||
if (stopWorkers || !connectionOpen) { return; }
|
||||
|
||||
// Pop first element off the list
|
||||
ConnReadEntry entry = readQueue[0];
|
||||
readQueue.erase(readQueue.begin());
|
||||
lck.unlock();
|
||||
|
||||
// Read from socket and send data to the handler
|
||||
int ret = read(entry.count, entry.buf);
|
||||
if (ret <= 0) {
|
||||
{
|
||||
std::lock_guard lck(connectionOpenMtx);
|
||||
connectionOpen = false;
|
||||
}
|
||||
connectionOpenCnd.notify_all();
|
||||
return;
|
||||
}
|
||||
entry.handler(ret, entry.buf, entry.ctx);
|
||||
}
|
||||
}
|
||||
|
||||
void ConnClass::writeWorker() {
|
||||
while (true) {
|
||||
// Wait for wakeup and exit if it's for terminating the thread
|
||||
std::unique_lock lck(writeQueueMtx);
|
||||
writeQueueCnd.wait(lck, [this](){ return (writeQueue.size() > 0 || stopWorkers); });
|
||||
if (stopWorkers || !connectionOpen) { return; }
|
||||
|
||||
// Pop first element off the list
|
||||
ConnWriteEntry entry = writeQueue[0];
|
||||
writeQueue.erase(writeQueue.begin());
|
||||
lck.unlock();
|
||||
|
||||
// Write to socket
|
||||
if (!write(entry.count, entry.buf)) {
|
||||
{
|
||||
std::lock_guard lck(connectionOpenMtx);
|
||||
connectionOpen = false;
|
||||
}
|
||||
connectionOpenCnd.notify_all();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ListenerClass::ListenerClass(Socket listenSock) {
|
||||
sock = listenSock;
|
||||
listening = true;
|
||||
acceptWorkerThread = std::thread(&ListenerClass::worker, this);
|
||||
}
|
||||
|
||||
ListenerClass::~ListenerClass() {
|
||||
close();
|
||||
}
|
||||
|
||||
Conn ListenerClass::accept() {
|
||||
assert(listening);
|
||||
std::lock_guard lck(acceptMtx);
|
||||
Socket _sock;
|
||||
|
||||
// Accept socket
|
||||
_sock = ::accept(sock, NULL, NULL);
|
||||
if (_sock < 0) {
|
||||
listening = false;
|
||||
throw std::runtime_error("Could not bind socket");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return Conn(new ConnClass(_sock));
|
||||
}
|
||||
|
||||
void ListenerClass::acceptAsync(void (*handler)(Conn conn, void* ctx), void* ctx) {
|
||||
assert(listening);
|
||||
// Create entry
|
||||
ListenerAcceptEntry entry;
|
||||
entry.handler = handler;
|
||||
entry.ctx = ctx;
|
||||
|
||||
// Add entry to queue
|
||||
{
|
||||
std::lock_guard lck(acceptQueueMtx);
|
||||
acceptQueue.push_back(entry);
|
||||
}
|
||||
|
||||
// Notify write worker
|
||||
acceptQueueCnd.notify_all();
|
||||
}
|
||||
|
||||
void ListenerClass::close() {
|
||||
{
|
||||
std::lock_guard lck(acceptQueueMtx);
|
||||
stopWorker = true;
|
||||
}
|
||||
|
||||
if (listening) {
|
||||
#ifdef _WIN32
|
||||
closesocket(sock);
|
||||
#else
|
||||
::close(sock);
|
||||
#endif
|
||||
}
|
||||
|
||||
acceptQueueCnd.notify_all();
|
||||
if (acceptWorkerThread.joinable()) { acceptWorkerThread.join(); }
|
||||
|
||||
|
||||
|
||||
listening = false;
|
||||
}
|
||||
|
||||
bool ListenerClass::isListening() {
|
||||
return listening;
|
||||
}
|
||||
|
||||
void ListenerClass::worker() {
|
||||
while (true) {
|
||||
// Wait for wakeup and exit if it's for terminating the thread
|
||||
std::unique_lock lck(acceptQueueMtx);
|
||||
acceptQueueCnd.wait(lck, [this](){ return (acceptQueue.size() > 0 || stopWorker); });
|
||||
if (stopWorker || !listening) { return; }
|
||||
|
||||
// Pop first element off the list
|
||||
ListenerAcceptEntry entry = acceptQueue[0];
|
||||
acceptQueue.erase(acceptQueue.begin());
|
||||
lck.unlock();
|
||||
|
||||
// Read from socket and send data to the handler
|
||||
try {
|
||||
Conn client = accept();
|
||||
if (!client) {
|
||||
listening = false;
|
||||
return;
|
||||
}
|
||||
entry.handler(std::move(client), entry.ctx);
|
||||
}
|
||||
catch (std::exception e) {
|
||||
listening = false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Conn connect(Protocol proto, std::string host, uint16_t port) {
|
||||
Socket sock;
|
||||
|
||||
#ifdef _WIN32
|
||||
// Initilize WinSock2
|
||||
if (!winsock_init) {
|
||||
WSADATA wsa;
|
||||
if (WSAStartup(MAKEWORD(2,2),&wsa)) {
|
||||
throw std::runtime_error("Could not initialize WinSock2");
|
||||
return NULL;
|
||||
}
|
||||
winsock_init = true;
|
||||
}
|
||||
assert(winsock_init);
|
||||
#endif
|
||||
|
||||
// Create a socket
|
||||
sock = socket(AF_INET, SOCK_STREAM, (proto == PROTO_TCP) ? IPPROTO_TCP : IPPROTO_UDP);
|
||||
if (sock < 0) {
|
||||
throw std::runtime_error("Could not create socket");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Get address from hostname/ip
|
||||
hostent* remoteHost = gethostbyname(host.c_str());
|
||||
if (remoteHost == NULL || remoteHost->h_addr_list[0] == NULL) {
|
||||
throw std::runtime_error("Could get address from host");
|
||||
return NULL;
|
||||
}
|
||||
uint32_t* naddr = (uint32_t*)remoteHost->h_addr_list[0];
|
||||
|
||||
// Create host address
|
||||
struct sockaddr_in addr;
|
||||
addr.sin_addr.s_addr = *naddr;
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
|
||||
// Connect to host
|
||||
if (::connect(sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
|
||||
throw std::runtime_error("Could not connect to host");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return Conn(new ConnClass(sock));
|
||||
}
|
||||
|
||||
Listener listen(Protocol proto, std::string host, uint16_t port) {
|
||||
Socket listenSock;
|
||||
|
||||
#ifdef _WIN32
|
||||
// Initilize WinSock2
|
||||
if (!winsock_init) {
|
||||
WSADATA wsa;
|
||||
if (WSAStartup(MAKEWORD(2,2),&wsa)) {
|
||||
throw std::runtime_error("Could not initialize WinSock2");
|
||||
return NULL;
|
||||
}
|
||||
winsock_init = true;
|
||||
}
|
||||
assert(winsock_init);
|
||||
#endif
|
||||
|
||||
// Create a socket
|
||||
listenSock = socket(AF_INET, SOCK_STREAM, (proto == PROTO_TCP) ? IPPROTO_TCP : IPPROTO_UDP);
|
||||
if (listenSock < 0) {
|
||||
throw std::runtime_error("Could not create socket");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Get address from hostname/ip
|
||||
hostent* remoteHost = gethostbyname(host.c_str());
|
||||
if (remoteHost == NULL || remoteHost->h_addr_list[0] == NULL) {
|
||||
throw std::runtime_error("Could get address from host");
|
||||
return NULL;
|
||||
}
|
||||
uint32_t* naddr = (uint32_t*)remoteHost->h_addr_list[0];
|
||||
|
||||
// Create host address
|
||||
struct sockaddr_in addr;
|
||||
addr.sin_addr.s_addr = *naddr;
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
|
||||
// Bind socket
|
||||
if (bind(listenSock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
|
||||
throw std::runtime_error("Could not bind socket");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Listen
|
||||
if (::listen(listenSock, SOMAXCONN) != 0) {
|
||||
throw std::runtime_error("Could not listen");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return Listener(new ListenerClass(listenSock));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user