log reporting for Relay and ITAP

pull/5/head
Tom Early 7 years ago
parent 8807b5347b
commit d194dfcea1

@ -423,9 +423,9 @@ bool CQnetITAP::ProcessGateway(const int len, const unsigned char *raw)
itap.type = 0x22U; itap.type = 0x22U;
itap.voice.counter = counter++; itap.voice.counter = counter++;
itap.voice.sequence = dstr.vpkt.ctrl; itap.voice.sequence = dstr.vpkt.ctrl;
if (log_qso && dstr.vpkt.ctrl&0x40) if (log_qso && (dstr.vpkt.ctrl & 0x40))
printf("Sent ITAP end of stream\n"); printf("Sent ITAP end of stream\n");
else if (dstr.vpkt.ctrl > 20) if ((dstr.vpkt.ctrl & ~0x40U) > 20)
printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", itap.voice.sequence); printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", itap.voice.sequence);
memcpy(itap.voice.ambe, dstr.vpkt.vasd.voice, 12); memcpy(itap.voice.ambe, dstr.vpkt.vasd.voice, 12);
itap.voice.end = 0xFFU; itap.voice.end = 0xFFU;

@ -240,9 +240,9 @@ bool CQnetRelay::ProcessGateway(const int len, const unsigned char *raw)
dsrp.voice.seq = dstr.vpkt.ctrl; // ditto dsrp.voice.seq = dstr.vpkt.ctrl; // ditto
if (29 == len) { // write an AMBE packet if (29 == len) { // write an AMBE packet
dsrp.tag = 0x21U; dsrp.tag = 0x21U;
if (log_qso && dsrp.voice.seq&0x40) if (log_qso && (dsrp.voice.seq & 0x40))
printf("Sent DSRP end of streamid=%04x\n", ntohs(dsrp.voice.id)); printf("Sent DSRP end of streamid=%04x\n", ntohs(dsrp.voice.id));
else if (dsrp.voice.seq > 20) if ((dsrp.voice.seq & ~0x40U) > 20)
printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", dsrp.voice.seq); printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", dsrp.voice.seq);
dsrp.voice.err = 0; // NOT SURE WHERE TO GET THIS FROM THE INPUT buf dsrp.voice.err = 0; // NOT SURE WHERE TO GET THIS FROM THE INPUT buf
memcpy(dsrp.voice.ambe, dstr.vpkt.vasd.voice, 12); memcpy(dsrp.voice.ambe, dstr.vpkt.vasd.voice, 12);

@ -2,8 +2,8 @@
#define IRCDDB_VERSION "QnetGateway-7.0.1" #define IRCDDB_VERSION "QnetGateway-7.0.1"
#define LINK_VERSION "QnetLink-6.0.0" #define LINK_VERSION "QnetLink-6.0.0"
#define DVAP_VERSION "QnetDVAP-5.1.1" #define DVAP_VERSION "QnetDVAP-5.1.1"
#define RELAY_VERSION "QnetRelay-0.2.0" #define RELAY_VERSION "QnetRelay-0.2.1"
#define ITAP_VERSION "QnetITAP-0.1.0" #define ITAP_VERSION "QnetITAP-0.1.1"
#define DVRPTR_VERSION "QnetDVRPTR-5.1.0" #define DVRPTR_VERSION "QnetDVRPTR-5.1.0"
#define MMDVM_VERSION "QnetGateway-MMDVM-0.1.0" #define MMDVM_VERSION "QnetGateway-MMDVM-0.1.0"
#define ICOM_VERSION IRCDDB_VERSION #define ICOM_VERSION IRCDDB_VERSION

Loading…
Cancel
Save

Powered by TurnKey Linux.