g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-01-01 14:10:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert the header files to IPv6.

Browse source
This commit is contained in:
Jonathan Naylor 2020-11-15 19:57:49 +00:00
parent f9f233f2cb
commit b0bf79fc21
35 changed files with 317 additions and 292 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Common/AMBEData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -35,13 +35,13 @@ public:
CAMBEData(const CAMBEData& data);
~CAMBEData();
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort);
bool setHBRepeaterData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort);
bool setG2Data(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort);
bool setDExtraData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setHBRepeaterData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setG2Data(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setDExtraData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
unsigned int getIcomRepeaterData(unsigned char* data, unsigned int length) const;
unsigned int getHBRepeaterData(unsigned char* data, unsigned int length) const;
@ -75,13 +75,13 @@ public:
void setData(const unsigned char* data, unsigned int length);
unsigned int getData(unsigned char* data, unsigned int length) const;
void setDestination(const in_addr& address, unsigned int port);
void setDestination(const sockaddr_storage& addr, unsigned int addrLen);
void setText(const wxString& text);
in_addr getYourAddress() const;
unsigned int getYourPort() const;
unsigned int getMyPort() const;
sockaddr_storage getYourAddr() const;
unsigned int getYourAddrLen() const;
unsigned int getMyPort() const;
unsigned int getErrors() const;
@ -90,19 +90,19 @@ public:
CAMBEData& operator=(const CAMBEData& data);
private:
unsigned int m_rptSeq;
unsigned char m_outSeq;
unsigned int m_id;
unsigned char m_band1;
unsigned char m_band2;
unsigned char m_band3;
unsigned char* m_data;
in_addr m_yourAddress;
unsigned int m_yourPort;
unsigned int m_myPort;
unsigned int m_errors;
wxString m_text;
CHeaderData m_header;
unsigned int m_rptSeq;
unsigned char m_outSeq;
unsigned int m_id;
unsigned char m_band1;
unsigned char m_band2;
unsigned char m_band3;
unsigned char* m_data;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
unsigned int m_errors;
wxString m_text;
CHeaderData m_header;
};
#endif

16
Common/APRSWriter.cpp
View file

@ -122,8 +122,8 @@ CAPRSWriter::CAPRSWriter(const wxString& address, unsigned int port, const wxStr
m_idTimer(1000U),
m_gateway(),
m_array(),
m_aprsAddress(),
m_aprsPort(port),
m_aprsAddr(),
m_aprsAddrLen(),
m_aprsSocket()
#if defined(USE_GPSD)
,m_gpsdEnabled(false),
@ -140,7 +140,7 @@ m_gpsdData()
m_gateway.Truncate(LONG_CALLSIGN_LENGTH - 1U);
m_gateway.Trim();
m_aprsAddress = CUDPReaderWriter::lookup(address);
CUDPReaderWriter::lookup(address, port, m_aprsAddr, m_aprsAddrLen);
}
CAPRSWriter::~CAPRSWriter()
@ -284,7 +284,7 @@ void CAPRSWriter::writeData(const wxString& callsign, const CAMBEData& data)
wxLogDebug(wxT("APRS ==> %s"), output.c_str());
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddress, m_aprsPort);
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddr, m_aprsAddrLen);
collector->reset();
}
@ -419,7 +419,7 @@ void CAPRSWriter::sendIdFramesFixed()
wxLogDebug(wxT("APRS ==> %s"), output.c_str());
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddress, m_aprsPort);
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddr, m_aprsAddrLen);
if (entry->getBand().Len() == 1U) {
output.Printf(wxT("%s-%s>APDG02,TCPIP*,qAC,%s-%sS:!%s%cD%s%c&RNG%04.0lf/A=%06.0lf %s %s\r\n"),
@ -434,7 +434,7 @@ void CAPRSWriter::sendIdFramesFixed()
wxLogDebug(wxT("APRS ==> %s"), output.c_str());
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddress, m_aprsPort);
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddr, m_aprsAddrLen);
}
}
}
@ -576,7 +576,7 @@ void CAPRSWriter::sendIdFramesMobile()
wxLogDebug(wxT("APRS ==> %s%s%s"), output1.c_str(), output2.c_str(), output3.c_str());
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddress, m_aprsPort);
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddr, m_aprsAddrLen);
if (entry->getBand().Len() == 1U) {
if (altitudeSet)
@ -602,7 +602,7 @@ void CAPRSWriter::sendIdFramesMobile()
wxLogDebug(wxT("APRS ==> %s%s%s"), output1.c_str(), output2.c_str(), output3.c_str());
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddress, m_aprsPort);
m_aprsSocket.write((unsigned char*)ascii, (unsigned int)::strlen(ascii), m_aprsAddr, m_aprsAddrLen);
}
}
}

4
Common/APRSWriter.h
View file

@ -92,8 +92,8 @@ private:
CTimer m_idTimer;
wxString m_gateway;
CEntry_t m_array;
in_addr m_aprsAddress;
unsigned int m_aprsPort;
sockaddr_storage m_aprsAddr;
unsigned int m_aprsAddrLen;
CUDPReaderWriter m_aprsSocket;
#if defined(USE_GPSD)
bool m_gpsdEnabled;

38
Common/CCSData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013 by Jonathan Naylor G4KLX
* Copyright (C) 2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -41,34 +41,34 @@ public:
CCCSData();
~CCCSData();
bool setCCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
unsigned int getCCSData(unsigned char* data, unsigned int length) const;
void setDestination(const in_addr& address, unsigned int port);
void setDestination(const sockaddr_storage& addr, unsigned int addrLen);
wxString getLocal() const;
wxString getRemote() const;
CC_TYPE getType() const;
in_addr getYourAddress() const;
unsigned int getYourPort() const;
unsigned int getMyPort() const;
sockaddr_storage getYourAddr() const;
unsigned int getYourAddrLen() const;
unsigned int getMyPort() const;
private:
wxString m_local;
wxString m_remote;
double m_latitude;
double m_longitude;
double m_frequency;
double m_offset;
wxString m_description1;
wxString m_description2;
wxString m_url;
CC_TYPE m_type;
in_addr m_yourAddress;
unsigned int m_yourPort;
unsigned int m_myPort;
wxString m_local;
wxString m_remote;
double m_latitude;
double m_longitude;
double m_frequency;
double m_offset;
wxString m_description1;
wxString m_description2;
wxString m_url;
CC_TYPE m_type;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
};
#endif

37
Common/CCSHandler.cpp
View file

@ -132,7 +132,8 @@ m_offset(offset),
m_description1(description1),
m_description2(description2),
m_url(url),
m_ccsAddress(),
m_ccsAddr(),
m_ccsAddrLen(0U),
m_protocol(localPort, m_localAddress),
m_state(CS_DISABLED),
m_local(),
@ -257,7 +258,7 @@ void CCCSHandler::process(CAMBEData& data)
wxLogMessage(wxT("CCS: Rejecting new incoming CCS link from %s @ %s to %s"), myCall1.c_str(), rptCall1.c_str(), yourCall.c_str());
CCCSData data(yourCall, myCall1, CT_TERMINATE);
data.setDestination(m_ccsAddress, CCS_PORT);
data.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeMisc(data);
m_protocol.writeMisc(data);
@ -351,7 +352,7 @@ void CCCSHandler::process(CConnectData& connect)
// Give our location, frequency, etc
CCCSData data(m_callsign, m_latitude, m_longitude, m_frequency, m_offset, m_description1, m_description2, m_url, CT_INFO);
data.setDestination(m_ccsAddress, CCS_PORT);
data.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeMisc(data);
m_state = CS_CONNECTED;
@ -369,16 +370,8 @@ void CCCSHandler::process(CConnectData& connect)
bool CCCSHandler::connect()
{
// Is CCS disabled?
if (m_localAddress.IsSameAs(wxT("127.0.0.1")))
return false;
// Can we resolve the CCS server address?
m_ccsAddress = CUDPReaderWriter::lookup(m_ccsHost);
if (m_ccsAddress.s_addr == INADDR_NONE) {
wxLogError(wxT("CCS: Unable to find the IP address for %s"), m_ccsHost.c_str());
return false;
}
CUDPReaderWriter::lookup(m_ccsHost, CCS_PORT, m_ccsAddr, m_ccsAddrLen);
bool res = m_protocol.open();
if (!res)
@ -396,7 +389,7 @@ bool CCCSHandler::connect()
void CCCSHandler::disconnectInt()
{
if (m_state == CS_CONNECTED || m_state == CS_ACTIVE) {
CConnectData connect(m_callsign, CT_UNLINK, m_ccsAddress, CCS_PORT);
CConnectData connect(m_callsign, CT_UNLINK, m_ccsAddr, m_ccsAddrLen);
m_protocol.writeConnect(connect);
}
@ -449,7 +442,7 @@ void CCCSHandler::stopLink(const wxString& user, const wxString& type)
wxLogMessage(wxT("CCS: Link to %s from %s has been terminated via %s by %s"), m_yourCall.c_str(), m_local.c_str(), type.c_str(), user.c_str());
CCCSData data(m_local, m_yourCall, CT_TERMINATE);
data.setDestination(m_ccsAddress, CCS_PORT);
data.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeMisc(data);
m_protocol.writeMisc(data);
@ -475,7 +468,7 @@ void CCCSHandler::unlink(const wxString& callsign)
wxLogMessage(wxT("CCS: Link to %s from %s has been terminated by command"), m_yourCall.c_str(), m_local.c_str());
CCCSData data(m_local, m_yourCall, CT_TERMINATE);
data.setDestination(m_ccsAddress, CCS_PORT);
data.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeMisc(data);
m_protocol.writeMisc(data);
@ -496,7 +489,7 @@ void CCCSHandler::writeHeard(CHeaderData& header)
return;
CHeardData heard(header, m_callsign, m_reflector);
heard.setDestination(m_ccsAddress, CCS_PORT);
heard.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeHeard(heard);
}
@ -523,7 +516,7 @@ void CCCSHandler::writeAMBE(CAMBEData& data)
header.setRptCall2(m_reflector);
temp.setRptSeq(m_seqNo++);
temp.setDestination(m_ccsAddress, CCS_PORT);
temp.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeData(temp);
}
@ -562,7 +555,7 @@ void CCCSHandler::clockInt(unsigned int ms)
}
if (m_tryTimer.isRunning() && m_tryTimer.hasExpired()) {
CConnectData connect(m_callsign, CT_LINK1, m_ccsAddress, CCS_PORT);
CConnectData connect(m_callsign, CT_LINK1, m_ccsAddr, m_ccsAddrLen);
if (m_latitude != 0.0 && m_longitude != 0.0) {
wxString locator = CUtils::latLonToLoc(m_latitude, m_longitude);
connect.setLocator(locator);
@ -574,7 +567,7 @@ void CCCSHandler::clockInt(unsigned int ms)
}
if (m_pollTimer.isRunning() && m_pollTimer.hasExpired()) {
CPollData poll(m_callsign, m_ccsAddress, CCS_PORT);
CPollData poll(m_callsign, m_ccsAddr, m_ccsAddrLen);
m_protocol.writePoll(poll);
m_pollTimer.start();
@ -584,7 +577,7 @@ void CCCSHandler::clockInt(unsigned int ms)
wxLogMessage(wxT("CCS: Activity timeout on link for %s"), m_callsign.c_str(), m_callsign.c_str());
CCCSData data(m_local, m_yourCall, CT_TERMINATE);
data.setDestination(m_ccsAddress, CCS_PORT);
data.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeMisc(data);
m_protocol.writeMisc(data);
@ -600,7 +593,7 @@ void CCCSHandler::clockInt(unsigned int ms)
}
if (m_waitTimer.isRunning() && m_waitTimer.hasExpired()) {
CConnectData connect(m_callsign, CT_LINK1, m_ccsAddress, CCS_PORT);
CConnectData connect(m_callsign, CT_LINK1, m_ccsAddr, m_ccsAddrLen);
if (m_latitude != 0.0 && m_longitude != 0.0) {
wxString locator = CUtils::latLonToLoc(m_latitude, m_longitude);
connect.setLocator(locator);
@ -617,7 +610,7 @@ void CCCSHandler::clockInt(unsigned int ms)
CHeaderData header;
header.setMyCall1(m_callsign.Left(LONG_CALLSIGN_LENGTH - 1U));
CHeardData heard(header, m_callsign, wxEmptyString);
heard.setDestination(m_ccsAddress, CCS_PORT);
heard.setDestination(m_ccsAddr, m_ccsAddrLen);
m_protocol.writeHeard(heard);
m_announceTimer.start(3600U);

5
Common/CCSHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013 by Jonathan Naylor G4KLX
* Copyright (C) 2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -121,7 +121,8 @@ private:
wxString m_description1;
wxString m_description2;
wxString m_url;
in_addr m_ccsAddress;
sockaddr_storage m_ccsAddr;
unsigned int m_ccsAddrLen;
CCCSProtocolHandler m_protocol;
CCS_STATUS m_state;
wxString m_local;

6
Common/CCSProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2013 by Jonathan Naylor G4KLX
* Copyright (C) 2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -71,8 +71,8 @@ private:
CCS_TYPE m_type;
unsigned char* m_buffer;
unsigned int m_length;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockadd_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
bool readPackets();

69
Common/CacheManager.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2011,2012 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2011,2012,2020 by Jonathan Naylor G4KLX
*
* 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
@ -33,11 +33,12 @@
class CUserData {
public:
CUserData(const wxString& user, const wxString& repeater, const wxString& gateway, in_addr address) :
CUserData(const wxString& user, const wxString& repeater, const wxString& gateway, const sockaddr_storage& addr, unsigned int addrLen) :
m_user(user),
m_repeater(repeater),
m_gateway(gateway),
m_address(address)
m_addr(addr),
m_addrLen(addrLen)
{
}
@ -56,24 +57,31 @@ public:
return m_gateway;
}
in_addr getAddress() const
sockaddr_storage getAddr() const
{
return m_address;
return m_addr;
}
unsigned int getAddrLen() const
{
return m_addLen;
}
private:
wxString m_user;
wxString m_repeater;
wxString m_gateway;
in_addr m_address;
wxString m_user;
wxString m_repeater;
wxString m_gateway;
sockaddr_storage m_addr;
unsigned int m_addrLen;
};
class CRepeaterData {
public:
CRepeaterData(const wxString& repeater, const wxString& gateway, in_addr address, DSTAR_PROTOCOL protocol) :
CRepeaterData(const wxString& repeater, const wxString& gateway, const sockaddr_storage& addr, unsigned int addrLen, DSTAR_PROTOCOL protocol) :
m_repeater(repeater),
m_gateway(gateway),
m_address(address),
m_addr(addr),
m_addrLen(addrLen),
m_protocol(protocol)
{
}
@ -88,9 +96,14 @@ public:
return m_gateway;
}
in_addr getAddress() const
sockaddr_storage getAddr() const
{
return m_address;
return m_addr;
}
unsigned int getAddrLen() const
{
return m_addrLen;
}
DSTAR_PROTOCOL getProtocol() const
@ -99,17 +112,19 @@ public:
}
private:
wxString m_repeater;
wxString m_gateway;
in_addr m_address;
DSTAR_PROTOCOL m_protocol;
wxString m_repeater;
wxString m_gateway;
sockaddr_storage m_addr;
unsigned int m_addrLen;
DSTAR_PROTOCOL m_protocol;
};
class CGatewayData {
public:
CGatewayData(const wxString& gateway, in_addr address, DSTAR_PROTOCOL protocol) :
CGatewayData(const wxString& gateway, const sockaddr_storage& addr, unsigned int addrLen, DSTAR_PROTOCOL protocol) :
m_gateway(gateway),
m_address(address),
m_addr(addr),
m_addrLen(addrLen),
m_protocol(protocol)
{
}
@ -119,9 +134,14 @@ public:
return m_gateway;
}
in_addr getAddress() const
sockaddr_storage getAddr() const
{
return m_address;
return m_addr;
}
unsigned int getAddrLen() const
{
return m_addrLen;
}
DSTAR_PROTOCOL getProtocol() const
@ -130,9 +150,10 @@ public:
}
private:
wxString m_gateway;
in_addr m_address;
DSTAR_PROTOCOL m_protocol;
wxString m_gateway;
sockaddr_storage m_addr;
unsigned int m_addrLen;
DSTAR_PROTOCOL m_protocol;
};
class CCacheManager {

42
Common/ConnectData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2012,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2012,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -39,18 +39,18 @@ enum CD_TYPE {
class CConnectData {
public:
CConnectData(GATEWAY_TYPE gatewayType, const wxString& repeater, const wxString& reflector, CD_TYPE type, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CConnectData(const wxString& repeater, const wxString& reflector, CD_TYPE type, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CConnectData(const wxString& repeater, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CConnectData(const wxString& repeater, CD_TYPE type, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CConnectData(CD_TYPE type, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CConnectData(GATEWAY_TYPE gatewayType, const wxString& repeater, const wxString& reflector, CD_TYPE type, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CConnectData(const wxString& repeater, const wxString& reflector, CD_TYPE type, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CConnectData(const wxString& repeater, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CConnectData(const wxString& repeater, CD_TYPE type, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CConnectData(CD_TYPE type, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CConnectData();
~CConnectData();
bool setDExtraData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDExtraData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
unsigned int getDExtraData(unsigned char* data, unsigned int length) const;
unsigned int getDPlusData(unsigned char* data, unsigned int length) const;
@ -61,21 +61,21 @@ public:
wxString getReflector() const;
CD_TYPE getType() const;
in_addr getYourAddress() const;
unsigned int getYourPort() const;
unsigned int getMyPort() const;
sockaddr_storage getYourAddr() const;
unsigned int getYourAddrLen() const;
unsigned int getMyPort() const;
void setLocator(const wxString& locator);
private:
GATEWAY_TYPE m_gatewayType;
wxString m_repeater;
wxString m_reflector;
CD_TYPE m_type;
wxString m_locator;
in_addr m_yourAddress;
unsigned int m_yourPort;
unsigned int m_myPort;
GATEWAY_TYPE m_gatewayType;
wxString m_repeater;
wxString m_reflector;
CD_TYPE m_type;
wxString m_locator;
sockaddr_storage m_yourAddress;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
};
#endif

10
Common/DCSHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2012,2013,2015 by Jonathan Naylor G4KLX
* Copyright (C) 2012,2013,2015,2020 by Jonathan Naylor G4KLX
*
* 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
@ -56,7 +56,7 @@ public:
static void setHeaderLogger(CHeaderLogger* logger);
static void setGatewayType(GATEWAY_TYPE type);
static void link(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, const in_addr& address);
static void link(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, const sockaddr_storage& addr, unsigned int addrLen);
static void unlink(IReflectorCallback* handler, const wxString& reflector = wxEmptyString, bool exclude = true);
static void unlink();
@ -83,7 +83,7 @@ public:
static wxString getIncoming(const wxString& callsign);
protected:
CDCSHandler(IReflectorCallback* handler, const wxString& reflector, const wxString& repeater, CDCSProtocolHandler* protoHandler, const in_addr& address, unsigned int port, DIRECTION direction);
CDCSHandler(IReflectorCallback* handler, const wxString& reflector, const wxString& repeater, CDCSProtocolHandler* protoHandler, const sockaddr_storage& addr, unsigned int addrLen, DIRECTION direction);
~CDCSHandler();
void processInt(CAMBEData& data);
@ -115,8 +115,8 @@ private:
bool m_isXlx;
wxString m_repeater;
CDCSProtocolHandler* m_handler;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
DIRECTION m_direction;
DCS_STATE m_linkState;

6
Common/DCSProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2012,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2012,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -65,8 +65,8 @@ private:
DCS_TYPE m_type;
unsigned char* m_buffer;
unsigned int m_length;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
bool readPackets();

12
Common/DDData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2011,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -35,8 +35,8 @@ public:
CDDData(const CDDData& data);
~CDDData();
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort);
bool setHBRepeaterData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort);
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setHBRepeaterData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
unsigned int getIcomRepeaterData(unsigned char* data, unsigned int length);
unsigned int getHBRepeaterData(unsigned char* data, unsigned int length);
@ -75,10 +75,10 @@ public:
unsigned char* getDestinationAddress() const;
void setRepeaters(const wxString& rpt1, const wxString& rpt2);
void setDestination(const in_addr& address, unsigned int port);
void setDestination(const sockaddr_storage& addr, unsigned int addrLen);
in_addr getYourAddress() const;
unsigned int getYourPort() const;
sockaddr_storage getYourAddr() const;
unsigned int getYourAddrLen() const;
private:
CHeaderData m_header;

12
Common/DExtraHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2013,2015 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2013,2015,2020 by Jonathan Naylor G4KLX
*
* 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
@ -56,7 +56,7 @@ public:
static void setHeaderLogger(CHeaderLogger* logger);
static void setMaxDongles(unsigned int maxDongles);
static void link(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, const in_addr& address);
static void link(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, const sockaddr_storage& addr, unsigned int addrLen);
static void unlink(IReflectorCallback* handler, const wxString& reflector = wxEmptyString, bool exclude = true);
static void unlink();
@ -85,8 +85,8 @@ public:
static wxString getDongles();
protected:
CDExtraHandler(IReflectorCallback* handler, const wxString& reflector, const wxString& repeater, CDExtraProtocolHandler* protoHandler, const in_addr& address, unsigned int port, DIRECTION direction);
CDExtraHandler(CDExtraProtocolHandler* protoHandler, const wxString& reflector, const in_addr& address, unsigned int port, DIRECTION direction);
CDExtraHandler(IReflectorCallback* handler, const wxString& reflector, const wxString& repeater, CDExtraProtocolHandler* protoHandler, const sockaddr_storage& addr, unsigned int addrLen, DIRECTION direction);
CDExtraHandler(CDExtraProtocolHandler* protoHandler, const wxString& reflector, const sockaddr_storage& addr, unsigned int addrLen, DIRECTION direction);
~CDExtraHandler();
void processInt(CHeaderData& header);
@ -117,8 +117,8 @@ private:
wxString m_reflector;
wxString m_repeater;
CDExtraProtocolHandler* m_handler;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
DIRECTION m_direction;
DEXTRA_STATE m_linkState;
IReflectorCallback* m_destination;

6
Common/DExtraProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -69,8 +69,8 @@ private:
DEXTRA_TYPE m_type;
unsigned char* m_buffer;
unsigned int m_length;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
bool readPackets();

12
Common/DPlusHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2013,2015 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2013,2015,2020 by Jonathan Naylor G4KLX
*
* 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
@ -61,7 +61,7 @@ public:
static void startAuthenticator(const wxString& address, CCacheManager* cache);
static void link(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, const in_addr& address);
static void link(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, const sockaddr_storage& addr, unsigned int addrLen);
static void relink(IReflectorCallback* handler, const wxString& reflector);
static void unlink(IReflectorCallback* handler, const wxString& reflector = wxEmptyString, bool exclude = true);
static void unlink();
@ -90,8 +90,8 @@ public:
static wxString getDongles();
protected:
CDPlusHandler(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, CDPlusProtocolHandler* protoHandler, const in_addr& address, unsigned int port);
CDPlusHandler(CDPlusProtocolHandler* protoHandler, const in_addr& address, unsigned int port);
CDPlusHandler(IReflectorCallback* handler, const wxString& repeater, const wxString& reflector, CDPlusProtocolHandler* protoHandler, const sockaddr_storage& addr, unsigned int addrLen);
CDPlusHandler(CDPlusProtocolHandler* protoHandler, const sockaddr_storage& addr, unsigned int addrLen);
~CDPlusHandler();
void processInt(CHeaderData& header);
@ -125,8 +125,8 @@ private:
wxString m_callsign;
wxString m_reflector;
CDPlusProtocolHandler* m_handler;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
DIRECTION m_direction;
DPLUS_STATE m_linkState;

6
Common/DPlusProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2011,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2011,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -69,8 +69,8 @@ private:
DPLUS_TYPE m_type;
unsigned char* m_buffer;
unsigned int m_length;
in_addr m_yourAddress;
unsigned int m_yourPort;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
bool readPackets();

6
Common/Defs.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2015 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2015,2020 by Jonathan Naylor G4KLX
*
* 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
@ -136,8 +136,4 @@ enum GATEWAY_TYPE {
const unsigned int TIME_PER_TIC_MS = 5U;
#if defined(__WINDOWS__)
typedef unsigned long in_addr_t;
#endif
#endif

7
Common/G2Handler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2012 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2012,2020 by Jonathan Naylor G4KLX
*
* 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
@ -50,7 +50,7 @@ public:
static void finalise();
protected:
CG2Handler(CRepeaterHandler* repeater, const in_addr& address, unsigned int id);
CG2Handler(CRepeaterHandler* repeater, const sockaddr_storage& addr, unsigned int addrLen, unsigned int id);
~CG2Handler();
bool clockInt(unsigned int ms);
@ -64,7 +64,8 @@ private:
static CHeaderLogger* m_headerLogger;
CRepeaterHandler* m_repeater;
in_addr m_address;
sockaddr_storage m_addr;
unsigned int m_addrLen;
unsigned int m_id;
CTimer m_inactivityTimer;
};

6
Common/G2ProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2011 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2011,2020 by Jonathan Naylor G4KLX
*
* 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
@ -63,8 +63,8 @@ private:
G2_TYPE m_type;
unsigned char* m_buffer;
unsigned int m_length;
in_addr m_address;
unsigned int m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
bool readPackets();
};

32
Common/GatewayCache.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2011,2012 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2011,2012,2020 by Jonathan Naylor G4KLX
*
* 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
@ -35,9 +35,10 @@
class CGatewayRecord {
public:
CGatewayRecord(const wxString& gateway, in_addr address, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock) :
CGatewayRecord(const wxString& gateway, const sockaddr_storage& addr, unsigned int addrLen, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock) :
m_gateway(gateway),
m_address(address),
m_addr(addr),
m_addrLen(addrLen),
m_protocol(DP_UNKNOWN),
m_addrLock(addrLock),
m_protoLock(false)
@ -53,9 +54,14 @@ public:
return m_gateway;
}
in_addr getAddress() const
sockaddr_storage getAddr() const
{
return m_address;
return m_addr;
}
unsigned int getAddrLen() const
{
return m_addrLen;
}
DSTAR_PROTOCOL getProtocol() const
@ -63,10 +69,11 @@ public:
return m_protocol;
}
void setData(in_addr address, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock)
void setData(const sockaddr_storage& addr, unsigned int addrLen, DSTAR_PROTOCOL protocol, bool addrLock, bool protoLock)
{
if (!m_addrLock) {
m_address = address;
m_addr = addr;
m_addrLen = addrLen;
m_addrLock = addrLock;
}
@ -79,11 +86,12 @@ public:
}
private:
wxString m_gateway;
in_addr m_address;
DSTAR_PROTOCOL m_protocol;
bool m_addrLock;
bool m_protoLock;
wxString m_gateway;
sockaddr_storage m_addr;
unsigned int m_addrLen;
DSTAR_PROTOCOL m_protocol;
bool m_addrLock;
bool m_protoLock;
};
WX_DECLARE_STRING_HASH_MAP(CGatewayRecord*, CGatewayCache_t);

6
Common/HBRepeaterProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -67,8 +67,8 @@ private:
REPEATER_TYPE m_type;
unsigned char* m_buffer;
unsigned int m_length;
in_addr m_address;
unsigned int m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
bool readPackets();
};

58
Common/HeaderData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2014 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2014,2020 by Jonathan Naylor G4KLX
*
* 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
@ -36,13 +36,13 @@ public:
unsigned char flag2 = 0x00, unsigned char flag3 = 0x00);
~CHeaderData();
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, bool check, const in_addr& yourAddress, unsigned int yourPort);
bool setHBRepeaterData(const unsigned char* data, unsigned int length, bool check, const in_addr& yourAddress, unsigned int yourPort);
bool setG2Data(const unsigned char* data, unsigned int length, bool check, const in_addr& yourAddress, unsigned int yourPort);
bool setDExtraData(const unsigned char* data, unsigned int length, bool check, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, bool check, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
void setDCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
void setCCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, bool check, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setHBRepeaterData(const unsigned char* data, unsigned int length, bool check, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setG2Data(const unsigned char* data, unsigned int length, bool check, const sockaddr_storage& yourAddr, unsigned int yourAddrLen);
bool setDExtraData(const unsigned char* data, unsigned int length, bool check, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, bool check, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
void setDCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
void setCCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
unsigned int getIcomRepeaterData(unsigned char* data, unsigned int length, bool check) const;
unsigned int getHBRepeaterData(unsigned char* data, unsigned int length, bool check) const;
@ -90,14 +90,14 @@ public:
void setCQCQCQ();
void setRepeaters(const wxString& rpt1, const wxString& rpt2);
void setDestination(const in_addr& address, unsigned int port);
void setDestination(const sockaddr_storage& addr, unsigned int addrLen);
bool setData(const unsigned char* data, unsigned int length, bool check);
unsigned int getData(unsigned char* data, unsigned int length, bool check) const;
in_addr getYourAddress() const;
unsigned int getYourPort() const;
unsigned int getMyPort() const;
sockaddr_storage getYourAddr() const;
unsigned int getYourAddrLen() const;
unsigned int getMyPort() const;
unsigned int getErrors() const;
@ -108,23 +108,23 @@ public:
CHeaderData& operator=(const CHeaderData& header);
private:
unsigned int m_rptSeq;
unsigned int m_id;
unsigned char m_band1;
unsigned char m_band2;
unsigned char m_band3;
unsigned char m_flag1;
unsigned char m_flag2;
unsigned char m_flag3;
unsigned char* m_myCall1;
unsigned char* m_myCall2;
unsigned char* m_yourCall;
unsigned char* m_rptCall1;
unsigned char* m_rptCall2;
in_addr m_yourAddress;
unsigned int m_yourPort;
unsigned int m_myPort;
unsigned int m_errors;
unsigned int m_rptSeq;
unsigned int m_id;
unsigned char m_band1;
unsigned char m_band2;
unsigned char m_band3;
unsigned char m_flag1;
unsigned char m_flag2;
unsigned char m_flag3;
unsigned char* m_myCall1;
unsigned char* m_myCall2;
unsigned char* m_yourCall;
unsigned char* m_rptCall1;
unsigned char* m_rptCall2;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
unsigned int m_errors;
};
#endif

22
Common/HeardData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2012,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2012,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -37,25 +37,25 @@ public:
CHeardData(const CHeaderData& data, const wxString& repeater, const wxString& reflector);
~CHeardData();
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, const in_addr& address, unsigned int port);
bool setIcomRepeaterData(const unsigned char* data, unsigned int length, const sockaddr_storage& addr, unsigned int addrLen);
unsigned int getCCSData(unsigned char* data, unsigned int length) const;
wxString getRepeater() const;
wxString getUser() const;
void setDestination(const in_addr& address, unsigned int port);
void setDestination(const sockaddr_storage& addr, unsigned int addrLen);
in_addr getAddress() const;
unsigned int getPort() const;
// sockaddr_storage getAddr() const;
// unsigned int getAddrLen() const;
private:
wxString m_reflector;
wxString m_repeater;
wxString m_user;
wxString m_ext;
in_addr m_address;
unsigned int m_port;
wxString m_reflector;
wxString m_repeater;
wxString m_user;
wxString m_ext;
sockaddr_storage m_addr;
unsigned int m_addrLen;
};
#endif

6
Common/IcomRepeaterProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -150,8 +150,8 @@ public:
private:
CUDPReaderWriter m_socket;
in_addr m_icomAddress;
unsigned int m_icomPort;
sockaddr_storage m_icomAddr;
unsigned int m_icomAddrLen;
bool m_over1;
wxUint16 m_seqNo;
unsigned int m_tries;

38
Common/PollData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2012,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2012,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -31,16 +31,16 @@
class CPollData {
public:
CPollData(const wxString& data1, const wxString& data2, DIRECTION direction, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CPollData(const wxString& data, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CPollData(const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort = 0U);
CPollData(const wxString& data1, const wxString& data2, DIRECTION direction, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CPollData(const wxString& data, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CPollData(const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort = 0U);
CPollData();
~CPollData();
bool setDExtraData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const in_addr& yourAddress, unsigned int yourPort, unsigned int myPort);
bool setDExtraData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDPlusData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setDCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
bool setCCSData(const unsigned char* data, unsigned int length, const sockaddr_storage& yourAddr, unsigned int yourAddrLen, unsigned int myPort);
unsigned int getDExtraData(unsigned char* data, unsigned int length) const;
unsigned int getDPlusData(unsigned char* data, unsigned int length) const;
@ -55,22 +55,22 @@ public:
bool isDongle() const;
in_addr getYourAddress() const;
unsigned int getYourPort() const;
unsigned int getMyPort() const;
sockaddr_storage getYourAddr() const;
unsigned int getYourAddrLen() const;
unsigned int getMyPort() const;
DIRECTION getDirection() const;
unsigned int getLength() const;
private:
wxString m_data1;
wxString m_data2;
DIRECTION m_direction;
bool m_dongle;
unsigned int m_length;
in_addr m_yourAddress;
unsigned int m_yourPort;
unsigned int m_myPort;
wxString m_data1;
wxString m_data2;
DIRECTION m_direction;
bool m_dongle;
unsigned int m_length;
sockaddr_storage m_yourAddr;
unsigned int m_yourAddrLen;
unsigned int m_myPort;
};
#endif

6
Common/RemoteProtocolHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2011,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -71,8 +71,8 @@ public:
private:
CUDPReaderWriter m_socket;
in_addr m_address;
unsigned int m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
bool m_loggedIn;
RPH_TYPE m_type;
unsigned char* m_inBuffer;

9
Common/RepeaterHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2015,2018 by Jonathan Naylor G4KLX
* Copyright (C) 2010-2015,2018,2020 by Jonathan Naylor G4KLX
*
* 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
@ -175,8 +175,8 @@ private:
wxString m_rptCallsign;
wxString m_gwyCallsign;
unsigned char m_band;
in_addr m_address;
unsigned int m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
HW_TYPE m_hwType;
IRepeaterProtocolHandler* m_repeaterHandler;
double m_frequency;
@ -231,7 +231,8 @@ private:
wxString m_g2Repeater;
wxString m_g2Gateway;
CHeaderData* m_g2Header;
in_addr m_g2Address;
sockaddr_storage m_g2Addr;
unsigned int m_g2AddrLen;
// Link info
LINK_STATUS m_linkStatus;

5
Common/StarNetHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011-2014 by Jonathan Naylor G4KLX
* Copyright (C) 2011-2014,2020 by Jonathan Naylor G4KLX
*
* 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
@ -98,7 +98,8 @@ public:
wxString m_destination;
wxString m_repeater;
wxString m_gateway;
in_addr m_address;
sockaddr_storage m_addr;
unsigned int m_addrLen;
IRepeaterCallback* m_local;
};

16
Common/StatusData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011,2012 by Jonathan Naylor G4KLX
* Copyright (C) 2011,2012,2020 by Jonathan Naylor G4KLX
*
* 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
@ -34,16 +34,16 @@ public:
unsigned int getHBRepeaterData(unsigned char* data, unsigned int length) const;
void setDestination(const in_addr& address, unsigned int port);
void setDestination(const sockaddr_storage& addr, unsigned int addrLen);
in_addr getAddress() const;
unsigned int getPort() const;
sockaddr_storage getAddr() const;
unsigned int getAddrLen() const;
private:
unsigned char* m_data;
unsigned int m_n;
in_addr m_address;
unsigned int m_port;
unsigned char* m_data;
unsigned int m_n;
sockaddr_storage m_addr;
unsigned int m_addrLen;
};
#endif

3
Common/TCPReaderWriterServer.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011 by Jonathan Naylor G4KLX
* Copyright (C) 2011,2020 by Jonathan Naylor G4KLX
*
* 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
@ -59,7 +59,6 @@ private:
bool open();
int accept();
void close();
in_addr lookup(const wxString& hostname) const;
};
#endif

22
Common/TextData.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2010,2011,2012,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2010,2011,2012,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -30,22 +30,22 @@
class CTextData {
public:
CTextData(LINK_STATUS status, const wxString& reflector, const wxString& text, const in_addr& address, unsigned int port, bool temporary = false);
CTextData(const wxString& text, const in_addr& address, unsigned int port, bool temporary = true);
CTextData(LINK_STATUS status, const wxString& reflector, const wxString& text, const sockaddr_storage& addr, unsigned int addrLen, bool temporary = false);
CTextData(const wxString& text, const sockaddr_storage& addr, unsigned int addrLen, bool temporary = true);
virtual ~CTextData();
unsigned int getHBRepeaterData(unsigned char* data, unsigned int length) const;
in_addr getAddress() const;
unsigned int getPort() const;
// sockaddr_storage getAddr() const;
// unsigned int getAddrLen() const;
private:
LINK_STATUS m_status;
unsigned char* m_reflector;
unsigned char* m_text;
in_addr m_address;
unsigned int m_port;
bool m_temporary;
LINK_STATUS m_status;
unsigned char* m_reflector;
unsigned char* m_text;
sockaddr_storage m_address;
unsigned int m_addrLen;
bool m_temporary;
};
#endif

19
Common/UDPReaderWriter.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2009-2011,2013,2018 by Jonathan Naylor G4KLX
* Copyright (C) 2009-2011,2013,2018,2020 by Jonathan Naylor G4KLX
*
* 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
@ -39,22 +39,25 @@ public:
CUDPReaderWriter();
~CUDPReaderWriter();
static in_addr lookup(const wxString& hostName);
static int lookup(const wxString& hostName, unsigned int port, sockaddr_storage& addr, unsigned int& addrLen);
static bool match(const sockaddr_storage& first, const sockaddr_storage& second);
bool open();
int read(unsigned char* buffer, unsigned int length, in_addr& address, unsigned int& port);
bool write(const unsigned char* buffer, unsigned int length, const in_addr& address, unsigned int port);
int read(unsigned char* buffer, unsigned int length, sockaddr_storage& addr, unsigned int& addrLen);
bool write(const unsigned char* buffer, unsigned int length, const sockaddr_storage& addr, unsigned int addrLen);
void close();
unsigned int getPort() const;
private:
wxString m_address;
unsigned short m_port;
in_addr m_addr;
int m_fd;
wxString m_address;
unsigned short m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
int m_fd;
};
#endif

6
RemoteControl/RemoteControlRemoteControlHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2011,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -72,8 +72,8 @@ public:
private:
CUDPReaderWriter m_socket;
in_addr m_address;
unsigned int m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
bool m_loggedIn;
unsigned int m_retryCount;
RC_TYPE m_type;

5
TimeServer/TimeServerThread.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2012,2013 by Jonathan Naylor G4KLX
* Copyright (C) 2012,2013,2020 by Jonathan Naylor G4KLX
*
* 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
@ -79,7 +79,8 @@ private:
wxString m_callsignD;
wxString m_callsignE;
wxString m_callsignG;
in_addr m_address;
sockaddr_storage m_addr;
unsigned int m_addrLen;
LANGUAGE m_language;
FORMAT m_format;
INTERVAL m_interval;

6
TimerControl/TimerControlRemoteControlHandler.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011 by Jonathan Naylor G4KLX
* Copyright (C) 2011,2020 by Jonathan Naylor G4KLX
*
* 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
@ -62,8 +62,8 @@ public:
private:
CUDPReaderWriter m_socket;
in_addr m_address;
unsigned int m_port;
sockaddr_storage m_addr;
unsigned int m_addrLen;
bool m_loggedIn;
unsigned int m_retryCount;
TC_TYPE m_type;