gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'hotfix/v23.3.1'

pull/4218/head v23.3.1
Daniel Gibbs 2 years ago
parent
e12353b21c 778b004b7f
commit
084553c306
12 changed files with 41 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lgsm/functions/core_functions.sh
  2. 2
      lgsm/functions/core_modules.sh
  3. 6
      lgsm/modules/command_dev_details.sh
  4. 2
      lgsm/modules/core_functions.sh
  5. 2
      lgsm/modules/core_modules.sh
  6. 53
      lgsm/modules/info_game.sh
  7. 1
      lgsm/modules/info_messages.sh
  8. 2
      linuxgsm.sh
  9. 2
      tests/tests_fctrserver.sh
  10. 2
      tests/tests_jc2server.sh
  11. 2
      tests/tests_mcserver.sh
  12. 2
      tests/tests_ts3server.sh

2
lgsm/functions/core_functions.sh
View File

@ -8,7 +8,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v23.3.0" modulesversion="v23.2.3"
# Core # Core

2
lgsm/functions/core_modules.sh
View File

@ -8,7 +8,7 @@
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v23.3.0" modulesversion="v23.3.1"
# Core # Core

6
lgsm/modules/command_dev_details.sh
View File

@ -44,7 +44,7 @@ declare -A server_details=(
['HTTP Password']="${httppassword}" ['HTTP Password']="${httppassword}"
['HTTP Port']="${httpport}" ['HTTP Port']="${httpport}"
['HTTP User']="${httpuser}" ['HTTP User']="${httpuser}"
['ip']="${ip}" ['Internet IP']="${extip}"
['LAN Port']="${lanport}" ['LAN Port']="${lanport}"
['Master Port']="${masterport}" ['Master Port']="${masterport}"
['Master']="${master}" ['Master']="${master}"
@ -56,12 +56,16 @@ declare -A server_details=(
['RCON Password']="${rconpassword}" ['RCON Password']="${rconpassword}"
['RCON Port']="${rconport}" ['RCON Port']="${rconport}"
['Reserved Slots']="${reservedslots}" ['Reserved Slots']="${reservedslots}"
['Server IP']="${ip}"
['Server Password']="${serverpassword}" ['Server Password']="${serverpassword}"
['Servername']="${servername}" ['Servername']="${servername}"
['Shard']="${shard}" ['Shard']="${shard}"
['Sharding']="${sharding}" ['Sharding']="${sharding}"
['Steam Auth Port']="${steamauthport}" ['Steam Auth Port']="${steamauthport}"
['Telnet Enabled']="${telnetenabled}"
['Telnet IP']="${telnetip}" ['Telnet IP']="${telnetip}"
['Telnet Password']="${telnetpassword}"
['Telnet Port']="${telnetport}"
['Tickrate']="${tickrate}" ['Tickrate']="${tickrate}"
['World Name']="${worldname}" ['World Name']="${worldname}"
['World Type']="${worldtype}" ['World Type']="${worldtype}"

2
lgsm/modules/core_functions.sh
View File

@ -8,7 +8,7 @@
module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v23.3.0" modulesversion="v23.3.1"
# Core # Core

2
lgsm/modules/core_modules.sh
View File

@ -8,7 +8,7 @@
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
modulesversion="v23.3.0" modulesversion="v23.3.1"
# Core # Core

53
lgsm/modules/info_game.sh
View File

@ -1883,38 +1883,39 @@ fn_info_game_scpsl() {
# Filetype: xml # Filetype: xml
fn_info_game_sdtd() { fn_info_game_sdtd() {
if [ -f "${servercfgfullpath}" ]; then if [ -f "${servercfgfullpath}" ]; then
fn_info_game_xml "gamemode" "ServerSettings/@GameMode" fn_info_game_xml "gamemode" "/ServerSettings/property[@name='GameMode']/@value"
fn_info_game_xml "maxplayers" "ServerSettings/@MaxPlayers" fn_info_game_xml "httpenabled" "/ServerSettings/property[@name='ControlPanelEnabled']/@value"
fn_info_game_xml "servername" "ServerSettings/@ServerName" fn_info_game_xml "httppassword" "/ServerSettings/property[@name='ControlPanelPassword']/@value"
fn_info_game_xml "serverpassword" "ServerSettings/@ServerPassword" fn_info_game_xml "httpport" "/ServerSettings/property[@name='ControlPanelPort']/@value"
fn_info_game_xml "serverport" "ServerSettings/@ServerPort" fn_info_game_xml "maxplayers" "/ServerSettings/property[@name='ServerMaxPlayerCount']/@value"
fn_info_game_xml "telnetenabled" "ServerSettings/@TelnetEnabled" fn_info_game_xml "servername" "/ServerSettings/property[@name='ServerName']/@value"
fn_info_game_xml "telnetpass" "ServerSettings/@TelnetPassword" fn_info_game_xml "serverpassword" "/ServerSettings/property[@name='ServerPassword']/@value"
fn_info_game_xml "telnetport" "ServerSettings/@TelnetPort" fn_info_game_xml "port" "/ServerSettings/property[@name='ServerPort']/@value"
fn_info_game_xml "httpenabled" "ServerSettings/@ControlPanelEnabled" fn_info_game_xml "telnetenabled" "/ServerSettings/property[@name='TelnetEnabled']/@value"
fn_info_game_xml "httppassword" "ServerSettings/@ControlPanelPassword" fn_info_game_xml "telnetpass" "/ServerSettings/property[@name='TelnetPassword']/@value"
fn_info_game_xml "httpport" "ServerSettings/@ControlPanelPort" fn_info_game_xml "telnetport" "/ServerSettings/property[@name='TelnetPort']/@value"
fn_info_game_xml "worldname" "ServerSettings/@GameWorld" fn_info_game_xml "worldname" "/ServerSettings/property[@name='GameWorld']/@value"
fi fi
servername="${servername:-"NOT SET"}" gamemode="${gamemode:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
port="${port:-"0"}"
queryport="${queryport:-"0"}"
httpenabled="${httpenabled:-"NOT SET"}" httpenabled="${httpenabled:-"NOT SET"}"
httpport="${httpport:-"0"}"
httppassword="${httppassword:-"NOT SET"}" httppassword="${httppassword:-"NOT SET"}"
telnetenabled="${telnetenabled:-"NOT SET"}" httpport="${httpport:-"0"}"
telnetport="${telnetport:-"0"}"
telnetpass="${telnetpass:-"NOT SET"}"
maxplayers="${maxplayers:-"0"}" maxplayers="${maxplayers:-"0"}"
gamemode="${gamemode:-"NOT SET"}" port="${port:-"0"}"
worldname="${worldname:-"NOT SET"}" port3="$((port + 2))"
queryport="${port:-"0"}"
servername="${servername:-"NOT SET"}"
serverpassword="${serverpassword:-"NOT SET"}"
telnetenabled="${telnetenabled:-"NOT SET"}"
# Telnet IP will be localhost if no password is set # Telnet IP will be localhost if no password is set
# check_ip will set the IP first. This will overwrite it. # check_ip will set the IP first. This will overwrite it.
if [ -z "${telnetpass}" ]; then if [ -z "${telnetpass}" ]; then
telnetip="127.0.0.1" telnetip="127.0.0.1"
fi fi
telnetpass="${telnetpass:-"NOT SET"}"
telnetport="${telnetport:-"0"}"
worldname="${worldname:-"NOT SET"}"
} }
# Config Type: Parameters (with an ini) # Config Type: Parameters (with an ini)
@ -2443,12 +2444,12 @@ if [ -z "${displaymasterserver}" ]; then
if [ "$(command -v jq 2> /dev/null)" ]; then if [ "$(command -v jq 2> /dev/null)" ]; then
if [ -n "${ip}" ] && [ -n "${port}" ]; then if [ -n "${ip}" ] && [ -n "${port}" ]; then
if [ "${steammaster}" == "true" ] || [ "${commandname}" == "DEV-QUERY-RAW" ]; then if [ "${steammaster}" == "true" ] || [ "${commandname}" == "DEV-QUERY-RAW" ]; then
# Query external IP first as most likely to succeed. # Query external IP first as most liky to succeed.
masterserver="$(curl --connect-timeout 10 -m 3 -s "https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${extip}&format=json" | jq --arg port "${port}" --arg queryport "${queryport}" 'if .response.servers != null then .response.servers[] | select((.gameport == ($port|tonumber) or .gameport == ($queryport|tonumber))) | .addr else empty end' | wc -l 2> /dev/null)" masterserver="$(curl --connect-timeout 10 -m 3 -s "https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${extip}&format=json" | jq --arg port "${port}" --arg queryport "${queryport}" --arg port3 "${port3}" 'if .response.servers != null then .response.servers[] | select((.gameport == ($port|tonumber) or .gameport == ($queryport|tonumber) or .gameport == ($port3|tonumber))) | .addr else empty end' | wc -l 2> /dev/null)"
if [ "${masterserver}" == "0" ]; then if [ "${masterserver}" == "0" ]; then
# Loop though server IP addresses if external IP fails. # Loop though server IP addresses if external IP fails.
for queryip in "${queryips[@]}"; do for queryip in "${queryips[@]}"; do
masterserver="$(curl --connect-timeout 10 -m 3 -s "https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${queryip}&format=json" | jq --arg port "${port}" --arg queryport "${queryport}" 'if .response.servers != null then .response.servers[] | select((.gameport == ($port|tonumber) or .gameport == ($queryport|tonumber))) | .addr else empty end' | wc -l 2> /dev/null)" masterserver="$(curl --connect-timeout 10 -m 3 -s "https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${queryip}&format=json" | jq --arg port "${port}" --arg queryport "${queryport}" --arg port3 "${port3}" 'if .response.servers != null then .response.servers[] | select((.gameport == ($port|tonumber) or .gameport == ($queryport|tonumber) or .gameport == ($port3|tonumber))) | .addr else empty end' | wc -l 2> /dev/null)"
done done
fi fi
if [ "${masterserver}" == "0" ]; then if [ "${masterserver}" == "0" ]; then

1
lgsm/modules/info_messages.sh
View File

@ -1411,7 +1411,6 @@ fn_info_message_sdtd() {
{ {
echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}" echo -e "${lightblue}Web Interface enabled:\t${default}${httpenabled}"
echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}/index.html" echo -e "${lightblue}Web Interface url:\t${default}http://${httpip}:${httpport}/index.html"
echo -e "${lightblue}Web Interface username:\t${default}${httpuser}"
echo -e "${lightblue}Web Interface password:\t${default}${httppassword}" echo -e "${lightblue}Web Interface password:\t${default}${httppassword}"
} | column -s $'\t' -t } | column -s $'\t' -t
echo -e "" echo -e ""

2
linuxgsm.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v23.3.0" version="v23.3.1"
shortname="core" shortname="core"
gameservername="core" gameservername="core"
commandname="CORE" commandname="CORE"

2
tests/tests_fctrserver.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v23.3.0" version="v23.3.1"
shortname="fctr" shortname="fctr"
gameservername="fctrserver" gameservername="fctrserver"
commandname="CORE" commandname="CORE"

2
tests/tests_jc2server.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v23.3.0" version="v23.3.1"
shortname="jc2" shortname="jc2"
gameservername="jc2server" gameservername="jc2server"
commandname="CORE" commandname="CORE"

2
tests/tests_mcserver.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v23.3.0" version="v23.3.1"
shortname="mc" shortname="mc"
gameservername="mcserver" gameservername="mcserver"
commandname="CORE" commandname="CORE"

2
tests/tests_ts3server.sh
View File

@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
set -x set -x
fi fi
version="v23.3.0" version="v23.3.1"
shortname="ts3" shortname="ts3"
gameservername="ts3server" gameservername="ts3server"
commandname="CORE" commandname="CORE"

Write Preview
Loading…
Cancel
Save