Remove network.mode file

src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel

@@ -2,8 +2,7 @@
 . /lib/functions/fff/babel
 
 #load board specific properties
-BOARD="$(uci get board.model.name)"
-. /etc/network.$BOARD
+. /lib/functions/fff/interfaces
 
 configure() {
 	## babelpeer

src/packages/fff/fff-layer3-config/files/etc/layer3.d/20-vlan

@@ -2,9 +2,8 @@
 . /lib/functions.sh
 
 # load board specific properties
-BOARD="$(uci get board.model.name)"
-. /etc/network.$BOARD
 . /lib/functions/fff/cpuport
+. /lib/functions/fff/interfaces
 
 
 configure() {

src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client

@@ -1,7 +1,5 @@
-# load board specific properties
-BOARD="$(uci get board.model.name)"
-. /etc/network.$BOARD
 
+. /lib/functions/fff/interfaces
 
 configure() {
 	# ipaddr

src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-wan

@@ -1,6 +1,5 @@
-# load board specific properties
-BOARD="$(uci get board.model.name)"
-. /etc/network.$BOARD
+
+. /lib/functions/fff/interfaces
 
 configure() {
 	if vlan=$(uci -q get gateway.@wan[0].vlan); then

src/packages/fff/fff-layer3-config/files/etc/uci-defaults/20-generate-default-gateway

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/fff/switchports
+
+# skip if gateway configuration already exists
+if [ -s /etc/config/gateway ]; then
+	exit 0
+fi
+
+touch /etc/config/gateway
+
+essid='noservice.freifunk'
+chan2ghz='1'
+chan5ghz='36'
+
+uci batch <<EOF
+	set gateway.meta='gateway'
+	set gateway.meta.config_version='2'
+
+	add gateway client
+	set gateway.@client[0].vlan='1'
+	set gateway.@client[0].essid='$essid'
+	set gateway.@client[0].chan2ghz='$chan2ghz'
+	set gateway.@client[0].chan5ghz='$chan5ghz'
+
+	add gateway wan
+	set gateway.@wan[0].vlan='2'
+
+	set gateway.1=vlan
+	set gateway.1.comment='client'
+	set gateway.1.ports='$BATMAN_PORTS $CLIENT_PORTS'
+	set gateway.2=vlan
+	set gateway.2.comment='wan'
+	set gateway.2.ports='$WAN_PORTS'
+
+	add gateway dns
+	add_list gateway.@dns[0].server='fd43:5602:29bd:ffff:1:1:1:1'
+EOF
+
+# TODO: one-port
+# TODO: two-port
+# TODO: dsa
+
+uci commit gateway
+
+exit 0

src/packages/fff/fff-layer3/Makefile

@@ -14,6 +14,7 @@ define Package/fff-layer3
 	         +fff-babeld \
 	         +fff-boardname \
 	         +fff-dhcp \
+	         +fff-firewall \
 	         +fff-layer3-config \
 	         +fff-mqtt-monitoring \
 	         +fff-network \

src/packages/fff/fff-network/Makefile

@@ -8,12 +8,11 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	SECTION:=base
 	CATEGORY:=Freifunk
-	TITLE:=Freifunk-Franken network configuration
+	TITLE:=Freifunk-Franken base network configuration
 	URL:=https://www.freifunk-franken.de
 	DEPENDS:= \
 		+owipcalc \
-		+fff-boardname \
-		+fff-firewall
+		+fff-boardname
 endef
 
 define Package/$(PKG_NAME)/description
@@ -26,7 +25,6 @@ endef
 
 define Package/$(PKG_NAME)/install
 	$(CP) ./files/* $(1)/
-	test -d ./$(ARCH) && $(CP) ./$(ARCH)/* $(1)/etc/
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

src/packages/fff/fff-network/arm/network.avm,fritzbox-4040

@@ -1,5 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 3 4"
-WAN_PORTS="0t 5"
-BATMAN_PORTS="0t 1 2"

src/packages/fff/fff-network/arm/network.tplink,c2600

@@ -1,5 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 1 2"
-WAN_PORTS="0t 5"
-BATMAN_PORTS="0t 3 4"

src/packages/fff/fff-network/files/etc/config/network

@@ -1,30 +0,0 @@
-config globals 'globals'
-        option packet_steering '1'
-
-config interface 'loopback'
-        option ifname 'lo'
-        option proto 'static'
-        option ipaddr '127.0.0.1'
-        option netmask '255.0.0.0'
-
-config interface 'client'
-        option type 'bridge'
-        option auto '1'
-
-config interface 'wan'
-        option proto 'none'
-        option ifname 'eth2'
-
-config interface 'wan4'
-        option proto 'dhcp'
-        option ifname '@wan'
-
-config interface 'wan6'
-        option proto 'dhcpv6'
-        option reqprefix 'no'
-        option sourcefilter '0'
-        option ifname '@wan'
-
-config interface 'ethmesh'
-        option proto 'batadv_hardif'
-        option master 'bat0'

src/packages/fff/fff-network/files/etc/uci-defaults/22-network-base

@@ -0,0 +1,80 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. /lib/functions/system.sh
+. /lib/functions/fff/interfaces
+. /lib/functions/fff/network
+. /lib/functions/fff/meshmac
+. /lib/functions/fff/routermac
+. /lib/functions/fff/switchports
+
+[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
+
+## Clear possibly existing network configuration
+> /etc/config/network
+
+## Add basic network configuration
+uci batch <<-__EOF__
+	set network.loopback='interface'
+	set network.loopback.ifname='lo'
+	set network.loopback.proto='static'
+	set network.loopback.ipaddr='127.0.0.1'
+	set network.loopback.netmask='255.0.0.0'
+
+	set network.client='interface'
+	set network.client.type='bridge'
+	set network.client.proto='static'
+	set network.client.auto='1'
+
+	set network.wan='interface'
+	set network.wan.proto='none'
+	set network.wan.ifname='eth2'
+
+	set network.wan4='interface'
+	set network.wan4.proto='dhcp'
+	set network.wan4.ifname='@wan'
+
+	set network.wan6='interface'
+	set network.wan6.proto='dhcpv6'
+	set network.wan6.reqprefix='no'
+	set network.wan6.sourcefilter='0'
+	set network.wan6.ifname='@wan'
+__EOF__
+
+## Add switch configuration
+SWITCHHW=$(swconfig list | awk '{ print $4 }')
+if [ -n "$SWITCHHW" ]; then
+	uci batch <<-__EOF__
+		set network.$SWITCHDEV=switch
+		set network.$SWITCHDEV.name=$SWITCHHW
+		set network.$SWITCHDEV.enable=1
+		set network.$SWITCHDEV.reset=1
+		set network.$SWITCHDEV.enable_vlan=1
+	__EOF__
+fi
+
+## Set router label mac address on client interface
+if [ -n "$ROUTERMAC" ]; then
+	uci set network.client.macaddr=$ROUTERMAC
+	uci commit network
+fi
+
+## Set default ip addresses
+prefix="fdff::/64"
+addr_def=$(owipcalc "$prefix" add ::1)
+addr_mac=$(owipcalc "$prefix" add "::$(ipMacSuffix "$ROUTERMAC")")
+addr_eui=$(owipcalc "$prefix" add "::$(ipEUISuffix "$ROUTERMAC")")
+
+uci batch <<-__EOF__
+	set network.globals=globals
+	set network.globals.ula_prefix=$prefix
+
+	add_list network.client.ip6addr=$addr_def
+	add_list network.client.ip6addr=$addr_mac
+	add_list network.client.ip6addr=$addr_eui
+__EOF__
+
+uci commit network
+[ -s /etc/init.d/fff-uradvd ] && /etc/init.d/fff-uradvd restart
+
+exit 0

src/packages/fff/fff-network/files/lib/functions/fff/interfaces

@@ -0,0 +1,61 @@
+# SPDX-License-Identifier: GPL-3.0-only
+
+BOARD="$(uci get board.model.name)"
+
+case "$BOARD" in
+	avm,fritzbox-4040|\
+	tplink,archer-c50-v3|\
+	tplink,archer-c50-v4|\
+	tplink,archer-c7-v5|\
+	tplink,c2600|\
+	tplink,tl-wdr3600-v1|\
+	tplink,tl-wdr4300-v1|\
+	tplink,tl-wdr4310-v1|\
+	tplink,tl-wdr4900-v1|\
+	tplink,tl-wr1043nd-v2|\
+	tplink,tl-wr1043nd-v3|\
+	tplink,tl-wr1043nd-v4|\
+	tplink,tl-wr1043n-v5|\
+	tplink,tl-wr841n-v13|\
+	xiaomi,mi-router-4a-100m)
+		WANDEV=eth0
+		SWITCHDEV=eth0
+		;;
+	glinet,gl-ar150|\
+	tplink,archer-c25-v1|\
+	tplink,archer-c60-v1|\
+	tplink,archer-c60-v2|\
+	tplink,cpe210-v1|\
+	tplink,tl-wdr3500-v1)
+		WANDEV=eth1
+		SWITCHDEV=eth0
+		;;
+	tplink,archer-c7-v2)
+		WANDEV=eth1
+		SWITCHDEV=eth1
+		;;
+	tplink,cpe210-v1|\
+	tplink,cpe510-v1)
+		WANDEV=eth1
+		SWITCHDEV=eth0
+		TWO_PORT=YES
+		;;
+	network.ubnt,unifi|\
+	network.ubnt,unifiac-mesh|\
+	tplink,cpe210-v2|\
+	tplink,cpe210-v3|\
+	ubnt,nanostation-loco-m-xw)
+		WANDEV=eth0
+		SWITCHDEV=eth0
+		ONE_PORT=YES
+		;;
+	netgear,r6220|\
+	ubnt,edgerouter-4|\
+	ubnt,edgerouter-x-sfp|\
+	ubnt,edgerouter-x|\
+	xiaomi,mi-router-4a-gigabit)
+		WANDEV=switch0
+		SWITCHDEV=switch0
+		DSA=1
+		;;
+esac

src/packages/fff/fff-network/files/lib/functions/fff/meshmac

@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: GPL-3.0-only
+
+. /lib/functions.sh
+. /lib/functions/system.sh
+. /lib/functions/fff/network
+
+BOARD="$(uci get board.model.name)"
+
+case "$BOARD" in
+	tplink,archer-c7-v2|\
+	tplink,archer-c25-v1)
+		ETHMESHMAC=$(cat /sys/class/net/eth0/address)
+		;;
+	tplink,archer-c60-v1|\
+	tplink,archer-c60-v2)
+		ETHMESHMAC=$(cat /sys/class/net/eth1/address)
+		;;
+	glinet,gl-ar150|\
+	netgear,r6220|\
+	tplink,archer-c50-v3|\
+	tplink,archer-c50-v4)
+		ETHMESHMAC="$(macFlipLocalBit $(cat /sys/class/net/eth0/address))"
+		;;
+	tplink,archer-c7-v5|\
+	tplink,tl-wdr4900-v1)
+		# use mac address from phy1 with 'locally administered' bit set to '1'
+		# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
+		ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
+		;;
+	tplink,tl-wdr3600-v1|\
+	tplink,tl-wdr4300-v1|\
+	tplink,tl-wdr4310-v1)
+		ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
+		;;
+	tplink,tl-wr1043nd-v4|\
+	tplink,tl-wr1043n-v5)
+		# Load second MAC address from flash because we haven't any interface with this
+		# address where we can copy it from
+		ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
+		;;
+	tplink,tl-wr841n-v13)
+		ETHMESHMAC=$(macaddr_setbit_la $(cat /sys/class/net/eth0/address))
+		;;
+esac

src/packages/fff/fff-network/files/lib/functions/fff/routermac

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-3.0-only
+
+BOARD="$(uci get board.model.name)"
+
+case "$BOARD" in
+	ubnt,edgerouter-4)
+		ROUTERMAC=$(cat /sys/class/net/lan3/address)
+		;;
+esac

src/packages/fff/fff-network/files/lib/functions/fff/switchports

@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: GPL-3.0-only
+
+BOARD="$(uci get board.model.name)"
+
+case "$BOARD" in
+	tplink,c2600|\
+	tplink,tl-wr1043nd-v2|\
+	tplink,tl-wr1043nd-v3|\
+	tplink,tl-wr1043nd-v4|\
+	tplink,tl-wr1043n-v5)
+		CLIENT_PORTS="1 2"
+		BATMAN_PORTS="3 4"
+		WAN_PORTS="5"
+		;;
+	avm,fritzbox-4040)
+		CLIENT_PORTS="3 4"
+		BATMAN_PORTS="1 2"
+		WAN_PORTS="5"
+		;;
+	tplink,archer-c7-v2|\
+	tplink,archer-c7-v5|\
+	tplink,tl-wdr3600-v1|\
+	tplink,tl-wdr4300-v1|\
+	tplink,tl-wdr4310-v1|\
+	tplink,tl-wdr4900-v1)
+		CLIENT_PORTS="4 5"
+		BATMAN_PORTS="2 3"
+		WAN_PORTS="1"
+		;;
+	tplink,archer-c50-v3|\
+	tplink,archer-c50-v4|\
+	tplink,tl-wr1043nd-v1|\
+	tplink,tl-wr841n-v13)
+		CLIENT_PORTS="3 4"
+		BATMAN_PORTS="1 2"
+		WAN_PORTS="0"
+		;;
+	xiaomi,mi-router-4a-100m)
+		CLIENT_PORTS="4"
+		BATMAN_PORTS="2"
+		WAN_PORTS="0"
+		;;
+	ubnt,edgerouter-4)
+		CLIENT_PORTS="lan2"
+		BATMAN_PORTS="lan1"
+		WAN_PORTS="lan0"
+		;;
+	ubnt,edgerouter-x|\
+	ubnt,edgerouter-x-sfp)
+		CLIENT_PORTS="eth3 eth4"
+		BATMAN_PORTS="eth1 eth2"
+		WAN_PORTS="eth0"
+		;;
+	netgear,r6220)
+		CLIENT_PORTS="lan1 lan2"
+		BATMAN_PORTS="lan3 lan4"
+		WAN_PORTS="wan"
+		;;
+	xiaomi,mi-router-4a-gigabit)
+		CLIENT_PORTS="lan2"
+		BATMAN_PORTS="lan1"
+		WAN_PORTS="wan"
+		;;
+	tplink,archer-c25-v1|\
+	tplink,archer-c60-v1|\
+	tplink,archer-c60-v2|\
+	tplink,tl-wdr3500-v1|\
+	tplink,tl-wr740n-v4|\
+	tplink,tl-wr741-v1|\
+	tplink,tl-wr841-v10|\
+	tplink,tl-wr841-v11|\
+	tplink,tl-wr841-v12|\
+	tplink,tl-wr841-v7|\
+	tplink,tl-wr841-v9)
+		CLIENT_PORTS="1 2"
+		BATMAN_PORTS="3 4"
+		;;
+	tplink,tl-wr741nd-v4|\
+	tplink,tl-wr841-v8|\
+	tplink,tl-wr842n-v2)
+		CLIENT_PORTS="1 4"
+		BATMAN_PORTS="2 3"
+		;;
+	tplink,tl-wr710n-v1)
+		CLIENT_PORTS="3"
+		BATMAN_PORTS=""
+		;;
+esac

src/packages/fff/fff-network/files/usr/sbin/configurenetwork

@@ -1,259 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-. /lib/functions/system.sh
-. /lib/functions/fff/network
-
-BOARD="$(uci get board.model.name)"
-. /etc/network.$BOARD
-[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
-
-if [ -s /etc/network.config ] ; then
-    . /etc/network.config
-else
-    # Write network.config
-    if [ "$ONE_PORT" = "YES" ] || [ -n "$ETHPORT" ] ; then
-        echo "ETHMODE='$ETHMODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
-    fi
-    if [ -n "$TWO_PORT" ] ; then
-        echo "LAN0MODE='$LAN0MODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
-        echo "LAN1MODE='$LAN1MODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
-    fi
-    echo "FORCEPARSE='0' # Parse at: 0=first boot only, 1=every reboot, 2=next reboot (once)" >> /etc/network.config
-fi
-
-if [ "$FORCEPARSE" = '2' ] ; then
-    sed -i '/^FORCEPARSE/d' /etc/network.config
-    echo "FORCEPARSE='0' # Parse at: 0=first boot only, 1=every reboot, 2=next reboot (once)" >> /etc/network.config
-    FORCEPARSE='1'
-fi
-
-if [ "$ONE_PORT" = "YES" ]; then
-    if ! uci -q get network.$SWITCHDEV.ifname || [ "$FORCEPARSE" = '1' ] ; then
-        uci set network.$SWITCHDEV=interface
-        uci set network.$SWITCHDEV.ifname=$SWITCHDEV
-        if [ "$ETHMODE" = "WAN" ]; then
-            uci set network.client.ifname="bat0"
-            uci set network.wan.ifname="$WANDEV"
-            uci del network.ethmesh.ifname
-            uci del network.${SWITCHDEV}.macaddr
-        elif [ "$ETHMODE" = "CLIENT" ] ; then
-            uci set network.client.ifname="bat0 $SWITCHDEV"
-            uci set network.wan.ifname="eth2" #eth2 because it is default in config file
-            uci del network.ethmesh.ifname
-            uci del network.${SWITCHDEV}.macaddr
-        elif [ "$ETHMODE" = "BATMAN" ] ; then
-            uci set network.client.ifname="bat0"
-            uci set network.wan.ifname="eth2" #eth2 because it is default in config file
-            uci set network.ethmesh.ifname="$SWITCHDEV"
-            ETH0DEV="$SWITCHDEV"
-            ETH0MAC="w2ap"
-        fi
-        uci commit network
-    fi
-elif [ "$TWO_PORT" = "YES" ]; then
-    if ! uci -q get network.$WANDEV.ifname || [ "$FORCEPARSE" = '1' ] ; then
-        uci set network.$WANDEV=interface
-        uci set network.$WANDEV.ifname="$WANDEV"
-        uci set network.$SWITCHDEV=interface
-        uci set network.$SWITCHDEV.ifname="$SWITCHDEV"
-        # Only one WAN possible, second port will be unset if both are WAN
-        if [ "$LAN0MODE" = "WAN" ]; then
-            if [ "$LAN1MODE" = "CLIENT" ]; then
-                uci set network.client.ifname="bat0 $SWITCHDEV"; else
-                uci set network.client.ifname=bat0; fi
-            # WAN
-            uci set network.wan.ifname="$WANDEV"
-            if [ "$LAN1MODE" = "BATMAN" ]; then
-                uci set network.ethmesh.ifname="$SWITCHDEV"; else
-                uci del network.ethmesh.ifname; fi
-        # Two client ports are possible
-        elif [ "$LAN0MODE" = "CLIENT" ]; then
-            if [ "$LAN1MODE" = "CLIENT" ]; then
-                uci set network.client.ifname="bat0 $WANDEV $SWITCHDEV"; else
-                uci set network.client.ifname="bat0 $WANDEV"; fi
-            if [ "$LAN1MODE" = "WAN" ]; then
-                uci set network.wan.ifname="$SWITCHDEV"; else
-                uci set network.wan.ifname=eth2; fi #eth2 because it is default in config file
-            if [ "$LAN1MODE" = "BATMAN" ]; then
-                uci set network.ethmesh.ifname="$SWITCHDEV"; else
-                uci del network.ethmesh.ifname; fi
-        # Only one BATMAN port possible, second port will be unset if both are BATMAN
-        elif [ "$LAN0MODE" = "BATMAN" ] ; then
-            if [ "$LAN1MODE" = "CLIENT" ]; then
-                uci set network.client.ifname="bat0 $SWITCHDEV"; else
-                uci set network.client.ifname=bat0; fi
-            if [ "$LAN1MODE" = "WAN" ]; then
-                uci set network.wan.ifname="$SWITCHDEV"; else
-                uci set network.wan.ifname=eth2; fi #eth2 because it is default in config file
-            # BATMAN
-            uci set network.ethmesh.ifname="$WANDEV"
-        fi
-        if [ "$LAN0MODE" = "BATMAN" ]; then
-            ETH0DEV="$WANDEV" # only needed for setting macaddr
-            ETH0MAC=w2ap
-            uci del network.$SWITCHDEV.macaddr
-        elif [ "$LAN1MODE" = "BATMAN" ]; then
-            # $WANDEV will win if both are set to BATMAN, as above
-            ETH0DEV="$SWITCHDEV" # only needed for setting macaddr
-            ETH0MAC=w2ap
-            uci del network.$WANDEV.macaddr
-        else
-            uci del network.$WANDEV.macaddr
-            uci del network.$SWITCHDEV.macaddr
-        fi
-
-        uci commit network
-    fi
-else
-    if ! uci -q get network.$SWITCHDEV > /dev/null ; then
-
-        if [ "$DSA" = "1" ]; then
-            uci set network.$SWITCHDEV=device
-            uci set network.$SWITCHDEV.name=$SWITCHDEV
-            uci set network.$SWITCHDEV.type=bridge
-            # temporary workaround for netifd bug present in OpenWrt 21.02.0 (FS#4104)
-            uci set network.$SWITCHDEV.bridge_empty='1'
-
-            uci set network.${SWITCHDEV}_1=bridge-vlan
-            uci set network.${SWITCHDEV}_1.device=$SWITCHDEV
-            uci set network.${SWITCHDEV}_1.vlan=1
-            uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
-
-            if [ "$WANDEV" = "$SWITCHDEV" ] || ! [ -z "$WAN_PORTS" ]; then
-                uci set network.${SWITCHDEV}_2=bridge-vlan
-                uci set network.${SWITCHDEV}_2.device=$SWITCHDEV
-                uci set network.${SWITCHDEV}_2.vlan=2
-                uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
-            fi
-
-            uci set network.${SWITCHDEV}_3=bridge-vlan
-            uci set network.${SWITCHDEV}_3.device=$SWITCHDEV
-            uci set network.${SWITCHDEV}_3.vlan=3
-            uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
-        else
-            SWITCHHW=$(swconfig list | awk '{ print $4 }')
-
-            uci set network.$SWITCHDEV=switch
-            uci set network.$SWITCHDEV.name=$SWITCHHW
-            uci set network.$SWITCHDEV.enable=1
-            uci set network.$SWITCHDEV.reset=1
-            uci set network.$SWITCHDEV.enable_vlan=1
-
-            uci set network.${SWITCHDEV}_1=switch_vlan
-            uci set network.${SWITCHDEV}_1.device=$SWITCHHW
-            uci set network.${SWITCHDEV}_1.vlan=1
-            uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
-
-            if [ "$WANDEV" = "$SWITCHDEV" ] || [ -n "$WAN_PORTS" ]; then
-                uci set network.${SWITCHDEV}_2=switch_vlan
-                uci set network.${SWITCHDEV}_2.device=$SWITCHHW
-                uci set network.${SWITCHDEV}_2.vlan=2
-                uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
-            fi
-
-            uci set network.${SWITCHDEV}_3=switch_vlan
-            uci set network.${SWITCHDEV}_3.device=$SWITCHHW
-            uci set network.${SWITCHDEV}_3.vlan=3
-            uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
-        fi
-
-        uci set network.client.ifname="$SWITCHDEV.1 bat0"
-
-        uci set network.ethmesh.ifname="$SWITCHDEV.3"
-
-        if [ "$WANDEV" = "$SWITCHDEV" ]; then
-            uci set network.wan.ifname=$WANDEV.2
-        else
-            uci set network.wan.ifname=$WANDEV
-        fi
-
-        uci commit network
-    fi
-fi
-
-/etc/init.d/network restart
-
-if [ -n "$ETHMESHMAC" ]; then
-    if uci get network.ethmesh.macaddr
-    then
-        echo "MAC for ethmesh is set already"
-    else
-        echo "Fixing MAC on $SWITCHDEV.3 (ethmesh)"
-        sleep 10
-
-        uci set network.ethmesh.macaddr=$ETHMESHMAC
-        uci commit network
-
-        ifconfig $SWITCHDEV.3 down
-        ifconfig $SWITCHDEV.3 hw ether $ETHMESHMAC
-        ifconfig $SWITCHDEV.3 up
-        /etc/init.d/network restart
-    fi
-fi
-
-if [ -n "$ROUTERMAC" ]; then
-    if uci get network.client.macaddr
-    then
-        echo "MAC for client is set already"
-    else
-        echo "Fixing MAC on br-client"
-        sleep 10
-
-        uci set network.client.macaddr=$ROUTERMAC
-        uci commit network
-
-        ifconfig br-client down
-        ifconfig br-client hw ether $ROUTERMAC
-        ifconfig br-client up
-        /etc/init.d/network restart
-    fi
-fi
-
-if [ -n "$ETH0MAC" ]; then
-        echo "Fixing MAC on $ETH0DEV"
-        sleep 10
-        NEW_MACADDR=$(cat "/sys/class/net/${ETH0MAC}/address")
-        uci set network.$ETH0DEV.macaddr=$NEW_MACADDR
-        uci commit network
-        ifconfig $ETH0DEV down
-        ifconfig $ETH0DEV hw ether $NEW_MACADDR
-        ifconfig $ETH0DEV up
-        /etc/init.d/network restart
-fi
-
-if uci -q get "network.client.ip6addr" > /dev/null
-then
-    echo "IPv6 for client is set already"
-else
-    echo "Setting IPv6 addresses"
-    # Some time needed :(
-    sleep 5
-
-    for ip in $(ip -6 addr show br-client | awk '/fdff/{ print $2 }'); do
-        ip -6 addr del $ip dev br-client
-    done
-
-    prefix="fdff::/64"
-    # Set $prefix::MAC as IP
-    addr=$(owipcalc "$prefix" add "::$(ipMacSuffix "$ROUTERMAC")")
-    ip -6 addr add $addr dev br-client
-
-    uci -q set network.globals.ula_prefix=$prefix
-    uci -q add_list network.client.ip6addr=$addr
-    uci -q set network.client.proto=static
-
-    # Set $prefix::1 as IP
-    addr=$(owipcalc "$prefix" add ::1)
-    ip -6 addr add $addr dev br-client
-    uci -q add_list network.client.ip6addr=$addr
-
-    # Set $prefix::link-local as IP
-    addr=$(owipcalc "$prefix" add "::$(ipEUISuffix "$ROUTERMAC")")
-    ip -6 addr add $addr dev br-client
-    uci -q add_list network.client.ip6addr=$addr
-
-    uci -q commit network
-
-    [ -s /etc/init.d/fff-uradvd ] && /etc/init.d/fff-uradvd restart
-fi

src/packages/fff/fff-network/mips/network.glinet,gl-ar150

@@ -1,13 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=eth1
-SWITCHDEV=eth0
-WAN_PORTS=
-BATMAN_PORTS="0t"
-CLIENT_PORTS="0t"
-
-ETHMESHMAC="$(macFlipLocalBit $(cat /sys/class/net/eth0/address))"
-
-. /etc/network.mode
-
-ETHPORT=1

src/packages/fff/fff-network/mips/network.mode

@@ -1,30 +0,0 @@
-################
-## This file is used to configure the behavior of network interfaces
-## if the routers interfaces differ from the standard WAN+4LAN-Ports
-## +2Wireless APs.
-## If you want to change their behavior, you should edit the file
-## /etc/network.config
-## After that you have to reboot the router with following command.
-#reboot
-#
-### The canonical syntax of this file is:
-#SPECIFIER="MODE"
-### MODES
-## Generally there are 3 operating modes for network interfaces in fff.
-#BATMAN: The interface is used to mesh with other fff-nodes
-#WAN:    The interface is used to connect to supernodes via vpn and
-#         ordinary internet.
-#CLIENT: The interface is used to connect clients to the fff-net
-##
-### SPECIFIER
-## For devices only including one ethernet port the specifier is called
-## ETHMODE. The default mode for these devices is "BATMAN".
-## For example this is the case for: gl-ar150, tl-mr3020-v1, tl-wa850re-v1,
-## tl-wa860re-v1, tl-wa901nd-v2, ubnt-bullet-m, ubnt-loco-m-xw, ubnt-nano-m,
-## ubnt-unifi
-ETHMODE="CLIENT"
-## Devices featuring 2 ethernet ports are configured by SPECIFIERs ressembling
-## the labels on the PORT itself. For the cpe210 these are called LAN0 and LAN1.
-## Therefore they are configured as follows:
-LAN0MODE="WAN"
-LAN1MODE="CLIENT"

src/packages/fff/fff-network/mips/network.tplink,archer-c25-v1

@@ -1,7 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 0t"
-WAN_PORTS=""
-BATMAN_PORTS="3 4 0t"
-
-ETHMESHMAC=$(cat /sys/class/net/eth0/address)

src/packages/fff/fff-network/mips/network.tplink,archer-c60-v1

@@ -1,6 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 0t"
-BATMAN_PORTS="3 4 0t"
-
-ETHMESHMAC=$(cat /sys/class/net/eth1/address)

src/packages/fff/fff-network/mips/network.tplink,archer-c60-v2

@@ -1,6 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 0t"
-BATMAN_PORTS="3 4 0t"
-
-ETHMESHMAC=$(cat /sys/class/net/eth1/address)

src/packages/fff/fff-network/mips/network.tplink,archer-c7-v2

@@ -1,7 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth1
-CLIENT_PORTS="4 5 0t"
-WAN_PORTS="1 0t"
-BATMAN_PORTS="2 3 0t"
-
-ETHMESHMAC=$(cat /sys/class/net/eth0/address)

src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5

@@ -1,12 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="4 5 0t"
-WAN_PORTS="1 0t"
-BATMAN_PORTS="2 3 0t"
-
-# use mac address from phy1 with 'locally administered' bit set to '1'
-# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
-
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")

src/packages/fff/fff-network/mips/network.tplink,cpe210-v1

@@ -1,5 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth0
-TWO_PORT=YES
-
-. /etc/network.mode

src/packages/fff/fff-network/mips/network.tplink,cpe210-v2

@@ -1,5 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-ONE_PORT="YES"
-
-. /etc/network.mode

src/packages/fff/fff-network/mips/network.tplink,cpe210-v3

@@ -1,5 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-ONE_PORT="YES"
-
-. /etc/network.mode

src/packages/fff/fff-network/mips/network.tplink,cpe510-v1

@@ -1,5 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth0
-TWO_PORT=YES
-
-. /etc/network.mode

src/packages/fff/fff-network/mips/network.tplink,tl-wdr3500-v1

@@ -1,5 +0,0 @@
-WANDEV=eth1
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 1 2"
-WAN_PORTS=
-BATMAN_PORTS="0t 3 4"

src/packages/fff/fff-network/mips/network.tplink,tl-wdr3600-v1

@@ -1,9 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 4 5"
-WAN_PORTS="0t 1"
-BATMAN_PORTS="0t 2 3"
-
-. /lib/functions/system.sh
-
-ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)

src/packages/fff/fff-network/mips/network.tplink,tl-wdr4300-v1

@@ -1,9 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 4 5"
-WAN_PORTS="0t 1"
-BATMAN_PORTS="0t 2 3"
-
-. /lib/functions/system.sh
-
-ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)

src/packages/fff/fff-network/mips/network.tplink,tl-wdr4310-v1

@@ -1,9 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 4 5"
-WAN_PORTS="0t 1"
-BATMAN_PORTS="0t 2 3"
-
-. /lib/functions/system.sh
-
-ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)

src/packages/fff/fff-network/mips/network.tplink,tl-wr1043n-v5

@@ -1,13 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 0t"
-WAN_PORTS="5 0t"
-BATMAN_PORTS="3 4 0t"
-
-. /lib/functions/system.sh
-. /lib/functions.sh
-
-# Load second MAC address from flash because we haven't any interface with this
-# address where we can copy it from
-
-ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)

src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v2

@@ -1,5 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 6t"
-WAN_PORTS="5 6t"
-BATMAN_PORTS="3 4 6t"

src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v3

@@ -1,5 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 6t"
-WAN_PORTS="5 6t"
-BATMAN_PORTS="3 4 6t"

src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v4

@@ -1,13 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="1 2 0t"
-WAN_PORTS="5 0t"
-BATMAN_PORTS="3 4 0t"
-
-. /lib/functions/system.sh
-. /lib/functions.sh
-
-# Load second MAC address from flash because we haven't any interface with this
-# address where we can copy it from
-
-ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)

src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m-xw

@@ -1,8 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS=""
-WAN_PORTS=""
-BATMAN_PORTS=""
-ONE_PORT="YES"
-
-. /etc/network.mode

src/packages/fff/fff-network/mips/network.ubnt,unifi

@@ -1,8 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS=""
-WAN_PORTS=""
-BATMAN_PORTS=""
-ONE_PORT="YES"
-
-. /etc/network.mode

src/packages/fff/fff-network/mips/network.ubnt,unifiac-mesh

@@ -1,8 +0,0 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS=""
-WAN_PORTS=""
-BATMAN_PORTS=""
-ONE_PORT="YES"
-
-. /etc/network.mode

src/packages/fff/fff-network/mips64/network.ubnt,edgerouter-4

@@ -1,10 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=switch0
-SWITCHDEV=switch0
-CLIENT_PORTS="lan2"
-WAN_PORTS="lan0"
-BATMAN_PORTS="lan1"
-DSA=1
-
-ROUTERMAC=$(cat /sys/class/net/lan3/address)

src/packages/fff/fff-network/mipsel/network.netgear,r6220

@@ -1,10 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=switch0
-SWITCHDEV=switch0
-CLIENT_PORTS="lan1 lan2"
-WAN_PORTS="wan"
-BATMAN_PORTS="lan3 lan4"
-DSA=1
-
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")

src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v3

@@ -1,9 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 3 4"
-WAN_PORTS="6t 0"
-BATMAN_PORTS="6t 1 2"
-
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")

src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v4

@@ -1,9 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 3 4"
-WAN_PORTS="6t 0"
-BATMAN_PORTS="6t 1 2"
-
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")

src/packages/fff/fff-network/mipsel/network.tplink,tl-wr841n-v13

@@ -1,9 +0,0 @@
-. /lib/functions/system.sh
-
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 3 4"
-WAN_PORTS="6t 0"
-BATMAN_PORTS="6t 1 2"
-
-ETHMESHMAC=$(macaddr_setbit_la $(cat /sys/class/net/eth0/address))

src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x

@@ -1,6 +0,0 @@
-WANDEV=switch0
-SWITCHDEV=switch0
-CLIENT_PORTS="eth3 eth4"
-WAN_PORTS="eth0"
-BATMAN_PORTS="eth1 eth2"
-DSA=1

src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp

@@ -1,6 +0,0 @@
-WANDEV=switch0
-SWITCHDEV=switch0
-CLIENT_PORTS="eth3 eth4 eth5"
-WAN_PORTS="eth0"
-BATMAN_PORTS="eth1 eth2"
-DSA=1

src/packages/fff/fff-network/mipsel/network.xiaomi,mi-router-4a-100m

@@ -1,7 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 4"
-WAN_PORTS="6t 0"
-BATMAN_PORTS="6t 2"

src/packages/fff/fff-network/mipsel/network.xiaomi,mi-router-4a-gigabit

@@ -1,6 +0,0 @@
-WANDEV=switch0
-SWITCHDEV=switch0
-CLIENT_PORTS="lan2"
-WAN_PORTS="wan"
-BATMAN_PORTS="lan1"
-DSA=1

src/packages/fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1

@@ -1,12 +0,0 @@
-. /lib/functions/fff/network
-
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="0t 4 5"
-WAN_PORTS="0t 1"
-BATMAN_PORTS="0t 2 3"
-
-# use mac address from phy1 with 'locally administered' bit set to '1'
-# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
-
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")

src/packages/fff/fff-node-config/Makefile

@@ -0,0 +1,30 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fff-node-config
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+	SECTION:=base
+	CATEGORY:=Freifunk
+	TITLE:=Freifunk-Franken node network configuration
+	URL:=https://www.freifunk-franken.de
+	DEPENDS:= \
+		+fff-boardname \
+		+fff-network
+endef
+
+define Package/$(PKG_NAME)/description
+	This package configures the network interfaces
+endef
+
+define Build/Compile
+	# nothing
+endef
+
+define Package/$(PKG_NAME)/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

src/packages/fff/fff-node-config/files/etc/uci-defaults/23-network-node

@@ -0,0 +1,42 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. /lib/functions/fff/interfaces
+
+## Add batman interfaces
+uci batch <<-__EOF__
+	set network.bat0='interface'
+	set network.bat0.proto='batadv'
+	set network.bat0.gw_mode='client'
+	set network.bat0.gw_sel_class='1'
+	set network.bat0.network_coding='0'
+	set network.bat0.aggregated_ogms='1'
+	set network.bat0.ap_isolation='0'
+	set network.bat0.bonding='0'
+	set network.bat0.fragmentation='1'
+	set network.bat0.orig_interval='1000'
+	set network.bat0.distributed_arp_table='1'
+	set network.bat0.hop_penalty='30'
+
+	set network.ethmesh='interface'
+	set network.ethmesh.proto='batadv_hardif'
+	set network.ethmesh.master='bat0'
+__EOF__
+
+## Fix ethmesh mac-address, if necessary
+if [ -n "$ETHMESHMAC" ]; then
+	uci set network.ethmesh.macaddr=$ETHMESHMAC
+	uci commit network
+	/etc/init.d/network restart
+fi
+
+if [ ! -s /etc/network.config ] ; then
+    # Write network.config
+    if [ "$ONE_PORT" = "YES" ] || [ -n "$ETHPORT" ] ; then
+        echo "ETHMODE='CLIENT' # use BATMAN, CLIENT or WAN" >> /etc/network.config
+    fi
+    if [ -n "$TWO_PORT" ] ; then
+        echo "LAN0MODE='WAN' # use BATMAN, CLIENT or WAN" >> /etc/network.config
+        echo "LAN1MODE='CLIENT' # use BATMAN, CLIENT or WAN" >> /etc/network.config
+    fi
+fi

src/packages/fff/fff-node-config/files/usr/sbin/configurenetwork

@@ -0,0 +1,147 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+. /lib/functions/system.sh
+. /lib/functions/fff/network
+. /lib/functions/fff/cpuport
+. /lib/functions/fff/interfaces
+. /lib/functions/fff/switchports
+
+# Add cpuport to switch configuration
+CLIENT_PORTS="$(get_cpu_port) $CLIENT_PORTS"
+BATMAN_PORTS="$(get_cpu_port) $BATMAN_PORTS"
+[ -n "$WAN_PORTS" ] && WAN_PORTS="$(get_cpu_port) $WAN_PORTS"
+
+if [ -s /etc/network.config ] ; then
+    . /etc/network.config
+fi
+
+if [ "$ONE_PORT" = "YES" ]; then
+    uci set network.$SWITCHDEV=interface
+    uci set network.$SWITCHDEV.ifname=$SWITCHDEV
+    if [ "$ETHMODE" = "WAN" ]; then
+        uci set network.client.ifname="bat0"
+        uci set network.wan.ifname="$WANDEV"
+        uci del network.ethmesh.ifname
+        uci del network.${SWITCHDEV}.macaddr
+    elif [ "$ETHMODE" = "CLIENT" ] ; then
+        uci set network.client.ifname="bat0 $SWITCHDEV"
+        uci set network.wan.ifname="eth2" #eth2 because it is default in config file
+        uci del network.ethmesh.ifname
+        uci del network.${SWITCHDEV}.macaddr
+    elif [ "$ETHMODE" = "BATMAN" ] ; then
+        uci set network.client.ifname="bat0"
+        uci set network.wan.ifname="eth2" #eth2 because it is default in config file
+        uci set network.ethmesh.ifname="$SWITCHDEV"
+        ETH0DEV="$SWITCHDEV"
+    fi
+    uci commit network
+elif [ "$TWO_PORT" = "YES" ]; then
+    uci set network.$WANDEV=interface
+    uci set network.$WANDEV.ifname="$WANDEV"
+    uci set network.$SWITCHDEV=interface
+    uci set network.$SWITCHDEV.ifname="$SWITCHDEV"
+    # Only one WAN possible, second port will be unset if both are WAN
+    if [ "$LAN0MODE" = "WAN" ]; then
+        if [ "$LAN1MODE" = "CLIENT" ]; then
+            uci set network.client.ifname="bat0 $SWITCHDEV"; else
+            uci set network.client.ifname=bat0; fi
+        # WAN
+        uci set network.wan.ifname="$WANDEV"
+        if [ "$LAN1MODE" = "BATMAN" ]; then
+            uci set network.ethmesh.ifname="$SWITCHDEV"; else
+            uci del network.ethmesh.ifname; fi
+    # Two client ports are possible
+    elif [ "$LAN0MODE" = "CLIENT" ]; then
+        if [ "$LAN1MODE" = "CLIENT" ]; then
+            uci set network.client.ifname="bat0 $WANDEV $SWITCHDEV"; else
+            uci set network.client.ifname="bat0 $WANDEV"; fi
+        if [ "$LAN1MODE" = "WAN" ]; then
+            uci set network.wan.ifname="$SWITCHDEV"; else
+            uci set network.wan.ifname=eth2; fi #eth2 because it is default in config file
+        if [ "$LAN1MODE" = "BATMAN" ]; then
+            uci set network.ethmesh.ifname="$SWITCHDEV"; else
+            uci del network.ethmesh.ifname; fi
+    # Only one BATMAN port possible, second port will be unset if both are BATMAN
+    elif [ "$LAN0MODE" = "BATMAN" ] ; then
+        if [ "$LAN1MODE" = "CLIENT" ]; then
+            uci set network.client.ifname="bat0 $SWITCHDEV"; else
+            uci set network.client.ifname=bat0; fi
+        if [ "$LAN1MODE" = "WAN" ]; then
+            uci set network.wan.ifname="$SWITCHDEV"; else
+            uci set network.wan.ifname=eth2; fi #eth2 because it is default in config file
+        # BATMAN
+        uci set network.ethmesh.ifname="$WANDEV"
+    fi
+    if [ "$LAN0MODE" = "BATMAN" ]; then
+        ETH0DEV="$WANDEV" # only needed for setting macaddr
+        uci del network.$SWITCHDEV.macaddr
+    elif [ "$LAN1MODE" = "BATMAN" ]; then
+        # $WANDEV will win if both are set to BATMAN, as above
+        ETH0DEV="$SWITCHDEV" # only needed for setting macaddr
+        uci del network.$WANDEV.macaddr
+    else
+        uci del network.$WANDEV.macaddr
+        uci del network.$SWITCHDEV.macaddr
+    fi
+
+    uci commit network
+else
+    if [ "$DSA" = "1" ]; then
+        uci set network.$SWITCHDEV=device
+        uci set network.$SWITCHDEV.name=$SWITCHDEV
+        uci set network.$SWITCHDEV.type=bridge
+        # temporary workaround for netifd bug present in OpenWrt 21.02.0 (FS#4104)
+        uci set network.$SWITCHDEV.bridge_empty='1'
+
+        uci set network.${SWITCHDEV}_1=bridge-vlan
+        uci set network.${SWITCHDEV}_1.device=$SWITCHDEV
+        uci set network.${SWITCHDEV}_1.vlan=1
+        uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
+
+        if [ "$WANDEV" = "$SWITCHDEV" ] || ! [ -z "$WAN_PORTS" ]; then
+            uci set network.${SWITCHDEV}_2=bridge-vlan
+            uci set network.${SWITCHDEV}_2.device=$SWITCHDEV
+            uci set network.${SWITCHDEV}_2.vlan=2
+            uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
+        fi
+
+        uci set network.${SWITCHDEV}_3=bridge-vlan
+        uci set network.${SWITCHDEV}_3.device=$SWITCHDEV
+        uci set network.${SWITCHDEV}_3.vlan=3
+        uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
+    else
+        SWITCHHW=$(swconfig list | awk '{ print $4 }')
+
+        uci set network.${SWITCHDEV}_1=switch_vlan
+        uci set network.${SWITCHDEV}_1.device=$SWITCHHW
+        uci set network.${SWITCHDEV}_1.vlan=1
+        uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
+
+        if [ "$WANDEV" = "$SWITCHDEV" ] || [ -n "$WAN_PORTS" ]; then
+            uci set network.${SWITCHDEV}_2=switch_vlan
+            uci set network.${SWITCHDEV}_2.device=$SWITCHHW
+            uci set network.${SWITCHDEV}_2.vlan=2
+            uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
+        fi
+
+        uci set network.${SWITCHDEV}_3=switch_vlan
+        uci set network.${SWITCHDEV}_3.device=$SWITCHHW
+        uci set network.${SWITCHDEV}_3.vlan=3
+        uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
+    fi
+
+    uci set network.client.ifname="$SWITCHDEV.1 bat0"
+
+    uci set network.ethmesh.ifname="$SWITCHDEV.3"
+
+    if [ "$WANDEV" = "$SWITCHDEV" ]; then
+        uci set network.wan.ifname=$WANDEV.2
+    else
+        uci set network.wan.ifname=$WANDEV
+    fi
+
+    uci commit network
+fi
+
+/etc/init.d/network restart

src/packages/fff/fff-node/Makefile

@@ -14,6 +14,7 @@ define Package/fff-node
 	         +fff-fastd \
 	         +fff-firewall \
 	         +fff-hoods \
+	         +fff-node-config \
 	         +fff-uradvd
 endef
 

src/packages/fff/fff-support/files/usr/sbin/show_info

@@ -4,10 +4,9 @@
 . /lib/functions/fff/evalhoodinfo
 . /lib/functions/fff/evalbytes
 . /lib/functions/fff/portorder
+. /lib/functions/fff/interfaces
 . /lib/functions.sh # required for config_load and config_foreach
 
-board_name=$(uci -q get board.model.name)
-
 HOSTNAME=$(uci -q get 'fff.system.hostname')
 hood="$(uci -q get "system.@system[0].hood")"
 hoodid="$(uci -q get "system.@system[0].hoodid")"
@@ -190,7 +189,7 @@ if swconfig list | grep -q switch0 ; then
 	echo ""
 	echo ""
 
-	if [ ! "$(awk -F= '/WANDEV=/ { print $2 }' /etc/network.$board_name)" = "$(awk -F= '/SWITCHDEV=/ { print $2 }' /etc/network.$board_name)" ] ; then
+	if [ ! "$WANDEV" = "$SWITCHDEV" ] ; then
 		wanif=$(uci -q get network.wan.ifname)
 		link=$(cat /sys/class/net/${wanif}/operstate)
 		if [ "$link" = "up" ] ; then
@@ -221,9 +220,8 @@ if swconfig list | grep -q switch0 ; then
 	done
 else
 	echo "-> PORT ASSIGNMENT"
-	if grep -q "ONE_PORT" "/etc/network.$board_name" || grep -q "ETHPORT" "/etc/network.$board_name" ; then
+	if [ -n "$ONE_PORT" ] || [ -n "$ETHPORT" ] ; then
 		# Device has a port set by $ETHMODE
-		. /etc/network.mode
 		. /etc/network.config
 		echo "Port Modus: $ETHMODE"
 	fi

src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/ports.html

@@ -1,14 +1,14 @@
 #!/usr/bin/haserl
 
 <%
-board_name=$(uci -q get board.model.name)
+
+. /lib/functions/fff/interfaces
+
 # write
 if [ "$REQUEST_METHOD" = "POST" ] ; then
 	if [ "$POST_change_mode" != "" ] ; then
 		sed -i '/^.*# set via WebUI/d' /etc/network.config
 		echo "ETHMODE=\"${POST_mode}\" # set via WebUI" >> /etc/network.config
-		sed -i '/^FORCEPARSE/d' /etc/network.config
-		echo "FORCEPARSE='2'" >> /etc/network.config
 		do_reboot=1
 		MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
 	fi
@@ -16,8 +16,6 @@ if [ "$REQUEST_METHOD" = "POST" ] ; then
 		sed -i '/^.*# set via WebUI/d' /etc/network.config
 		echo "LAN0MODE=\"${POST_mode0}\" # set via WebUI" >> /etc/network.config
 		echo "LAN1MODE=\"${POST_mode1}\" # set via WebUI" >> /etc/network.config
-		sed -i '/^FORCEPARSE/d' /etc/network.config
-		echo "FORCEPARSE='2'" >> /etc/network.config
 		do_reboot=1
 		MSG='<span class="green">Port Modus ge&auml;ndert! Router startet neu...</span>'
 	fi
@@ -92,7 +90,7 @@ format_port() {
 				echo "</td>"
 				echo "<td class=\"swport\" style=\"width:2em\"></td>"
 				
-				if [ ! "$(awk -F= '/WANDEV=/ { print $2 }' /etc/network.$board_name)" = "$(awk -F= '/SWITCHDEV=/ { print $2 }' /etc/network.$board_name)" ] ; then
+				if [ ! "$WANDEV" = "$SWITCHDEV" ] ; then
 					wanif=$(uci -q get network.wan.ifname)
 					link=$(cat /sys/class/net/${wanif}/operstate)
 					if [ "$link" = "up" ] ; then
@@ -151,10 +149,9 @@ format_port() {
 	</fieldset>
 	</td></tr>
 <% fi %>
-<% if grep -q "ONE_PORT" "/etc/network.$board_name" || grep -q "ETHPORT" "/etc/network.$board_name" ; then %>
+<% if [ -n "$ONE_PORT" ] || [ -n "$ETHPORT" ] ; then %>
 	<%
 		# Device has a port set by $ETHMODE
-		. /etc/network.mode
 		. /etc/network.config
 	%>
 	<tr><td>
@@ -167,7 +164,7 @@ format_port() {
 					<select name="mode">
 						<option value="BATMAN" <% [ "$ETHMODE" = "BATMAN" ] && echo -n 'selected="selected" ' %>>BATMAN</option>
 						<option value="CLIENT" <% [ "$ETHMODE" = "CLIENT" ] && echo -n 'selected="selected" ' %>>CLIENT</option>
-						<% if grep -q "ONE_PORT" "/etc/network.$board_name" ; then %>
+						<% if [ -n "$ONE_PORT" ] ; then %>
 						<option value="WAN" <% [ "$ETHMODE" = "WAN" ] && echo -n 'selected="selected" ' %>>WAN</option>
 						<% fi %>
 					</select>
@@ -188,10 +185,9 @@ format_port() {
 	</fieldset>
 	</td></tr>
 <% fi %>
-<% if grep -q "LAN0PORT" "/etc/network.$board_name" || grep -q "LAN1PORT" "/etc/network.$board_name" ; then %>
+<% if [ -n "$TWO_PORT" ] ; then %>
 	<%
 		# Device has two ports
-		. /etc/network.mode
 		. /etc/network.config
 	%>
 	<tr><td>

src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard

@@ -4,8 +4,7 @@
 . /lib/functions/fff/babel
 
 #load board specific properties
-BOARD="$(uci get board.model.name)"
-. /etc/network.$BOARD
+. /lib/functions/fff/routermac
 [ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
 
 configure() {