Browse Source

changes

pull/3015/head
Daniel Gibbs 5 years ago
parent
commit
dfcbfbdfda
  1. 2
      lgsm/functions/check_ip.sh
  2. 85
      lgsm/functions/command_dev_query_raw.sh

2
lgsm/functions/check_ip.sh

@ -25,7 +25,7 @@ if [ "${ip}" != "0.0.0.0" ]&&[ "${ip}" != "" ]; then
queryips=( "${ip}" ) queryips=( "${ip}" )
# If ip is not set by user # If ip is not set by user
else else
queryips=( "${getip}" ) queryips=( $(echo "${getip}") )
fi fi
echo "###### DEV IP CHECK ######" echo "###### DEV IP CHECK ######"

85
lgsm/functions/command_dev_query_raw.sh

@ -14,14 +14,16 @@ info_config.sh
info_parms.sh info_parms.sh
for queryip in "${queryips[@]}"
do
echo -e "" echo -e ""
echo -e "Query Port - Raw Output" echo -e "Query Port - Raw Output"
echo -e "==================================================================" echo -e "=================================================================="
echo -e "" echo -e ""
echo -e "QUERY IP" echo -e "QUERY IP"
echo -e "${queryip}" for queryip in "${queryips[@]}"
do
echo -e "${queryip}"
done
echo -e "=================================" echo -e "================================="
echo -e "Ports" echo -e "Ports"
echo -e "=================================" echo -e "================================="
@ -38,38 +40,43 @@ do
if [ ! "$(command -v jq 2>/dev/null)" ]; then if [ ! "$(command -v jq 2>/dev/null)" ]; then
fn_print_failure_nl "jq not installed" fn_print_failure_nl "jq not installed"
fi fi
for queryip in "${queryips[@]}"
query_gamedig.sh do
echo -e "${gamedigcmd}" query_gamedig.sh
echo"" echo -e "${gamedigcmd}"
echo "${gamedigraw}" | jq echo""
echo "${gamedigraw}" | jq
done
echo -e "" echo -e ""
echo -e "gsquery Raw Output" echo -e "gsquery Raw Output"
echo -e "=================================" echo -e "================================="
echo -e "" echo -e ""
echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\"" for queryip in "${queryips[@]}"
echo -e "" do
if [ ! -f "${functionsdir}/query_gsquery.py" ]; then echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\""
fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5" echo -e ""
fi if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
"${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5"
fi
"${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}"
done
echo -e "" echo -e ""
echo -e "TCP Raw Output" echo -e "TCP Raw Output"
echo -e "=================================" echo -e "================================="
echo -e "" echo -e ""
echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''" for queryip in "${queryips[@]}"
echo -e "" do
timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}'' echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''"
querystatus="$?" echo -e ""
echo -e "" timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${queryport}''
if [ "${querystatus}" == "0" ]; then querystatus="$?"
echo -e "TCP query PASS" echo -e ""
else if [ "${querystatus}" == "0" ]; then
echo -e "TCP query FAIL" echo -e "TCP query PASS"
fi else
echo -e "TCP query FAIL"
fi
done
echo -e "" echo -e ""
echo -e "Game Port - Raw Output" echo -e "Game Port - Raw Output"
echo -e "==================================================================" echo -e "=================================================================="
@ -77,16 +84,18 @@ do
echo -e "TCP Raw Output" echo -e "TCP Raw Output"
echo -e "=================================" echo -e "================================="
echo -e "" echo -e ""
echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''" for queryip in "${queryips[@]}"
echo -e "" do
timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}'' echo -e "bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''"
querystatus="$?" echo -e ""
echo -e "" timeout 3 bash -c 'exec 3<> /dev/tcp/'${queryip}'/'${port}''
if [ "${querystatus}" == "0" ]; then querystatus="$?"
echo -e "TCP query PASS" echo -e ""
else if [ "${querystatus}" == "0" ]; then
echo -e "TCP query FAIL" echo -e "TCP query PASS"
fi else
done echo -e "TCP query FAIL"
fi
done
exitcode=0 exitcode=0
core_exit.sh core_exit.sh

Loading…
Cancel
Save