[PATCH 2/2] show_info: Add VPN peer lists for fastd/L2TP

robert rlanghammer at web.de
Fr Nov 30 21:52:31 CET 2018


hallo Adrian, s. inline

Am 30.11.18 um 18:09 schrieb Adrian Schmutzler:
> This shows the configured peers for fastd and L2TP.
> Note that "configured" does not tell whether they are working.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
>
> ---
>
> Fastd has been tested with and without peers.
> L2TP has only been tested without peers.
> ---
>  .../fff/fff-support/files/usr/sbin/show_info       | 27 ++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>
> diff --git a/src/packages/fff/fff-support/files/usr/sbin/show_info b/src/packages/fff/fff-support/files/usr/sbin/show_info
> index 86c01f01..c63e86ba 100755
> --- a/src/packages/fff/fff-support/files/usr/sbin/show_info
> +++ b/src/packages/fff/fff-support/files/usr/sbin/show_info
> @@ -3,6 +3,7 @@
>  . /etc/firmware_release
>  . /lib/functions/fff/evalhoodinfo
>  . /lib/functions/fff/evalbytes
> +. /lib/functions.sh # required for config_load and config_foreach
>  
>  board_name=$(uci -q get board.model.name)
>  
> @@ -134,6 +135,32 @@ echo "IPv4 Adressen: $(addr 4 br-mesh)"
>  echo "IPv6 Adressen: $(addr 6 br-mesh)"
>  
>  echo ""
> +if [ -d /etc/fastd/fff/peers ]; then
> +	echo "-> FASTD: Peer list"
> +	for fastdpeer in $(ls /etc/fastd/fff/peers/*); do

Man neigt hier gerne dazu eine Kommandosubstitution zu machen (geht mir
auch so). Es ist aber nicht noetig ne Subshell zu starten und das ls
laufen zu lassen.

for fastdpeer in /etc/fastd/fff/peers/*  ist schlanker.

Da das aber nur Kosmetik ist, gibt es von mir ein

Reviewed-by: Robert Langhammer <rlanghammer at web.de>

Kannst du mitnehmen, falls du das noch aendern moechtest.

> +		echo "${fastdpeer##*/}: $(grep "remote" "$fastdpeer" | sed "s/remote //")"
> +	done
> +else
> +	echo "-> FASTD"
> +	echo "No FASTD peers available"
> +fi
> +
> +function printL2TP() {
> +	local broker="$1"
> +	echo "${broker}: $(uci -q get "tunneldigger.$broker.address")"
> +}
> +
> +echo ""
> +if [ -s /etc/config/tunneldigger ]; then
> +	echo "-> L2TP: Peer list"
> +	config_load tunneldigger
> +	config_foreach printL2TP broker
> +else
> +	echo "-> L2TP"
> +	echo "No L2TP peers available"
> +fi
> +
> +echo ""
>  echo "-> Netz: WAN"
>  echo "Internet vorhanden: ${internet_active}"
>  echo "Empfangen: $(cat /sys/class/net/${wanif}/statistics/rx_bytes 2> /dev/null | human_bytes)"



Mehr Informationen über die Mailingliste franken-dev