From a5286ede78e51fd06deb1150bba72b13f331f0a7 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Thu, 24 Jan 2019 06:37:32 -0700 Subject: [PATCH] combined criteria --- QnetGateway.cpp | 98 ++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/QnetGateway.cpp b/QnetGateway.cpp index 5bef527..0494f94 100644 --- a/QnetGateway.cpp +++ b/QnetGateway.cpp @@ -1000,57 +1000,55 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const b if (g2buflen == 56) { // Find out the local repeater module IP/port to send the data to int i = g2buf.hdr.rpt1[7] - 'A'; - if (rptr.mod[i].defined) { - /* valid repeater module? */ - if (i>=0 && i<3) { - // toRptr[i] is active if a remote system is talking to it or - // toRptr[i] is receiving data from a cross-band - if (0==toRptr[i].last_time && 0==band_txt[i].last_time && (Flag_is_ok(g2buf.hdr.flag[0]) || 0x01U==g2buf.hdr.flag[0] || 0x40U==g2buf.hdr.flag[0])) { - if (bool_qso_details) { - printf("id=%04x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s ", ntohs(g2buf.streamid), g2buf.hdr.urcall, g2buf.hdr.rpt1, g2buf.hdr.rpt2, g2buf.hdr.mycall, g2buf.hdr.sfx); - if (is_from_g2) - printf("IP=%s:%u\n", inet_ntoa(fromDst4.sin_addr), ntohs(fromDst4.sin_port)); - else - printf("UnixSock=%s\n", link2gate.c_str()); - } - memcpy(rptrbuf.pkt_id, "DSTR", 4); - rptrbuf.counter = htons(toRptr[i].G2_COUNTER++); // bump the counter - rptrbuf.flag[0] = 0x73U; - rptrbuf.flag[1] = 0x12U; - rptrbuf.flag[2] = 0x00U; - rptrbuf.remaining = 0x30U; - rptrbuf.vpkt.icm_id = 0x20U; - //memcpy(&rptrbuf.vpkt.dst_rptr_id, g2buf.flagb, 47); - rptrbuf.vpkt.dst_rptr_id = g2buf.flagb[0]; - rptrbuf.vpkt.snd_rptr_id = g2buf.flagb[1]; - rptrbuf.vpkt.snd_term_id = g2buf.flagb[2]; - rptrbuf.vpkt.streamid = g2buf.streamid; - rptrbuf.vpkt.ctrl = g2buf.ctrl; - memcpy(rptrbuf.vpkt.hdr.flag, g2buf.hdr.flag, 3); - memcpy(rptrbuf.vpkt.hdr.r1, g2buf.hdr.rpt2, 8); - memcpy(rptrbuf.vpkt.hdr.r2, g2buf.hdr.rpt1, 8); - memcpy(rptrbuf.vpkt.hdr.ur, g2buf.hdr.urcall, 8); - memcpy(rptrbuf.vpkt.hdr.my, g2buf.hdr.mycall, 8); - memcpy(rptrbuf.vpkt.hdr.nm, g2buf.hdr.sfx, 4); - memcpy(rptrbuf.vpkt.hdr.pfcs, g2buf.hdr.pfcs, 2); - - Gate2Modem[i].Write(rptrbuf.pkt_id, 58); - - /* save the header */ - if (! is_from_g2) - fromDst4.sin_addr.s_addr = (unsigned long)i; - memcpy(toRptr[i].saved_hdr.pkt_id, rptrbuf.pkt_id, 58); - toRptr[i].saved_adr = fromDst4.sin_addr.s_addr; - - /* This is the active streamid */ - toRptr[i].streamid = g2buf.streamid; - toRptr[i].adr = fromDst4.sin_addr.s_addr; - - /* time it, in case stream times out */ - time(&toRptr[i].last_time); - - toRptr[i].sequence = rptrbuf.vpkt.ctrl; + /* valid repeater module? */ + if (i>=0 && i<3 && rptr.mod[i].defined) { + // toRptr[i] is active if a remote system is talking to it or + // toRptr[i] is receiving data from a cross-band + if (0==toRptr[i].last_time && 0==band_txt[i].last_time && (Flag_is_ok(g2buf.hdr.flag[0]) || 0x01U==g2buf.hdr.flag[0] || 0x40U==g2buf.hdr.flag[0])) { + if (bool_qso_details) { + printf("id=%04x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s ", ntohs(g2buf.streamid), g2buf.hdr.urcall, g2buf.hdr.rpt1, g2buf.hdr.rpt2, g2buf.hdr.mycall, g2buf.hdr.sfx); + if (is_from_g2) + printf("IP=%s:%u\n", inet_ntoa(fromDst4.sin_addr), ntohs(fromDst4.sin_port)); + else + printf("UnixSock=%s\n", link2gate.c_str()); } + memcpy(rptrbuf.pkt_id, "DSTR", 4); + rptrbuf.counter = htons(toRptr[i].G2_COUNTER++); // bump the counter + rptrbuf.flag[0] = 0x73U; + rptrbuf.flag[1] = 0x12U; + rptrbuf.flag[2] = 0x00U; + rptrbuf.remaining = 0x30U; + rptrbuf.vpkt.icm_id = 0x20U; + //memcpy(&rptrbuf.vpkt.dst_rptr_id, g2buf.flagb, 47); + rptrbuf.vpkt.dst_rptr_id = g2buf.flagb[0]; + rptrbuf.vpkt.snd_rptr_id = g2buf.flagb[1]; + rptrbuf.vpkt.snd_term_id = g2buf.flagb[2]; + rptrbuf.vpkt.streamid = g2buf.streamid; + rptrbuf.vpkt.ctrl = g2buf.ctrl; + memcpy(rptrbuf.vpkt.hdr.flag, g2buf.hdr.flag, 3); + memcpy(rptrbuf.vpkt.hdr.r1, g2buf.hdr.rpt2, 8); + memcpy(rptrbuf.vpkt.hdr.r2, g2buf.hdr.rpt1, 8); + memcpy(rptrbuf.vpkt.hdr.ur, g2buf.hdr.urcall, 8); + memcpy(rptrbuf.vpkt.hdr.my, g2buf.hdr.mycall, 8); + memcpy(rptrbuf.vpkt.hdr.nm, g2buf.hdr.sfx, 4); + memcpy(rptrbuf.vpkt.hdr.pfcs, g2buf.hdr.pfcs, 2); + + Gate2Modem[i].Write(rptrbuf.pkt_id, 58); + + /* save the header */ + if (! is_from_g2) + fromDst4.sin_addr.s_addr = (unsigned long)i; + memcpy(toRptr[i].saved_hdr.pkt_id, rptrbuf.pkt_id, 58); + toRptr[i].saved_adr = fromDst4.sin_addr.s_addr; + + /* This is the active streamid */ + toRptr[i].streamid = g2buf.streamid; + toRptr[i].adr = fromDst4.sin_addr.s_addr; + + /* time it, in case stream times out */ + time(&toRptr[i].last_time); + + toRptr[i].sequence = rptrbuf.vpkt.ctrl; } } } else { // g2buflen == 27