KB8PMY
/
F4KXL_DStarGateway
mirror of https://github.com/F4FXL/DStarGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle DPlsu the same way has DCS and Dextra

Browse Source
master
Geoffrey Merck 4 years ago
parent 659e455d85
commit 5a46526bf2
2 changed files with 76 additions and 95 deletions
Show Stats Download Patch File Download Diff File

114
DPlusProtocolHandlerPool.cpp
Unescape View File

@ -1,5 +1,6 @@
/*
* Copyright (C) 2012,2013,2015 by Jonathan Naylor G4KLX
* Copyright (C) 2012,2013 by Jonathan Naylor G4KLX
* Copyright (c) 2017-2018 by Thomas A. Early
* Copyright (c) 2021 by Geoffrey Merck F4FXL / KC3FRA
*
* This program is free software; you can redistribute it and/or modify
@ -20,122 +21,107 @@
#include <cassert>
#include "DPlusProtocolHandlerPool.h"
#include "Log.h"
#include "Utils.h"
CDPlusProtocolHandlerPool::CDPlusProtocolHandlerPool(unsigned int n, unsigned int port, const std::string& addr) :
m_pool(NULL),
m_n(n),
m_index(0U)
CDPlusProtocolHandlerPool::CDPlusProtocolHandlerPool(const unsigned int port, const std::string &addr) :
m_basePort(port),
m_address(addr)
{
assert(port > 0U);
assert(n > 0U);
m_pool = new CDPlusProtocolHandlerEntry[n];
for (unsigned int i = 0U; i < n; i++) {
m_pool[i].m_handler = new CDPlusProtocolHandler(port + i, addr);
m_pool[i].m_port = port + i;
m_pool[i].m_inUse = false;
}
wxLogMessage("Allocated UDP ports %u-%u to D-Plus", port, port + n - 1U);
m_index = m_pool.end();
printf("DExtra UDP port base = %u\n", port);
}
CDPlusProtocolHandlerPool::~CDPlusProtocolHandlerPool()
{
for (unsigned int i = 0U; i < m_n; i++)
delete m_pool[i].m_handler;
delete[] m_pool;
while (m_pool.end() != m_pool.begin()) {
auto it = m_pool.begin();
delete it->second;
m_pool.erase(it);
}
}
bool CDPlusProtocolHandlerPool::open()
CDPlusProtocolHandler* CDPlusProtocolHandlerPool::getIncomingHandler()
{
for (unsigned int i = 0U; i < m_n; i++) {
bool ret = m_pool[i].m_handler->open();
if (!ret)
return false;
return getHandler(m_basePort);
}
return true;
CDPlusProtocolHandler* CDPlusProtocolHandlerPool::getHandler()
{
return getHandler(m_basePort + 1U);
}
CDPlusProtocolHandler* CDPlusProtocolHandlerPool::getHandler(unsigned int port)
{
if (port == 0U) {
for (unsigned int i = 0U; i < m_n; i++) {
if (!m_pool[i].m_inUse) {
m_pool[i].m_inUse = true;
return m_pool[i].m_handler;
}
}
while (m_pool.end() != m_pool.find(port))
port++; // find an unused port
CDPlusProtocolHandler *proto = new CDPlusProtocolHandler(port, m_address);
if (proto) {
if (proto->open()) {
m_pool[port] = proto;
printf("New CDPlusProtocolHandler now on UDP port %u.\n", port);
} else {
for (unsigned int i = 0U; i < m_n; i++) {
if (m_pool[i].m_port == port) {
m_pool[i].m_inUse = true;
return m_pool[i].m_handler;
}
delete proto;
proto = NULL;
printf("ERROR: Can't open new DPlus UDP port %u!\n", port);
}
}
wxLogError("Cannot find a free D-Plus port in the pool");
return NULL;
} else
printf("ERROR: Can't allocate new CDPlusProtocolHandler at port %u\n", port);
return proto;
}
void CDPlusProtocolHandlerPool::release(CDPlusProtocolHandler *handler)
{
assert(handler != NULL);
for (unsigned int i = 0U; i < m_n; i++) {
if (m_pool[i].m_handler == handler && m_pool[i].m_inUse) {
m_pool[i].m_inUse = false;
for (auto it=m_pool.begin(); it!=m_pool.end(); it++) {
if (it->second == handler) {
it->second->close();
delete it->second;
printf("Releasing CDPlusProtocolHandler on port %u.\n", it->first);
m_pool.erase(it);
return;
}
}
wxLogError("Trying to release an unused D-Plus port");
// we should never get here!
printf("ERROR: could not find CDPlusProtocolHander (port=%u) to release!\n", handler->getPort());
}
DPLUS_TYPE CDPlusProtocolHandlerPool::read()
{
while (m_index < m_n) {
if (m_pool[m_index].m_inUse) {
DPLUS_TYPE type = m_pool[m_index].m_handler->read();
if (m_index == m_pool.end())
m_index = m_pool.begin();
while (m_index != m_pool.end()) {
DPLUS_TYPE type = m_index->second->read();
if (type != DP_NONE)
return type;
}
m_index++;
}
m_index = 0U;
return DP_NONE;
}
CHeaderData *CDPlusProtocolHandlerPool::readHeader()
{
return m_pool[m_index].m_handler->readHeader();
return m_index->second->readHeader();
}
CAMBEData *CDPlusProtocolHandlerPool::readAMBE()
{
return m_pool[m_index].m_handler->readAMBE();
return m_index->second->readAMBE();
}
CPollData *CDPlusProtocolHandlerPool::readPoll()
{
return m_pool[m_index].m_handler->readPoll();
return m_index->second->readPoll();
}
CConnectData *CDPlusProtocolHandlerPool::readConnect()
{
return m_pool[m_index].m_handler->readConnect();
return m_index->second->readConnect();
}
void CDPlusProtocolHandlerPool::close()
{
for (unsigned int i = 0U; i < m_n; i++)
m_pool[i].m_handler->close();
for (auto it=m_pool.begin(); it!=m_pool.end(); it++)
it->second->close();
}

35
DPlusProtocolHandlerPool.h
Unescape View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2012,2013,2015 by Jonathan Naylor G4KLX
* Copyright (c) 2021 by Geoffrey Merck F4FXL / KC3FRA
* Copyright (C) 2012,2013 by Jonathan Naylor G4KLX
* Copyright (c) 2017-2018 by Thomas A. Early
*
* 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
@ -17,26 +17,20 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef DPlusProtocolHandlerPool_H
#define DPlusProtocolHandlerPool_H
#pragma once
#include "DPlusProtocolHandler.h"
#include <string>
#include <map>
class CDPlusProtocolHandlerEntry {
public:
CDPlusProtocolHandler* m_handler;
unsigned int m_port;
bool m_inUse;
};
#include "DPlusProtocolHandler.h"
class CDPlusProtocolHandlerPool {
public:
CDPlusProtocolHandlerPool(unsigned int n, unsigned int port, const std::string& addr = "");
CDPlusProtocolHandlerPool(const unsigned int port, const std::string &addr = std::string(""));
~CDPlusProtocolHandlerPool();
bool open();
CDPlusProtocolHandler* getHandler(unsigned int port = 0U);
CDPlusProtocolHandler *getHandler();
CDPlusProtocolHandler *getIncomingHandler();
void release(CDPlusProtocolHandler *handler);
DPLUS_TYPE read();
@ -48,9 +42,10 @@ public:
void close();
private:
CDPlusProtocolHandlerEntry* m_pool;
unsigned int m_n;
unsigned int m_index;
};
CDPlusProtocolHandler *getHandler(unsigned int port);
#endif
std::map<unsigned int, CDPlusProtocolHandler *> m_pool;
std::map<unsigned int, CDPlusProtocolHandler *>::iterator m_index;
unsigned int m_basePort;
std::string m_address;
};

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.