forked from freifunk-franken/firmware
Fabian Bläse
104a260843
When the user removes a peer from /etc/config/gateway, the script has to be able to find any leftover configurations that have been created for it. This can be made very easy by prepending a prefix to every automatically generated configuration. This also allows to remove the nasty check for the babeld default interface. Therefore the naming check for cfg* also can be removed. As a side effect all manually created configuration blocks that do not match a prefix will not be touched by configuregateway. Signed-off-by: Fabian Bläse <fabian@blaese.de> Reviewed-by: Robert Langhammer <rlanghammer@web.de>
94 lines
2.0 KiB
Plaintext
94 lines
2.0 KiB
Plaintext
. /lib/functions.sh
|
|
. /lib/functions/fff/babel
|
|
|
|
#load board specific properties
|
|
BOARD="$(uci get board.model.name)"
|
|
. /etc/network.$BOARD
|
|
|
|
configure() {
|
|
## babelpeer
|
|
# remove peers missing in gateway config
|
|
remove_babelpeer() {
|
|
local name="$1"
|
|
|
|
# check prefix
|
|
if [ "$name" = "${name#babelpeer_}" ]; then
|
|
return
|
|
fi
|
|
|
|
if ! uci -q get gateway.$name > /dev/null; then
|
|
# remove interface
|
|
uci -q del network.$name
|
|
# remove iif-rules
|
|
babel_delete_iifrules "$name"
|
|
# remove babel interface
|
|
babel_delete_interface "$name"
|
|
fi
|
|
}
|
|
|
|
config_load babeld
|
|
config_foreach remove_babelpeer interface
|
|
|
|
#add new peers
|
|
add_babelpeer() {
|
|
local name="$1"
|
|
local prefixname="babelpeer_$name"
|
|
local vlan
|
|
local type
|
|
|
|
# get iface
|
|
if vlan=$(uci -q get gateway.$name.vlan); then
|
|
iface="${SWITCHDEV}.$vlan"
|
|
elif iface=$(uci -q get gateway.$name.iface); then
|
|
iface="$iface"
|
|
else
|
|
echo "ERROR: No iface set for babelpeer $name!"
|
|
exit 1
|
|
fi
|
|
|
|
# get type
|
|
if type=$(uci -q get gateway.$name.type); then
|
|
type="$type"
|
|
else
|
|
type=wired
|
|
fi
|
|
|
|
# get rxcost
|
|
if rxcost=$(uci -q get gateway.$name.rxcost); then
|
|
rxcost="$rxcost"
|
|
else
|
|
rxcost=96
|
|
fi
|
|
|
|
# add interface
|
|
uci set network.$prefixname=interface
|
|
uci set network.$prefixname.proto=static
|
|
uci set network.$prefixname.ifname=$iface
|
|
|
|
# add iif-rules
|
|
babel_add_iifrules "$prefixname" || { echo "Could not add iif-rules for babelpeer $name"; exit 1; }
|
|
|
|
# peer_ip
|
|
uci -q delete "network.$prefixname.ipaddr"
|
|
uci -q delete "network.$prefixname.ip6addr"
|
|
babel_add_peeraddr "network.$prefixname.ipaddr"
|
|
babel_add_peer6addr "network.$prefixname.ip6addr"
|
|
|
|
# add babel interface
|
|
babel_add_interface "$prefixname" "$iface" "$type" "$rxcost" || { echo "Could not add babeld interface for babelpeer $name"; exit 1; }
|
|
}
|
|
|
|
config_load gateway
|
|
config_foreach add_babelpeer babelpeer
|
|
}
|
|
|
|
apply() {
|
|
uci commit network
|
|
uci commit babeld
|
|
}
|
|
|
|
revert() {
|
|
uci revert network
|
|
uci revert babeld
|
|
}
|