ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2024-11-15 20:41:46 -05:00
Code Issues Projects Releases Wiki Activity

Hopefully fix the IP address display.

Browse Source
This commit is contained in:
Jonathan Naylor 2021-02-13 15:34:18 +00:00
parent 9d7ad98771
commit 4b482edab3
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
NXDNReflector/NXDNReflector.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2016,2018,2020 by Jonathan Naylor G4KLX * Copyright (C) 2016,2018,2020,2021 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
@ -252,7 +252,7 @@ void CNXDNReflector::run()
if (rpt == NULL) { if (rpt == NULL) {
rpt = new CNXDNRepeater; rpt = new CNXDNRepeater;
rpt->m_timer.start(); rpt->m_timer.start();
rpt->m_addr = address; ::memcpy(&rpt->m_addr, &address, sizeof(struct sockaddr_storage));
rpt->m_addrLen = addressLen; rpt->m_addrLen = addressLen;
rpt->m_callsign = std::string((char*)(buffer + 5U), 10U); rpt->m_callsign = std::string((char*)(buffer + 5U), 10U);
m_repeaters.push_back(rpt); m_repeaters.push_back(rpt);
@ -343,10 +343,8 @@ void CNXDNReflector::run()
watchdogTimer.start(); watchdogTimer.start();
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
sockaddr_storage addr = (*it)->m_addr; if (!CUDPSocket::match((*it)->m_addr, address))
unsigned int addrLen = (*it)->m_addrLen; nxdnNetwork.write(buffer, len, (*it)->m_addr, (*it)->m_addrLen);
if (!CUDPSocket::match(addr, address))
nxdnNetwork.write(buffer, len, addr, addrLen);
} }
if (m_icomNetwork != NULL) if (m_icomNetwork != NULL)
@ -414,11 +412,8 @@ void CNXDNReflector::run()
if (active == ACTIVE_ICOM) { if (active == ACTIVE_ICOM) {
watchdogTimer.start(); watchdogTimer.start();
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it)
sockaddr_storage addr = (*it)->m_addr; nxdnNetwork.write(buffer, len, srcId, dstId, grp, (*it)->m_addr, (*it)->m_addrLen);
unsigned int addrLen = (*it)->m_addrLen;
nxdnNetwork.write(buffer, len, srcId, dstId, grp, addr, addrLen);
}
if (m_kenwoodNetwork != NULL) if (m_kenwoodNetwork != NULL)
m_kenwoodNetwork->write(buffer, len); m_kenwoodNetwork->write(buffer, len);
@ -482,11 +477,8 @@ void CNXDNReflector::run()
if (active == ACTIVE_KENWOOD) { if (active == ACTIVE_KENWOOD) {
watchdogTimer.start(); watchdogTimer.start();
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it)
sockaddr_storage addr = (*it)->m_addr; nxdnNetwork.write(buffer, len, srcId, dstId, grp, (*it)->m_addr, (*it)->m_addrLen);
unsigned int addrLen = (*it)->m_addrLen;
nxdnNetwork.write(buffer, len, srcId, dstId, grp, addr, addrLen);
}
if (m_icomNetwork != NULL) if (m_icomNetwork != NULL)
m_icomNetwork->write(buffer, len); m_icomNetwork->write(buffer, len);
@ -514,15 +506,13 @@ void CNXDNReflector::run()
(*it)->m_timer.clock(ms); (*it)->m_timer.clock(ms);
for (std::vector<CNXDNRepeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
CNXDNRepeater* itRpt = *it; if ((*it)->m_timer.hasExpired()) {
if (itRpt->m_timer.hasExpired()) {
std::string callsign = itRpt->m_callsign;
char buff[80U]; char buff[80U];
LogMessage("Removing %s (%s) disappeared", callsign.c_str(), CUDPSocket::display(itRpt->m_addr, buff, 80U)); LogMessage("Removing %s (%s) disappeared", (*it)->m_callsign.c_str(),
CUDPSocket::display((*it)->m_addr, buff, 80U));
m_repeaters.erase(it); m_repeaters.erase(it);
delete itRpt; delete *it;
break; break;
} }
} }
@ -582,13 +572,11 @@ void CNXDNReflector::dumpRepeaters() const
LogMessage("Currently linked repeaters:"); LogMessage("Currently linked repeaters:");
for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) { for (std::vector<CNXDNRepeater*>::const_iterator it = m_repeaters.begin(); it != m_repeaters.end(); ++it) {
std::string callsign = (*it)->m_callsign;
sockaddr_storage addr = (*it)->m_addr;
unsigned int timer = (*it)->m_timer.getTimer();
unsigned int timeout = (*it)->m_timer.getTimeout();
char buffer[80U]; char buffer[80U];
LogMessage(" %s: %s %u/%u", callsign.c_str(), CUDPSocket::display(addr, buffer, 80U), timer, timeout); LogMessage(" %s: %s %u/%u", (*it)->m_callsign.c_str(),
CUDPSocket::display((*it)->m_addr, buffer, 80U),
(*it)->m_timer.getTimer(),
(*it)->m_timer.getTimeout());
} }
} }

4
NXDNReflector/Version.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015,2016,2018,2020 by Jonathan Naylor G4KLX * Copyright (C) 2015,2016,2018,2020,2021 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
@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20201124"; const char* VERSION = "20210213";
#endif #endif