From 5ec2cd2f90d735dbd4b42e0ecb17b026debd0bc2 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sun, 8 Apr 2018 20:55:47 -0700
Subject: [PATCH] copied VD to wrong address

---
 g2_ircddb.cpp   | 4 ++--
 mmdvm_modem.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/g2_ircddb.cpp b/g2_ircddb.cpp
index 7c81951..2ef3107 100644
--- a/g2_ircddb.cpp
+++ b/g2_ircddb.cpp
@@ -1494,12 +1494,12 @@ void CG2_ircddb::process()
 							}
 						}
 					}
-				} else {
+				} else {	// recvlen != 58
 					for (int i=0; i<3; i++) {
 						if (band_txt[i].streamID == rptrbuf.vpkt.streamid) {
 							time(&band_txt[i].last_time);
 
-							if ((rptrbuf.vpkt.ctrl & 0x40) != 0) {
+							if ((rptrbuf.vpkt.ctrl & 0x40) != 0) {	// end of voice data
 								if (dtmf_buf_count[i] > 0) {
 									dtmf_file = dtmf_dir;
 									dtmf_file.push_back('/');
diff --git a/mmdvm_modem.cpp b/mmdvm_modem.cpp
index 329208c..e7e69db 100644
--- a/mmdvm_modem.cpp
+++ b/mmdvm_modem.cpp
@@ -309,7 +309,7 @@ bool CMMDVMModem::ProcessMMDVM(const int len, const unsigned char *raw)
 			printf("INFO: ProcessMMDVM: sent header to port %u pkt = '%s\n", G2_IN_PORT, std::string((char *)gpkt.vpkt.hdr.rpt1, 36).c_str());
 		} else if (21 == len) {	// ambe
 			gpkt.remaining = 0x16;
-			memcpy(gpkt.vpkt.vasd.text, mpkt.voice.ambe, 12);
+			memcpy(gpkt.vpkt.vasd.voice, mpkt.voice.ambe, 12);
 			int ret = SendTo(msock, gpkt.pkt_id, 29, G2_INTERNAL_IP, G2_IN_PORT);
 			if (ret != 29) {
 				printf("ERROR: ProcessMMDVM: Could not write gateway voice packet\n");