fff-layer3: add ethtool

Signed-off-by: Fabian Bläse <fabian@blaese.de>
OpenWrt: bump to v23.05.3
2024-04-01 23:54:21 +02:00 · 2024-04-01 23:54:21 +02:00 · 2024-04-01 23:54:16 +02:00
3 changed files with 4 additions and 10 deletions
--- a/4
+++ b/4
@ -7,8 +7,8 @@ set -o pipefail
 builddir=./build

 # OpenWrt: package hashes correspond to core repo version
-OPENWRTREV="2f2eceab1307d9f9c33f151d442ab97c95bd0400"
-PACKAGEREV="b1b33235b221b36458942c2cb8f51d0e1d0d8f89"
+OPENWRTREV="v23.05.3"
+PACKAGEREV="063b2393cbc3e5aab9d2b40b2911cab1c3967c59"
 ROUTINGREV="648753932d5a7deff7f2bdb33c000018a709ad84"

 # Gluon packages: master from 2020-02-04
--- a/src/packages/fff/fff-extra/Makefile
+++ b/src/packages/fff/fff-extra/Makefile
@ -11,6 +11,7 @@ define Package/fff-extra
 	TITLE:=Freifunk-Franken gateway configuration
 	URL:=https://www.freifunk-franken.de
 	DEPENDS:=+bmon \
+	         +ethtool \
 	         +htop \
 	         +procps-ng \
 	         +procps-ng-vmstat \
--- a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/20-interfaces.sh
+++ b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/20-interfaces.sh
@ -48,19 +48,12 @@ for filename in $(grep 'up\|unknown' /sys/class/net/*/operstate); do

 	interface_data=$interface_data"<$iface><name>$iface</name>$addrs<traffic_rx>$traffic_rx</traffic_rx><traffic_tx>$traffic_tx</traffic_tx>"

-	interface_data=$interface_data$(iwconfig "${iface}" 2>/dev/null | awk -F':' '
-		/Mode/{ split($2, m, " "); printf "<wlan_mode>"m[1]"</wlan_mode>" }
-		/Cell/{ split($0, c, " "); printf "<wlan_bssid>"c[5]"</wlan_bssid>" }
-		/ESSID/ { split($0, e, "\""); printf "<wlan_essid>"e[2]"</wlan_essid>" }
-		/Freq/{ split($3, f, " "); printf "<wlan_frequency>"f[1]f[2]"</wlan_frequency>" }
-		/Tx-Power/{ split($0, p, "="); sub(/[[:space:]]*$/, "", p[2]); printf "<wlan_tx_power>"p[2]"</wlan_tx_power>" }
-	')
-
 	interface_data=$interface_data$(iw dev "${iface}" info 2>/dev/null | awk '
 		/ssid/{ split($0, s, " "); printf "<wlan_ssid>"s[2]"</wlan_ssid>" }
 		/type/ { split($0, t, " "); printf "<wlan_type>"t[2]"</wlan_type>" }
 		/channel/{ split($0, c, " "); printf "<wlan_channel>"c[2]"</wlan_channel>" }
 		/width/{ split($0, w, ": "); sub(/ .*/, "", w[2]); printf "<wlan_width>"w[2]"</wlan_width>" }
+		/txpower/{ sub(/\.../, "", $2); print "<wlan_tx_power>"$2" dBm</wlan_tx_power>" }
 	')

 	interface_data=$interface_data"</$iface>"
Author	SHA1	Message	Date
Fabian Bläse	d593b1aa5e	fff-layer3: add ethtool ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details Signed-off-by: Fabian Bläse <fabian@blaese.de>	2024-04-01 23:54:21 +02:00
Fabian Bläse	3dc5905241	OpenWrt: bump to v23.05.3 Bump core, packages and routing. Signed-off-by: Fabian Bläse <fabian@blaese.de>	2024-04-01 23:54:21 +02:00
Robert Langhammer	4762825411	fff-network: remove iwconfig iwconfig is upstream scheduled for removal and no longer working. It is only used once to get the txpower for the nodewatcher. Fixes: #327 Signed-off-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Fabian Bläse <fabian@blaese.de>	2024-04-01 23:54:16 +02:00