From b8fd10d0a5e6713c0795e9e71e51dfe1f1ba1f83 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Mon, 11 Feb 2019 14:00:00 -0700 Subject: [PATCH] "DSTR" -> "DSVT" --- QnetDVAP.cpp | 4 ++-- QnetITAP.cpp | 4 ++-- QnetModem.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/QnetDVAP.cpp b/QnetDVAP.cpp index cb3a944..6c44402 100644 --- a/QnetDVAP.cpp +++ b/QnetDVAP.cpp @@ -328,7 +328,7 @@ static void readFrom20000() 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); break; } @@ -814,7 +814,7 @@ static void ReadDVAPThread() if (dsvt.hdr.rpt2[7] != ' ') memcpy(dsvt.hdr.rpt2, OWNER.c_str(), 7); - memcpy(dsvt.title, "DSTR", 4); + memcpy(dsvt.title, "DSVT", 4); dsvt.config = 0x10U; dsvt.id = 0x20; streamid_raw = Random.NewStreamID(); diff --git a/QnetITAP.cpp b/QnetITAP.cpp index 4fad012..e74dcd7 100644 --- a/QnetITAP.cpp +++ b/QnetITAP.cpp @@ -291,7 +291,7 @@ void CQnetITAP::Run(const char *cfgfile) break; } - if (0 == memcmp(buf, "DSTR", 4)) { + if (0 == memcmp(buf, "DSVT", 4)) { //printf("read %d bytes from QnetGateway\n", (int)len); if (ProcessGateway(len, buf)) break; @@ -449,7 +449,7 @@ bool CQnetITAP::ProcessITAP(const unsigned char *buf) return true; } 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 dsvt.ctrl = itap.voice.sequence; memcpy(dsvt.vasd.voice, itap.voice.ambe, 12); diff --git a/QnetModem.cpp b/QnetModem.cpp index e85b505..1a3d52d 100644 --- a/QnetModem.cpp +++ b/QnetModem.cpp @@ -518,7 +518,7 @@ void CQnetModem::Run(const char *cfgfile) break; } - if (0 == memcmp(buf, "DSTR", 4)) { + if (0 == memcmp(buf, "DSVT", 4)) { //printf("read %d bytes from QnetGateway\n", (int)len); if (ProcessGateway(len, buf)) break; @@ -583,7 +583,7 @@ bool CQnetModem::ProcessGateway(const int len, const unsigned char *raw) static std::string superframe; if (27==len || 56==len) { //here is dstar data 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 frame.start = FRAME_START; @@ -686,7 +686,7 @@ bool CQnetModem::ProcessModem(const SMODEM &frame) return true; } 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 dsvt.ctrl = ctrl++; if (frame.type == TYPE_DATA) { @@ -722,7 +722,7 @@ bool CQnetModem::ProcessModem(const SMODEM &frame) dsvt.ctrl |= 0x40U; if (LOG_QSO) { 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 printf("Sent LOST end of streamid=%04x\n", ntohs(dsvt.streamid)); }