diff --git a/lgsm/modules/command_dev_query_raw.sh b/lgsm/modules/command_dev_query_raw.sh index 541c463ce..412649114 100644 --- a/lgsm/modules/command_dev_query_raw.sh +++ b/lgsm/modules/command_dev_query_raw.sh @@ -118,23 +118,18 @@ echo -e "==================================================================" echo -e "Steam:" fi - if [ -v steamauthport ]; then - echo -e "Steam: Auth: \t${steamauthport} \t$(ss -tupl | grep -c ${steamauthport}) \t$(ss -tupl | grep ${steamauthport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${steamauthport} | grep udp | awk '{ print $2 }')" + if [ -v steamworksport ]; then + echo -e "Steamworks P2P: \t${steamworksport} \t$(ss -tupl | grep -c ${steamworksport}) \t$(ss -tupl | grep ${steamworksport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${steamworksport} | grep udp | awk '{ print $2 }')" else - echo -e "Steam: Auth:" + echo -e "Steamworks P2P:" fi - if [ -v steammasterport ]; then - echo -e "Steam: Master: \t${steammasterport} \t$(ss -tupl | grep -c ${steammasterport}) \t$(ss -tupl | grep ${steammasterport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${steammasterport} | grep udp | awk '{ print $2 }')" + if [ -v steamauthport ]; then + echo -e "Steam: Auth: \t${steamauthport} \t$(ss -tupl | grep -c ${steamauthport}) \t$(ss -tupl | grep ${steamauthport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${steamauthport} | grep udp | awk '{ print $2 }')" else - echo -e "Steam: Master:" + echo -e "Steam: Auth:" fi - if [ -v steamqueryport ]; then - echo -e "Steam: Query: \t${steamqueryport} \t$(ss -tupl | grep -c ${steamqueryport}) \t$(ss -tupl | grep ${steamqueryport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${steamqueryport} | grep udp | awk '{ print $2 }')" - else - echo -e "Steam: Query:" - fi if [ -v beaconport ]; then echo -e "Beacon: \t${beaconport} \t$(ss -tupl | grep -c ${beaconport}) \t$(ss -tupl | grep ${beaconport} | grep tcp | awk '{ print $2 }') \t$(ss -tupl | grep ${beaconport} | grep udp | awk '{ print $2 }')" else diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index 173f3a7ef..ea66ddc35 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -295,7 +295,7 @@ fn_info_game_arma3() { queryport="$((port + 1))" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steammasterport="$((port + 2))" + steamport="$((port + 2))" voiceport="${port:-"0"}" voiceunusedport="$((port + 3))" } @@ -328,7 +328,7 @@ fn_info_game_av() { queryport="${rconport:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steammasterport="$((port + 21))" + steamport="$((port + 21))" steamworksport="$((port + 20))" } @@ -413,7 +413,7 @@ fn_info_game_dst() { if [ -f "${servercfgfullpath}" ]; then fn_info_game_ini "port" "server_port" fn_info_game_ini "steamauthport" "authentication_port" - fn_info_game_ini "steammasterport" "master_server_port" + fn_info_game_ini "steamport" "master_server_port" fi if [ -f "${clustercfgfullpath}" ]; then fn_info_game_ini "maxplayers" "max_players" "${clustercfgfullpath}" @@ -438,7 +438,7 @@ fn_info_game_dst() { shard="${shard:-"NOT SET"}" sharding="${sharding:-"NOT SET"}" steamauthport="${steamauthport:-"0"}" - steammasterport="${steammasterport:-"0"}" + steamport="${steamport:-"0"}" tickrate="${tickrate:-"0"}" } @@ -450,20 +450,23 @@ fn_info_game_dst() { fn_info_game_kf() { if [ -f "${servercfgfullpath}" ]; then fn_info_game_ini "adminpassword" "AdminPassword" + fn_info_game_ini "httpenabled" "bEnabled" + fn_info_game_ini "httppassword" "httppasswordword" fn_info_game_ini "httpport" "ListenPort" + fn_info_game_ini "httpuser" "AdminName" fn_info_game_ini "lanport" "LANServerPort" fn_info_game_ini "maxplayers" "MaxPlayers" fn_info_game_ini "port" "Port" fn_info_game_ini "queryportgs" "QueryPort" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" - fn_info_game_ini "httpenabled" "bEnabled" - fn_info_game_ini "httppassword" "httppasswordword" - fn_info_game_ini "httpuser" "AdminName" fi adminpassword="${adminpassword:-"NOT SET"}" defaultmap="${defaultmap:-"NOT SET"}" + httpenabled="${httpenabled:-"NOT SET"}" + httppassword="${adminpassword}" httpport="${httpport:-"0"}" + httpuser="${httpuser:-"NOT SET"}" lanport="${lanport:-"0"}" maxplayers="${maxplayers:-"0"}" port="${port:-"0"}" @@ -471,11 +474,8 @@ fn_info_game_kf() { queryportgs="${queryportgs:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steammasterport="28852" + steamport="28852" steamworksport="20560" - httpenabled="${httpenabled:-"NOT SET"}" - httppassword="${adminpassword}" - httpuser="${httpuser:-"NOT SET"}" } # Config Type: ini @@ -1105,7 +1105,7 @@ fn_info_game_dayz() { queryport="${queryport:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steammasterport="$((port + 2))" + steamport="$((port + 2))" } # Config Type: json @@ -1608,20 +1608,23 @@ fn_info_game_qw() { fn_info_game_ro() { if [ -f "${servercfgfullpath}" ]; then fn_info_game_ini "adminpassword" "AdminPassword" + fn_info_game_ini "httpenabled" "bEnabled" + fn_info_game_ini "httppassword" "httppasswordword" fn_info_game_ini "httpport" "ListenPort" + fn_info_game_ini "httpuser" "AdminName" fn_info_game_ini "lanport" "LANServerPort" fn_info_game_ini "maxplayers" "MaxPlayers" fn_info_game_ini "port" "Port" fn_info_game_ini "queryportgs" "QueryPort" fn_info_game_ini "servername" "ServerName" fn_info_game_ini "serverpassword" "GamePassword" - fn_info_game_ini "httpenabled" "bEnabled" - fn_info_game_ini "httppassword" "httppasswordword" - fn_info_game_ini "httpuser" "AdminName" fi adminpassword="${adminpassword:-"NOT SET"}" defaultmap="${defaultmap:-"NOT SET"}" + httpenabled="${httpenabled:-"NOT SET"}" + httppassword="${adminpassword}" httpport="${httpport:-"0"}" + httpuser="${httpuser:-"NOT SET"}" lanport="${lanport:-"0"}" maxplayers="${maxplayers:-"0"}" port="${port:-"0"}" @@ -1629,11 +1632,8 @@ fn_info_game_ro() { queryportgs="${queryportgs:-"0"}" servername="${servername:-"NOT SET"}" serverpassword="${serverpassword:-"NOT SET"}" - steamport="20610" - steammasterport="28902" - httpenabled="${httpenabled:-"NOT SET"}" - httppassword="${adminpassword}" - httpuser="${httpuser:-"NOT SET"}" + steamport="28902" + steamworksport="20610" } # Config Type: QuakeC diff --git a/lgsm/modules/info_messages.sh b/lgsm/modules/info_messages.sh index 2be5a4c80..c590dbfe3 100644 --- a/lgsm/modules/info_messages.sh +++ b/lgsm/modules/info_messages.sh @@ -809,7 +809,7 @@ fn_info_message_arma3() { fn_port "Game" port udp fn_port "Voice" voiceport udp fn_port "Query" queryport udp - fn_port "Steam Master Server" steammasterport udp + fn_port "Steam" steamport udp fn_port "Voice (unused)" voiceunusedport udp fn_port "BattleEye" battleeyeport udp } | column -s $'\t' -t @@ -829,7 +829,7 @@ fn_info_message_av() { fn_port "header" fn_port "Game" port udp fn_port "Query" queryport udp - fn_port "Steam Master Server" steammasterport udp + fn_port "Steam" steamport udp fn_port "Steamworks P2P" steamworksport udp fn_port "RCON" rconport tcp } | column -s $'\t' -t @@ -968,7 +968,7 @@ fn_info_message_dayz() { fn_port "header" fn_port "Game" port udp fn_port "Query Steam" queryport udp - fn_port "Steam Master Server" steammasterport udp + fn_port "Steam" steamport udp fn_port "BattleEye" battleeyeport udp } | column -s $'\t' -t } @@ -986,8 +986,9 @@ fn_info_message_dst() { fn_port "header" fn_port "Game: Server" port udp fn_port "Game: Master" masterport udp + fn_port "Steam" steamport udp fn_port "Steam: Auth" steamauthport udp - fn_port "Steam: Master Server" steammasterport udp + } | column -s $'\t' -t } @@ -1085,7 +1086,7 @@ fn_info_message_kf() { fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp fn_port "Steamworks P2P" steamworksport udp - fn_port "Steam Master Server" steammasterport udp + fn_port "Steam" steamport udp } | column -s $'\t' -t echo -e "" echo -e "${lightgreen}${servername} Web Interface${default}" @@ -1286,7 +1287,7 @@ fn_info_message_ro() { fn_port "Web Interface" httpport tcp fn_port "LAN" lanport udp fn_port "Steamworks P2P" steamworksport udp - fn_port "Steam Master Server" steammasterport udp + fn_port "Steam" steamport udp } | column -s $'\t' -t echo -e "" echo -e "${lightgreen}${servername} Web Interface${default}"