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

"DSTR" -> "DSVT"

Browse Source
pull/12/head
Tom Early 7 years ago
parent f8cb9ba6bf
commit b8fd10d0a5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
QnetDVAP.cpp
Unescape View File

@ -328,7 +328,7 @@ static void readFrom20000()
break; break;
} }
if ((memcmp(dsvt.title, "DSTR", 4) != 0) || (dsvt.id != 0x20)) { /* voice type */ if ((memcmp(dsvt.title, "DSVT", 4) != 0) || (dsvt.id != 0x20)) { /* voice type */
FD_CLR(fd, &readfd); FD_CLR(fd, &readfd);
break; break;
} }
@ -814,7 +814,7 @@ static void ReadDVAPThread()
if (dsvt.hdr.rpt2[7] != ' ') if (dsvt.hdr.rpt2[7] != ' ')
memcpy(dsvt.hdr.rpt2, OWNER.c_str(), 7); memcpy(dsvt.hdr.rpt2, OWNER.c_str(), 7);
memcpy(dsvt.title, "DSTR", 4); memcpy(dsvt.title, "DSVT", 4);
dsvt.config = 0x10U; dsvt.config = 0x10U;
dsvt.id = 0x20; dsvt.id = 0x20;
streamid_raw = Random.NewStreamID(); streamid_raw = Random.NewStreamID();

4
QnetITAP.cpp
Unescape View File

@ -291,7 +291,7 @@ void CQnetITAP::Run(const char *cfgfile)
break; break;
} }
if (0 == memcmp(buf, "DSTR", 4)) { if (0 == memcmp(buf, "DSVT", 4)) {
//printf("read %d bytes from QnetGateway\n", (int)len); //printf("read %d bytes from QnetGateway\n", (int)len);
if (ProcessGateway(len, buf)) if (ProcessGateway(len, buf))
break; break;
@ -449,7 +449,7 @@ bool CQnetITAP::ProcessITAP(const unsigned char *buf)
return true; return true;
} }
if (log_qso) if (log_qso)
printf("Sent DSTR to gateway, streamid=%04x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ntohs(dsvt.streamid), dsvt.hdr.urcall, dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.mycall, dsvt.hdr.sfx); printf("Sent DSVT to gateway, streamid=%04x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ntohs(dsvt.streamid), dsvt.hdr.urcall, dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.mycall, dsvt.hdr.sfx);
} else if (16 == len) { // ambe } else if (16 == len) { // ambe
dsvt.ctrl = itap.voice.sequence; dsvt.ctrl = itap.voice.sequence;
memcpy(dsvt.vasd.voice, itap.voice.ambe, 12); memcpy(dsvt.vasd.voice, itap.voice.ambe, 12);

8
QnetModem.cpp
Unescape View File

@ -518,7 +518,7 @@ void CQnetModem::Run(const char *cfgfile)
break; break;
} }
if (0 == memcmp(buf, "DSTR", 4)) { if (0 == memcmp(buf, "DSVT", 4)) {
//printf("read %d bytes from QnetGateway\n", (int)len); //printf("read %d bytes from QnetGateway\n", (int)len);
if (ProcessGateway(len, buf)) if (ProcessGateway(len, buf))
break; break;
@ -583,7 +583,7 @@ bool CQnetModem::ProcessGateway(const int len, const unsigned char *raw)
static std::string superframe; static std::string superframe;
if (27==len || 56==len) { //here is dstar data if (27==len || 56==len) { //here is dstar data
SDSVT dsvt; SDSVT dsvt;
memcpy(dsvt.title, raw, len); // transfer raw data to SDSTR struct memcpy(dsvt.title, raw, len); // transfer raw data to SDSVT struct
SMODEM frame; // destination SMODEM frame; // destination
frame.start = FRAME_START; frame.start = FRAME_START;
@ -686,7 +686,7 @@ bool CQnetModem::ProcessModem(const SMODEM &frame)
return true; return true;
} }
if (LOG_QSO) if (LOG_QSO)
printf("Sent DSTR to gateway, streamid=%04x flags=%02x:%02x:%02x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ntohs(dsvt.streamid), dsvt.hdr.flag[0], dsvt.hdr.flag[1], dsvt.hdr.flag[2], dsvt.hdr.urcall, dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.mycall, dsvt.hdr.sfx); printf("Sent DSVT to gateway, streamid=%04x flags=%02x:%02x:%02x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ntohs(dsvt.streamid), dsvt.hdr.flag[0], dsvt.hdr.flag[1], dsvt.hdr.flag[2], dsvt.hdr.urcall, dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.mycall, dsvt.hdr.sfx);
} else if (in_stream && (frame.type==TYPE_DATA || frame.type==TYPE_EOT || frame.type==TYPE_LOST)) { // ambe } else if (in_stream && (frame.type==TYPE_DATA || frame.type==TYPE_EOT || frame.type==TYPE_LOST)) { // ambe
dsvt.ctrl = ctrl++; dsvt.ctrl = ctrl++;
if (frame.type == TYPE_DATA) { if (frame.type == TYPE_DATA) {
@ -722,7 +722,7 @@ bool CQnetModem::ProcessModem(const SMODEM &frame)
dsvt.ctrl |= 0x40U; dsvt.ctrl |= 0x40U;
if (LOG_QSO) { if (LOG_QSO) {
if (frame.type == TYPE_EOT) if (frame.type == TYPE_EOT)
printf("Sent DSTR end of streamid=%04x\n", ntohs(dsvt.streamid)); printf("Sent DSVT end of streamid=%04x\n", ntohs(dsvt.streamid));
else else
printf("Sent LOST end of streamid=%04x\n", ntohs(dsvt.streamid)); printf("Sent LOST end of streamid=%04x\n", ntohs(dsvt.streamid));
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.