KB8PMY
/
QnetGateway
mirror of https://github.com/n7tae/QnetGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linking ports are hardcoded to 'any'

Browse Source
pull/14/head
Tom Early 6 years ago
parent 29ca01c683
commit d7de29ba20
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
QnetGateway.cpp
Unescape View File

@ -54,7 +54,7 @@
#define CFG_DIR "/usr/local/etc" #define CFG_DIR "/usr/local/etc"
#endif #endif
const std::string GW_VERSION("QnetGateway-526"); const std::string GW_VERSION("QnetGateway-603");
int CQnetGateway::FindIndex(const int i) const int CQnetGateway::FindIndex(const int i) const
{ {

2
QnetLink.cpp
Unescape View File

@ -54,7 +54,7 @@
#include "QnetLink.h" #include "QnetLink.h"
#include "Utilities.h" #include "Utilities.h"
#define LINK_VERSION "QnetLink-526" #define LINK_VERSION "QnetLink-603"
#ifndef BIN_DIR #ifndef BIN_DIR
#define BIN_DIR "/usr/local/bin" #define BIN_DIR "/usr/local/bin"
#endif #endif

1
defaults
Unescape View File

@ -83,7 +83,6 @@ aprs_filter_d='' # advanced feature
#link_link_unlink_d='' # if defined, comma-separated list of users that can link and unlink a repeater #link_link_unlink_d='' # if defined, comma-separated list of users that can link and unlink a repeater
#link_no_link_unlink_d='' # if defined, comma-separated list of users that cannot link or unlink, it's a blacklist #link_no_link_unlink_d='' # if defined, comma-separated list of users that cannot link or unlink, it's a blacklist
# if the blacklist is defined (even if it's empty), the link_unlink will not be read # if the blacklist is defined (even if it's empty), the link_unlink will not be read
link_incoming_ip_d='0.0.0.0' # incoming ip address of qnlink, '0.0.0.0' means accepts any connection.
link_ref_port_d=20001 # port for REF linking, don't change link_ref_port_d=20001 # port for REF linking, don't change
link_xrf_port_d=30001 # port for XRF linking, don't change link_xrf_port_d=30001 # port for XRF linking, don't change
link_dcs_port_d=30051 # port for DCS linking, don't change link_dcs_port_d=30051 # port for DCS linking, don't change

6
qnconfig
Unescape View File

@ -79,7 +79,6 @@ LinkMenu () {
echo -n "li : CSV of calls that can link and unlink = "; EvaluateVar link_link_unlink{,_d} echo -n "li : CSV of calls that can link and unlink = "; EvaluateVar link_link_unlink{,_d}
echo -n "n : CSV of calls that cannot link&unlink = "; EvaluateVar link_no_link_unlink{,_d} echo -n "n : CSV of calls that cannot link&unlink = "; EvaluateVar link_no_link_unlink{,_d}
if [ -n "$em" ]; then if [ -n "$em" ]; then
echo -n "i : Incoming IP address of QnetLink = "; EvaluateVar link_incoming_ip{,_d}
echo -n "r : UDP port for REF linking = "; EvaluateVar link_ref_port{,_d} echo -n "r : UDP port for REF linking = "; EvaluateVar link_ref_port{,_d}
echo -n "x : UDP port for XRF linking = "; EvaluateVar link_xrf_port{,_d} echo -n "x : UDP port for XRF linking = "; EvaluateVar link_xrf_port{,_d}
echo -n "d : DCS port for XRF linking = "; EvaluateVar link_dcs_port{,_d} echo -n "d : DCS port for XRF linking = "; EvaluateVar link_dcs_port{,_d}
@ -101,7 +100,6 @@ LinkMenu () {
if [[ "$key" == ad* ]]; then link_admin="${value^^}" if [[ "$key" == ad* ]]; then link_admin="${value^^}"
elif [[ "$key" == li* ]]; then link_link_unlink="${value^^}" elif [[ "$key" == li* ]]; then link_link_unlink="${value^^}"
elif [[ "$key" == n* ]]; then link_no_link_unlink="${value^^}" elif [[ "$key" == n* ]]; then link_no_link_unlink="${value^^}"
elif [[ "$key" == i* ]]; then link_incoming_ip="$value"
elif [[ "$key" == r* ]]; then link_ref_port="$value" elif [[ "$key" == r* ]]; then link_ref_port="$value"
elif [[ "$key" == x* ]]; then link_xrf_port="$value" elif [[ "$key" == x* ]]; then link_xrf_port="$value"
elif [[ "$key" == d* ]]; then link_dcs_port="$value" elif [[ "$key" == d* ]]; then link_dcs_port="$value"
@ -117,7 +115,6 @@ LinkMenu () {
if [[ "$value" == ad* ]]; then unset link_admin if [[ "$value" == ad* ]]; then unset link_admin
elif [[ "$value" == li* ]]; then unset link_link_unlink elif [[ "$value" == li* ]]; then unset link_link_unlink
elif [[ "$value" == n* ]]; then unset link_no_link_unlink elif [[ "$value" == n* ]]; then unset link_no_link_unlink
elif [[ "$value" == i* ]]; then unset link_incoming_ip
elif [[ "$value" == r* ]]; then unset link_ref_port elif [[ "$value" == r* ]]; then unset link_ref_port
elif [[ "$value" == x* ]]; then unset link_xrf_port elif [[ "$value" == x* ]]; then unset link_xrf_port
elif [[ "$value" == d* ]]; then unset link_dcs_port elif [[ "$value" == d* ]]; then unset link_dcs_port
@ -639,7 +636,6 @@ WriteCFGFile () {
[ -z "${link_admin+x}" ] || echo "link_admin='${link_admin}'" >> $outFile [ -z "${link_admin+x}" ] || echo "link_admin='${link_admin}'" >> $outFile
[ -z "${link_link_unlink+x}" ] || echo "link_link_unlink='${link_link_unlink}'" >> $outFile [ -z "${link_link_unlink+x}" ] || echo "link_link_unlink='${link_link_unlink}'" >> $outFile
[ -z "${link_no_link_unlink+x}" ] || echo "link_no_link_unlink='${link_no_link_unlink}'" >> $outFile [ -z "${link_no_link_unlink+x}" ] || echo "link_no_link_unlink='${link_no_link_unlink}'" >> $outFile
[ -z "${link_incoming_ip+x}" ] || echo "link_incoming_ip='${link_incoming_ip}'" >> $outFile
[ -z "${link_ref_port+x}" ] || echo "link_ref_port=${link_ref_port}" >> $outFile [ -z "${link_ref_port+x}" ] || echo "link_ref_port=${link_ref_port}" >> $outFile
[ -z "${link_xrf_port+x}" ] || echo "link_xrf_port=${link_xrf_port}" >> $outFile [ -z "${link_xrf_port+x}" ] || echo "link_xrf_port=${link_xrf_port}" >> $outFile
[ -z "${link_dcs_port+x}" ] || echo "link_dcs_port=${link_dcs_port}" >> $outFile [ -z "${link_dcs_port+x}" ] || echo "link_dcs_port=${link_dcs_port}" >> $outFile
@ -706,7 +702,7 @@ while [[ "$ans" != q* ]]
do do
clear clear
echo echo
echo " QnConfig Main Menu V#200518" echo " QnConfig Main Menu V#200603"
echo echo
echo -n "a : Module A - "; if [ -z $module_a ]; then echo "<EMPTY>"; else echo "${module_a^^}"; fi echo -n "a : Module A - "; if [ -z $module_a ]; then echo "<EMPTY>"; else echo "${module_a^^}"; fi
echo -n "b : Module B - "; if [ -z $module_b ]; then echo "<EMPTY>"; else echo "${module_b^^}"; fi echo -n "b : Module B - "; if [ -z $module_b ]; then echo "<EMPTY>"; else echo "${module_b^^}"; fi

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.