From 7eac0293519475ca947b80ec4c035162039a67a2 Mon Sep 17 00:00:00 2001
From: perceival <kamil.bienkiewicz@gmail.com>
Date: Fri, 8 May 2026 11:22:18 +0200
Subject: [PATCH 1/2] sysinfo: hostapd_cli for sta count + ifname-config
 fallback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two fixes for newer OpenWrt / GL.iNet builds where the previous
station-count logic silently produced "Down":

1. ifname schema move: ubus call network.wireless status now puts
   ifname inside the per-iface "config" object instead of at the
   iface-object level. Added a fallback read from config.ifname so
   RadioIface gets populated and the per-iface code path runs at all.

2. New get_sta_count() helper: prefers hostapd_cli on /var/run/hostapd
   (single-dir layout) and /var/run/hostapd-<iface>/<iface>
   (per-instance dir layout). Sums num_sta[*] across all BSS slots,
   so MLO/MLD-bound clients are counted (iw dev station dump misses
   them on Flint 3 / BE9300 type setups). Falls back to the original
   iw dev station dump if hostapd_cli isn't available.

Tested on GL.iNet BE9300 (Flint 3) running OpenWrt 23.05-SNAPSHOT
with MLO across wlan02/wlan12/wlan22 — counts now match
hostapd_cli status num_sta values.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 misc/sysinfo.sh | 162 ++++++++++++++++++++++++++++--------------------
 1 file changed, 95 insertions(+), 67 deletions(-)

diff --git a/misc/sysinfo.sh b/misc/sysinfo.sh
index 0f934d4b93..0e8b5e297a 100644
--- a/misc/sysinfo.sh
+++ b/misc/sysinfo.sh
@@ -1,31 +1,31 @@
 #!/bin/sh
 #
-# sysinfo.sh dla OpenWRT AA Cezary Jackiewicz 2013
+# sysinfo.sh for OpenWRT AA Cezary Jackiewicz 2013
 # 
-#	1.00	CJ	Pierwsza wersja kodu
-#	1.01	RD	Drobna przebudowa
-#	1.02	RD	Korekta błędu wy¶w. zajeto¶ci Flash-a, dodanie kolorów
-#	1.03	RD	Dodanie nazwy routera, zmiana formatowania
-#	1.04	RD	Kosmetyka, sugestie @mikhnal. Zmiana przetwarzania info. o wan.
-#	1.05	RD	Zmiana algorytmu pobierania danych dla wan i lan
-#	1.06	RD	Parametryzacja kolorów i pojawiania się podkre¶leń
-#	1.07	RD	Modyfikacja zwi±zana z poprawnym wy¶wietlaniem interfejsu dla prot.3g
-#	1.08	RD	Modyfikacja wy¶wietlania DNS-ów dla wan, dodanie uptime dla interfejsów
-#	1.09	RD	Dodanie statusu "Down" dla wył±czonego wifi, zmiana wy¶wietlania dla WLAN(sta)
-#	1.10	RD	Korekta wy¶wietlania dla WLAN(sta)
-#	1.11	RD	Korekta wy¶wietlania stanu pamięci, sugestie @dopsz 
-#	1.12	RD	Zmiana kolejno¶ci wy¶wietlania warto¶ci stanu pamięci + kosmetyka 
-#	1.13	RD	Dodanie info o dhcp w LAN, zmiana sposobu wy¶wietlania informacji o LAN
-#	1.14	RD	Dodanie informacji o ostatnich 5 błędach
-#	1.15	RD	Zmiana stderr
-#	1.16	RD	Dodanie wy¶wietlania informacji o swap
-#	1.17	RD	Zmiana wyliczania informacji o flash
-#	1.18	RD	Zmiana wy¶wietlania informacji o flash
-#	1.19	RD	Zmiana wy¶wietlania informacji o sprzęcie
-#	1.20	RD	Zmiana wy¶wietlania informacji o sprzęcie
-#	1.21	RD	Dopasowyanie szeroko¶ci do zawarto¶ci /etc/banner
-#	1.22	RD	Dodanie wyświetlania w HTML-u
-#	1.23	RD  Poprawki w wyświetlaniu LAN-DHCP i WLAN
+# 1.00  CJ  Initial version of the code
+# 1.01  RD  Minor restructuring
+# 1.02  RD  Correction of Flash occupancy display error, added colors
+# 1.03  RD  Added router name, changed formatting
+# 1.04  RD  Cosmetic changes, suggestions by @mikhnal. Changed processing of WAN information.
+# 1.05  RD  Changed data retrieval algorithm for WAN and LAN
+# 1.06  RD  Parameterization of colors and underlining appearance
+# 1.07  RD  Modification for proper display of 3G protocol interface
+# 1.08  RD  Modification of DNS display for WAN, added uptime for interfaces
+# 1.09  RD  Added "Down" status for disabled Wi-Fi, changed display for WLAN(sta)
+# 1.10  RD  Display correction for WLAN(sta)
+# 1.11  RD  Memory status display correction, suggestions by @dopsz
+# 1.12  RD  Changed display order of memory status values + cosmetic changes
+# 1.13  RD  Added DHCP information in LAN, changed display method for LAN info
+# 1.14  RD  Added information on the last 5 errors
+# 1.15  RD  Changed stderr
+# 1.16  RD  Added swap information display
+# 1.17  RD  Changed calculation of Flash information
+# 1.18  RD  Changed display of Flash information
+# 1.19  RD  Changed hardware information display
+# 1.20  RD  Changed hardware information display
+# 1.21  RD  Adjusted width to match /etc/banner content
+# 1.22  RD  Added HTML display
+# 1.23  RD  Fixes in LAN-DHCP and WLAN display
 # Destination /sbin/sysinfo.sh
 #
 . /usr/share/libubox/jshn.sh
@@ -44,6 +44,11 @@ ExtraName=""
 ExtraValue=""
 HTML=""
 
+clean_output() {
+    # Removes literal e[0;31m and e[0m from stdin
+    sed 's/e\[0;31m//g; s/e\[0m//g'
+}
+
 initialize() { # <Script Parameters>
 	local ColorMode="c"
 	if [ ! -z "$REQUEST_METHOD" ]; then
@@ -357,52 +362,74 @@ print_lan() {
 	for Zone in $(uci -q show firewall | grep []]=zone | cut -f2 -d. | cut -f1 -d=); do
 		if [ "$(uci -q get firewall.$Zone.masq)" != "1" ]; then
 			for Device in $(uci -q get firewall.$Zone.network); do
-				local Status="$(ubus call network.interface.$Device status 2>/dev/null)"
-				if [ "$Status" != "" ]; then
-					local State=""
-					local Iface=""
-					local IP4=""
-					local IP6=""
-					local Subnet4=""
-					local Subnet6=""
-					json_load "${Status:-{}}"
-					json_get_var State up
-					json_get_var Iface device
-					if json_get_type Status ipv4_address && [ "$Status" = array ]; then
-						json_select ipv4_address
-						json_get_type Status 1
-						if [ "$Status" = object ]; then
-							json_select 1
-							json_get_var IP4 address
-							json_get_var Subnet4 mask
-							[ "$IP4" != "" ] && [ "$Subnet4" != "" ] && IP4="$IP4/$Subnet4"
+				if [ "$(uci -q get dhcp.$Device.start)" != "" ]; then
+					local Status="$(ubus call network.interface.$Device status 2>/dev/null)"
+					if [ "$Status" != "" ]; then
+						local State=""
+						local Iface=""
+						local IP4=""
+						local IP6=""
+						local Subnet4=""
+						local Subnet6=""
+						json_load "${Status:-{}}"
+						json_get_var State up
+						json_get_var Iface device
+						if json_get_type Status ipv4_address && [ "$Status" = array ]; then
+							json_select ipv4_address
+							json_get_type Status 1
+							if [ "$Status" = object ]; then
+								json_select 1
+								json_get_var IP4 address
+								json_get_var Subnet4 mask
+								[ "$IP4" != "" ] && [ "$Subnet4" != "" ] && IP4="$IP4/$Subnet4"
+							fi
 						fi
-					fi
-					json_select
-					if json_get_type Status ipv6_address && [ "$Status" = array ]; then
-						json_select ipv6_address
-						json_get_type Status 1
-						if [ "$Status" = object ]; then
-							json_select 1
-							json_get_var IP6 address
-							json_get_var Subnet6 mask
-							[ "$IP6" != "" ] && [ "$Subnet6" != "" ] && IP6="$IP6/$Subnet6"
+						json_select
+						if json_get_type Status ipv6_address && [ "$Status" = array ]; then
+							json_select ipv6_address
+							json_get_type Status 1
+							if [ "$Status" = object ]; then
+								json_select 1
+								json_get_var IP6 address
+								json_get_var Subnet6 mask
+								[ "$IP6" != "" ] && [ "$Subnet6" != "" ] && IP6="$IP6/$Subnet6"
+							fi
 						fi
-					fi
-					local DHCPConfig=$(uci -q show dhcp | grep -E .interface=\.?$Device\.? | cut -d. -f2)
-					if [ "$DHCPConfig" != "" ] && [ "$(uci -q get dhcp.$DHCPConfig.ignore)" != "1" ]; then
-						local DHCPStart=$(uci -q get dhcp.$DHCPConfig.start)
-						local DHCPLimit=$(uci -q get dhcp.$DHCPConfig.limit)
-						[ "$DHCPStart" != "" ] && [ "$DHCPLimit" != "" ] && DHCP="$(echo $IP4 | cut -d. -f1-3).$DHCPStart-$(expr $DHCPStart + $DHCPLimit - 1)"
-					fi
-					[ "$IP4" != "" ] && print_line "LAN: $AddrColor$IP4$NormalColor($Iface), dhcp: $AddrColor${DHCP:-n/a}$NormalColor"
-					[ "$IP6" != "" ] && print_line "LAN: $AddrColor$IP6$NormalColor($Iface)"
+#					DHCPConfig=$(uci -q show dhcp | grep -E .interface=\.?$Device\.? | cut -d. -f2)
+#					if [ "$DHCPConfig" != "" ] && [ "$(uci -q get dhcp.$DHCPConfig.ignore)" != "1" ]; then
+							local DHCPStart=$(uci -q get dhcp.$Device.start)
+							local DHCPLimit=$(uci -q get dhcp.$Device.limit)
+							[ "$DHCPStart" != "" ] && [ "$DHCPLimit" != "" ] && DHCP="$(echo $IP4 | cut -d. -f1-3).$DHCPStart-$(expr $DHCPStart + $DHCPLimit - 1)"
+#					fi
+						[ "$IP4" != "" ] && print_line "LAN: $AddrColor$IP4$NormalColor($Iface), dhcp: $AddrColor${DHCP:-n/a}$NormalColor"
+						[ "$IP6" != "" ] && print_line "LAN: $AddrColor$IP6$NormalColor($Iface)"
+					fi		
 				fi
 			done
 		fi 
 	done
 }
 
+get_sta_count() {
+	# Number of associated stations on a wireless AP iface.
+	# Prefer hostapd_cli (works on MLD setups where iw dev station dump misses
+	# MLO-bound clients); fall back to iw dev. Returns 0 when unsure.
+	local iface="$1"
+	local count=""
+	if [ -S "/var/run/hostapd/$iface" ]; then
+		count=$(hostapd_cli -p /var/run/hostapd -i "$iface" status 2>/dev/null \
+			| awk -F= '/^num_sta\[/ {sum+=$2; n++} END {if (n) print sum; else print ""}')
+	fi
+	if [ -z "$count" ] && [ -S "/var/run/hostapd-$iface/$iface" ]; then
+		count=$(hostapd_cli -p "/var/run/hostapd-$iface" -i "$iface" status 2>/dev/null \
+			| awk -F= '/^num_sta\[/ {sum+=$2; n++} END {if (n) print sum; else print ""}')
+	fi
+	if [ -z "$count" ]; then
+		count=$(iw dev "$iface" station dump 2>/dev/null | grep -c '^Station')
+	fi
+	echo "${count:-0}"
+}
+
 print_wlan() {
 	local Status="$(ubus call network.wireless status 2>/dev/null)"
 	if [ "$Status" != "" ]; then
@@ -431,7 +458,8 @@ print_wlan() {
 				json_select $Interface
 				json_get_var Iface section
 				json_get_var RadioIface ifname
-				json_select "config" 
+				json_select "config"
+				[ -z "$RadioIface" ] && json_get_var RadioIface ifname
 				json_get_var SSID ssid
 				json_get_var Mode mode
 				local IfaceDisabled=$(uci -q get wireless.$Iface.disabled)
@@ -440,7 +468,7 @@ print_wlan() {
 					local Connection="Down"
 					if [ -n "$RadioIface" ]; then
 						if [ "$Mode" == "ap" ]; then
-							Connection="$(iw dev $RadioIface station dump | grep Station | wc -l 2>/dev/null)"
+							Connection="$(get_sta_count "$RadioIface")"
 						else
 							Connection="$(iw dev $RadioIface link | awk 'BEGIN{FS=": ";Signal="";Bitrate=""} $1~/signal/ {Signal=$2} $1~/tx bitrate/ {Bitrate=$2}END{print Signal" "Bitrate}' 2>/dev/null)"
 						fi
@@ -511,7 +539,7 @@ print_wlan
 print_vpn
 print_extra
 [ "$EndRuler" == "1" ] && print_horizontal_ruler
-[ "$LastErrors" == "1" ] && print_error
+[ "$LastErrors" == "1" ] && print_error | clean_output
 finalize
-exit 0
+#exit 0
 # Done.

From b0cd0f3b69cd50bc3532ad27ad754d777eb22151 Mon Sep 17 00:00:00 2001
From: perceival <perceivalpercy@gmail.com>
Date: Tue, 12 May 2026 17:50:14 +0200
Subject: [PATCH 2/2] sysinfo: restore Polish revision log (bilingual PL/EN),
 fix Destination path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Bring back the original Polish revision-log entries from the upstream
  header and keep the English translations side-by-side (one line per
  revision, `PL / EN`, with overflow wrapped on the next line).
- File re-encoded as UTF-8 so both `ś/ł/ą/ę/ó/ż/ź/ć/ń` and ASCII fit
  cleanly (the upstream file mixed ISO-8859-2 and CP1250 bytes).
- Update the `# Destination` hint from `/sbin/sysinfo.sh` to
  `/etc/profile.d/99-sysinfo.sh` — that's where the script naturally
  belongs on modern OpenWrt: dropping it into `profile.d/` makes it
  fire automatically on each shell login (mirrors how OpenWrt's stock
  banner / motd is delivered) and survives sysupgrade when listed in
  `/etc/sysupgrade.conf`.

No code changes in this commit.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 misc/sysinfo.sh | 68 +++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/misc/sysinfo.sh b/misc/sysinfo.sh
index 0e8b5e297a..daed1a8127 100644
--- a/misc/sysinfo.sh
+++ b/misc/sysinfo.sh
@@ -1,32 +1,46 @@
 #!/bin/sh
 #
-# sysinfo.sh for OpenWRT AA Cezary Jackiewicz 2013
-# 
-# 1.00  CJ  Initial version of the code
-# 1.01  RD  Minor restructuring
-# 1.02  RD  Correction of Flash occupancy display error, added colors
-# 1.03  RD  Added router name, changed formatting
-# 1.04  RD  Cosmetic changes, suggestions by @mikhnal. Changed processing of WAN information.
-# 1.05  RD  Changed data retrieval algorithm for WAN and LAN
-# 1.06  RD  Parameterization of colors and underlining appearance
-# 1.07  RD  Modification for proper display of 3G protocol interface
-# 1.08  RD  Modification of DNS display for WAN, added uptime for interfaces
-# 1.09  RD  Added "Down" status for disabled Wi-Fi, changed display for WLAN(sta)
-# 1.10  RD  Display correction for WLAN(sta)
-# 1.11  RD  Memory status display correction, suggestions by @dopsz
-# 1.12  RD  Changed display order of memory status values + cosmetic changes
-# 1.13  RD  Added DHCP information in LAN, changed display method for LAN info
-# 1.14  RD  Added information on the last 5 errors
-# 1.15  RD  Changed stderr
-# 1.16  RD  Added swap information display
-# 1.17  RD  Changed calculation of Flash information
-# 1.18  RD  Changed display of Flash information
-# 1.19  RD  Changed hardware information display
-# 1.20  RD  Changed hardware information display
-# 1.21  RD  Adjusted width to match /etc/banner content
-# 1.22  RD  Added HTML display
-# 1.23  RD  Fixes in LAN-DHCP and WLAN display
-# Destination /sbin/sysinfo.sh
+# sysinfo.sh dla OpenWRT AA / for OpenWRT AA  Cezary Jackiewicz 2013
+#
+# Format: # ver  who  PL original / EN translation
+#
+# 1.00  CJ  Pierwsza wersja kodu / Initial version of the code
+# 1.01  RD  Drobna przebudowa / Minor restructuring
+# 1.02  RD  Korekta błędu wyśw. zajetości Flash-a, dodanie kolorów /
+#           Fix Flash usage display, added colors
+# 1.03  RD  Dodanie nazwy routera, zmiana formatowania /
+#           Added router name, changed formatting
+# 1.04  RD  Kosmetyka, sugestie @mikhnal. Zmiana przetwarzania info. o wan. /
+#           Cosmetic changes (suggestions by @mikhnal), reworked WAN info processing
+# 1.05  RD  Zmiana algorytmu pobierania danych dla wan i lan /
+#           Changed data-retrieval algorithm for WAN and LAN
+# 1.06  RD  Parametryzacja kolorów i pojawiania się podkreśleń /
+#           Parameterized colors and underline appearance
+# 1.07  RD  Modyfikacja związana z poprawnym wyświetlaniem interfejsu dla prot.3g /
+#           Fix display of the interface for proto=3g
+# 1.08  RD  Modyfikacja wyświetlania DNS-ów dla wan, dodanie uptime dla interfejsów /
+#           Reworked DNS display for WAN, added per-interface uptime
+# 1.09  RD  Dodanie statusu "Down" dla wyłączonego wifi, zmiana wyświetlania dla WLAN(sta) /
+#           Added "Down" status for disabled Wi-Fi, updated WLAN(sta) display
+# 1.10  RD  Korekta wyświetlania dla WLAN(sta) / Fix display for WLAN(sta)
+# 1.11  RD  Korekta wyświetlania stanu pamięci, sugestie @dopsz /
+#           Fix memory-status display (suggestions by @dopsz)
+# 1.12  RD  Zmiana kolejności wyświetlania wartości stanu pamięci + kosmetyka /
+#           Changed display order of memory values + cosmetics
+# 1.13  RD  Dodanie info o dhcp w LAN, zmiana sposobu wyświetlania informacji o LAN /
+#           Added DHCP info in LAN, changed LAN-info display
+# 1.14  RD  Dodanie informacji o ostatnich 5 błędach / Added info on the last 5 errors
+# 1.15  RD  Zmiana stderr / Changed stderr
+# 1.16  RD  Dodanie wyświetlania informacji o swap / Added swap-info display
+# 1.17  RD  Zmiana wyliczania informacji o flash / Changed Flash-info calculation
+# 1.18  RD  Zmiana wyświetlania informacji o flash / Changed Flash-info display
+# 1.19  RD  Zmiana wyświetlania informacji o sprzęcie / Changed hardware-info display
+# 1.20  RD  Zmiana wyświetlania informacji o sprzęcie / Changed hardware-info display
+# 1.21  RD  Dopasowyanie szerokości do zawartości /etc/banner /
+#           Match width to /etc/banner content
+# 1.22  RD  Dodanie wyświetlania w HTML-u / Added HTML output
+# 1.23  RD  Poprawki w wyświetlaniu LAN-DHCP i WLAN / Fixes in LAN-DHCP and WLAN display
+# Destination /etc/profile.d/99-sysinfo.sh
 #
 . /usr/share/libubox/jshn.sh