writing to ITAP

QnetITAP.cpp

@@ -361,9 +361,11 @@ int CQnetITAP::SendTo(const unsigned char length, const unsigned char *buf)
 	while (ptr < len) {
 		ssize_t n = ::write(serfd, buf + ptr, len - ptr);
 		if (n < 0) {
+			if (EAGAIN != errno) {
 				printf("Error %d writing to dvap, message=%s\n", errno, strerror(errno));
 				return -1;
 			}
+		}
 
 		if (n > 0)
 			ptr += n;
@@ -406,16 +408,16 @@ bool CQnetITAP::ProcessGateway(const int len, const unsigned char *raw)
 			memcpy(itap.header.ur,   dstr.vpkt.hdr.ur,   8);
 			memcpy(itap.header.my,   dstr.vpkt.hdr.my,   8);
 			memcpy(itap.header.nm,   dstr.vpkt.hdr.nm,   4);
-			int ret = SendTo(itap.length, &itap.length);
+			itap.header.end = 0xFFU;
-			if (ret != 49) {
+			if (42 != SendTo(42U, &itap.length)) {
-				printf("41: ProcessGateway: Could not write Header ITAP packet\n");
+				printf("ERROR: ProcessGateway: Could not write Header ITAP packet\n");
 				return true;
 			}
 			if (log_qso)
 				printf("Sent ITAP to %s ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ITAP_DEVICE.c_str(),
 						itap.header.ur, itap.header.r1, itap.header.r2, itap.header.my, itap.header.nm);
 		} else {	// write an AMBE packet
-			itap.length = 17U;
+			itap.length = 16U;
 			itap.type = 0x22U;
 			itap.voice.counter = counter++;
 			itap.voice.sequence = dstr.vpkt.ctrl;
@@ -424,8 +426,8 @@ bool CQnetITAP::ProcessGateway(const int len, const unsigned char *raw)
 			else if (dstr.vpkt.ctrl > 20)
 				printf("DEBUG: ProcessGateway: unexpected voice sequence number %d\n", itap.voice.sequence);
 			memcpy(itap.voice.ambe, dstr.vpkt.vasd.voice, 12);
-			int ret = SendTo(itap.length, &itap.length);
+			itap.voice.end = 0xFFU;
-			if (ret != 17) {
+			if (17 != SendTo(17U, &itap.length)) {
 				printf("ERROR: ProcessGateway: Could not write AMBE ITAP packet\n");
 				return true;
 			}

QnetITAP.h

@@ -64,12 +64,14 @@ typedef struct itap_tag {
 			unsigned char ur[8];
 			unsigned char my[8];
 			unsigned char nm[4];
+			unsigned char end;	// 0xFFU for sending
 		} header;
 		struct {
 			unsigned char counter;	// ordinal counter is reset with each header
 			unsigned char sequence;	// is modulo 21
 			unsigned char ambe[9];
 			unsigned char text[3];
+			unsigned char end;	// 0xFFU for sending
 		} voice;
 	};
 } SITAP;