diff --git a/CONFIG+INSTALL b/CONFIG+INSTALL index a739f5b..ba3db38 100644 --- a/CONFIG+INSTALL +++ b/CONFIG+INSTALL @@ -74,6 +74,14 @@ the general method is to type the key followed by the new value. If you want to an overridden value, type a "u" followed by the key you want to unset. Boolean values (true or false) can be toggled by just entering the key. +By default, QnetGateway will only connect to the IPv4 QuadNet server at rr.openquad.net. +QnetGateway is capabile of dual-stack operation and can also connect to the IPv6 server +at rrv6.openquad.net. If you want to operate in dual stack mode, enter the IRC sub-menu +and set ha to "rrv6.openquad.net" and hb to "rr.openquad.net". + +Once your operating in dual-stack mode, any routing will prefer an IPv6 address, if +available. It's that easy. + For a DVAP Dongle or a DVRPTR V1, there are some parameters that must be specified, like the serial number. The two "inverse" parameters for the DVRPTR will probably have to change. If you don't hear traffic on a connected system, try toggling the diff --git a/OPERATING b/OPERATING index 95b5881..49598c6 100644 --- a/OPERATING +++ b/OPERATING @@ -26,41 +26,8 @@ probably will be) then you only need to specify what you need to change. This means that for most users, you will only need to specify a few -parameters. For example, if you want to set up a 70cm dvap, your working -configuration file might be: - -------------------------------------------------------------------- -# my configuration, using rr.openquad.net with my DVAP Dongle -# on startup link module b to REF020C - -ircddb = { - login = "XX0XXX" -} - -module = { - b = { - type = "dvap" - frequency = 445.474 - serial_number = "AP123456" - } -} - -link = { - admin = [ "XX0XXX"] -} - -dplus = { - authorize = true -} - -------------------------------------------------------------------- - -Of course, you can add other parameters, such as latitude and longitude, -or a URL that will show up on the "User Gateways" page of -www.openquad.net. This software is highly flexible, so you can have -different modules running on different computers and these hidden -configuration parameters to allow that are there, waiting to be defined. -However, most hams won't have to bother with them! +parameters. In addtion, there is a new script, qnconfig to help you easily +build your configuration file, qn.cfg. Some other features are discussed below and are pretty much directly quoted from KI4LKF original documentation. diff --git a/QnetGateway.cpp b/QnetGateway.cpp index ce70537..247159d 100644 --- a/QnetGateway.cpp +++ b/QnetGateway.cpp @@ -924,7 +924,7 @@ void CQnetGateway::ProcessSlowData(unsigned char *data, unsigned short sid) } } else { // not a new_group, this is the second of a two-voice-frame pair - if (! band_txt[i].sent_key_on_msg && vPacketCount > 100) { + if (! band_txt[i].sent_key_on_msg && vPacketCount[i] > 100) { // 100 voice packets received and still no 20-char message! /*** if YRCALL is CQCQCQ, set dest_rptr ***/ band_txt[i].txt[0] = '\0'; @@ -1285,7 +1285,6 @@ void CQnetGateway::ProcessModem() if (0 == memcmp(dsvt.title, "DSVT", 4)) { if ( (recvlen==56 || recvlen==27) && dsvt.id==0x20U && (dsvt.config==0x10U || dsvt.config==0x20U) ) { if (recvlen == 56) { - vPacketCount = 0U; if (LOG_QSO) printf("id=%04x start RPTR flag0=%02x ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n", ntohs(dsvt.streamid), dsvt.hdr.flag[0], dsvt.hdr.urcall, dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.mycall, dsvt.hdr.sfx); @@ -1294,6 +1293,7 @@ void CQnetGateway::ProcessModem() int i = dsvt.hdr.rpt1[7] - 'A'; if (i>=0 && i<3) { + vPacketCount[i] = 0; Index[i] = -1; if (LOG_DTMF) printf("resetting dtmf[%d] (got a header)\n", i); @@ -1804,8 +1804,8 @@ void CQnetGateway::ProcessModem() } break; } + vPacketCount[i]++; } - vPacketCount++; ProcessSlowData(dsvt.vasd.text, dsvt.streamid); /* send data to qnlink */ diff --git a/QnetGateway.h b/QnetGateway.h index 4c52862..52e27f6 100644 --- a/QnetGateway.h +++ b/QnetGateway.h @@ -108,7 +108,7 @@ private: int TIMING_PLAY_WAIT, TIMING_PLAY_DELAY, TIMING_TIMEOUT_ECHO, TIMING_TIMEOUT_VOICEMAIL, TIMING_TIMEOUT_REMOTE_G2, TIMING_TIMEOUT_LOCAL_RPTR, dtmf_digit; - unsigned int vPacketCount; + unsigned int vPacketCount[3] = { 0, 0, 0 }; std::set findRoute; diff --git a/README.md b/README.md index 0df7d0f..2dbe10d 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,11 @@ QnetGateway The QnetGateway is an D-Star IRCDDB gateway application that supports MMDVMHost (and all of its supported repeater modems) as well as the DVAP Dongle, the DVRPTR_V1. It is *incredibly easy* to build and install the system. -The Qnet Gateway program now includes support for Icom's new Terminal Mode and Access Point mode. For more information, Terminal Mode turns off the RF portion of you radio and just uses the AMBE vocoder to convert between audio and AMBE data and then sends and receives that data through a USB serial cable. Access Point mode turns your Icom radio into a high power, simplex hot-spot. +QnetGateway is dual-stack capabile. This means it can simultaneously connect to rr.openquad.net, which is IPv4 based (using 32-bit internet addresses) and to rrv6.openquad.net which is IPv6 based (using 128-bit internet address). If your hot-spot/reapeater has IPv6 access you can enable dual-stack operation (it's IPv4-only by default) and then take advantage of direct world-routable address. The potential benefit of IPv6 to routing is significant. -QnetGateway now supports MMDVM modems directly, without the need for MMDVMHost. This is for hams that want to use their MMDVM devices and create a hot-spot for D-Star mode only. (You still can talk to your friends on other modes by gathering at multi-mode reflectors, like the QuadNet Array!) +The Qnet Gateway program includes support for Icom's new Terminal Mode and Access Point mode. For more information, Terminal Mode turns off the RF portion of you radio and just uses the AMBE vocoder to convert between audio and AMBE data and then sends and receives that data through a USB serial cable. Access Point mode turns your Icom radio into a high power, simplex hot-spot. + +QnetGateway supports MMDVM modems directly, without the need for MMDVMHost. This is for hams that want to use their MMDVM devices and create a hot-spot for D-Star mode only. (You still can talk to your friends on other modes by gathering at multi-mode reflectors, like the QuadNet Array!) For building a QnetGateway + MMDVMHost system, see the MMDVM.README file. To build QnetGateway that uses a DVAP Dongle or DVRPTR V1, see the CONFIG+INSTALL file. To build QnetGateway for an Icom Repeater Stack, I have another repo at QnetIcomGateway. Detailed information is available there.