[PATCH 10/11] fff-nodewatcher: self-detect client interfaces
mayosemmel
mayosemmel at googlemail.com
Do Jun 9 14:10:18 CEST 2016
Hi Tim,
bitte noch die README anpassen. Da wird das CLIENTIF auch nochmal
erwähnt.
Danach darfst du gern ein Revied-By von mir dranhängen.
Grüße Jan
Am Mittwoch, den 08.06.2016, 18:29 +0200 schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
>
> src/packages/fff/fff-network/Makefile | 2 +-
> src/packages/fff/fff-network/ar71xx/network.cpe210 | 1 -
> src/packages/fff/fff-network/ar71xx/network.gl-ar150 | 1 -
> src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 | 2 --
> src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 | 2 --
> src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 | 2 --
> src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 | 3 +--
> src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 | 1 -
> src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 | 1 -
> src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 | 1 -
> src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 | 1 -
> src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 | 1 -
> src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 | 1 -
> src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m | 2 --
> src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw | 2 --
> src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m | 2 --
> src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 6 ------
> src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 | 3 +--
> src/packages/fff/fff-nodewatcher/Makefile | 2 +-
> src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 4 ++--
> 29 files changed, 15 insertions(+), 52 deletions(-)
>
> diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
> index 37e5ea3..5ccf301 100644
> --- a/src/packages/fff/fff-network/Makefile
> +++ b/src/packages/fff/fff-network/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-network
> -PKG_VERSION:=0.0.2
> +PKG_VERSION:=0.0.3
> PKG_RELEASE:=1
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network
> diff --git a/src/packages/fff/fff-network/ar71xx/network.cpe210 b/src/packages/fff/fff-network/ar71xx/network.cpe210
> index e1313ba..8180789 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.cpe210
> +++ b/src/packages/fff/fff-network/ar71xx/network.cpe210
> @@ -3,7 +3,6 @@ SWITCHDEV=eth0
> CLIENT_PORTS="0t"
> WAN_PORTS="0t"
> BATMAN_PORTS="0t"
> -CLIENTIF="w2ap eth0.1"
>
> ETHMESHMAC="w2ap"
>
> diff --git a/src/packages/fff/fff-network/ar71xx/network.gl-ar150 b/src/packages/fff/fff-network/ar71xx/network.gl-ar150
> index 78dbb09..4e59b86 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.gl-ar150
> +++ b/src/packages/fff/fff-network/ar71xx/network.gl-ar150
> @@ -2,7 +2,6 @@ WANDEV=eth0
> SWITCHDEV=eth1
> WAN_PORTS=
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> ROUTERMAC=eth0
>
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
> index e2150d0..1198c3d 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1
> @@ -6,7 +6,6 @@ BATMAN_PORTS=""
>
> . /etc/network.mode
>
> -CLIENTIF="w2ap"
> ETHMESHMAC=eth0
> ROUTERMAC=eth0
>
> @@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
> uci set network.wan.ifname=$WANDEV
> elif [ "$ETHMODE" = "CLIENT" ] ; then
> ## Activate Client:
> - CLIENTIF="w2ap eth0"
> uci set network.mesh.ifname="bat0 $SWITCHDEV"
> else
> ## Activate BATMAN:
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
> index c694415..e745b21 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1
> @@ -6,7 +6,6 @@ BATMAN_PORTS=""
>
> . /etc/network.mode
>
> -CLIENTIF="w2ap"
> ETHMESHMAC=
> ROUTERMAC=w2mesh
>
> @@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
> uci set network.wan.ifname=$WANDEV
> elif [ "$ETHMODE" = "CLIENT" ] ; then
> ## Activate Client:
> - CLIENTIF="w2ap eth0"
> uci set network.mesh.ifname="bat0 $SWITCHDEV"
> else
> ## Activate BATMAN:
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
> index c694415..e745b21 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1
> @@ -6,7 +6,6 @@ BATMAN_PORTS=""
>
> . /etc/network.mode
>
> -CLIENTIF="w2ap"
> ETHMESHMAC=
> ROUTERMAC=w2mesh
>
> @@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
> uci set network.wan.ifname=$WANDEV
> elif [ "$ETHMODE" = "CLIENT" ] ; then
> ## Activate Client:
> - CLIENTIF="w2ap eth0"
> uci set network.mesh.ifname="bat0 $SWITCHDEV"
> else
> ## Activate BATMAN:
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
> index 480fddb..3d0e901 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1
> @@ -4,6 +4,5 @@ CLIENT_PORTS="0t 1 2"
> WAN_PORTS=
> BATMAN_PORTS="0t 3 4"
>
> -CLIENTIF="eth0.1 w2ap w5ap"
> ETHMESHMAC=
> -ROUTERMAC=w2mesh
> \ No newline at end of file
> +ROUTERMAC=w2mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
> index fcac123..897152e 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1
> @@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
> WAN_PORTS="0t 1"
> BATMAN_PORTS="0t 2 3"
>
> -CLIENTIF="eth0.1 w2ap w5ap"
> ETHMESHMAC=
> -ROUTERMAC=w5mesh
> \ No newline at end of file
> +ROUTERMAC=w5mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
> index fcac123..897152e 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1
> @@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
> WAN_PORTS="0t 1"
> BATMAN_PORTS="0t 2 3"
>
> -CLIENTIF="eth0.1 w2ap w5ap"
> ETHMESHMAC=
> -ROUTERMAC=w5mesh
> \ No newline at end of file
> +ROUTERMAC=w5mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
> index fcac123..897152e 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1
> @@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
> WAN_PORTS="0t 1"
> BATMAN_PORTS="0t 2 3"
>
> -CLIENTIF="eth0.1 w2ap w5ap"
> ETHMESHMAC=
> -ROUTERMAC=w5mesh
> \ No newline at end of file
> +ROUTERMAC=w5mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
> index 4c4629a..a3ea6c3 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v1
> @@ -4,6 +4,5 @@ CLIENT_PORTS="3 4 5t"
> WAN_PORTS="0 5t"
> BATMAN_PORTS="1 2 5t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=w2ap
> -ROUTERMAC=eth0
> \ No newline at end of file
> +ROUTERMAC=eth0
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
> index 2f0e5f6..6dd4674 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v2
> @@ -4,6 +4,5 @@ CLIENT_PORTS="1 2 6t"
> WAN_PORTS="5 6t"
> BATMAN_PORTS="3 4 6t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=
> -ROUTERMAC=eth1
> \ No newline at end of file
> +ROUTERMAC=eth1
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
> index 2f0e5f6..6dd4674 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v3
> @@ -4,6 +4,5 @@ CLIENT_PORTS="1 2 6t"
> WAN_PORTS="5 6t"
> BATMAN_PORTS="3 4 6t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=
> -ROUTERMAC=eth1
> \ No newline at end of file
> +ROUTERMAC=eth1
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
> index 5d19a38..fbe5744 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4
> @@ -5,6 +5,5 @@ CLIENT_PORTS="1 4 0t"
> WAN_PORTS=
> BATMAN_PORTS="2 3 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> -ROUTERMAC=w2mesh
> \ No newline at end of file
> +ROUTERMAC=w2mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
> index 2ffdff6..85abc31 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2
> @@ -5,6 +5,5 @@ CLIENT_PORTS="1 2 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 4 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> -ROUTERMAC=w2mesh
> \ No newline at end of file
> +ROUTERMAC=w2mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
> index 5d19a38..fbe5744 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4
> @@ -5,6 +5,5 @@ CLIENT_PORTS="1 4 0t"
> WAN_PORTS=
> BATMAN_PORTS="2 3 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> -ROUTERMAC=w2mesh
> \ No newline at end of file
> +ROUTERMAC=w2mesh
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
> index 02cefd8..81b406c 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
> @@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 4 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> ROUTERMAC=eth0
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
> index 02cefd8..81b406c 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
> @@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 4 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> ROUTERMAC=eth0
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
> index 0835322..8afd850 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
> @@ -6,6 +6,5 @@ CLIENT_PORTS="1 4 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 2 0t"
>
> -CLIENTIF="eth1.1 w2ap"
> ETHMESHMAC=eth0
> ROUTERMAC=eth1
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
> index 02cefd8..81b406c 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
> @@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 4 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> ROUTERMAC=eth0
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
> index cd75ea3..eef8168 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
> @@ -6,6 +6,5 @@ CLIENT_PORTS="1 2 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 4 0t"
>
> -CLIENTIF="eth0.1 w2ap"
> ETHMESHMAC=eth1
> ROUTERMAC=wlan0
> diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
> index fe2e698..c0e3817 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr842n-v2
> @@ -4,6 +4,5 @@ CLIENT_PORTS="1 4 0t"
> WAN_PORTS=
> BATMAN_PORTS="3 2 0t"
>
> -CLIENTIF="eth1.1 w2ap"
> ETHMESHMAC=eth0
> ROUTERMAC=eth1
> diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
> index 1e9223f..c16993d 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
> +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m
> @@ -6,7 +6,6 @@ BATMAN_PORTS=""
>
> . /etc/network.mode
>
> -CLIENTIF="w2ap"
> ETHMESHMAC=
> ROUTERMAC=w2mesh
>
> @@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
> uci set network.wan.ifname=$WANDEV
> elif [ "$ETHMODE" = "CLIENT" ] ; then
> ## Activate Client:
> - CLIENTIF="w2ap eth0"
> uci set network.mesh.ifname="bat0 $SWITCHDEV"
> else
> ## Activate BATMAN:
> diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
> index 20ac8bd..2298117 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
> +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw
> @@ -6,7 +6,6 @@ BATMAN_PORTS=""
>
> . /etc/network.mode
>
> -CLIENTIF="w2ap"
> ETHMESHMAC=
> ROUTERMAC=w2mesh
>
> @@ -25,7 +24,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
> uci set network.wan.ifname=$WANDEV
> elif [ "$ETHMODE" = "CLIENT" ] ; then
> ## Activate Client:
> - CLIENTIF="w2ap eth0"
> uci set network.mesh.ifname="bat0 $SWITCHDEV"
> else
> ## Activate BATMAN:
> diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
> index 1e9223f..c16993d 100644
> --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
> +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m
> @@ -6,7 +6,6 @@ BATMAN_PORTS=""
>
> . /etc/network.mode
>
> -CLIENTIF="w2ap"
> ETHMESHMAC=
> ROUTERMAC=w2mesh
>
> @@ -23,7 +22,6 @@ if [ "$ETHMODE" = "WAN" ] ; then
> uci set network.wan.ifname=$WANDEV
> elif [ "$ETHMODE" = "CLIENT" ] ; then
> ## Activate Client:
> - CLIENTIF="w2ap eth0"
> uci set network.mesh.ifname="bat0 $SWITCHDEV"
> else
> ## Activate BATMAN:
> diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> index 4122322..3b21411 100755
> --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
> @@ -12,12 +12,6 @@
> BOARD="$(uci get board.model.name)"
> . /etc/network.$BOARD
>
> -if ! uci get nodewatcher. at network[0].client_interfaces; then
> - echo "Setting nodewatchers client interfaces to: $CLIENTIF"
> - uci set nodewatcher. at network[0].client_interfaces="$CLIENTIF"
> - uci commit
> -fi
> -
> if ! uci get network.$SWITCHDEV.ifname; then
>
> SWITCHHW=$(swconfig list | awk '{ print $4 }')
> diff --git a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
> index fcac123..897152e 100644
> --- a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
> +++ b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1
> @@ -4,6 +4,5 @@ CLIENT_PORTS="0t 4 5"
> WAN_PORTS="0t 1"
> BATMAN_PORTS="0t 2 3"
>
> -CLIENTIF="eth0.1 w2ap w5ap"
> ETHMESHMAC=
> -ROUTERMAC=w5mesh
> \ No newline at end of file
> +ROUTERMAC=w5mesh
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
> index 7be6e3b..334cc0a 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -1,7 +1,7 @@
> include $(TOPDIR)/rules.mk
>
> PKG_NAME:=fff-nodewatcher
> -PKG_VERSION:=37
> +PKG_VERSION:=38
> PKG_RELEASE:=1
>
> PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> index e9b734b..966e1b3 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -2,7 +2,7 @@
> # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
> # License; GPL v3
>
> -SCRIPT_VERSION="37"
> +SCRIPT_VERSION="38"
>
> test -f /tmp/started || exit
>
> @@ -13,7 +13,6 @@ if [ -f /etc/config/nodewatcher ];then
> SCRIPT_LOGFILE=`uci get nodewatcher. at script[0].logfile`
> SCRIPT_DATA_FILE=`uci get nodewatcher. at script[0].data_file`
> MESH_INTERFACE=`uci get nodewatcher. at network[0].mesh_interface`
> - CLIENT_INTERFACES=`uci get nodewatcher. at network[0].client_interfaces`
> IFACEBLACKLIST=`uci get nodewatcher. at network[0].iface_blacklist`
> IPWHITELIST=`uci get nodewatcher. at network[0].ip_whitelist`
> SCRIPT_STATUS_FILE=`uci get nodewatcher. at script[0].status_text_file`
> @@ -228,6 +227,7 @@ crawl() {
> err "`date`: Collecting information about conected clients"
> #CLIENTS
> client_count=0
> + CLIENT_INTERFACES=$(bridge link | awk '$2 !~/^bat/{ printf $2" " }')
> for clientif in ${CLIENT_INTERFACES}; do
> local cc=$(bridge fdb show br $MESH_INTERFACE brport $clientif | grep -v self | grep -v permanent -c)
> client_count=$((client_count + $cc))
> --
> 2.1.4
>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 473 bytes
Beschreibung: This is a digitally signed message part
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20160609/be8a1113/attachment-0001.sig>
Mehr Informationen über die Mailingliste franken-dev