fff-web-ui: fix redirection of stderr

The stderr of batctl should be redirected. In a row of pipes a redirection at the end will only redirect the output of the last command! Put it on the right place. It's just shell grammar. Signed-off-by: Robert Langhammer <rlanghammer@web.de>
buildscript: drop md5 checksum
2022-04-17 00:31:42 +02:00 · 2022-04-13 19:22:31 +02:00 · 2022-04-13 19:22:31 +02:00 · 2022-04-13 19:22:27 +02:00 · 2022-04-13 19:21:25 +02:00
5 changed files with 12 additions and 7 deletions
--- a/3
+++ b/3
@ -312,8 +312,7 @@ buildrelease() {
    fi

    cd bin/$variant
-    for binary in *.bin *.img *.tar; do
-        md5sum "$binary" > ./"$binary".md5
+    for binary in *.bin *.img *.img.gz *.tar; do
        sha256sum "$binary" > ./"$binary".sha256
    done
    echo -e "VERSION:$version" > release.nfo
--- a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
+++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
@ -116,7 +116,7 @@ fi
 # Checks if fastd is running
 vpn_active=0
 pidof fastd >/dev/null && vpn_active=1
-bridge fdb show brport vxlan0 state permanent >/dev/null && vpn_active=1
+bridge fdb show brport vxlan0 state permanent &>/dev/null && vpn_active=1
 SYSTEM_DATA="$SYSTEM_DATA<vpn_active>$vpn_active</vpn_active>"

 echo -n "<system_data>$SYSTEM_DATA</system_data>"
--- a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
+++ b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
@ -5,6 +5,12 @@ uci batch <<EOF
 	set dhcp.client.ra_default='2'
 	set dhcp.client.ra_management='0'
 	set dhcp.client.ra_useleasetime='1'
+
+	# Work around unexpected behavior of odhcpd (see #238).
+	#
+	# This value has to be less then or equal to
+	# dhcp.client.leasetime (set in fff-dhcp).
+	set dhcp.client.preferred_lifetime='1h'
 EOF

 exit 0
--- a/src/packages/fff/fff-web-ui/files/www/public/cgi-bin/status.html
+++ b/src/packages/fff/fff-web-ui/files/www/public/cgi-bin/status.html
@ -61,8 +61,8 @@ contact="$(uci -q get "fff.system.contact")"
 							<legend>Status</legend>
 							<table>
 								<tr><th>Hood:</th><td><% echo "$hood" %></td></tr>
-								<tr><th>Bekannte Knoten:</th><td><% echo -n $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2> /dev/null)+1)) %></td></tr>
-								<tr><th>Nachbarknoten:</th><td><% echo -n $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2> /dev/null) %></td></tr>
+								<tr><th>Bekannte Knoten:</th><td><% echo -n $(($(batctl tg -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l)+1)) %></td></tr>
+								<tr><th>Nachbarknoten:</th><td><% echo -n $(batctl o -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l) %></td></tr>
 								<tr><th>Lokale Clients:</th><td><% echo -n $(batctl tl -H 2> /dev/null | grep -c 'W') %></td></tr>
 							</table>
 						</fieldset>
--- a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/home.html
+++ b/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/home.html
@ -59,8 +59,8 @@ fi
 		<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
 		<tr><th>Modell:</th><td><% cat /tmp/sysinfo/model 2>/dev/null %></td></tr>
 		<tr><th>MAC-Adresse:</th><td><%= $(cat /sys/class/net/br-client/address) %></td></tr>
-		<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr>
-		<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr>
+		<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l)+1)) %></td></tr>
+		<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H 2>/dev/null | cut -b 40-56 | sort | uniq | wc -l) %></td></tr>
 		<tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr>
 		<tr><th>fastd public key:</th><td><%= ${fastd_pub} %></td></tr>
 		<tr><th>Laufzeit:</th><td><%= ${uptime} %></td></tr>
Author	SHA1	Message	Date
Robert Langhammer	dc9a91307e	fff-web-ui: fix redirection of stderr The stderr of batctl should be redirected. In a row of pipes a redirection at the end will only redirect the output of the last command! Put it on the right place. It's just shell grammar. Signed-off-by: Robert Langhammer <rlanghammer@web.de>	2022-04-17 00:31:42 +02:00
Fabian Bläse	20d12f943e	buildscript: drop md5 checksum The md5 checksum has not been used by fff-upgrade since 2016 [1]. Since md5 does not have any advantages over sha256 in our use case, drop md5 checksum entirely. [1] `da1199a55b` Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems>	2022-04-13 19:22:31 +02:00
Fabian Bläse	90c58d575b	buildscript: fix checksum generation for .img.gz binaries The new x86_64 target produces gzip compressed binaries, so it is necessary to generate checksums for .img.gz files as well. Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems>	2022-04-13 19:22:31 +02:00
Fabian Bläse	bc3c0b717d	fff-ra: set preferred lifetime smaller than valid lifetime A recent change (`b26399283a`) introduced an upper limit for the preferred and valid lifetimes, so the statically configured addresses on the client interface do not result in infinite lifetimes. This upper bound is derived from the dhcp lease time. However, the preferred lifetime is unexpectedly bound by an explicit configuration option in recent versions of odhcpd. Due to our short dhcp leasetime, the default value of this option is higher than the lease time, which results preferred lifetimes longer than the valid lifetime. As this behavior is rather unintuitive, a proper fix for it should be done upstream (see #238). Until then, lower the preferred lifetime option to the same value as our leasetime. Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems>	2022-04-13 19:22:27 +02:00
Robert Langhammer	f3b1604ff3	nodewatcher: fix errormessage. Insert the lost "&" Fixes: #239 Signed-off-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Christian Dresel <freifunk@dresel.systems> Reviewed-by: Fabian Bläse <fabian@blaese.de>	2022-04-13 19:21:25 +02:00