Skip to content

Commit 8032eca

Browse files
committed
feat(kf): Migrate to using valve query
1 parent ee8d30f commit 8032eca

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

lgsm/config-default/config-lgsm/kfserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ stopmode="2"
146146
# 4: gsquery
147147
# 5: tcp
148148
querymode="2"
149-
querytype="protocol-unreal2"
149+
querytype="protocol-valve"
150150

151151
## Console type
152152
consoleverbose="yes"

lgsm/modules/info_game.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,25 +496,25 @@ fn_info_game_kf() {
496496
fn_info_game_ini "lanport" "LANServerPort"
497497
fn_info_game_ini "maxplayers" "MaxPlayers"
498498
fn_info_game_ini "port" "Port"
499-
fn_info_game_ini "gamespyqueryport" "QueryPort"
499+
fn_info_game_ini "gamespyqueryport" "OldQueryPortNumber"
500500
fn_info_game_ini "servername" "ServerName"
501501
fn_info_game_ini "serverpassword" "GamePassword"
502502
fi
503503
adminpassword="${adminpassword:-"NOT SET"}"
504504
defaultmap="${defaultmap:-"NOT SET"}"
505+
gamespyqueryport="${gamespyqueryport:-"0"}" # Gamespy Query Port
505506
httpenabled="${httpenabled:-"NOT SET"}"
506507
httppassword="${adminpassword}"
507508
httpport="${httpport:-"0"}"
508509
httpuser="${httpuser:-"NOT SET"}"
509510
lanport="${lanport:-"0"}"
510511
maxplayers="${maxplayers:-"0"}"
511512
port="${port:-"0"}"
512-
queryport="$((port + 1))"
513-
gamespyqueryport="${gamespyqueryport:-"0"}"
513+
queryport=$((28902 + (port - 7757))) # Valve Query Port
514514
servername="${servername:-"NOT SET"}"
515515
serverpassword="${serverpassword:-"NOT SET"}"
516-
steamport="28852"
517-
steamworksport="20560"
516+
steamport="20610"
517+
unreal2queryport="$((port + 1))" # Unreal2 Query Port
518518
}
519519

520520
# Config Type: ini
@@ -1761,6 +1761,11 @@ fn_info_game_qw() {
17611761
servername="${servername:-"NOT SET"}"
17621762
}
17631763

1764+
# Config Type: ini
1765+
# Parameters: true
1766+
# Comment: ; or #
1767+
# Example: ServerName=SERVERNAME
1768+
# Filetype: ini
17641769
fn_info_game_ro() {
17651770
if [ -f "${servercfgfullpath}" ]; then
17661771
fn_info_game_ini "adminpassword" "AdminPassword"

lgsm/modules/info_messages.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,11 +1129,11 @@ fn_info_messages_kf() {
11291129
{
11301130
fn_port "header"
11311131
fn_port "Game" port udp
1132-
fn_port "Query" queryport udp
1133-
fn_port "Query (GameSpy)" gamespyqueryport udp
1132+
fn_port "Query - Steam" queryport udp
1133+
fn_port "Query - Unreal 2" unreal2queryport udp
1134+
fn_port "Query - Gamespy" gamespyqueryport udp
11341135
fn_port "Web Interface" httpport tcp
11351136
fn_port "LAN" lanport udp
1136-
fn_port "Steamworks P2P" steamworksport udp
11371137
fn_port "Steam" steamport udp
11381138
} | column -s $'\t' -t
11391139
echo -e ""

0 commit comments

Comments
 (0)