adaptions to gluon-2023

Signed-off-by: Richard Fröhning <misanthropos@gmx.de>

Author: misanthropos

ffffm-helper-tools/files/usr/bin/nodeinfo

@@ -6,58 +6,52 @@ gluon-neighbour-info -d ::1 -p 1001 -c 1 -r nodeinfo > $NODEINFO
 STATISTICS="$(mktemp -p /tmp)"
 gluon-neighbour-info -d ::1 -p 1001 -c 1 -r statistics > $STATISTICS
 
-echo
-echo -n "### Node ID: "
-jsonfilter -i $NODEINFO -e '@.node_id'
-echo -n "### Node MAC: "
-jsonfilter -i $NODEINFO -e '@.network.mac'
-echo -n "### Node IPv6: "
-jsonfilter -i $NODEINFO -e '@.network.addresses.*'
-
-echo
-echo "### (Next)Node IPv4: $(uci -q get network.local_node.ipaddr || echo '-')"
-
-echo
-echo "### Gateways:"
-wg | grep endpoint
-
-echo
-echo -n "### Hardware: "
-cat /tmp/sysinfo/model
+echo "### Gluon-Info: "
+gluon-info
 echo -n "### Hardware ID: "
 # Bei TP-Link Geraeten kann eine HWID ausgelesen werden
 echo $([ -f /lib/ar71xx.sh ]&&[ $(head -c 4 /tmp/sysinfo/model) = 'TP-L' ]&&(. /lib/ar71xx.sh ;. /lib/functions.sh ; echo $(tplink_get_hwid))||(echo '-'))
-echo -n "### Firmware: "
-cat /lib/gluon/release
-echo -n "### Gluon: "
-cat /lib/gluon/gluon-version
-echo -n "### Site Code: "
-jsonfilter -i $NODEINFO -e '@.system.site_code'
-echo -n "### Domain Code: "
-jsonfilter -i $NODEINFO -e '@.system.domain_code'
 echo -n "### Autoupdate enabled: "
 uci -q get autoupdater.settings.enabled
 echo -n "### Autoupdate Branch: "
 uci -q get autoupdater.settings.branch
 
-echo
-echo -n "### Contact Information: "
-uci -q get gluon-node-info.@owner[0].contact || echo '-'
-
-echo
 echo "### Location:"
 echo -n " Enabled: "
 uci -q get gluon-node-info.@location[0].share_location || echo '0'
-echo -n " Latitude: "
+echo -n " Latitude:  "
 uci -q get  gluon-node-info.@location[0].latitude || echo '-'
 echo -n " Longitude: "
 uci -q get gluon-node-info.@location[0].longitude || echo '-'
 
+echo -n "### Contact Information: "
+uci -q get gluon-node-info.@owner[0].contact || echo '-'
+
+echo
+echo -n "### Node ID: "
+jsonfilter -i $NODEINFO -e '@.node_id'
+echo -n "### Node MAC: "
+jsonfilter -i $NODEINFO -e '@.network.mac'
+echo -n "### Node IPv6: "
+jsonfilter -i $NODEINFO -e '@.network.addresses.*'
+
 echo
-echo "### Mesh-VPN:"
-echo -n " Wireguard enabled: "
+echo "### (Next)Node IPv4:   $(uci -q get network.local_node.ipaddr || echo '-')"
+
+echo -n "### Mesh-VPN: enabled: "
 uci -q get gluon.mesh_vpn.enabled || echo '-'
 
+echo "### Gateways:"
+for index in $(seq 1 8); do
+  METHOD=$(jsonfilter -i $STATISTICS -e @.mesh_vpn.groups.backbone.peers.gw0$index.method)
+  if [ ! -z $METHOD ]; then
+        UPTIME=$(jsonfilter -i $STATISTICS -e @.mesh_vpn.groups.backbone.peers.gw0$index.established)
+        UPTIME="$(echo "$UPTIME" | cut -d '.' -f 1)"
+        UPTIME=$(date -ud "@$UPTIME" +"$(( $UPTIME/3600/24 )) days %H hours %M minutes %S seconds")
+        echo "gw0$index:" $METHOD "up: " $UPTIME
+  fi
+done
+
 echo
 echo "### Mesh:"
 echo -n " Mesh on LAN enabled: "
@@ -96,11 +90,8 @@ echo
 echo -n "### Uptime:"
 uptime
 
-echo
 echo "### SSH connection from/to : "$SSH_CONNECTION
 
-echo
-
 #Aufraeumen
 rm $NODEINFO
 rm $STATISTICS