forked from freifunk-franken/firmware
show_info: Add extended switch scheme and bandwidth control
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Reviewed-by: Christian Dresel <fff@chrisi01.de>
This commit is contained in:
parent
fad3d8f502
commit
fb8290b8ec
|
@ -3,6 +3,8 @@
|
||||||
. /etc/community.cfg
|
. /etc/community.cfg
|
||||||
. /etc/firmware_release
|
. /etc/firmware_release
|
||||||
|
|
||||||
|
board_name=$(uci -q get board.model.name)
|
||||||
|
|
||||||
HOSTNAME=$(uci -q get 'system.@system[0].hostname')
|
HOSTNAME=$(uci -q get 'system.@system[0].hostname')
|
||||||
|
|
||||||
human_bytes() {
|
human_bytes() {
|
||||||
|
@ -17,6 +19,51 @@ human_bytes() {
|
||||||
echo $(((GB+512)/1024)) TB
|
echo $(((GB+512)/1024)) TB
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
format_state() {
|
||||||
|
batmanports=$(swconfig dev switch0 vlan 3 show | grep 'ports:')
|
||||||
|
clientports=$(swconfig dev switch0 vlan 1 show | grep 'ports:')
|
||||||
|
wanports=$(swconfig dev switch0 vlan 2 show | grep 'ports:')
|
||||||
|
|
||||||
|
if (echo "$clientports" | grep -q "${1}") && (echo "$batmanports" | grep -q "${1}") ; then
|
||||||
|
linkstate="Multi-Link"
|
||||||
|
elif echo "$clientports" | grep -q "${1}" ; then
|
||||||
|
linkstate="CLIENT"
|
||||||
|
elif echo "$batmanports" | grep -q "${1}" ; then
|
||||||
|
linkstate="BATMAN"
|
||||||
|
elif echo "$wanports" | grep -q "${1}" ; then
|
||||||
|
linkstate="WAN"
|
||||||
|
else
|
||||||
|
linkstate="Unknown"
|
||||||
|
fi
|
||||||
|
printf '%-11s' "$linkstate "
|
||||||
|
}
|
||||||
|
format_port() {
|
||||||
|
port=$(echo "$1" | sed 's/.* port:\([^ ]*\) .*/\1/')
|
||||||
|
link=$(echo "$1" | sed 's/.* link:\([^ ]*\).*/\1/')
|
||||||
|
if [ "$link" = "up" ] ; then
|
||||||
|
speed=$(echo "$1" | sed 's/.* speed:\([^ ]*\).*/\1/')
|
||||||
|
duplex=$(echo "$1" | sed 's/.* \([^ ]*-duplex\).*/\1/')
|
||||||
|
else
|
||||||
|
speed="no link"
|
||||||
|
duplex=""
|
||||||
|
fi
|
||||||
|
printf '%-5s%s' "${link} " "- "
|
||||||
|
format_state "${port}"
|
||||||
|
printf '%-26s' "@ $speed $duplex "
|
||||||
|
|
||||||
|
swconfig dev switch0 show | grep "VLAN\s" | while read line ; do
|
||||||
|
vid=$(echo "$line" | sed 's/.*VLAN \([^:]*\).*/\1/')
|
||||||
|
vports=$(swconfig dev switch0 vlan "$vid" show | grep 'ports:')
|
||||||
|
if echo "$vports" | grep -q "${port}t" ; then
|
||||||
|
printf '%-2s ' "t"
|
||||||
|
elif echo "$vports" | grep -q "${port}" ; then
|
||||||
|
printf '%-2s ' "u"
|
||||||
|
else
|
||||||
|
printf '%-2s ' "-"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
}
|
||||||
|
|
||||||
if pidof fastd >/dev/null ; then
|
if pidof fastd >/dev/null ; then
|
||||||
vpn_active="aktiv"
|
vpn_active="aktiv"
|
||||||
|
@ -101,23 +148,63 @@ echo "Standortbeschreibung: $(uci -q get 'system.@system[0].position_comment')"
|
||||||
echo "E-Mail Adresse: $(uci -q get 'system.@system[0].contact')"
|
echo "E-Mail Adresse: $(uci -q get 'system.@system[0].contact')"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "-> SWITCH"
|
echo "-> BITRATEN-BEGRENZUNG"
|
||||||
if swconfig list | grep -q switch0 ; then
|
if [ "$(uci -q get 'simple-tc.example.enabled')" == "1" ] ; then
|
||||||
swconfig dev switch0 show | grep "\t*link:" | while read line ; do
|
echo "Aktiv: ja"
|
||||||
line=$(echo "$line" | tr -d '\n' | tr -d '\t')
|
else
|
||||||
port=$(echo "$line" | sed 's/.* port:\([^ ]*\) .*/\1/')
|
echo "Aktiv: nein"
|
||||||
link=$(echo "$line" | sed 's/.* link:\([^ ]*\).*/\1/')
|
fi
|
||||||
if [ "$link" == "up" ] ; then
|
echo "Download-Limit: $(uci -q get 'simple-tc.example.limit_ingress') kBit/s"
|
||||||
speed=$(echo "$line" | sed 's/.* speed:\([^ ]*\).*/\1/')
|
echo "Upload-Limit: $(uci -q get 'simple-tc.example.limit_egress') kBit/s"
|
||||||
duplex=$(echo "$line" | sed 's/.* \([^ ]*-duplex\).*/\1/')
|
|
||||||
else
|
if grep -q 'PORTORDER=' /etc/network.$board_name ; then
|
||||||
speed="no link"
|
portorder=$(awk -F= '/PORTORDER=/ { print $2 }' /etc/network.$board_name | sed "s/\"//g")
|
||||||
duplex=""
|
|
||||||
fi
|
|
||||||
port="Port ${port}"
|
|
||||||
echo "${port}: ${link} @ $speed $duplex"
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
if [ -n "$portorder" ] ; then
|
||||||
|
echo "-> SWITCH (tatsaechliche Portreihenfolge)"
|
||||||
|
else
|
||||||
|
echo "-> SWITCH (interne logische Portreihenfolge)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf '%-54s' "VLAN-IDs:"
|
||||||
|
swconfig dev switch0 show | grep "VLAN\s" | while read line ; do
|
||||||
|
vid=$(echo "$line" | sed 's/.*VLAN \([^:]*\).*/\1/')
|
||||||
|
printf '%-2s ' "$vid"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
if [ ! "$(awk -F= '/WANDEV=/ { print $2 }' /etc/network.$board_name)" = "$(awk -F= '/SWITCHDEV=/ { print $2 }' /etc/network.$board_name)" ] ; then
|
||||||
|
wanif=$(uci -q get network.wan.ifname)
|
||||||
|
link=$(cat /sys/class/net/${wanif}/operstate)
|
||||||
|
if [ "$link" = "up" ] ; then
|
||||||
|
speed="connected"
|
||||||
|
else
|
||||||
|
speed="no link"
|
||||||
|
fi
|
||||||
|
printf '%-10s%-5s%-13s%s\n' "WAN-Port: " "${link} " "- WAN " "@ $speed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
for internalport in $portorder
|
||||||
|
do
|
||||||
|
line=$(swconfig dev switch0 port "$internalport" show | tr -d '\n' | tr -d '\t')
|
||||||
|
port=$(echo "$line" | sed 's/.* port:\([^ ]*\) .*/\1/')
|
||||||
|
printf '%-10s' "Port #${port}: "
|
||||||
|
format_port "${line}"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
swconfig dev switch0 show | grep "\t*link:" | while read line ; do
|
||||||
|
line=$(echo "$line" | tr -d '\n' | tr -d '\t')
|
||||||
|
port=$(echo "$line" | sed 's/.* port:\([^ ]*\) .*/\1/')
|
||||||
|
if echo "$portorder" | grep -q "$port" ; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
printf '%-10s' "Port #${port}: "
|
||||||
|
format_port "${line}"
|
||||||
|
done
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "END"
|
echo "END"
|
||||||
|
|
Loading…
Reference in New Issue