forked from freifunk-franken/firmware
consistently use same webserver port for hoodfile on wifi and lan
Signed-off-by: Fabian Bläse <fabian@blaese.de> 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
3f607e106f
commit
4f3c30eb0e
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
getJsonPath() {
|
getJsonPath() {
|
||||||
jsonfile=""
|
jsonfile=""
|
||||||
if [ -s /www/public/keyxchangev2data ] ; then
|
if [ -s /www/hood/keyxchangev2data ] ; then
|
||||||
jsonfile="/www/public/keyxchangev2data"
|
jsonfile="/www/hood/keyxchangev2data"
|
||||||
elif [ -s /tmp/keyxchangev2data ] ; then
|
elif [ -s /tmp/keyxchangev2data ] ; then
|
||||||
jsonfile="/tmp/keyxchangev2data"
|
jsonfile="/tmp/keyxchangev2data"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
sectorlocal=/etc/sectorfile
|
sectorlocal=/etc/sectorfile
|
||||||
sectortmp=/tmp/sectorfile
|
sectortmp=/tmp/sectorfile
|
||||||
sectorcopy=/www/public/sectorfile
|
sectorcopy=/www/hood/sectorfile
|
||||||
|
|
||||||
rm -f /tmp/keyxchangev2data
|
rm -f /tmp/keyxchangev2data
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ else
|
||||||
if ! isGatewayAvailable ; then
|
if ! isGatewayAvailable ; then
|
||||||
#now we haven't a gateway in Range, we search for a hidden AP to get a keyxchangev2data file!
|
#now we haven't a gateway in Range, we search for a hidden AP to get a keyxchangev2data file!
|
||||||
#first we delete all wifi settings
|
#first we delete all wifi settings
|
||||||
rm -f /www/public/keyxchangev2data # delete this, so interfaces are recreated if reconnect with unchanged hood file takes place
|
rm -f /www/hood/keyxchangev2data # delete this, so interfaces are recreated if reconnect with unchanged hood file takes place
|
||||||
rm -f "$sectorcopy" # always delete: no broadcast for isolated device
|
rm -f "$sectorcopy" # always delete: no broadcast for isolated device
|
||||||
rm -f "$sectortmp"
|
rm -f "$sectortmp"
|
||||||
|
|
||||||
|
@ -108,10 +108,10 @@ else
|
||||||
# wait a moment to start the interface
|
# wait a moment to start the interface
|
||||||
sleep 10;
|
sleep 10;
|
||||||
# and here we can download the Hoodfile from the other node
|
# and here we can download the Hoodfile from the other node
|
||||||
wget -T15 -t5 "http://[fe80::1%w2sta]/keyxchangev2data" -O /tmp/keyxchangev2data
|
wget -T15 -t5 "http://[fe80::1%w2sta]:2342/keyxchangev2data" -O /tmp/keyxchangev2data
|
||||||
#UPLINK: Set up uplink data on first contact:
|
#UPLINK: Set up uplink data on first contact:
|
||||||
if [ -s /tmp/keyxchangev2data ]; then
|
if [ -s /tmp/keyxchangev2data ]; then
|
||||||
wget -T15 -t5 "http://[fe80::1%w2sta]/sectorfile" -O "$sectortmp"
|
wget -T15 -t5 "http://[fe80::1%w2sta]:2342/sectorfile" -O "$sectortmp"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1"
|
echo "We have a Gateway in Range, we load the keyxchangev2data from fe80::1"
|
||||||
|
@ -141,7 +141,7 @@ if [ -s /tmp/keyxchangev2data ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
catnew="$(cat /tmp/keyxchangev2data | sed 's/"timestamp":[0-9]*/"timestamp":0/')"
|
catnew="$(cat /tmp/keyxchangev2data | sed 's/"timestamp":[0-9]*/"timestamp":0/')"
|
||||||
catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed 's/"timestamp":[0-9]*/"timestamp":0/')"
|
catold="$(cat /www/hood/keyxchangev2data 2>/dev/null | sed 's/"timestamp":[0-9]*/"timestamp":0/')"
|
||||||
sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ")
|
sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ")
|
||||||
sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ")
|
sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ")
|
||||||
|
|
||||||
|
@ -221,7 +221,7 @@ if [ -s /tmp/keyxchangev2data ]; then
|
||||||
|
|
||||||
# copy the file to webroot so that other mesh routers can download it;
|
# copy the file to webroot so that other mesh routers can download it;
|
||||||
# copy only after all other steps so IF can be reentered if something goes wrong
|
# copy only after all other steps so IF can be reentered if something goes wrong
|
||||||
cp /tmp/keyxchangev2data /www/public/
|
cp /tmp/keyxchangev2data /www/hood/
|
||||||
cp "$sectortmp" "$sectorcopy"
|
cp "$sectortmp" "$sectorcopy"
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
|
@ -5,6 +5,7 @@ uci batch <<EOF
|
||||||
delete uhttpd.public
|
delete uhttpd.public
|
||||||
delete uhttpd.ssl
|
delete uhttpd.ssl
|
||||||
delete uhttpd.px5g
|
delete uhttpd.px5g
|
||||||
|
|
||||||
set uhttpd.public=uhttpd
|
set uhttpd.public=uhttpd
|
||||||
add_list uhttpd.public.listen_http='80'
|
add_list uhttpd.public.listen_http='80'
|
||||||
set uhttpd.public.home='/www/public'
|
set uhttpd.public.home='/www/public'
|
||||||
|
@ -14,6 +15,7 @@ uci batch <<EOF
|
||||||
set uhttpd.public.network_timeout='30'
|
set uhttpd.public.network_timeout='30'
|
||||||
set uhttpd.public.tcp_keepalive='1'
|
set uhttpd.public.tcp_keepalive='1'
|
||||||
set uhttpd.public.config='_'
|
set uhttpd.public.config='_'
|
||||||
|
|
||||||
set uhttpd.ssl=uhttpd
|
set uhttpd.ssl=uhttpd
|
||||||
add_list uhttpd.ssl.listen_https='443'
|
add_list uhttpd.ssl.listen_https='443'
|
||||||
set uhttpd.ssl.home='/www/ssl'
|
set uhttpd.ssl.home='/www/ssl'
|
||||||
|
@ -29,6 +31,14 @@ uci batch <<EOF
|
||||||
set uhttpd.px5g.days='1400'
|
set uhttpd.px5g.days='1400'
|
||||||
set uhttpd.px5g.bits='2048'
|
set uhttpd.px5g.bits='2048'
|
||||||
set uhttpd.px5g.commonname='OpenWrt'
|
set uhttpd.px5g.commonname='OpenWrt'
|
||||||
|
|
||||||
|
set uhttpd.hood=uhttpd
|
||||||
|
add_list uhttpd.hood.listen_http='2342'
|
||||||
|
set uhttpd.hood.home='/www/hood'
|
||||||
|
set uhttpd.hood.rfc1918_filter='1'
|
||||||
|
set uhttpd.hood.network_timeout='30'
|
||||||
|
set uhttpd.hood.tcp_keepalive='1'
|
||||||
|
set uhttpd.hood.config='_'
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
uci commit uhttpd
|
uci commit uhttpd
|
||||||
|
|
0
src/packages/fff/fff-web/files/www/hood/.keep
Normal file
0
src/packages/fff/fff-web/files/www/hood/.keep
Normal file
|
@ -5,7 +5,7 @@
|
||||||
if [ "$REQUEST_METHOD" == "POST" ] ; then
|
if [ "$REQUEST_METHOD" == "POST" ] ; then
|
||||||
if [ "$POST_resethood" != "" ] ; then
|
if [ "$POST_resethood" != "" ] ; then
|
||||||
# reset hood
|
# reset hood
|
||||||
rm /www/public/keyxchangev2data 2> /dev/null
|
rm /www/hood/keyxchangev2data 2> /dev/null
|
||||||
MSG='<span class="green">Hood-Daten werden innerhalb von 5 Minuten neu prozessiert.</span>'
|
MSG='<span class="green">Hood-Daten werden innerhalb von 5 Minuten neu prozessiert.</span>'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user