McUles
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

treewide: rename br-mesh to br-client 

The name br-mesh is actually quite misleading, since the bridge
actually includes the "client" interfaces. In order to make this
obvious, and to prevent confusion with the properly named wXmesh
interfaces, rename them to br-client.

Note that br-mesh is also particularly disturbing for the layer 3
firmware without batman-adv.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Fabian Bläse <fabian@blaese.de>
Acked-by: Christian Dresel <freifunk@dresel.systems>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
This commit is contained in:
Adrian Schmutzler 2020-12-18 20:49:01 +01:00
parent 7e552761f6
commit 3214388680
33 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/packages/fff/fff-alfred/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-alfred PKG_NAME:=fff-alfred
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
View File

@ -2,7 +2,7 @@
uci batch <<EOF uci batch <<EOF
set alfred.alfred=alfred set alfred.alfred=alfred
set alfred.alfred.interface='br-mesh' set alfred.alfred.interface='br-client'
set alfred.alfred.mode='slave' set alfred.alfred.mode='slave'
set alfred.alfred.batmanif='none' set alfred.alfred.batmanif='none'
set alfred.alfred.start_vis='0' set alfred.alfred.start_vis='0'

2
src/packages/fff/fff-babeld/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-babeld PKG_NAME:=fff-babeld
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld

4
src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules
View File

@ -19,7 +19,7 @@ uci batch <<EOF
set network.@rule[3].priority='20' set network.@rule[3].priority='20'
add network rule add network rule
set network.@rule[4]=rule set network.@rule[4]=rule
set network.@rule[4].in='mesh' set network.@rule[4].in='client'
set network.@rule[4].lookup='10' set network.@rule[4].lookup='10'
set network.@rule[4].priority='31' set network.@rule[4].priority='31'
add network rule6 add network rule6
@ -34,7 +34,7 @@ uci batch <<EOF
set network.@rule6[1].priority='20' set network.@rule6[1].priority='20'
add network rule6 add network rule6
set network.@rule6[2]=rule6 set network.@rule6[2]=rule6
set network.@rule6[2].in='mesh' set network.@rule6[2].in='client'
set network.@rule6[2].lookup='10' set network.@rule6[2].lookup='10'
set network.@rule6[2].priority='31' set network.@rule6[2].priority='31'
add network rule6 add network rule6

2
src/packages/fff/fff-dhcp/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-dhcp PKG_NAME:=fff-dhcp
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp

6
src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
View File

@ -24,9 +24,9 @@ uci batch <<EOF
add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.11' add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.11'
add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.0' add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.0'
set dhcp.mesh=dhcp set dhcp.client=dhcp
set dhcp.mesh.interface='mesh' set dhcp.client.interface='client'
set dhcp.mesh.leasetime='1h' set dhcp.client.leasetime='1h'
EOF EOF
uci commit dhcp uci commit dhcp

2
src/packages/fff/fff-hoods/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-hoods PKG_NAME:=fff-hoods
PKG_RELEASE:=15 PKG_RELEASE:=16
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile
View File

@ -77,7 +77,7 @@ getGatewayHoodfile() {
echo "Trying to get hoodfile from gateway..." echo "Trying to get hoodfile from gateway..."
if /bin/busybox wget -T15 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then if /bin/busybox wget -T15 -O "$file" "http://[fe80::1%br-client]:2342/keyxchangev2data"; then
return 0 return 0
else else
return 1 return 1

26
src/packages/fff/fff-hoods/files/usr/sbin/configurehood
View File

@ -184,36 +184,36 @@ if [ -s "$hoodfiletmp" ]; then
/usr/sbin/vpn-stop /usr/sbin/vpn-stop
fi fi
# now we load the prefix from the hoodfile and set this to br-mesh # now we load the prefix from the hoodfile and set this to br-client
json_select network json_select network
json_get_var prefix ula_prefix json_get_var prefix ula_prefix
# Set $prefix::MAC as IP # Set $prefix::MAC as IP
if [ -n "$prefix" ] ; then if [ -n "$prefix" ] ; then
prefix="$(echo "$prefix" | sed -e 's,\\,,')" prefix="$(echo "$prefix" | sed -e 's,\\,,')"
mac="$(cat "/sys/class/net/br-mesh/address")" mac="$(cat "/sys/class/net/br-client/address")"
addr="$(ipMacAssemble "$prefix" "$mac")" addr="$(ipMacAssemble "$prefix" "$mac")"
addr="$(ipTidyColon "$addr")" addr="$(ipTidyColon "$addr")"
addr_eui="$(ipEUIAssemble "$prefix" "$mac")" addr_eui="$(ipEUIAssemble "$prefix" "$mac")"
addr_eui="$(ipTidyColon "$addr_eui")" addr_eui="$(ipTidyColon "$addr_eui")"
for ip in $(ip -6 addr show dev br-mesh | grep inet6 | grep -v -e " $addr" -e " $addr_eui" -e " fe80::" -e " fdff::" | cut -f6 -d " "); do for ip in $(ip -6 addr show dev br-client | grep inet6 | grep -v -e " $addr" -e " $addr_eui" -e " fe80::" -e " fdff::" | cut -f6 -d " "); do
ip -6 addr del "$ip" dev br-mesh ip -6 addr del "$ip" dev br-client
done done
if ! ( ip -6 addr show dev br-mesh | grep -q "$addr" ) ; then if ! ( ip -6 addr show dev br-client | grep -q "$addr" ) ; then
ip -6 addr add "$addr" dev br-mesh ip -6 addr add "$addr" dev br-client
echo "Set ULA address to br-mesh: $addr" echo "Set ULA address to br-client: $addr"
else else
echo "Address already set." echo "Address already set."
fi fi
# Set $prefix::link-local as IP # Set $prefix::link-local as IP
if ! ( ip -6 addr show dev br-mesh | grep -q "$addr_eui" ) ; then if ! ( ip -6 addr show dev br-client | grep -q "$addr_eui" ) ; then
ip -6 addr add "$addr_eui" dev br-mesh ip -6 addr add "$addr_eui" dev br-client
echo "Set ULA EUI-64 address to br-mesh: $addr_eui" echo "Set ULA EUI-64 address to br-client: $addr_eui"
else else
echo "Address already set." echo "Address already set."
fi fi
if ! ( ip -6 route show dev br-mesh | grep -q "fc00::" ) ; then if ! ( ip -6 route show dev br-client | grep -q "fc00::" ) ; then
ip -6 route add fc00::/7 via fe80::1 dev br-mesh ip -6 route add fc00::/7 via fe80::1 dev br-client
echo "Set ULA route to br-mesh." echo "Set ULA route to br-client."
else else
echo "Route already set." echo "Route already set."
fi fi

2
src/packages/fff/fff-layer3-config/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-layer3-config PKG_NAME:=fff-layer3-config
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-layer3-config PKG_BUILD_DIR:=$(BUILD_DIR)/fff-layer3-config

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

@ -6,55 +6,55 @@ BOARD="$(uci get board.model.name)"
configure() { configure() {
# ipaddr # ipaddr
#remove old ipaddr #remove old ipaddr
uci -q del network.mesh.ipaddr uci -q del network.client.ipaddr
#set new ipaddr #set new ipaddr
if ipaddr=$(uci -q get gateway.@client[0].ipaddr); then if ipaddr=$(uci -q get gateway.@client[0].ipaddr); then
for ip in $ipaddr; do for ip in $ipaddr; do
uci add_list network.mesh.ipaddr=$ip uci add_list network.client.ipaddr=$ip
done done
else else
echo "WARNING: No client ipaddr set!" echo "WARNING: No client ipaddr set!"
fi fi
#put interface routes from set addresses into fff table #put interface routes from set addresses into fff table
uci set network.mesh.ip4table='fff' uci set network.client.ip4table='fff'
# ip6addr # ip6addr
#remove old ip6addr #remove old ip6addr
for ip in $(uci get network.mesh.ip6addr); do for ip in $(uci get network.client.ip6addr); do
if echo "$ip" | grep -v -e "fdff:" -e "fe80::1/64" > /dev/null; then if echo "$ip" | grep -v -e "fdff:" -e "fe80::1/64" > /dev/null; then
uci del_list network.mesh.ip6addr="$ip" uci del_list network.client.ip6addr="$ip"
fi fi
done done
#set new ip6addr #set new ip6addr
if ip6addr=$(uci -q get gateway.@client[0].ip6addr); then if ip6addr=$(uci -q get gateway.@client[0].ip6addr); then
for ip in $ip6addr; do for ip in $ip6addr; do
uci add_list network.mesh.ip6addr=$ip uci add_list network.client.ip6addr=$ip
done done
else else
echo "WARNING: No client ip6addr set!" echo "WARNING: No client ip6addr set!"
fi fi
#put interface routes from set addresses into fff table #put interface routes from set addresses into fff table
uci set network.mesh.ip6table='fff' uci set network.client.ip6table='fff'
# dhcp # dhcp
uci -q del dhcp.mesh.start uci -q del dhcp.client.start
uci -q del dhcp.mesh.limit uci -q del dhcp.client.limit
if dhcp_start=$(uci -q get gateway.@client[0].dhcp_start); then if dhcp_start=$(uci -q get gateway.@client[0].dhcp_start); then
uci set dhcp.mesh=dhcp uci set dhcp.client=dhcp
uci set dhcp.mesh.interface=mesh uci set dhcp.client.interface=client
uci set dhcp.mesh.start=$dhcp_start uci set dhcp.client.start=$dhcp_start
uci set dhcp.mesh.limit=$(uci -q get gateway.@client[0].dhcp_limit) uci set dhcp.client.limit=$(uci -q get gateway.@client[0].dhcp_limit)
else else
echo "WARNING: No DHCP range start and/or limit set!" echo "WARNING: No DHCP range start and/or limit set!"
fi fi
# set interface # set interface
#remove all eth interfaces #remove all eth interfaces
ifaces=$(uci get network.mesh.ifname | sed 's/\beth[^ ]* *//g') ifaces=$(uci get network.client.ifname | sed 's/\beth[^ ]* *//g')
if vlan=$(uci -q get gateway.@client[0].vlan); then if vlan=$(uci -q get gateway.@client[0].vlan); then
uci set network.mesh.ifname="${SWITCHDEV}.$vlan $ifaces" uci set network.client.ifname="${SWITCHDEV}.$vlan $ifaces"
elif iface=$(uci -q get gateway.@client[0].iface); then elif iface=$(uci -q get gateway.@client[0].iface); then
uci set network.mesh.ifname="$iface $ifaces" uci set network.client.ifname="$iface $ifaces"
else else
echo "WARNING: No Interface for client specified" echo "WARNING: No Interface for client specified"
fi fi

2
src/packages/fff/fff-macnock/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-macnock PKG_NAME:=fff-macnock
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git

4
src/packages/fff/fff-macnock/files/etc/init.d/macnock
View File

@ -11,7 +11,7 @@ validate_hood_section() {
return 1 return 1
fi fi
if [ -n "$(uci -q get system.@system[0].hood)" -o -n "$(uci -q get network.mesh.macaddr)" ]; then if [ -n "$(uci -q get system.@system[0].hood)" -o -n "$(uci -q get network.client.macaddr)" ]; then
# true # true
return 0 return 0
fi fi
@ -49,7 +49,7 @@ start_service() {
local IFACE="$(uci -q get network.ethmesh.ifname)" local IFACE="$(uci -q get network.ethmesh.ifname)"
local HOOD="$(uci -q get system.@system[0].hood)" local HOOD="$(uci -q get system.@system[0].hood)"
if [ -z "$HOOD" ]; then if [ -z "$HOOD" ]; then
HOOD="$(uci -q get network.mesh.macaddr)" HOOD="$(uci -q get network.client.macaddr)"
fi fi
procd_open_instance macnock procd_open_instance macnock

2
src/packages/fff/fff-network/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-network PKG_NAME:=fff-network
PKG_RELEASE:=25 PKG_RELEASE:=26
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-network/files/etc/config/network
View File

@ -4,7 +4,7 @@ config interface 'loopback'
option ipaddr '127.0.0.1' option ipaddr '127.0.0.1'
option netmask '255.0.0.0' option netmask '255.0.0.0'
config interface 'mesh' config interface 'client'
option type 'bridge' option type 'bridge'
option auto '1' option auto '1'

4
src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network
View File

@ -1,8 +1,8 @@
uci batch <<EOF uci batch <<EOF
add nodewatcher network add nodewatcher network
set nodewatcher.@network[-1].mesh_interface='br-mesh' set nodewatcher.@network[-1].mesh_interface='br-client'
set nodewatcher.@network[-1].iface_blacklist='lo ifb0' set nodewatcher.@network[-1].iface_blacklist='lo ifb0'
set nodewatcher.@network[-1].ip_whitelist='br-mesh' set nodewatcher.@network[-1].ip_whitelist='br-client'
EOF EOF
uci commit nodewatcher uci commit nodewatcher

44
src/packages/fff/fff-network/files/usr/sbin/configurenetwork
View File

@ -98,7 +98,7 @@ if ! uci -q get network.$SWITCHDEV > /dev/null || [ "$FORCEPARSE" = '1' ] ; then
uci set network.${SWITCHDEV}_3.vlan=3 uci set network.${SWITCHDEV}_3.vlan=3
uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS" uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
uci set network.mesh.ifname="$SWITCHDEV.1 bat0" uci set network.client.ifname="$SWITCHDEV.1 bat0"
uci set network.ethmesh.ifname="$SWITCHDEV.3" uci set network.ethmesh.ifname="$SWITCHDEV.3"
@ -115,17 +115,17 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO
uci set network.$SWITCHDEV=interface uci set network.$SWITCHDEV=interface
uci set network.$SWITCHDEV.ifname=$SWITCHDEV uci set network.$SWITCHDEV.ifname=$SWITCHDEV
if [ "$ETHMODE" = "WAN" ]; then if [ "$ETHMODE" = "WAN" ]; then
uci set network.mesh.ifname="bat0" uci set network.client.ifname="bat0"
uci set network.wan.ifname="$WANDEV" uci set network.wan.ifname="$WANDEV"
uci del network.ethmesh.ifname uci del network.ethmesh.ifname
uci del network.eth0.macaddr uci del network.eth0.macaddr
elif [ "$ETHMODE" = "CLIENT" ] ; then elif [ "$ETHMODE" = "CLIENT" ] ; then
uci set network.mesh.ifname="bat0 $SWITCHDEV" uci set network.client.ifname="bat0 $SWITCHDEV"
uci set network.wan.ifname="eth2" #eth2 because it is default in config file uci set network.wan.ifname="eth2" #eth2 because it is default in config file
uci del network.ethmesh.ifname uci del network.ethmesh.ifname
uci del network.eth0.macaddr uci del network.eth0.macaddr
elif [ "$ETHMODE" = "BATMAN" ] ; then elif [ "$ETHMODE" = "BATMAN" ] ; then
uci set network.mesh.ifname="bat0" uci set network.client.ifname="bat0"
uci set network.wan.ifname="eth2" #eth2 because it is default in config file uci set network.wan.ifname="eth2" #eth2 because it is default in config file
uci set network.ethmesh.ifname="$SWITCHDEV" uci set network.ethmesh.ifname="$SWITCHDEV"
ETH0MAC="w2ap" ETH0MAC="w2ap"
@ -154,19 +154,19 @@ if [ -n "$ETHMESHMAC" ]; then
fi fi
if [ -n "$ROUTERMAC" ]; then if [ -n "$ROUTERMAC" ]; then
if uci get network.mesh.macaddr if uci get network.client.macaddr
then then
echo "MAC for mesh is set already" echo "MAC for client is set already"
else else
echo "Fixing MAC on br-mesh (mesh)" echo "Fixing MAC on br-client"
sleep 10 sleep 10
uci set network.mesh.macaddr=$ROUTERMAC uci set network.client.macaddr=$ROUTERMAC
uci commit network uci commit network
ifconfig br-mesh down ifconfig br-client down
ifconfig br-mesh hw ether $ROUTERMAC ifconfig br-client hw ether $ROUTERMAC
ifconfig br-mesh up ifconfig br-client up
/etc/init.d/network restart /etc/init.d/network restart
fi fi
fi fi
@ -183,38 +183,38 @@ if [ -n "$ETH0MAC" ]; then
/etc/init.d/network restart /etc/init.d/network restart
fi fi
if uci -q get "network.mesh.ip6addr" > /dev/null if uci -q get "network.client.ip6addr" > /dev/null
then then
echo "IPv6 for mesh is set already" echo "IPv6 for client is set already"
else else
echo "Setting IPv6 addresses" echo "Setting IPv6 addresses"
# Some time needed :( # Some time needed :(
sleep 5 sleep 5
for ip in $(ip -6 addr show br-mesh | awk '/fdff/{ print $2 }'); do for ip in $(ip -6 addr show br-client | awk '/fdff/{ print $2 }'); do
ip -6 addr del $ip dev br-mesh ip -6 addr del $ip dev br-client
done done
prefix="fdff:0::/64" prefix="fdff:0::/64"
# Set $prefix::MAC as IP # Set $prefix::MAC as IP
addr="$(ipMacAssemble "$prefix" "$ROUTERMAC")" addr="$(ipMacAssemble "$prefix" "$ROUTERMAC")"
ip -6 addr add $addr dev br-mesh ip -6 addr add $addr dev br-client
uci -q del network.globals uci -q del network.globals
uci -q set network.globals=globals uci -q set network.globals=globals
uci -q set network.globals.ula_prefix=$prefix uci -q set network.globals.ula_prefix=$prefix
uci -q add_list network.mesh.ip6addr=$addr uci -q add_list network.client.ip6addr=$addr
uci -q set network.mesh.proto=static uci -q set network.client.proto=static
# Set $prefix::1 as IP # Set $prefix::1 as IP
addr="$(ipAssemble "$prefix" "1")" addr="$(ipAssemble "$prefix" "1")"
ip -6 addr add $addr dev br-mesh ip -6 addr add $addr dev br-client
uci -q add_list network.mesh.ip6addr=$addr uci -q add_list network.client.ip6addr=$addr
# Set $prefix::link-local as IP # Set $prefix::link-local as IP
addr="$(ipEUIAssemble "$prefix" "$ROUTERMAC")" addr="$(ipEUIAssemble "$prefix" "$ROUTERMAC")"
ip -6 addr add $addr dev br-mesh ip -6 addr add $addr dev br-client
uci -q add_list network.mesh.ip6addr=$addr uci -q add_list network.client.ip6addr=$addr
uci -q commit network uci -q commit network

2
src/packages/fff/fff-node/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-node PKG_NAME:=fff-node
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-node PKG_BUILD_DIR:=$(BUILD_DIR)/fff-node

10
src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains
View File

@ -3,14 +3,14 @@ ebtables -N IN_ONLY -P RETURN
# Daten aus dem BATMAN werden erlaubt # Daten aus dem BATMAN werden erlaubt
# Alles ausser Daten von BATMAN werden DROP'ed # Alles ausser Daten von BATMAN werden DROP'ed
ebtables -A IN_ONLY -i ! bat0 --logical-in br-mesh -j DROP ebtables -A IN_ONLY -i ! bat0 --logical-in br-client -j DROP
######## OUT_ONLY ############ ######## OUT_ONLY ############
ebtables -N OUT_ONLY -P RETURN ebtables -N OUT_ONLY -P RETURN
# Daten ins BATMAN werden erlaubt # Daten ins BATMAN werden erlaubt
# Alles ausser Daten ins BATMAN werden DROP'ed # Alles ausser Daten ins BATMAN werden DROP'ed
ebtables -A OUT_ONLY --logical-out br-mesh -o ! bat0 -j DROP ebtables -A OUT_ONLY --logical-out br-client -o ! bat0 -j DROP
######## MULTICAST_OUT ############ ######## MULTICAST_OUT ############
ebtables -N MULTICAST_OUT -P DROP ebtables -N MULTICAST_OUT -P DROP
@ -19,16 +19,16 @@ ebtables -N MULTICAST_OUT -P DROP
ebtables -P INPUT ACCEPT ebtables -P INPUT ACCEPT
# Regelt alles was an Multicast/Broadcast von CLIENT -> KNOTEN geht bei MULTICAST_OUT # Regelt alles was an Multicast/Broadcast von CLIENT -> KNOTEN geht bei MULTICAST_OUT
ebtables -A INPUT -d Multicast --logical-in br-mesh -i ! bat0 -j ACCEPT ebtables -A INPUT -d Multicast --logical-in br-client -i ! bat0 -j ACCEPT
######## FORWARD ############ ######## FORWARD ############
ebtables -P FORWARD ACCEPT ebtables -P FORWARD ACCEPT
# Regelt alles was an Multicast/Broadcast von CLIENT -> BATMAN geht bei MULTICAST_OUT # Regelt alles was an Multicast/Broadcast von CLIENT -> BATMAN geht bei MULTICAST_OUT
ebtables -A FORWARD -d Multicast --logical-out br-mesh -o bat0 -j MULTICAST_OUT ebtables -A FORWARD -d Multicast --logical-out br-client -o bat0 -j MULTICAST_OUT
######## OUTPUT ############ ######## OUTPUT ############
ebtables -P OUTPUT ACCEPT ebtables -P OUTPUT ACCEPT
# Regelt alles was an Multicast/Broadcast von KNOTEN -> BATMAN geht bei MULTICAST_OUT # Regelt alles was an Multicast/Broadcast von KNOTEN -> BATMAN geht bei MULTICAST_OUT
ebtables -A OUTPUT -d Multicast --logical-out br-mesh -o bat0 -j MULTICAST_OUT ebtables -A OUTPUT -d Multicast --logical-out br-client -o bat0 -j MULTICAST_OUT

12
src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node
View File

@ -1,11 +1,11 @@
# No input from/to local node ip from batman # No input from/to local node ip from batman
ebtables -A INPUT --logical-in br-mesh -i bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP ebtables -A INPUT --logical-in br-client -i bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP
ebtables -A INPUT --logical-in br-mesh -i bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP ebtables -A INPUT --logical-in br-client -i bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP
# Do not forward local node ip # Do not forward local node ip
ebtables -A FORWARD --logical-out br-mesh -o bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP ebtables -A FORWARD --logical-out br-client -o bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP
ebtables -A FORWARD --logical-out br-mesh -o bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP ebtables -A FORWARD --logical-out br-client -o bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP
# Do not output local node ip to batman # Do not output local node ip to batman
ebtables -A OUTPUT --logical-out br-mesh -o bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP ebtables -A OUTPUT --logical-out br-client -o bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP
ebtables -A OUTPUT --logical-out br-mesh -o bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP ebtables -A OUTPUT --logical-out br-client -o bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP

2
src/packages/fff/fff-nodewatcher/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-nodewatcher PKG_NAME:=fff-nodewatcher
PKG_RELEASE:=59 PKG_RELEASE:=60
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
View File

@ -14,7 +14,7 @@ debug "Collecting basic system status data"
SYSTEM_DATA="<status>online</status>" SYSTEM_DATA="<status>online</status>"
hostname="$(cat /proc/sys/kernel/hostname)" hostname="$(cat /proc/sys/kernel/hostname)"
mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' /sys/class/net/br-mesh/address 2>/dev/null) mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' /sys/class/net/br-client/address 2>/dev/null)
[ "$hostname" = "OpenWrt" ] && hostname="$mac" [ "$hostname" = "OpenWrt" ] && hostname="$mac"
[ "$hostname" = "FFF" ] && hostname="$mac" [ "$hostname" = "FFF" ] && hostname="$mac"
SYSTEM_DATA="$SYSTEM_DATA<hostname>$hostname</hostname>" SYSTEM_DATA="$SYSTEM_DATA<hostname>$hostname</hostname>"

2
src/packages/fff/fff-ra/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-ra PKG_NAME:=fff-ra
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-ra PKG_BUILD_DIR:=$(BUILD_DIR)/fff-ra

10
src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
View File

@ -1,9 +1,9 @@
uci batch <<EOF uci batch <<EOF
set dhcp.mesh=dhcp set dhcp.client=dhcp
set dhcp.mesh.interface='mesh' set dhcp.client.interface='client'
set dhcp.mesh.ra='server' set dhcp.client.ra='server'
set dhcp.mesh.ra_default='2' set dhcp.client.ra_default='2'
set dhcp.mesh.ra_management='0' set dhcp.client.ra_management='0'
EOF EOF
exit 0 exit 0

2
src/packages/fff/fff-support/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-support PKG_NAME:=fff-support
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

10
src/packages/fff/fff-support/files/usr/sbin/show_info
View File

@ -93,7 +93,7 @@ echo ""
echo "-> SYSTEM" echo "-> SYSTEM"
echo "Name: ${HOSTNAME}" echo "Name: ${HOSTNAME}"
echo "Modell: $(cat /tmp/sysinfo/model 2>/dev/null)" echo "Modell: $(cat /tmp/sysinfo/model 2>/dev/null)"
echo "MAC-Adresse: $(cat /sys/class/net/br-mesh/address)" echo "MAC-Adresse: $(cat /sys/class/net/br-client/address)"
echo "Bekannte Knoten: $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1))" echo "Bekannte Knoten: $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1))"
echo "Nachbarknoten: $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)" echo "Nachbarknoten: $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)"
echo "VPN via fastd: ${vpn_active}" echo "VPN via fastd: ${vpn_active}"
@ -124,10 +124,10 @@ echo "Fastd Version: $(fastd --version 2> /dev/null | cut -d' ' -f 2)"
echo "" echo ""
echo "-> Netz: FREIFUNK" echo "-> Netz: FREIFUNK"
echo "Nutzer: $(batctl tl -H 2> /dev/null | grep -c 'W')" echo "Nutzer: $(batctl tl -H 2> /dev/null | grep -c 'W')"
echo "Empfangen: $(cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes)" echo "Empfangen: $(cat /sys/class/net/br-client/statistics/rx_bytes 2> /dev/null | human_bytes)"
echo "Gesendet: $(cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes)" echo "Gesendet: $(cat /sys/class/net/br-client/statistics/tx_bytes 2> /dev/null | human_bytes)"
echo "IPv4 Adressen: $(addr 4 br-mesh)" echo "IPv4 Adressen: $(addr 4 br-client)"
echo "IPv6 Adressen: $(addr 6 br-mesh)" echo "IPv6 Adressen: $(addr 6 br-client)"
echo "" echo ""
if [ -d /etc/fastd/fff/peers ]; then if [ -d /etc/fastd/fff/peers ]; then

2
src/packages/fff/fff-uradvd/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-uradvd PKG_NAME:=fff-uradvd
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-uradvd/files/etc/init.d/fff-uradvd
View File

@ -16,5 +16,5 @@ service_triggers()
start_service() { start_service() {
procd_open_instance procd_open_instance
procd_set_param command "$URADVD_BIN" -i br-mesh -p $(uci get network.globals.ula_prefix) procd_set_param command "$URADVD_BIN" -i br-client -p $(uci get network.globals.ula_prefix)
} }

2
src/packages/fff/fff-web/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-web PKG_NAME:=fff-web
PKG_RELEASE:=13 PKG_RELEASE:=14
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
View File

@ -5,7 +5,7 @@ echo -en "Content-Type: text/html\r\n\r\n"
HOSTNAME="$(uci -q get "fff.system.hostname")" HOSTNAME="$(uci -q get "fff.system.hostname")"
hood="$(uci -q get "system.@system[0].hood")" hood="$(uci -q get "system.@system[0].hood")"
MAC="$(uci -q get network.mesh.macaddr)" MAC="$(uci -q get network.client.macaddr)"
lat="$(uci -q get "fff.system.latitude")" lat="$(uci -q get "fff.system.latitude")"
lon="$(uci -q get "fff.system.longitude")" lon="$(uci -q get "fff.system.longitude")"
contact="$(uci -q get "fff.system.contact")" contact="$(uci -q get "fff.system.contact")"

10
src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
View File

@ -58,7 +58,7 @@ fi
<table> <table>
<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr> <tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
<tr><th>Modell:</th><td><% cat /tmp/sysinfo/model 2>/dev/null %></td></tr> <tr><th>Modell:</th><td><% cat /tmp/sysinfo/model 2>/dev/null %></td></tr>
<tr><th>MAC-Adresse:</th><td><%= $(cat /sys/class/net/br-mesh/address) %></td></tr> <tr><th>MAC-Adresse:</th><td><%= $(cat /sys/class/net/br-client/address) %></td></tr>
<tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr> <tr><th>Bekannte Knoten:</th><td><%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %></td></tr>
<tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr> <tr><th>Nachbarknoten:</th><td><%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %></td></tr>
<tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr> <tr><th>VPN via fastd:</th><td><%= ${vpn_active} %></td></tr>
@ -72,10 +72,10 @@ fi
<legend>Netz: Freifunk</legend> <legend>Netz: Freifunk</legend>
<table> <table>
<tr><th>Nutzer:</th><td><% batctl tl -H 2> /dev/null | grep -c 'W' %></td></tr> <tr><th>Nutzer:</th><td><% batctl tl -H 2> /dev/null | grep -c 'W' %></td></tr>
<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr> <tr><th>Empfangen:</th><td><% cat /sys/class/net/br-client/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr> <tr><th>Gesendet:</th><td><% cat /sys/class/net/br-client/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh %></td></tr> <tr><th>IPv4 Adressen:</th><td><% addr 4 br-client %></td></tr>
<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh %></td></tr> <tr><th>IPv6 Adressen:</th><td><% addr 6 br-client %></td></tr>
</table> </table>
</fieldset> </fieldset>
</td><td> </td><td>

2
src/packages/fff/fff-wireless/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fff-wireless PKG_NAME:=fff-wireless
PKG_RELEASE:=19 PKG_RELEASE:=20
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
View File

@ -30,7 +30,7 @@ configWifiDevice() {
set wireless.w${freq}ap='wifi-iface' set wireless.w${freq}ap='wifi-iface'
set wireless.w${freq}ap.device='${radio}' set wireless.w${freq}ap.device='${radio}'
set wireless.w${freq}ap.network='mesh' set wireless.w${freq}ap.network='client'
set wireless.w${freq}ap.ifname='w${freq}ap' set wireless.w${freq}ap.ifname='w${freq}ap'
set wireless.w${freq}ap.mode='ap' set wireless.w${freq}ap.mode='ap'
set wireless.w${freq}ap.ssid='noservice.freifunk' set wireless.w${freq}ap.ssid='noservice.freifunk'