ChillerDragon/teeworlds_network
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Check args for chunk header

Browse source 
related to #7
This commit is contained in:
ChillerDragon 2022-11-12 10:34:40 +01:00
parent 83c38c4639
commit ff21d6ca84
2 changed files with 67 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chunk.rb
View file

@ -63,7 +63,7 @@ class NetChunk
return _create_non_vital_header(opts) unless opts[:vital]
@@sent_vital_chunks += 1
seq = @@sent_vital_chunks if opts[:seq].nil?
seq = opts[:seq].nil? ? @@sent_vital_chunks : opts[:seq]
flag_bits = '00'.dup
flag_bits[0] = opts[:resend] ? '1' : '0'

96
scripts/bad_code.sh
View file

@ -7,37 +7,73 @@ then
arg_fix=1
fi
if [ "$arg_fix" == "1" ]
then
while read -r bad_file
do
echo "[*] fixing '$bad_file' ..."
for del in ';' '$' ' '
do
del_end="$del"
[[ "$del" == '$' ]] && del_end=''
sed "s/.to_s(16)$del/.to_s(16).rjust(2, '0')$del_end/g" "$bad_file" > "$bad_file".tmp
done
mv "$bad_file".tmp "$bad_file"
done < <(grep -nri "to_s(16)" --exclude=bad_code.sh |
grep -v "to_s(16).rjust(2, '0')" |
cut -d':' -f1)
fi
if grep -nri "to_s(16)" --exclude=bad_code.sh | grep -v "to_s(16).rjust(2, '0')"
then
function check_hex_str() {
local bad_file
local del
local del_end
if [ "$arg_fix" == "1" ]
then
echo "[-] Error: could not fix those ^"
while read -r bad_file
do
echo "[*] fixing '$bad_file' ..."
for del in ';' '$' ' '
do
del_end="$del"
[[ "$del" == '$' ]] && del_end=''
sed "s/.to_s(16)$del/.to_s(16).rjust(2, '0')$del_end/g" "$bad_file" > "$bad_file".tmp
done
mv "$bad_file".tmp "$bad_file"
done < <(grep -nr "to_s(16)" --exclude=bad_code.sh |
grep -v "to_s(16).rjust(2, '0')" |
cut -d':' -f1)
fi
if grep -nr "to_s(16)" --exclude=bad_code.sh | grep -v "to_s(16).rjust(2, '0')"
then
if [ "$arg_fix" == "1" ]
then
echo "[-] Error: could not fix those ^"
exit 1
fi
echo "[-] Error: found usage of 'to_s(16)' without 'rjust(2, '0')'"
echo "[-] all hexadecimal string bytes have to be zero padded!"
echo "[-]"
echo "[-] bad: FAF"
echo "[-] good: 0FAF"
echo "[-]"
echo "[-] run ./scripts/bad_code.sh --fix to fix"
echo "[-]"
exit 1
fi
echo "[-] Error: found usage of 'to_s(16)' without 'rjust(2, '0')'"
echo "[-] all hexadecimal string bytes have to be zero padded!"
echo "[-]"
echo "[-] bad: FAF"
echo "[-] good: 0FAF"
echo "[-]"
echo "[-] run ./scripts/bad_code.sh --fix to fix"
echo "[-]"
exit 1
fi
}
function check_chunk_header_args() {
local header_line
local line
local method_args
local needed_args
local needed_arg
local code
needed_args=(vital: size:)
while read -r header_line
do
line="$(echo "$header_line" | cut -d':' -f1-2)"
code="$(echo "$header_line" | cut -d':' -f3-)"
method_args="$(echo "$header_line" | cut -d'(' -f2-)"
for needed_arg in "${needed_args[@]}"
do
if ! echo "$method_args" | grep -q "$needed_arg"
then
echo "[-] Error: missing argument '$needed_arg' for create_header() in $line"
echo "[-]"
echo "[-] $code"
echo "[-]"
exit 1
fi
done
done < <(grep -Enor "Chunk.create_header\([^)]+\)" --include=*.rb)
}
check_hex_str
check_chunk_header_args