freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

fff-babeld: redistribute all peer_ip and peer_ip6 addresses #87

Closed
jkimmel wants to merge 2 commits from jkimmel/firmware:babel_peer_ip into master
pull from: jkimmel/firmware:babel_peer_ip
merge into: freifunk-franken:master
Conversation 12 Commits 2 Files Changed 4 -17
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 00a894c21b - Show all commits

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

@ -70,9 +70,7 @@ configure() {
# 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; }

14
src/packages/fff/fff-babeld/files/lib/functions/fff/babel
View File

@ -47,20 +47,6 @@ babel_add_peeraddr() {
return 0
}
babel_add_peer6addr() {
[ "$#" -ne "1" ] && return 1
local option="$1"
if peer_ip6=$(uci -q get gateway.@gateway[0].peer_ip6); then
uci add_list "$option"="$peer_ip6"
else
return 1
fi
return 0
}
babel_add_interface() {
[ "$#" -ne "4" ] && return 1

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

@ -120,7 +120,6 @@ configure() {
# add peer_ip
babel_add_peeraddr "network.$prefixname.addresses"
babel_add_peer6addr "network.$prefixname.addresses"
# add iif-rules
babel_add_iifrules "$prefixname" || { echo "ERROR: Could not add iif-rules for wgpeer $name"; exit 1; }