From fa43155928d0af08bf01494debb218dc1f0be5c7 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Fri, 21 Aug 2020 20:23:21 -0700 Subject: [PATCH] colby found some bugs --- README.md | 2 +- src/cg3protocol.cpp | 1 - src/cg3protocol.h | 2 +- src/cprotoaddress.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a11e13a..8d70763 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Configuring, compiling and maintaining your reflector build is easy! Start the c ./rconfig ``` -There are only a few things that need to be specified. Most important are, the reflector callsign and the IP addresses for the IPv4 and IPv6 listen ports and a transcoder port, if there is a transcoder. Dual-stack operation is enabled by specifying both an IPv4 and IPv6 address. IPv6-only single stack can be specified by leaving the IPv6 address set to `none`. It's even possible to operate in an IPv6-only configuration by leaving the IPv4 address to the default `none`. You can override the ip addresses for any of the supported protocol and this is done in a sub-menu. This would allow you to install other Ham-related services that might use the same ports, like a Smart Group Server. +There are only a few things that need to be specified. Most important are, the reflector callsign and the IP addresses for the IPv4 and IPv6 listen ports and a transcoder port, if there is a transcoder. Dual-stack operation is enabled by specifying both an IPv4 and IPv6 address. IPv4-only single stack can be specified by leaving the IPv6 address set to `none`. It's even possible to operate in an IPv6-only configuration by leaving the IPv4 address to the default `none`. You can override the ip addresses for any of the supported protocol and this is done in a sub-menu. This would allow you to install other Ham-related services that might use the same ports, like a Smart Group Server. Obviously the transcoder is only specified for an XLX reflector. If your reflector is configured with a transcoder, you can specify which configured modules will be transcoded. If you are building an XLX system with a transcoder, you can also specify which channels get transcoder support. There are also true/false flags to prevent G3 support and so that you can build executables that will support gdb debugging. diff --git a/src/cg3protocol.cpp b/src/cg3protocol.cpp index 80ffe12..75a009e 100644 --- a/src/cg3protocol.cpp +++ b/src/cg3protocol.cpp @@ -246,7 +246,6 @@ void CG3Protocol::ConfigTask(void) if ( m_ConfigSocket.Receive(&Buffer, &Ip, 20) != -1 ) { - if (Buffer.size() == 16) { if (memcmp(&Buffer.data()[8], " ", 8) == 0) diff --git a/src/cg3protocol.h b/src/cg3protocol.h index 72a976a..fffced9 100644 --- a/src/cg3protocol.h +++ b/src/cg3protocol.h @@ -40,7 +40,7 @@ // // There are 3 steps in handling an incoming connection // -// 1 - Notification of terminal call on port UDP 12346, Presence port, aCUdpSocket. +// 1 - Notification of terminal call on port UDP 12346, Presence port, a CUdpSocket. // - Call will be rejected if in blacklisted // // 2 - Destination request on port UDP 12345, Config port, a CUdpMsgSocket. diff --git a/src/cprotoaddress.cpp b/src/cprotoaddress.cpp index c67c88c..d564e2e 100644 --- a/src/cprotoaddress.cpp +++ b/src/cprotoaddress.cpp @@ -89,7 +89,7 @@ std::string CProtoAddress::GetV4Address(int protocol) } #endif -#ifdef LISTEN_IPV4 +#ifdef LISTEN_IPV6 std::string CProtoAddress::GetV6Address(int protocol) { if (v6address.end() == v6address.find(protocol))