From 32143886800346fd3dad9763dd4bb991243aadeb Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 18 Dec 2020 20:49:01 +0100 Subject: [PATCH] treewide: rename br-mesh to br-client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Fabian Bläse Acked-by: Christian Dresel Reviewed-by: Robert Langhammer --- src/packages/fff/fff-alfred/Makefile | 2 +- .../files/etc/uci-defaults/51-fff-alfred | 2 +- src/packages/fff/fff-babeld/Makefile | 2 +- .../files/etc/uci-defaults/02-network-rules | 4 +- src/packages/fff/fff-dhcp/Makefile | 2 +- .../files/etc/uci-defaults/90-fff-dhcp | 6 +-- src/packages/fff/fff-hoods/Makefile | 2 +- .../files/usr/lib/functions/fff/hoodfile | 2 +- .../fff-hoods/files/usr/sbin/configurehood | 26 +++++------ src/packages/fff/fff-layer3-config/Makefile | 2 +- .../files/etc/layer3.d/30-network-client | 32 +++++++------- src/packages/fff/fff-macnock/Makefile | 2 +- .../fff/fff-macnock/files/etc/init.d/macnock | 4 +- src/packages/fff/fff-network/Makefile | 2 +- .../fff/fff-network/files/etc/config/network | 2 +- .../uci-defaults/94-fff-nodewatcher-network | 4 +- .../files/usr/sbin/configurenetwork | 44 +++++++++---------- src/packages/fff/fff-node/Makefile | 2 +- .../usr/lib/firewall.d/05-setup-batman-chains | 10 ++--- .../files/usr/lib/firewall.d/40-local-node | 12 ++--- src/packages/fff/fff-nodewatcher/Makefile | 2 +- .../usr/lib/nodewatcher.d/10-systemdata.sh | 2 +- src/packages/fff/fff-ra/Makefile | 2 +- .../fff-ra/files/etc/uci-defaults/90-fff-ra | 10 ++--- src/packages/fff/fff-support/Makefile | 2 +- .../fff/fff-support/files/usr/sbin/show_info | 10 ++--- src/packages/fff/fff-uradvd/Makefile | 2 +- .../fff-uradvd/files/etc/init.d/fff-uradvd | 2 +- src/packages/fff/fff-web/Makefile | 2 +- .../files/www/public/cgi-bin/status.html | 2 +- .../fff-web/files/www/ssl/cgi-bin/home.html | 10 ++--- src/packages/fff/fff-wireless/Makefile | 2 +- .../files/etc/uci-defaults/24a-fff-wireless | 2 +- 33 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/packages/fff/fff-alfred/Makefile b/src/packages/fff/fff-alfred/Makefile index 06ab5fc..ebe7ad9 100644 --- a/src/packages/fff/fff-alfred/Makefile +++ b/src/packages/fff/fff-alfred/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-alfred -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred index 13db506..77db65e 100644 --- a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred +++ b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred @@ -2,7 +2,7 @@ uci batch < /dev/null; then - uci del_list network.mesh.ip6addr="$ip" + uci del_list network.client.ip6addr="$ip" fi done #set new ip6addr if ip6addr=$(uci -q get gateway.@client[0].ip6addr); then for ip in $ip6addr; do - uci add_list network.mesh.ip6addr=$ip + uci add_list network.client.ip6addr=$ip done else echo "WARNING: No client ip6addr set!" fi #put interface routes from set addresses into fff table - uci set network.mesh.ip6table='fff' + uci set network.client.ip6table='fff' # dhcp - uci -q del dhcp.mesh.start - uci -q del dhcp.mesh.limit + uci -q del dhcp.client.start + uci -q del dhcp.client.limit if dhcp_start=$(uci -q get gateway.@client[0].dhcp_start); then - uci set dhcp.mesh=dhcp - uci set dhcp.mesh.interface=mesh - uci set dhcp.mesh.start=$dhcp_start - uci set dhcp.mesh.limit=$(uci -q get gateway.@client[0].dhcp_limit) + uci set dhcp.client=dhcp + uci set dhcp.client.interface=client + uci set dhcp.client.start=$dhcp_start + uci set dhcp.client.limit=$(uci -q get gateway.@client[0].dhcp_limit) else echo "WARNING: No DHCP range start and/or limit set!" fi # set interface #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 - 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 - uci set network.mesh.ifname="$iface $ifaces" + uci set network.client.ifname="$iface $ifaces" else echo "WARNING: No Interface for client specified" fi diff --git a/src/packages/fff/fff-macnock/Makefile b/src/packages/fff/fff-macnock/Makefile index 1a2f881..e97aa96 100644 --- a/src/packages/fff/fff-macnock/Makefile +++ b/src/packages/fff/fff-macnock/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-macnock -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/FreifunkFranken/macnocker.git diff --git a/src/packages/fff/fff-macnock/files/etc/init.d/macnock b/src/packages/fff/fff-macnock/files/etc/init.d/macnock index 41fc9f1..98c55d1 100755 --- a/src/packages/fff/fff-macnock/files/etc/init.d/macnock +++ b/src/packages/fff/fff-macnock/files/etc/init.d/macnock @@ -11,7 +11,7 @@ validate_hood_section() { return 1 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 return 0 fi @@ -49,7 +49,7 @@ start_service() { local IFACE="$(uci -q get network.ethmesh.ifname)" local HOOD="$(uci -q get system.@system[0].hood)" if [ -z "$HOOD" ]; then - HOOD="$(uci -q get network.mesh.macaddr)" + HOOD="$(uci -q get network.client.macaddr)" fi procd_open_instance macnock diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 7cb1e46..854749a 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_RELEASE:=25 +PKG_RELEASE:=26 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-network/files/etc/config/network b/src/packages/fff/fff-network/files/etc/config/network index 1b9d29b..1d540bb 100644 --- a/src/packages/fff/fff-network/files/etc/config/network +++ b/src/packages/fff/fff-network/files/etc/config/network @@ -4,7 +4,7 @@ config interface 'loopback' option ipaddr '127.0.0.1' option netmask '255.0.0.0' -config interface 'mesh' +config interface 'client' option type 'bridge' option auto '1' diff --git a/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network b/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network index 353ab1b..1cdbd4b 100644 --- a/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network +++ b/src/packages/fff/fff-network/files/etc/uci-defaults/94-fff-nodewatcher-network @@ -1,8 +1,8 @@ uci batch < /dev/null || [ "$FORCEPARSE" = '1' ] ; then uci set network.${SWITCHDEV}_3.vlan=3 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" @@ -115,17 +115,17 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO uci set network.$SWITCHDEV=interface uci set network.$SWITCHDEV.ifname=$SWITCHDEV if [ "$ETHMODE" = "WAN" ]; then - uci set network.mesh.ifname="bat0" + uci set network.client.ifname="bat0" uci set network.wan.ifname="$WANDEV" uci del network.ethmesh.ifname uci del network.eth0.macaddr 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 del network.ethmesh.ifname uci del network.eth0.macaddr 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.ethmesh.ifname="$SWITCHDEV" ETH0MAC="w2ap" @@ -154,19 +154,19 @@ if [ -n "$ETHMESHMAC" ]; then fi if [ -n "$ROUTERMAC" ]; then - if uci get network.mesh.macaddr + if uci get network.client.macaddr then - echo "MAC for mesh is set already" + echo "MAC for client is set already" else - echo "Fixing MAC on br-mesh (mesh)" + echo "Fixing MAC on br-client" sleep 10 - uci set network.mesh.macaddr=$ROUTERMAC + uci set network.client.macaddr=$ROUTERMAC uci commit network - ifconfig br-mesh down - ifconfig br-mesh hw ether $ROUTERMAC - ifconfig br-mesh up + ifconfig br-client down + ifconfig br-client hw ether $ROUTERMAC + ifconfig br-client up /etc/init.d/network restart fi fi @@ -183,38 +183,38 @@ if [ -n "$ETH0MAC" ]; then /etc/init.d/network restart fi -if uci -q get "network.mesh.ip6addr" > /dev/null +if uci -q get "network.client.ip6addr" > /dev/null then - echo "IPv6 for mesh is set already" + 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-mesh | awk '/fdff/{ print $2 }'); do - ip -6 addr del $ip dev br-mesh + 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:0::/64" # Set $prefix::MAC as IP 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 set network.globals=globals uci -q set network.globals.ula_prefix=$prefix - uci -q add_list network.mesh.ip6addr=$addr - uci -q set network.mesh.proto=static + uci -q add_list network.client.ip6addr=$addr + uci -q set network.client.proto=static # Set $prefix::1 as IP addr="$(ipAssemble "$prefix" "1")" - ip -6 addr add $addr dev br-mesh - uci -q add_list network.mesh.ip6addr=$addr + ip -6 addr add $addr dev br-client + uci -q add_list network.client.ip6addr=$addr # Set $prefix::link-local as IP addr="$(ipEUIAssemble "$prefix" "$ROUTERMAC")" - ip -6 addr add $addr dev br-mesh - uci -q add_list network.mesh.ip6addr=$addr + ip -6 addr add $addr dev br-client + uci -q add_list network.client.ip6addr=$addr uci -q commit network diff --git a/src/packages/fff/fff-node/Makefile b/src/packages/fff/fff-node/Makefile index 0292725..3361493 100644 --- a/src/packages/fff/fff-node/Makefile +++ b/src/packages/fff/fff-node/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-node -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-node diff --git a/src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains b/src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains index 3d2069f..5db9296 100644 --- a/src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains +++ b/src/packages/fff/fff-node/files/usr/lib/firewall.d/05-setup-batman-chains @@ -3,14 +3,14 @@ ebtables -N IN_ONLY -P RETURN # Daten aus dem BATMAN werden erlaubt # 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 ############ ebtables -N OUT_ONLY -P RETURN # Daten ins BATMAN werden erlaubt # 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 ############ ebtables -N MULTICAST_OUT -P DROP @@ -19,16 +19,16 @@ ebtables -N MULTICAST_OUT -P DROP ebtables -P INPUT ACCEPT # 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 ############ ebtables -P FORWARD ACCEPT # 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 ############ ebtables -P OUTPUT ACCEPT # 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 diff --git a/src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node b/src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node index cce7231..33c4a6d 100644 --- a/src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node +++ b/src/packages/fff/fff-node/files/usr/lib/firewall.d/40-local-node @@ -1,11 +1,11 @@ # 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-mesh -i bat0 -p IPv6 --ip6-destination 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-client -i bat0 -p IPv6 --ip6-destination fdff::1/128 -j DROP # 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-mesh -o bat0 -p IPv6 --ip6-source 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-client -o bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP # 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-mesh -o bat0 -p IPv6 --ip6-source 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-client -o bat0 -p IPv6 --ip6-source fdff::1/128 -j DROP diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile index f0014ff..f342b3f 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_RELEASE:=59 +PKG_RELEASE:=60 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh index e49da8a..c5e07e1 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh +++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh @@ -14,7 +14,7 @@ debug "Collecting basic system status data" SYSTEM_DATA="online" 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" = "FFF" ] && hostname="$mac" SYSTEM_DATA="$SYSTEM_DATA$hostname" diff --git a/src/packages/fff/fff-ra/Makefile b/src/packages/fff/fff-ra/Makefile index 752647a..97a27ff 100644 --- a/src/packages/fff/fff-ra/Makefile +++ b/src/packages/fff/fff-ra/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-ra -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-ra diff --git a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra index 7cf1a3b..ffbfc93 100644 --- a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra +++ b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra @@ -1,9 +1,9 @@ uci batch < SYSTEM" echo "Name: ${HOSTNAME}" 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 "Nachbarknoten: $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)" echo "VPN via fastd: ${vpn_active}" @@ -124,10 +124,10 @@ echo "Fastd Version: $(fastd --version 2> /dev/null | cut -d' ' -f 2)" echo "" echo "-> Netz: FREIFUNK" 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 "Gesendet: $(cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes)" -echo "IPv4 Adressen: $(addr 4 br-mesh)" -echo "IPv6 Adressen: $(addr 6 br-mesh)" +echo "Empfangen: $(cat /sys/class/net/br-client/statistics/rx_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-client)" +echo "IPv6 Adressen: $(addr 6 br-client)" echo "" if [ -d /etc/fastd/fff/peers ]; then diff --git a/src/packages/fff/fff-uradvd/Makefile b/src/packages/fff/fff-uradvd/Makefile index 173c160..652dce9 100644 --- a/src/packages/fff/fff-uradvd/Makefile +++ b/src/packages/fff/fff-uradvd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-uradvd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-uradvd/files/etc/init.d/fff-uradvd b/src/packages/fff/fff-uradvd/files/etc/init.d/fff-uradvd index c9d8b9d..a72b89b 100755 --- a/src/packages/fff/fff-uradvd/files/etc/init.d/fff-uradvd +++ b/src/packages/fff/fff-uradvd/files/etc/init.d/fff-uradvd @@ -16,5 +16,5 @@ service_triggers() start_service() { 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) } diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index 3f892be..f694603 100644 --- a/src/packages/fff/fff-web/Makefile +++ b/src/packages/fff/fff-web/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web -PKG_RELEASE:=13 +PKG_RELEASE:=14 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html index 88ae192..aed86b5 100755 --- a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html +++ b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html @@ -5,7 +5,7 @@ echo -en "Content-Type: text/html\r\n\r\n" HOSTNAME="$(uci -q get "fff.system.hostname")" 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")" lon="$(uci -q get "fff.system.longitude")" contact="$(uci -q get "fff.system.contact")" diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html index ad42433..3d4ce37 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html @@ -58,7 +58,7 @@ fi - + @@ -72,10 +72,10 @@ fi Netz: Freifunk
Name:<%= ${HOSTNAME} %>
Modell:<% cat /tmp/sysinfo/model 2>/dev/null %>
MAC-Adresse:<%= $(cat /sys/class/net/br-mesh/address) %>
MAC-Adresse:<%= $(cat /sys/class/net/br-client/address) %>
Bekannte Knoten:<%= $(($(batctl tg -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null)+1)) %>
Nachbarknoten:<%= $(batctl o -H | cut -b 40-56 | sort | uniq | wc -l 2>/dev/null) %>
VPN via fastd:<%= ${vpn_active} %>
- - - - + + + +
Nutzer:<% batctl tl -H 2> /dev/null | grep -c 'W' %>
Empfangen:<% cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes %>
Gesendet:<% cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes %>
IPv4 Adressen:<% addr 4 br-mesh %>
IPv6 Adressen:<% addr 6 br-mesh %>
Empfangen:<% cat /sys/class/net/br-client/statistics/rx_bytes 2> /dev/null | human_bytes %>
Gesendet:<% cat /sys/class/net/br-client/statistics/tx_bytes 2> /dev/null | human_bytes %>
IPv4 Adressen:<% addr 4 br-client %>
IPv6 Adressen:<% addr 6 br-client %>
diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile index c24f5a2..d9a00f9 100644 --- a/src/packages/fff/fff-wireless/Makefile +++ b/src/packages/fff/fff-wireless/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-wireless -PKG_RELEASE:=19 +PKG_RELEASE:=20 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless index 218ec48..18d8de0 100644 --- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless @@ -30,7 +30,7 @@ configWifiDevice() { set wireless.w${freq}ap='wifi-iface' 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.mode='ap' set wireless.w${freq}ap.ssid='noservice.freifunk'