add DMR database to rconfig

rconfig

@@ -217,6 +217,9 @@ WriteMemFile ()
 	[ -z ${dstar_out_gain+x} ] || echo "dstar_out_gain=$dstar_out_gain" >> $file
 	[ -z ${dmr_in_gain+x}    ] || echo    "dmr_in_gain=$dmr_in_gain"    >> $file
 	[ -z ${dmr_out_gain+x}   ] || echo   "dmr_out_gain=$dmr_out_gain"   >> $file
+	[ -z ${dmrdbuseserver+x} ] || echo "dmrdbuseserver=$dmrdbuseserver" >> $file
+	[ -z ${dmrdbrefresh+x}   ] || echo   "dmrdbrefresh=$dmrdbrefresh"   >> $file
+	[ -z ${dmrdbpath+x}      ] || echo      "dmrdbpath='$dmrdbpath'"    >> $file
 	[ -z ${ysfautolink+x}    ] || echo    "ysfautolink=$ysfautolink"    >> $file
 	[ -z ${ysfmodule+x}      ] || echo      "ysfmodule='$ysfmodule'"    >> $file
 	[ -z ${ysflocaldb+x}     ] || echo     "ysflocaldb=$ysflocaldb"     >> $file
@@ -259,6 +262,26 @@ WriteSRCHFile ()
 	else
 		echo "#define YSF_AUTOLINK_MODULE '${ysfmodule}'" >> $file
 	fi
+	if [ ! -z ${dmrdbuseserver+x} ]; then
+		if [[ "$dmrdbuseserver" == true ]]; then
+			m=1
+		else
+			m=0
+		fi
+	else
+		m=1
+	fi
+	echo "#define DMRIDDB_USE_RLX_SERVER $m" >> $file
+	if [ ! -z ${dmrdbrefresh+x} ]; then
+		echo "#define DMRIDDB_REFRESH_RATE $dmrdbrefresh" >> $file
+	else
+		echo "#define DMRIDDB_REFRESH_RATE $dmrdbrefresh_d" >> $file
+	fi
+	if [ ! -z ${dmrdbpath+x} ]; then
+		echo "#define DMRIDDB_PATH \"$dmrdbpath\"" >> $file
+	else
+		echo "#define DMRIDDB_PATH \"$dmrdbpath_d\"" >> $file
+	fi
 	if [[ "$ysflocaldb" == true ]]; then
 		echo '#define YSF_DB_SUPPORT true' >> $file
 		echo "#define YSF_DB_NAME \"$ysfdbname\"" >> $file
@@ -475,6 +498,9 @@ ysfautolink_d=false
 ysfmodule_d='D'
 g3support_d=false
 dbsupport_d=false
+dmrdbuseserver_d=true
+dmrdbrefresh_d=180
+dmrdbpath_d='/usr/local/etc/dmrid.dat'
 ysflocaldb_d=false
 ysfdbname_d=''
 ysfdbuser_d=''
@@ -510,7 +536,7 @@ while [[ "$key" != q* ]]
 do
 	clear
 	echo
-	echo "        Reflector Configuration, Version #220306"
+	echo "        Reflector Configuration, Version #220326"
 	echo
 	echo    "     ******* REFLECTOR ********"
 	echo -n "cs : Reflector Callsign     = "; EvaluateVar callsign{,_d}
@@ -538,6 +564,10 @@ do
 			echo -n "     DMR Output gain        = "; EvaluateVar dmr_out_gain{,_d}
 		fi
 	fi
+	echo    "     ******* DMR Database ********"
+	echo -n "ds : Use RLX Server         = "; EvaluateVar dmrdbuseserver{,_d}
+	echo -n "dt : Refresh time (in min)  = "; EvaluateVar dmrdbrefresh{,_d}
+	echo -n "dp : Database path          = "; EvaluateVar dmrdbpath{,_d}
 	echo    "     ******* SYSTEM FUSION ********"
 	echo -n "ye : YSF Autolink Enable    = "; EvaluateVar ysfautolink{,_d}
 	if [ ! -z ${ysfautolink+x} ]; then
@@ -578,6 +608,9 @@ do
 	elif [[ "$key" == ag* ]]; then
 		AudioGainMenu
 		key=x
+	elif [[ "$key" == ds* ]]; then SetBooleanValue dmrdbuseserver "$value"
+	elif [[ "$key" == dt* ]]; then dmrdbrefresh="$value"
+	elif [[ "$key" == dp* ]]; then dmrdbpath="$value"
 	elif [[ "$key" == ye* ]]; then SetBooleanValue ysfautolink "$value"
 	elif [[ "$key" == ym* ]]; then
 		ysfmodule="${value^^}"
@@ -601,6 +634,9 @@ do
 		elif [[ "$value" == i6* ]]; then unset ip6addr
 		elif [[ "$value" == tc* ]]; then unset tcaddress
 		elif [[ "$value" == tm* ]]; then tcmodules=${modules:0:1}
+		elif [[ "$value" == ds* ]]; then unset dmrdbuseserver
+		elif [[ "$value" == dt* ]]; then unset dmrdbrefresh
+		elif [[ "$value" == dp* ]]; then unset dmrdbpath
 		elif [[ "$value" == ye* ]]; then unset ysfautolink ysfmodule
 		elif [[ "$value" == ym* ]]; then unset ysfmodule
 		elif [[ "$value" == g3* ]]; then unset g3support

reflector/Main.h

@@ -165,9 +165,10 @@ enum class EProtocol { any, none, dextra, dplus, dcs, bm, urf, dmrplus, dmrmmdvm
 
 // DMRid database -----------------------------------------------
 
-#define DMRIDDB_USE_RLX_SERVER          1                                   // 1 = use http, 0 = use local file
+// these values are now set in configure.h by ./rconfig
-#define DMRIDDB_PATH                    "/usr/local/etc/dmrid.dat"          // local file path
+//#define DMRIDDB_USE_RLX_SERVER          1                                   // 1 = use http, 0 = use local file
-#define DMRIDDB_REFRESH_RATE            180                                 // in minutes
+//#define DMRIDDB_PATH                    "/usr/local/etc/dmrid.dat"          // local file path
+//#define DMRIDDB_REFRESH_RATE            180                                 // in minutes
 
 // Wires-X node database ----------------------------------------