pull/1/head
Tom Early 8 years ago
parent e7492f86a4
commit 4e502203b0

@ -131,7 +131,7 @@ void CMMDVMModem::Run(const char *cfgfile)
return; return;
} }
printf("msock=%d\n", msock); printf("msock=%d, gsock=%d\n", msock, gsock);
keep_running = true; keep_running = true;
@ -170,7 +170,7 @@ void CMMDVMModem::Run(const char *cfgfile)
} }
if (ntohs(addr.sin_port) != MMDVM_OUT_PORT) if (ntohs(addr.sin_port) != MMDVM_OUT_PORT)
printf("DEBUG: Run: reading from msock but port was %u, expected %u.\n", ntohs(addr.sin_port), MMDVM_OUT_PORT); printf("DEBUG: Run: read from msock but port was %u, expected %u.\n", ntohs(addr.sin_port), MMDVM_OUT_PORT);
} else if (FD_ISSET(gsock, &readfds)) { } else if (FD_ISSET(gsock, &readfds)) {
len = ::recvfrom(gsock, buf, 100, 0, (sockaddr *)&addr, &size); len = ::recvfrom(gsock, buf, 100, 0, (sockaddr *)&addr, &size);
@ -181,14 +181,16 @@ void CMMDVMModem::Run(const char *cfgfile)
} }
if (ntohs(addr.sin_port) != G2_OUT_PORT) if (ntohs(addr.sin_port) != G2_OUT_PORT)
printf("DEBUG: Run: reading from gsock but the port was %u, expected %u\n", ntohs(addr.sin_port), G2_OUT_PORT); printf("DEBUG: Run: read from gsock but the port was %u, expected %u\n", ntohs(addr.sin_port), G2_OUT_PORT);
} else { } else {
printf("ERROR: Run: Input from unknown fd!\n"); printf("ERROR: Run: Input from unknown fd!\n");
break; break;
} }
if (len == 0) if (len == 0) {
printf("DEBUG: Run: read zero bytes from %u\n", ntohs(addr.sin_port));
continue; continue;
}
if (0 == memcmp(buf, "DSRP", 4)) { if (0 == memcmp(buf, "DSRP", 4)) {
printf("read %d bytes from MMDVMHost\n", (int)len); printf("read %d bytes from MMDVMHost\n", (int)len);
@ -304,6 +306,7 @@ bool CMMDVMModem::ProcessMMDVM(const int len, const unsigned char *raw)
printf("ERROR: ProcessMMDVM: Could not write gateway header packet\n"); printf("ERROR: ProcessMMDVM: Could not write gateway header packet\n");
return true; return true;
} }
printf("INFO: ProcessMMDVM: sent header pkt = '%s\n", std::string((char *)gpkt.vpkt.hdr.rpt2, 36).c_str());
} else if (21 == len) { // ambe } else if (21 == len) { // ambe
gpkt.remaining = 0x16; gpkt.remaining = 0x16;
memcpy(gpkt.vpkt.vasd.text, mpkt.voice.ambe, 12); memcpy(gpkt.vpkt.vasd.text, mpkt.voice.ambe, 12);

Loading…
Cancel
Save

Powered by TurnKey Linux.