X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b543bf484af90acbf5b515ffd764ed7167600c29..02e3b0f5531da86339e8da86b1f78a9b6aba7f50:/package/base-files/files/lib/network/config.sh?ds=sidebyside diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index def156290..cf5b197b5 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -9,6 +9,23 @@ do_sysctl() { sysctl -n -e "$1" } +map_sysctls() { + local cfg="$1" + local ifn="$2" + + local fam + for fam in ipv4 ipv6; do + if [ -d /proc/sys/net/$fam ]; then + local key + for key in /proc/sys/net/$fam/*/$ifn/*; do + local val + config_get val "$cfg" "${fam}_${key##*/}" + [ -n "$val" ] && echo -n "$val" > "$key" + done + fi + done +} + find_config() { local iftype device iface ifaces ifn for ifn in $interfaces; do @@ -96,8 +113,8 @@ add_dns() { done [ -n "$cfg" ] && { - uci_set_state network "$cfg" dns "$add" - uci_set_state network "$cfg" resolv_dns "$add" + uci_toggle_state network "$cfg" dns "$add" + uci_toggle_state network "$cfg" resolv_dns "$add" } } @@ -156,6 +173,9 @@ prepare_interface() { ifconfig "$iface" down ifconfig "$iface" hw ether "$vifmac" up } + + # Apply sysctl settings + map_sysctls "$config" "$iface" } # Setup VLAN interfaces @@ -176,7 +196,7 @@ prepare_interface() { for dev in $(sort_list "$devices" "$iface"); do append newdevs "$dev" done - uci_set_state network "$config" device "$newdevs" + uci_toggle_state network "$config" device "$newdevs" $DEBUG ifconfig "$iface" 0.0.0.0 $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1 $DEBUG brctl addif "br-$config" "$iface" @@ -186,11 +206,12 @@ prepare_interface() { config_get_bool stp "$config" stp 0 $DEBUG brctl addbr "br-$config" $DEBUG brctl setfd "br-$config" 0 - $DEBUG ifconfig "br-$config" up $DEBUG ifconfig "$iface" 0.0.0.0 $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1 $DEBUG brctl addif "br-$config" "$iface" $DEBUG brctl stp "br-$config" $stp + [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)" + $DEBUG ifconfig "br-$config" hw ether $macaddr up # Creating the bridge here will have triggered a hotplug event, which will # result in another setup_interface() call, so we simply stop processing # the current event at this point. @@ -209,8 +230,8 @@ set_interface_ifname() { local device config_get device "$1" device - uci_set_state network "$config" ifname "$ifname" - uci_set_state network "$config" device "$device" + uci_toggle_state network "$config" ifname "$ifname" + uci_toggle_state network "$config" device "$device" } setup_interface_none() { @@ -234,6 +255,11 @@ setup_interface_static() { config_get bcast "$config" broadcast config_get metric "$config" metric + case "$ip6addr" in + */*) ;; + *:*) ip6addr="$ip6addr/64" ;; + esac + [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}" [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr" [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface" @@ -324,7 +350,7 @@ setup_interface() { } # Interface settings - grep "$iface:" /proc/net/dev > /dev/null && { + grep -qE "^ *$iface:" /proc/net/dev && { local mtu macaddr txqueuelen config_get mtu "$config" mtu config_get macaddr "$config" macaddr