forked from freifunk-franken/firmware
wget: Remove -t from calls
The wget from busybox we are using ignores the -t option, although it does not throw errors in the currently used version. However, specifying the -t option in calls where it is not used is misleading, so it should be removed. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Reviewed-by: Christian Dresel <fff@chrisi01.de> Reviewed-by: Robert Langhammer <rlanghammer@web.de>
This commit is contained in:
parent
23a81ffb9a
commit
dc6d77610f
|
@ -44,9 +44,9 @@ getWirelessHoodfile() {
|
||||||
# wait a moment to start the interface
|
# wait a moment to start the interface
|
||||||
sleep 10;
|
sleep 10;
|
||||||
|
|
||||||
if wget -T15 -t5 -O "$file" "http://[fe80::1%w2sta]:2342/keyxchangev2data"; then
|
if wget -T15 -O "$file" "http://[fe80::1%w2sta]:2342/keyxchangev2data"; then
|
||||||
return 0
|
return 0
|
||||||
elif wget -T15 -t5 -O "$file" "http://[fe80::1%w5sta]:2342/keyxchangev2data"; then
|
elif wget -T15 -O "$file" "http://[fe80::1%w5sta]:2342/keyxchangev2data"; then
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return 1
|
return 1
|
||||||
|
@ -70,7 +70,7 @@ getEthernetHoodfile() {
|
||||||
neighbor_addrs=$(ping6 -c2 ff02::1%"${ethmesh_dev}" | grep seq | grep DUP | cut -d " " -f4 | sed s/:$//g | sort -u)
|
neighbor_addrs=$(ping6 -c2 ff02::1%"${ethmesh_dev}" | grep seq | grep DUP | cut -d " " -f4 | sed s/:$//g | sort -u)
|
||||||
|
|
||||||
for addr in $neighbor_addrs; do
|
for addr in $neighbor_addrs; do
|
||||||
wget -T2 -t1 -qO "$file" "http://[${addr}%${ethmesh_dev}]:2342/keyxchangev2data" && return 0
|
wget -T2 -qO "$file" "http://[${addr}%${ethmesh_dev}]:2342/keyxchangev2data" && return 0
|
||||||
done
|
done
|
||||||
|
|
||||||
# got no hoodfile
|
# got no hoodfile
|
||||||
|
@ -86,7 +86,7 @@ getGatewayHoodfile() {
|
||||||
|
|
||||||
echo "Trying to get hoodfile from gateway..."
|
echo "Trying to get hoodfile from gateway..."
|
||||||
|
|
||||||
if wget -T15 -t5 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then
|
if wget -T15 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return 1
|
return 1
|
||||||
|
@ -108,7 +108,7 @@ getKeyserverHoodfile() {
|
||||||
|
|
||||||
echo "Getting hoodfile from Keyserver"
|
echo "Getting hoodfile from Keyserver"
|
||||||
|
|
||||||
if wget -T15 -t5 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then
|
if wget -T15 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then
|
||||||
return 0
|
return 0
|
||||||
else
|
else
|
||||||
return 1
|
return 1
|
||||||
|
|
Loading…
Reference in New Issue