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

layer3: move from fixed address to fixed hostname #80

Open
jkimmel wants to merge 2 commits from jkimmel/firmware:fdff into master
pull from: jkimmel/firmware:fdff
merge into: freifunk-franken:master
Conversation 5 Commits 2 Files Changed 5 +59 -8
5 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-dhcp
PKG_RELEASE:=5
PKG_RELEASE:=6
include $(INCLUDE_DIR)/package.mk

45
src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns
View File

@ -1,3 +1,6 @@
# load uci functions
. /lib/functions.sh
configure() {
## dns
uci -q del dhcp.@dnsmasq[0].server
@ -10,6 +13,48 @@ configure() {
else
echo "WARNING: No DNS servers set!"
fi
# remove all domain autogenerated entries
remove_domains() {
local name="$1"
case $(uci -q get dhcp."$name".addedbyautoconfig) in
/etc/layer3.d/35-dns | /etc/uci-defaults/90-fff-dhcp)
uci -q del dhcp."$name" ;;
esac
}
config_load dhcp
config_foreach remove_domains domain
local dnsips
local have_dns=false
# gather all ips belonging to the router
dnsips=$(
uci -q batch <<- EOF | cut -d / -f1 | sort -u
get network.client.ip6addr
get network.client.ipaddr
get gateway.@gateway[0].peer_ip
get gateway.@gateway[0].peer_ip6
EOF
)
for ip in $dnsips; do
ip=$(echo "$ip" | cut -d / -f1)
case "$ip" in
fe80*) continue ;;
esac
have_dns=true
uci -q add dhcp domain > /dev/null
uci -q set dhcp.@domain[-1].ip="$ip"
uci -q set dhcp.@domain[-1].name="local.fff.community"
uci -q set dhcp.@domain[-1].addedbyautoconfig="/etc/layer3.d/35-dns"
done
if ! $have_dns; then
echo "WARNING: No valid device ip available for local DNS."
fi
}
apply() {

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

@ -27,6 +27,16 @@ uci batch >/dev/null <<EOF
set dhcp.client=dhcp
set dhcp.client.interface='client'
set dhcp.client.leasetime='1h'
add dhcp domain
set dhcp.@domain[-1].ip="fdff::1"
set dhcp.@domain[-1].name="local.fff.community"
jkimmel marked this conversation as resolved Outdated
ChristianD commented 2021-01-19 16:16:52 +01:00
Outdated
Review
Copy Link

fdff::1 oder?

fdff::1 oder?
adschm commented 2021-01-19 16:34:37 +01:00
Outdated
Review
Copy Link

und ggf. /64?

und ggf. /64?
jkimmel commented 2021-01-19 21:27:08 +01:00
Outdated
Review
Copy Link

@ChristianD jop, hast recht. Hatte ich auf dem Testrouter schon gefixt und dann vermutlich vergessen. Danke.

@ChristianD jop, hast recht. Hatte ich auf dem Testrouter schon gefixt und dann vermutlich vergessen. Danke.
set dhcp.@domain[-1].addedbyautoconfig="/etc/uci-defaults/90-fff-dhcp"
add dhcp domain
set dhcp.@domain[-1].ip="0.0.0.0"
set dhcp.@domain[-1].name="local.fff.community"
set dhcp.@domain[-1].addedbyautoconfig="/etc/uci-defaults/90-fff-dhcp"
EOF
uci commit dhcp

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

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-layer3-config
PKG_RELEASE:=6
PKG_RELEASE:=7
include $(INCLUDE_DIR)/package.mk

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

@ -19,14 +19,10 @@ configure() {
uci set network.client.ip4table='fff'
# ip6addr
#remove old ip6addr
for ip in $(uci get network.client.ip6addr); do
if echo "$ip" | grep -v -e "fdff:" -e "fe80::1/64" > /dev/null; then
uci del_list network.client.ip6addr="$ip"
fi
done
#set new ip6addr
if ip6addr=$(uci -q get gateway.@client[0].ip6addr); then
#remove old ip6addr
uci delete network.client.ip6addr
fbl commented 2021-12-30 17:44:59 +01:00
Review
Copy Link

Das hier darf nicht ins if rutschen, sonst werden die Adressen nicht entfernt, wenn keine ip6addr im /etc/config/gateway angegeben sind.

Das hier darf nicht ins if rutschen, sonst werden die Adressen nicht entfernt, wenn keine ip6addr im /etc/config/gateway angegeben sind.
for ip in $ip6addr; do
uci add_list network.client.ip6addr=$ip
done