Skip to content

Handle additional ports and prevent hanging commands #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dougfultz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle additional ports and prevent hanging commands #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf713e1
Fixing port checking logic to handle additional ports
Aug 25, 2017
453af39
Set timeout for PORTTEST
dougfultz Nov 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions wemo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#==============================================================================#
# 10 Main: Argument Error #
# 11 Main: Run Action Error #
# 12 Main: Unable to detect port for device #
# 20 restPostXmlStdinBelkinSoap: Argument Error #
# 21 restPostXmlStdinBelkinSoap: Missing/Empty URL #
# 22 restPostXmlStdinBelkinSoap: Missing/Emtpy SOAP Header #
Expand Down Expand Up @@ -302,12 +303,22 @@ done
#123456789o123456789o123456789o123456789o123456789o123456789o123456789o123456789
# Identify TCP port to use #
#123456789o123456789o123456789o123456789o123456789o123456789o123456789o123456789
PORTTEST="$( curl --silent ${DEVICE_HOST}:49153 | grep "404" )"
if testEmpty "${PORTTEST}"
declare -a ports=(49152 49153 49154 49155)
PORT=0
for p in "${ports[@]}"
do
PORTTEST="$( curl --max-time 10 --silent ${DEVICE_HOST}:$p | grep "404" )"
if ! testEmpty "${PORTTEST}"
then
PORT=$p
break
fi
done

if [ "$PORT" -le "0" ]
then
PORT=49152
else
PORT=49153
echoError "Unable to detect port for ${DEVICE_HOST}"
finish 12
fi

#123456789o123456789o123456789o123456789o123456789o123456789o123456789o123456789
Expand Down