diff options
| author | Vladislav Grigoryev | 2023-10-24 17:33:09 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-05-30 20:55:27 +0000 |
| commit | d989d9a8ec4c94bd2185cac45ad9f3272ce100ac (patch) | |
| tree | 3b058b61e78c95f16f68762d746f012b7b2a57a5 | |
| parent | 427c4aa266169b67aa26c0817b807d2921b4bba5 (diff) | |
| download | openwrt-d989d9a8ec4c94bd2185cac45ad9f3272ce100ac.tar.gz | |
base-files: use cidr for config_generate
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>
| -rwxr-xr-x | package/base-files/files/bin/config_generate | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index fecf82fcaa..7507aa612c 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -3,6 +3,7 @@ CFG=/etc/board.json . /usr/share/libubox/jshn.sh +. /lib/functions/ipv4.sh [ -s $CFG ] || /bin/board_detect || exit 1 [ -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.device='lo' set network.loopback.proto='static' - set network.loopback.ipaddr='127.0.0.1' - set network.loopback.netmask='255.0.0.0' + add_list network.loopback.ipaddr='127.0.0.1/8' EOF [ -e /proc/sys/net/ipv6 ] && { uci -q batch <<-EOF @@ -160,18 +160,19 @@ generate_network() { case "$protocol" in static) - local ipad + local ipad netm prefix case "$1" in lan) ipad=${ipaddr:-"192.168.1.1"} ;; *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;; esac netm=${netmask:-"255.255.255.0"} + str2ip netm "$netm" + netmask2prefix prefix "$netm" uci -q batch <<-EOF set network.$1.proto='static' - set network.$1.ipaddr='$ipad' - set network.$1.netmask='$netm' + add_list network.$1.ipaddr='$ipad/$prefix' EOF [ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60' ;; |