KillingFloor2/KF2-SRV
1
0
Fork 0
Code Releases 11 Activity

refactor: replaced steamID3/steamID64 conversation algorithm

Browse Source
This commit is contained in:
GenZmeY
2020-08-17 01:12:51 +03:00
parent 0c13ad296f
commit 6c2a62ebdc
4 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SOURCES/main/kf2-srv
View File

@ -43,7 +43,7 @@ readonly InstanceConfigTemplate="/etc/kf2-srv/instance.conf.template"
readonly AppServerNum="232130"
readonly AppClientNum="232090"
readonly StrangeConstUID="17825793"
readonly SteamConstB='17825793'
readonly ServerBotLogin="srvbot"
declare -a DiffNames

4
SOURCES/main/lib/ban.lib
View File

@ -108,7 +108,7 @@ function ban_ID3 () # $1: ID3
do
(
local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
local BanStr="(Uid=(A=$ID3,B=$StrangeConstUID))"
local BanStr="(Uid=(A=$ID3,B=$SteamConstB))"
local Service=$(service_name "$Instance")
if ! multini -gq "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"; then
echo "Add ban $ID3 to $Instance"
@ -137,7 +137,7 @@ function unban_ID3 () # $1: ID3
do
(
local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
local BanStr="(Uid=(A=$ID3,B=$StrangeConstUID))"
local BanStr="(Uid=(A=$ID3,B=$SteamConstB))"
local Service=$(service_name "$Instance")
if systemctl -q is-active $Service ; then
local PlainID=0

45
SOURCES/main/lib/playerids.lib
View File

@ -19,35 +19,42 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# conversion algorithm taken from here:
# https://github.com/noobient/killinuxfloor/blob/master/share/killinuxfloor
# thank bviktor for that :)
function steamID3_to_steamID64 () # $1: ID3
# WARNING:
# Conversion works correctly for positive A/B for EGS,
# but still gives incorrect results if there are negative ones
function steamID3_to_steamID64 () # $1: ID3 (A), $2: B
{
# steamID64 = "7656" + (steamID3 + 1197960265728)
ID64=$1
((ID64+=1197960265728))
ID64="7656${ID64}"
echo "$ID64"
local ID3="$1"
if [[ -z $2 ]]; then
local B="$SteamConstB"
else
local B="$2"
fi
# SteamID64=B*2^32+SteamID3
echo $(($B*(2**32)+$ID3))
}
function steamID64_to_steamID3 () # $1: ID4
function steamID64_to_steamID3 () # $1: ID64, $2: B
{
# steamID3 = substr(steamID64, 4) - 1197960265728
ID3=${1:4}
((ID3-=1197960265728))
echo "$ID3"
local ID64="$1"
if [[ -z $2 ]]; then
local B="$SteamConstB"
else
local B="$2"
fi
# SteamID3=SteamID64-B*2^32
echo $(($ID64-$B*(2**32)))
}
function any_to_ID3 () # $1: ID3/ID64/Url
{
if echo "$1" | grep -qP '^http.+'; then
local Xml=$(mktemp)
curl -ss "$1/?xml=1" > "$Xml"
local ID64=$(xmllint --xpath 'string(//steamID64/text())' "$Xml")
local ID64=$(curl -ss "$1/?xml=1" | xmllint --xpath 'string(//steamID64/text())' -)
local ID3=$(steamID64_to_steamID3 "$ID64")
rm -f "$Xml"
elif [[ $(echo "$1" | wc -m) -eq 18 ]] && echo "$1" | grep -qP '^76561[0-9]+' ; then
elif [[ $(echo "$1" | wc -m) -eq 18 ]] && echo "$1" | grep -qP '^7656[0-9]+' ; then
local ID3=$(steamID64_to_steamID3 "$1")
else
local ID3="$1"