From 445ca0a9d60e57d1fd725ab448ee7a94f27fec6f Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 19 Sep 2024 05:18:25 +0200
Subject: [PATCH] board/common: restore 'show' script from 493be97 sync with
 present

The intention is to provide a similar set of commands as klish
admin-exec.  However, instead of trying to make the Linux tools
more accessible, we now make the Infix tooling more accessible.

E.g., instead of "show ip route" mapping to "ip route show", we
map it to:

sysrepocfg -f json -X -d operational -x "/ietf-routing:routing/ribs" | \
      /usr/libexec/statd/cli-pretty "show-routing-table"

As a spin-off we alos get a much more readable infix.xml for klish:
 - Relocate logic to shell script wrapper 'show'
 - Introduce Cisco style "show ip route" and "show ipv6 route"

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 board/common/rootfs/usr/bin/show     | 366 +++++++++++++++++++++++++++
 src/klish-plugin-infix/xml/infix.xml |  30 ++-
 2 files changed, 389 insertions(+), 7 deletions(-)
 create mode 100755 board/common/rootfs/usr/bin/show

diff --git a/board/common/rootfs/usr/bin/show b/board/common/rootfs/usr/bin/show
new file mode 100755
index 00000000..b83216a2
--- /dev/null
+++ b/board/common/rootfs/usr/bin/show
@@ -0,0 +1,366 @@
+#!/bin/sh
+# Displays basic information about the system
+# shellcheck disable=SC2048,SC2086
+. /etc/os-release
+
+bopt="-c"
+opt="-br"
+all=""
+plain=""
+
+h1()
+{
+    STR="$*"
+    if [ -n "$plain" ]; then
+	echo "$STR" | tr '[:lower:]' '[:upper:]'
+    else
+	printf "\033[7m%-${COLUMNS}s\033[0m\n" "$STR"
+    fi
+}
+
+h2()
+{
+    STR="$*"
+    if [ -n "$plain" ]; then
+	echo "$STR"
+	echo "$STR" | sed 's/./-/g'
+    else
+	printf "\033[1m%-${COLUMNS}s\033[0m\n" "$STR"
+    fi
+}
+
+dm()
+{
+    if [ -n "$plain" ]; then
+	echo "${*}"
+    else
+	printf "\033[2m%s\033[0m\n" "$*"
+    fi
+}
+
+ul()
+{
+    if [ -n "$plain" ]; then
+	printf "__%s__" "$*"
+    else
+	printf "\033[4%s\033[0m" "$*"
+    fi
+}
+
+em()
+{
+    if [ -n "$plain" ]; then
+	printf "**%s**" "$*"
+    else
+	printf "\033[5m%s\033[0m" "$*"
+    fi
+}
+
+usage()
+{
+    cat <<EOF
+usage:
+  show [opt] cmd
+
+options:
+  -a            Show all, of something
+  -f            Show full output, not brief port/iface listings
+  -h            Show this help text
+  -n            Show output without any footer
+  -p            Show plain output, no bells or whistles
+
+commands:
+  port PORT     Show port configuration and link information
+  ports         Show ports available for bridging
+  vlans         Show port groups in bridge
+  ifaces        Show interfaces and their addresses
+  fdb           Show forwarding database (unicast)
+  mdb           Show multicast forwarding database
+  ip   addr     Show IPv4 addresses
+       route    Show routing table
+  ipv6 addr     Show IPv6 addresses
+       route    Show routing table
+  log [FILE]    Show latest entries from syslog, or other FILE
+  rmon PORT     Show RMON counters for PORT (when applicable)
+  system        Show OS details
+  version       Show OS verson
+EOF
+}
+
+# Usage 1: show port eth0
+# Usage 2: show port
+# Usage 3: show ports
+#
+# The first show ethtool output for 'eth0' (in this case).  The latter
+# two are the same, showing a summary of all interfaces classified as
+# access ports.
+ports()
+{
+    if [ $# -gt 0 ] && [ -e "/sys/class/net/$1" ]; then
+	for port in $*; do
+	    ethtool "$port"
+	done
+	return
+    fi
+
+    h1 "PORT             STATE          MAC ADDRESS        FLAGS"
+    if grep -q port /etc/iproute2/group; then
+	ip $opt link show group port
+    else
+	ip $opt link show
+    fi
+
+    if [ -z "$plain" ] && [ -z "$nofoot" ]; then
+	dm "______________________________________________________________________________"
+	dm "Use: '[ip|bridge] --help' and '[ip|bridge] link help' for more details."
+    fi
+}
+
+vlans()
+{
+    h1 "INTERFACE         VLAN  FLAGS"
+    bridge $bopt vlan show |tail +2 | awk 'NF { iface=$1; vid=$2; printf("%-16s  %4d  ", iface, vid); for (i=3; i <= NF; i++) printf("%s ", $i); printf("\n"); }'
+    if [ -z "$plain" ] && [ -z "$nofoot" ]; then
+	dm "______________________________________________________________________________"
+	dm "See: 'bridge --help' and 'bridge vlan help' for more details."
+    fi
+}
+
+ifaces()
+{
+    if [ -n "$all" ]; then
+	if [ $# -gt 0 ]; then
+	    for iface in $*; do
+		ip $opt addr show dev "$iface"
+	    done
+	    return
+	fi
+
+	h1 "INTERFACE        STATE          ADDRESS"
+	ip $opt addr show
+	if [ -z "$plain" ] && [ -z "$nofoot" ]; then
+	    dm "______________________________________________________________________________"
+	    dm "See: 'ip --help' and 'ip address help' for more details."
+	fi
+    else
+	if [ $# -gt 0 ]; then
+	    for iface in $*; do
+		sysrepocfg -f json -X -d operational -x \
+			   "/ietf-interfaces:interfaces/interface[name='$iface']" | \
+		    /usr/libexec/statd/cli-pretty "show-interfaces" -n "$iface"
+	    done
+	    return
+	fi
+        sysrepocfg -f json -X -d operational -m ietf-interfaces | \
+          /usr/libexec/statd/cli-pretty "show-interfaces"
+    fi
+}
+
+log()
+{
+    if [ -n "$1" ] && [ -r "/var/log/$1" ]; then
+	fn="/var/log/$1"
+    else
+	fn="/var/log/syslog"
+    fi
+    less +G $fn
+}
+
+rmon()
+{
+    if [ -z "$*" ]; then
+	echo "Missing argument, see 'show port' for available interfaces"
+	exit 1
+    fi
+    for port in $*; do
+	ethtool -S "$port"
+    done
+    if [ -z "$plain" ] && [ -z "$nofoot" ]; then
+	dm "______________________________________________________________________________"
+	dm "See: 'ethtool --help' for more details."
+    fi
+}
+
+rstp()
+{
+    mstpctl showbridge
+    echo "br0 port info"
+    mstpctl showport br0
+}
+
+fdb()
+{
+    bridge $bopt fdb show
+}
+
+mdb()
+{
+    bridge $bopt mdb show
+}
+
+routes()
+{
+    if [ -n "$1" ]; then
+	arg="-i $1"
+    else
+	arg="-i ipv4"
+    fi
+    sysrepocfg -f json -X -d operational -x "/ietf-routing:routing/ribs" | \
+	/usr/libexec/statd/cli-pretty "show-routing-table" $arg
+}
+
+igmp()
+{
+    mctl $@
+}
+
+system()
+{
+    h1 "SYSTEM INFORMATION"
+    echo "System Name        : $(uname -n)"
+    echo "System Variant     : $VARIANT"
+    echo "System Description : $PRETTY_NAME"
+    echo "System Contact     : $HOME_URL"
+    echo "System Timezone    : $(cat /etc/timezone)"
+    echo "System Type        : $NAME"
+    echo "System Version     : $(cat /etc/version)"
+    echo "System Arch        : $(uname -m)"
+    echo "Kernel Version     : $(uname -sr)"
+}
+
+version()
+{
+    cat /etc/version
+}
+
+while [ "$1" != "" ]; do
+    case $1 in
+	-a)
+	    all=1
+	    ;;
+	-f)
+	    opt=""
+	    if [ -n "$plain" ]; then
+		opt="-color=never"
+		bopt="-color=never"
+	    fi
+	    opt="-d $opt"
+	    bopt="-d $bopt"
+	    ;;
+	-n)
+	    nofoot="yes"
+	    ;;
+	-p)
+	    plain="yes"
+	    opt="$opt -color=never"
+	    bopt="$bopt -color=never"
+	    ;;
+	-h)
+	    usage
+	    exit 0
+	    ;;
+	*)
+	    break
+    esac
+    shift
+done
+
+if [ -z "$plain" ]; then
+    TTY=$(resize)
+    eval "$TTY"
+
+    # COLUMS and ROWS should be set on the console, if not, use fallback
+    if [ -z "$COLUMNS" ]; then
+	if command -v tput; then
+	    COLUMNS=$(tput cols)
+	else
+	    COLUMNS=80
+	fi
+    fi
+fi
+
+cmd=$1
+if [ -n "$cmd" ]; then
+    shift
+fi
+
+case $cmd in
+    help)
+	usage
+	;;
+    port*)
+	ports $*
+	;;
+    vlan*)
+	vlans
+	;;
+    fdb)
+	fdb
+	;;
+    mdb)
+	mdb
+	;;
+    ifa*)
+	ifaces $*
+	;;
+    ip)
+	cmd=$1
+	shift
+	case $cmd in
+	    addr*)
+		all=1
+		opt="$opt -d"
+		ifaces $*
+		;;
+	    route*)
+		routes ipv4
+		;;
+	    igmp*)
+		igmp $*
+		;;
+	    *)
+		usage
+		;;
+	esac
+	;;
+    ipv6)
+	cmd=$1
+	shift
+	case $cmd in
+	    addr*)
+		ifaces
+		;;
+	    route*)
+		routes ipv6
+		;;
+	    mld*)
+		igmp $*
+		;;
+	    *)
+		usage
+		;;
+	esac
+	;;
+    log)
+	log $1
+	;;
+    rmon)
+	rmon $*
+	;;
+    route*)
+	routes
+	;;
+    span*)
+	rstp
+	;;
+    sys*)
+	system
+	;;
+    ver*)
+	version
+	;;
+    *)
+	usage
+	exit 1
+	;;
+esac
diff --git a/src/klish-plugin-infix/xml/infix.xml b/src/klish-plugin-infix/xml/infix.xml
index 22b7ed33..fd29468e 100644
--- a/src/klish-plugin-infix/xml/infix.xml
+++ b/src/klish-plugin-infix/xml/infix.xml
@@ -331,13 +331,15 @@
 	</COMPL>
     </PARAM>
     <ACTION sym="script">
-      if [ "$KLISH_PARAM_ip" != "ipv4" ]; then
-        if [ "$KLISH_PARAM_ip" != "ipv6" ]; then
-          KLISH_PARAM_ip=ipv4
-        fi
-      fi
-      sysrepocfg -f json -X -d operational -x "/ietf-routing:routing/ribs" | \
-      /usr/libexec/statd/cli-pretty "show-routing-table"  -i "$KLISH_PARAM_ip"
+      case $KLISH_PARAM_ip in
+        ipv4)
+          KLISH_PARAM_ip=ip
+          ;;
+        ipv6)
+          KLISH_PARAM_ip=ipv6
+          ;;
+      esac
+      show -p $KLISH_PARAM_ip route
     </ACTION>
   </COMMAND>
 
@@ -383,6 +385,20 @@
       <COMMAND name="multicast" help="Show IGMP/MLD status" mode="switch">
         <ACTION sym="script">mctl</ACTION>
       </COMMAND>
+
+      <COMMAND name="route" help="Show IPv4 routing table" mode="switch">
+        <ACTION sym="script">show -p ip route</ACTION>
+      </COMMAND>
+    </SWITCH>
+  </COMMAND>
+
+  <COMMAND name="ipv6" help="Show IPv6 level status (Layer-3)">
+    <ACTION sym="script">ip -color -6 addr</ACTION>
+
+    <SWITCH name="optional" min="0">
+      <COMMAND name="route" help="Show IPv6 routing table" mode="switch">
+        <ACTION sym="script">show -p ipv6 route</ACTION>
+      </COMMAND>
     </SWITCH>
   </COMMAND>