Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base-files: use cidr for config_generate

Browse source 
Generate network configuration replacing netmask with CIDR.

Depends on:
https://github.com/openwrt/openwrt/pull/13765

Using CIDR provides the following advantages:
* Consolidate notation for IPv4 and IPv6 addresses.
* Consolidate notation for IP addresses and routing targets.
* Simplify network configuration and troubleshooting.
* Follow the transition from net-tools to iproute2.

Resulting configuration example:
```
config interface 'loopback'
	option device 'lo'
	option proto 'static'
	list ipaddr '127.0.0.1/8'

config interface 'lan'
	option device 'br-lan'
	option proto 'static'
	list ipaddr '192.168.1.1/24'
```

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/13780
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Vladislav Grigoryev 2023-10-24 20:33:09 +03:00 committed by Robert Marko
parent 427c4aa266
commit d989d9a8ec
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
package/base-files/files/bin/config_generate
View file

@ -3,6 +3,7 @@
CFG=/etc/board.json CFG=/etc/board.json
. /usr/share/libubox/jshn.sh . /usr/share/libubox/jshn.sh
. /lib/functions/ipv4.sh
[ -s $CFG ] || /bin/board_detect || exit 1 [ -s $CFG ] || /bin/board_detect || exit 1
[ -s /etc/config/network -a -s /etc/config/system ] && exit 0 [ -s /etc/config/network -a -s /etc/config/system ] && exit 0
@ -42,8 +43,7 @@ generate_static_network() {
set network.loopback='interface' set network.loopback='interface'
set network.loopback.device='lo' set network.loopback.device='lo'
set network.loopback.proto='static' set network.loopback.proto='static'
set network.loopback.ipaddr='127.0.0.1' add_list network.loopback.ipaddr='127.0.0.1/8'
set network.loopback.netmask='255.0.0.0'
EOF EOF
[ -e /proc/sys/net/ipv6 ] && { [ -e /proc/sys/net/ipv6 ] && {
uci -q batch <<-EOF uci -q batch <<-EOF
@ -160,18 +160,19 @@ generate_network() {
case "$protocol" in case "$protocol" in
static) static)
local ipad local ipad netm prefix
case "$1" in case "$1" in
lan) ipad=${ipaddr:-"192.168.1.1"} ;; lan) ipad=${ipaddr:-"192.168.1.1"} ;;
*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;; *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
esac esac
netm=${netmask:-"255.255.255.0"} netm=${netmask:-"255.255.255.0"}
str2ip netm "$netm"
netmask2prefix prefix "$netm"
uci -q batch <<-EOF uci -q batch <<-EOF
set network.$1.proto='static' set network.$1.proto='static'
set network.$1.ipaddr='$ipad' add_list network.$1.ipaddr='$ipad/$prefix'
set network.$1.netmask='$netm'
EOF EOF
[ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60' [ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60'
;; ;;