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

32 byte end voice frame for DPlus

Browse Source
pull/14/head
Tom Early 6 years ago
parent e2b04a6e17
commit 9205868c5a
3 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File

82
QnetLink.cpp
Unescape View File

@ -54,7 +54,7 @@
#include "QnetLink.h" #include "QnetLink.h"
#include "Utilities.h" #include "Utilities.h"
#define LINK_VERSION "QnetLink-603" #define LINK_VERSION "QnetLink-606"
#ifndef BIN_DIR #ifndef BIN_DIR
#define BIN_DIR "/usr/local/bin" #define BIN_DIR "/usr/local/bin"
#endif #endif
@ -1195,9 +1195,8 @@ void CQnetLink::ProcessXRF(unsigned char *buf, const int length)
inbound->mod = dsvt.hdr.rpt1[7]; inbound->mod = dsvt.hdr.rpt1[7];
} else { } else {
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(58 & 0xFF); rdsvt.head[0] = 58U;
rdsvt.head[1] = (unsigned char)(58 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 56); memcpy(rdsvt.dsvt.title, dsvt.title, 56);
REFWrite(rdsvt.head, 58, inbound->addr); REFWrite(rdsvt.head, 58, inbound->addr);
@ -1287,9 +1286,8 @@ void CQnetLink::ProcessXRF(unsigned char *buf, const int length)
to_remote_g2[i].in_streamid = dsvt.streamid; to_remote_g2[i].in_streamid = dsvt.streamid;
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(58 & 0xFF); rdsvt.head[0] = 58U;
rdsvt.head[1] = (unsigned char)(58 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 56); memcpy(rdsvt.dsvt.title, dsvt.title, 56);
@ -1345,13 +1343,14 @@ void CQnetLink::ProcessXRF(unsigned char *buf, const int length)
SINBOUND *inbound = (SINBOUND *)pos->second; SINBOUND *inbound = (SINBOUND *)pos->second;
if (fromDst4 != inbound->addr) { if (fromDst4 != inbound->addr) {
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(29 & 0xFF); rdsvt.head[0] = (dsvt.ctrl & 0x40U) ? 32U : 29U;
rdsvt.head[1] = (unsigned char)(29 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 27); memcpy(rdsvt.dsvt.title, dsvt.title, 27);
if (32U == rdsvt.head[0])
memcpy(rdsvt.dsvt.vend.end, endbytes, 6);
REFWrite(rdsvt.head, 29, inbound->addr); REFWrite(rdsvt.head, rdsvt.head[0], inbound->addr);
} }
} }
@ -1384,13 +1383,13 @@ void CQnetLink::ProcessXRF(unsigned char *buf, const int length)
XRFWrite(dsvt.title, 27, to_remote_g2[i].addr); XRFWrite(dsvt.title, 27, to_remote_g2[i].addr);
} else if (to_remote_g2[i].addr.GetPort() == rmt_ref_port) { } else if (to_remote_g2[i].addr.GetPort() == rmt_ref_port) {
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(29 & 0xFF); rdsvt.head[0] = (dsvt.ctrl & 0x40) ? 32U : 29U;
rdsvt.head[1] = (unsigned char)(29 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 27); memcpy(rdsvt.dsvt.title, dsvt.title, 27);
if (32U == rdsvt.head[0])
REFWrite(rdsvt.head, 29, to_remote_g2[i].addr); memcpy(rdsvt.dsvt.vend.end, endbytes, 6);
REFWrite(rdsvt.head, rdsvt.head[0], to_remote_g2[i].addr);
} else if (to_remote_g2[i].addr.GetPort() == rmt_dcs_port) { } else if (to_remote_g2[i].addr.GetPort() == rmt_dcs_port) {
unsigned char dcs_buf[1000]; unsigned char dcs_buf[1000];
memset(dcs_buf, 0x00, 600); memset(dcs_buf, 0x00, 600);
@ -1493,9 +1492,8 @@ void CQnetLink::ProcessDCS(unsigned char *dcs_buf, const int length)
/* generate our header */ /* generate our header */
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(58 & 0xFF); rdsvt.head[0] = 58U;
rdsvt.head[1] = (unsigned char)(58 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, "DSVT", 4); memcpy(rdsvt.dsvt.title, "DSVT", 4);
rdsvt.dsvt.config = 0x10; rdsvt.dsvt.config = 0x10;
rdsvt.dsvt.flaga[0] = rdsvt.dsvt.flaga[1] = rdsvt.dsvt.flaga[2] = 0x00; rdsvt.dsvt.flaga[0] = rdsvt.dsvt.flaga[1] = rdsvt.dsvt.flaga[2] = 0x00;
@ -1535,9 +1533,8 @@ void CQnetLink::ProcessDCS(unsigned char *dcs_buf, const int length)
if (0==memcmp(&to_remote_g2[i].in_streamid, dcs_buf+43, 2) && dcs_seq[i]!=dcs_buf[45]) { if (0==memcmp(&to_remote_g2[i].in_streamid, dcs_buf+43, 2) && dcs_seq[i]!=dcs_buf[45]) {
dcs_seq[i] = dcs_buf[45]; dcs_seq[i] = dcs_buf[45];
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(29 & 0xFF); rdsvt.head[0] = (dcs_buf[45] & 0x40U) ? 32U : 29U;
rdsvt.head[1] = (unsigned char)(29 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, "DSVT", 4); memcpy(rdsvt.dsvt.title, "DSVT", 4);
rdsvt.dsvt.config = 0x20; rdsvt.dsvt.config = 0x20;
rdsvt.dsvt.flaga[0] = rdsvt.dsvt.flaga[1] = rdsvt.dsvt.flaga[2] = 0x00; rdsvt.dsvt.flaga[0] = rdsvt.dsvt.flaga[1] = rdsvt.dsvt.flaga[2] = 0x00;
@ -1553,6 +1550,8 @@ void CQnetLink::ProcessDCS(unsigned char *dcs_buf, const int length)
memcpy(&rdsvt.dsvt.streamid, dcs_buf+43, 2); memcpy(&rdsvt.dsvt.streamid, dcs_buf+43, 2);
rdsvt.dsvt.ctrl = dcs_buf[45]; rdsvt.dsvt.ctrl = dcs_buf[45];
memcpy(rdsvt.dsvt.vasd.voice, dcs_buf+46, 12); memcpy(rdsvt.dsvt.vasd.voice, dcs_buf+46, 12);
if (dcs_buf[45] & 0x40U)
memcpy(rdsvt.dsvt.vend.end, endbytes, 6);
/* send the data to the local gateway/repeater */ /* send the data to the local gateway/repeater */
ToGate.Write(rdsvt.dsvt.title, 27); ToGate.Write(rdsvt.dsvt.title, 27);
@ -1560,7 +1559,7 @@ void CQnetLink::ProcessDCS(unsigned char *dcs_buf, const int length)
/* send the data to the donglers */ /* send the data to the donglers */
for (auto pos = inbound_list.begin(); pos != inbound_list.end(); pos++) { for (auto pos = inbound_list.begin(); pos != inbound_list.end(); pos++) {
SINBOUND *inbound = (SINBOUND *)pos->second; SINBOUND *inbound = (SINBOUND *)pos->second;
REFWrite(rdsvt.head, 29, inbound->addr); REFWrite(rdsvt.head, rdsvt.head[0], inbound->addr);
} }
if ((dcs_buf[45] & 0x40) != 0) { if ((dcs_buf[45] & 0x40) != 0) {
@ -2353,7 +2352,7 @@ void CQnetLink::ProcessREF(unsigned char *buf, const int length)
for (pos = inbound_list.begin(); pos != inbound_list.end(); pos++) { for (pos = inbound_list.begin(); pos != inbound_list.end(); pos++) {
SINBOUND *inbound = (SINBOUND *)pos->second; SINBOUND *inbound = (SINBOUND *)pos->second;
if (fromDst4 != inbound->addr) { if (fromDst4 != inbound->addr) {
REFWrite(rdsvt.head, 29, inbound->addr); REFWrite(rdsvt.head, rdsvt.head[0], inbound->addr);
} }
} }
@ -2364,7 +2363,7 @@ void CQnetLink::ProcessREF(unsigned char *buf, const int length)
rdsvt.dsvt.flagb[2] = to_remote_g2[i].from_mod; rdsvt.dsvt.flagb[2] = to_remote_g2[i].from_mod;
XRFWrite(rdsvt.dsvt.title, 27, to_remote_g2[i].addr); XRFWrite(rdsvt.dsvt.title, 27, to_remote_g2[i].addr);
} else if (to_remote_g2[i].addr.GetPort() == rmt_ref_port) } else if (to_remote_g2[i].addr.GetPort() == rmt_ref_port)
REFWrite(rdsvt.head, 29, to_remote_g2[i].addr); REFWrite(rdsvt.head, rdsvt.head[0], to_remote_g2[i].addr);
else if (to_remote_g2[i].addr.GetPort() == rmt_dcs_port) { else if (to_remote_g2[i].addr.GetPort() == rmt_dcs_port) {
unsigned char dcs_buf[600]; unsigned char dcs_buf[600];
memset(dcs_buf, 0x00, 600); memset(dcs_buf, 0x00, 600);
@ -2734,9 +2733,8 @@ void CQnetLink::Process()
SREFDSVT rdsvt; SREFDSVT rdsvt;
if (inbound_list.size() > 0) { if (inbound_list.size() > 0) {
memset(rdsvt.head, 0U, 58U); memset(rdsvt.head, 0U, 58U);
rdsvt.head[0] = (unsigned char)(58 & 0xFF); rdsvt.head[0] = 58U;
rdsvt.head[1] = (unsigned char)(58 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 56); memcpy(rdsvt.dsvt.title, dsvt.title, 56);
memcpy(rdsvt.dsvt.hdr.rpt1, owner.c_str(), CALL_SIZE); memcpy(rdsvt.dsvt.hdr.rpt1, owner.c_str(), CALL_SIZE);
@ -2792,9 +2790,8 @@ void CQnetLink::Process()
if (to_remote_g2[i].addr.GetPort()==rmt_xrf_port || to_remote_g2[i].addr.GetPort()==rmt_ref_port) { if (to_remote_g2[i].addr.GetPort()==rmt_xrf_port || to_remote_g2[i].addr.GetPort()==rmt_ref_port) {
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(58 & 0xFF); rdsvt.head[0] = 58U;
rdsvt.head[1] = (unsigned char)(58 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 56); memcpy(rdsvt.dsvt.title, dsvt.title, 56);
memset(rdsvt.dsvt.hdr.rpt1, ' ', CALL_SIZE); memset(rdsvt.dsvt.hdr.rpt1, ' ', CALL_SIZE);
@ -2826,17 +2823,17 @@ void CQnetLink::Process()
} }
} }
else { // length is 27 else { // length is 27
if (inbound_list.size() > 0) {
SREFDSVT rdsvt; SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(29 & 0xFF); rdsvt.head[0] = (dsvt.ctrl & 0x40U) ? 32U : 29U;
rdsvt.head[1] = (unsigned char)(29 >> 8 & 0x1F); rdsvt.head[1] = 0x80U;
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 27); memcpy(rdsvt.dsvt.title, dsvt.title, 27);
if (dsvt.ctrl & 0x40U)
memcpy(rdsvt.dsvt.vend.end, endbytes, 6);
if (inbound_list.size() > 0) {
for (auto pos = inbound_list.begin(); pos != inbound_list.end(); pos++) { for (auto pos = inbound_list.begin(); pos != inbound_list.end(); pos++) {
SINBOUND *inbound = (SINBOUND *)pos->second; REFWrite(rdsvt.head, rdsvt.head[0], pos->second->addr);
REFWrite(rdsvt.head, 29, inbound->addr);
} }
} }
@ -2862,20 +2859,13 @@ void CQnetLink::Process()
} }
if (to_remote_g2[i].addr.GetPort()==rmt_xrf_port || to_remote_g2[i].addr.GetPort()==rmt_ref_port) { if (to_remote_g2[i].addr.GetPort()==rmt_xrf_port || to_remote_g2[i].addr.GetPort()==rmt_ref_port) {
SREFDSVT rdsvt;
rdsvt.head[0] = (unsigned char)(29 & 0xFF);
rdsvt.head[1] = (unsigned char)(29 >> 8 & 0x1F);
rdsvt.head[1] = (unsigned char)(rdsvt.head[1] | 0xFFFFFF80);
memcpy(rdsvt.dsvt.title, dsvt.title, 27);
if (to_remote_g2[i].addr.GetPort() == rmt_xrf_port) { if (to_remote_g2[i].addr.GetPort() == rmt_xrf_port) {
/* inform XRF about the source */ /* inform XRF about the source */
rdsvt.dsvt.flagb[2] = to_remote_g2[i].from_mod; rdsvt.dsvt.flagb[2] = to_remote_g2[i].from_mod;
XRFWrite(rdsvt.dsvt.title, 27, to_remote_g2[i].addr); XRFWrite(dsvt.title, 27, to_remote_g2[i].addr);
} else if (to_remote_g2[i].addr.GetPort() == rmt_ref_port) } else if (to_remote_g2[i].addr.GetPort() == rmt_ref_port)
REFWrite(rdsvt.head, 29, to_remote_g2[i].addr); REFWrite(rdsvt.head, rdsvt.head[0], to_remote_g2[i].addr);
} else if (to_remote_g2[i].addr.GetPort() == rmt_dcs_port) { } else if (to_remote_g2[i].addr.GetPort() == rmt_dcs_port) {
unsigned char dcs_buf[600]; unsigned char dcs_buf[600];
memset(dcs_buf, 0x0, 600); memset(dcs_buf, 0x0, 600);

1
QnetLink.h
Unescape View File

@ -181,6 +181,7 @@ private:
std::vector<unsigned long> speak; std::vector<unsigned long> speak;
// used for processing loop // used for processing loop
const unsigned char endbytes[6] = { 0x55U, 0x55U, 0x55U, 0x55U, 0xC8U, 0x7AU };
time_t tnow; time_t tnow;
unsigned char dcs_seq[3] = { 0x00, 0x00, 0x00 }; unsigned char dcs_seq[3] = { 0x00, 0x00, 0x00 };
struct { struct {

4
QnetTypeDefs.h
Unescape View File

@ -87,6 +87,10 @@ using SDSVT = struct dsvt_tag {
unsigned char voice[9]; // 15 unsigned char voice[9]; // 15
unsigned char text[3]; // 24 unsigned char text[3]; // 24
} vasd; // voice and slow data total 27 } vasd; // voice and slow data total 27
struct {
unsigned char voice[9]; // 15
unsigned char end[6]; // 24
} vend; // voice and end seq total 32 (for DPlus)
}; };
}; };
#pragma pack(pop) #pragma pack(pop)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.