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

comment changes

Browse Source
unstable
Tom Early 4 years ago
parent 47abcf0fdc
commit a7e52fc330
138 changed files with 182 additions and 210 deletions
Show Stats Download Patch File Download Diff File

2
reflector/BMClient.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/BMClient.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal Reflector
// urfd -- The universal Reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -36,7 +36,7 @@ public:
EProtocol GetProtocol(void) const { return EProtocol::ulx; }
int GetProtocolRevision(void) const { return XLX_PROTOCOL_REVISION_2; }
const char *GetProtocolName(void) const { return "ULX"; }
int GetCodec(void) const { return CODEC_AMBE2PLUS; }
ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsPeer(void) const { return true; }
// status

2
reflector/BMPeer.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/BMPeer.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/BPTC19696.cpp
Unescape View File

@ -1,7 +1,7 @@
// Copyright (C) 2012 by Ian Wraith
// Copyright (C) 2015 by Jonathan Naylor G4KLX
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/BPTC19696.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright (C) 2015 by Jonathan Naylor G4KLX
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Buffer.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Buffer.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/CNotificationQueue.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc. All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/CRC.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/CRC.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

33
reflector/Callsign.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -49,16 +49,19 @@ CCallsign::CCallsign(const char *sz, uint32_t dmrid)
m_uiDmrid = dmrid;
// and populate
if ( ::strlen(sz) > 0 )
auto len = strlen(sz);
if ( len > 0 )
{
// Calculate the M17 coded callsign
CSIn();
// callsign valid
memcpy(m_Callsign, sz, MIN(strlen(sz), CALLSIGN_LEN-1));
if ( strlen(sz) >= CALLSIGN_LEN )
memcpy(m_Callsign, sz, MIN(len, CALLSIGN_LEN-1));
if ( len > CALLSIGN_LEN )
{
m_Module = sz[CALLSIGN_LEN-1];
m_Module = sz[len-1];
}
// Calculate the M17 coded callsign
CSIn();
// dmrid ok ?
if ( m_uiDmrid == 0 )
{
@ -145,10 +148,11 @@ void CCallsign::SetCallsign(const char *sz, bool UpdateDmrid)
// set callsign
memset(m_Callsign, ' ', CALLSIGN_LEN);
m_Module = ' ';
memcpy(m_Callsign, sz, MIN(strlen(sz), CALLSIGN_LEN-1));
if ( strlen(sz) >= CALLSIGN_LEN )
auto len = strlen(sz);
memcpy(m_Callsign, sz, MIN(len, CALLSIGN_LEN-1));
if ( len > CALLSIGN_LEN )
{
m_Module = sz[CALLSIGN_LEN-1];
m_Module = sz[len-1];
}
// update M17 coded callsign
CSIn();
@ -273,11 +277,8 @@ void CCallsign::GetCallsignString(char *sz) const
const std::string CCallsign::GetCS(unsigned len) const
{
if (len > 8)
len = 8;
std::string rval(m_Callsign);
if (len)
rval.resize(len, ' ');
std::string rval(m_Callsign, CALLSIGN_LEN);
rval.append(1, m_Module);
return rval;
}
@ -411,7 +412,7 @@ void CCallsign::CSIn()
auto pos = m17_alphabet.find(m_Module);
m_coded = pos;
m_coded *= 40;
for( int i=CALLSIGN_LEN-2; i>=0; i-- ) {
for( int i=CALLSIGN_LEN-1; i>=0; i-- ) {
pos = m17_alphabet.find(m_Callsign[i]);
if (pos == std::string::npos) {
pos = 0;

5
reflector/Callsign.h
Unescape View File

@ -1,6 +1,6 @@
/// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -18,6 +18,9 @@
#pragma once
#include <cstdint>
#include <string>
////////////////////////////////////////////////////////////////////////////////////////
// define

2
reflector/CallsignList.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/CallsignList.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/CallsignListItem.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/CallsignListItem.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Client.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

7
reflector/Client.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -22,6 +22,7 @@
#include "IP.h"
#include "Callsign.h"
#include "Buffer.h"
#include "Packet.h"
////////////////////////////////////////////////////////////////////////////////////////
//
@ -58,7 +59,7 @@ public:
// identity
virtual EProtocol GetProtocol(void) const { return EProtocol::none; }
virtual int GetProtocolRevision(void) const { return 0; }
virtual int GetCodec(void) const { return CODEC_NONE; }
virtual ECodecType GetCodec(void) const { return ECodecType::none; }
virtual const char *GetProtocolName(void) const { return "none"; }
virtual bool IsNode(void) const { return false; }
virtual bool IsPeer(void) const { return false; }
@ -87,7 +88,7 @@ protected:
// status
char m_ModuleMastered;
CTimer m_LastKeepaliveTime;
CTimer m_LastKeepaliveTime;
std::time_t m_ConnectTime;
std::time_t m_LastHeardTime;
};

2
reflector/Clients.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Clients.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

7
reflector/CodecStream.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -25,13 +25,12 @@
////////////////////////////////////////////////////////////////////////////////////////
// constructor
CCodecStream::CCodecStream(CPacketStream *PacketStream, uint16_t uiId, uint8_t uiCodecIn, uint8_t uiCodecOut)
CCodecStream::CCodecStream(CPacketStream *PacketStream, uint16_t uiId, ECodecType type)
{
keep_running = true;
m_uiStreamId = uiId;
m_uiPid = 0;
m_uiCodecIn = uiCodecIn;
m_uiCodecOut = uiCodecOut;
m_eCodecIn = type;
m_bConnected = false;
m_fPingMin = -1;
m_fPingMax = -1;

16
reflector/CodecStream.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -21,15 +21,6 @@
#include "UDPSocket.h"
#include "PacketQueue.h"
////////////////////////////////////////////////////////////////////////////////////////
// define
// frame sizes
#define 9 9
#define 9 9
////////////////////////////////////////////////////////////////////////////////////////
// class
@ -39,7 +30,7 @@ class CCodecStream : public CPacketQueue
{
public:
// constructor
CCodecStream(CPacketStream *, uint16_t, uint8_t, uint8_t);
CCodecStream(CPacketStream *, uint16_t, ECodecType);
// destructor
virtual ~CCodecStream();
@ -76,8 +67,7 @@ protected:
uint16_t m_uiStreamId;
uint16_t m_uiPort;
uint8_t m_uiPid;
uint8_t m_uiCodecIn;
uint8_t m_uiCodecOut;
ECodecType m_eCodecIn;
// socket
CIp m_Ip;

2
reflector/DCSClient.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/DCSClient.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -34,7 +34,7 @@ public:
// identity
EProtocol GetProtocol(void) const { return EProtocol::dcs; }
const char *GetProtocolName(void) const { return "DCS"; }
int GetCodec(void) const { return CODEC_AMBEPLUS; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; }
// status

2
reflector/DCSProtocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DCSProtocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DExtraClient.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/DExtraClient.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -42,7 +42,7 @@ public:
EProtocol GetProtocol(void) const { return EProtocol::dextra; }
int GetProtocolRevision(void) const { return m_ProtRev; }
const char *GetProtocolName(void) const { return "DExtra"; }
int GetCodec(void) const { return CODEC_AMBEPLUS; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; }
// status

2
reflector/DExtraPeer.cpp
Unescape View File

@ -1,7 +1,7 @@
// Created by Antony Chazapis (SV9OAN) on 25/2/2018.
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DExtraPeer.h
Unescape View File

@ -1,7 +1,7 @@
// Created by Antony Chazapis (SV9OAN) on 25/2/2018.
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DExtraProtocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DExtraProtocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRIdDir.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRIdDir.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRIdDirFile.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRIdDirFile.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRIdDirHttp.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRIdDirHttp.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRMMDVMClient.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/DMRMMDVMClient.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -34,7 +34,7 @@ public:
// identity
EProtocol GetProtocol(void) const { return EProtocol::dmrmmdvm; }
const char *GetProtocolName(void) const { return "DMRMmdvm"; }
int GetCodec(void) const { return CODEC_AMBE2PLUS; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; }
// status

2
reflector/DMRMMDVMProtocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRMMDVMProtocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRPlusClient.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/DMRPlusClient.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -34,7 +34,7 @@ public:
// identity
EProtocol GetProtocol(void) const { return EProtocol::dmrplus; }
const char *GetProtocolName(void) const { return "DMRplus"; }
int GetCodec(void) const { return CODEC_AMBE2PLUS; }
ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsNode(void) const { return true; }
// status

2
reflector/DMRPlusProtocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DMRPlusProtocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DPlusClient.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/DPlusClient.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -34,7 +34,7 @@ public:
// identity
EProtocol GetProtocol(void) const { return EProtocol::dplus; }
const char *GetProtocolName(void) const { return "DPlus"; }
int GetCodec(void) const { return CODEC_AMBEPLUS; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; }
bool IsDextraDongle(void) const { return m_bDextraDongle; }
void SetDextraDongle(void) { m_bDextraDongle = true; }

2
reflector/DPlusProtocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DPlusProtocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DVFramePacket.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DVFramePacket.h
Unescape View File

@ -2,7 +2,7 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DVHeaderPacket.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DVHeaderPacket.h
Unescape View File

@ -2,7 +2,7 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DVLastFramePacket.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/DVLastFramePacket.h
Unescape View File

@ -2,7 +2,7 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/G3Client.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/G3Client.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -34,7 +34,7 @@ public:
// identity
EProtocol GetProtocol(void) const { return EProtocol::g3; }
const char *GetProtocolName(void) const { return "Terminal/AP"; }
int GetCodec(void) const { return CODEC_AMBEPLUS; }
ECodecType GetCodec(void) const { return ECodecType::dstar; }
bool IsNode(void) const { return true; }
// status

2
reflector/G3Protocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/G3Protocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2019 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/GateKeeper.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/GateKeeper.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/IP.cpp
Unescape View File

@ -1,5 +1,5 @@
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/IP.h
Unescape View File

@ -1,7 +1,7 @@
#pragma once
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/M17Client.cpp
Unescape View File

@ -1,4 +1,4 @@
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/M17Client.h
Unescape View File

@ -1,6 +1,6 @@
#pragma once
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/M17Protocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/M17Protocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Main.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Main.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Notification.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc. All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Notification.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc. All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/NotificationQueue.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc. All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Packet.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Packet.h
Unescape View File

@ -2,7 +2,7 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
//
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/PacketQueue.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

14
reflector/PacketStream.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -28,7 +28,7 @@ CPacketStream::CPacketStream()
m_uiStreamId = 0;
m_uiPacketCntr = 0;
m_OwnerClient = nullptr;
#ifdef TRANSCODER_IP
#ifdef TRANSCODED_MODULES
m_CodecStream = nullptr;
#endif
}
@ -50,11 +50,11 @@ bool CPacketStream::OpenPacketStream(const CDvHeaderPacket &DvHeader, std::share
m_DvHeader = DvHeader;
m_OwnerClient = client;
m_LastPacketTime.start();
#ifdef TRANSCODER_IP
#ifdef TRANSCODED_MODULES
if (std::string::npos != std::string(TRANSCODED_MODULES).find(DvHeader.GetRpt2Module()))
m_CodecStream = g_Transcoder.GetCodecStream(this, client->GetCodec());
else
m_CodecStream = g_Transcoder.GetCodecStream(this, CODEC_NONE);
m_CodecStream = g_Transcoder.GetCodecStream(this, ECodecType::none);
#endif
ok = true;
}
@ -67,7 +67,7 @@ void CPacketStream::ClosePacketStream(void)
m_bOpen = false;
m_uiStreamId = 0;
m_OwnerClient = nullptr;
#ifdef TRANSCODER_IP
#ifdef TRANSCODED_MODULES
g_Transcoder.ReleaseStream(m_CodecStream);
m_CodecStream = nullptr;
#endif
@ -82,7 +82,7 @@ void CPacketStream::Push(std::unique_ptr<CPacket> Packet)
m_LastPacketTime.start();
Packet->UpdatePids(m_uiPacketCntr++);
// transcoder avaliable ?
#ifdef TRANSCODER_IP
#ifdef TRANSCODED_MODULES
if ( m_CodecStream != nullptr )
{
// todo: verify no possibilty of double lock here
@ -114,7 +114,7 @@ void CPacketStream::Push(std::unique_ptr<CPacket> Packet)
bool CPacketStream::IsEmpty(void) const
{
#ifdef TRANSCODER_IP
#ifdef TRANSCODED_MODULES
bool bEmpty = empty();
// also check no packets still in Codec stream's queue
if ( bEmpty && (m_CodecStream != nullptr) )

4
reflector/PacketStream.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -62,7 +62,7 @@ protected:
CTimer m_LastPacketTime;
CDvHeaderPacket m_DvHeader;
std::shared_ptr<CClient> m_OwnerClient;
#ifdef TRANSCODER_IP
#ifdef TRANSCODED_MODULES
std::shared_ptr<CCodecStream> m_CodecStream;
#endif
};

2
reflector/Peer.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Peer.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/PeerCallsignList.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/PeerCallsignList.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Peers.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Peers.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Protocol.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Protocol.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Protocols.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Protocols.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/RawSocket.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/RawSocket.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

4
reflector/Reflector.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -433,7 +433,6 @@ void CReflector::JsonReportThread()
std::cout << "Error creating monitor socket" << std::endl;
}
}
#endif
////////////////////////////////////////////////////////////////////////////////////////
// notifications
@ -482,6 +481,7 @@ void CReflector::OnStreamClose(const CCallsign &callsign)
m_Notifications.push(notification);
m_Notifications.Unlock();
}
#endif
////////////////////////////////////////////////////////////////////////////////////////
// modules & queues

5
reflector/Reflector.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify
@ -133,10 +133,9 @@ protected:
std::future<void> m_XmlReportFuture;
#ifdef JSON_MONITOR
std::future<void> m_JsonReportFuture;
#endif
// notifications
CNotificationQueue m_Notifications;
#endif
public:
#ifdef DEBUG_DUMPFILE

2
reflector/Semaphore.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Semaphore.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Timer.h
Unescape View File

@ -1,4 +1,4 @@
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Transcoder.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/Transcoder.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2015 Jean-Luc Deltombe (LX3JL). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/UDPMsgSocket.cpp
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

2
reflector/UDPMsgSocket.h
Unescape View File

@ -1,6 +1,6 @@
// Copyright © 2020 Marius Petrescu (YO2LOJ). All rights reserved.
// ulxd -- The universal reflector
// urfd -- The universal reflector
// Copyright © 2021 Thomas A. Early N7TAE
//
// This program is free software: you can redistribute it and/or modify

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.