X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/93d22b0af880c93352f9a232565fc467ca7f8e95..8ef0e1eb51ad54bbcd21bf22dc3af695120beb2a:/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 449d252ab..a194ab8e2 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -170,11 +170,6 @@ prepare_interface() { local macaddr config_get macaddr "$config" macaddr [ -x /usr/sbin/brctl ] && { - # Disable IPv6 for bridge ports - do_sysctl net.ipv6.conf.$iface.disable_ipv6 1 - [ "${iface##wlan}" != "$iface" ] && \ - do_sysctl net.ipv6.conf.mon.$iface.disable_ipv6 1 - ifconfig "br-$config" 2>/dev/null >/dev/null && { local newdevs devices config_get devices "$config" device @@ -183,6 +178,7 @@ prepare_interface() { done uci_set_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" # Bridge existed already. No further processing necesary } || { @@ -190,10 +186,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. @@ -237,6 +235,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" @@ -327,7 +330,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 @@ -360,9 +363,14 @@ setup_interface() { [ -z "$ipaddr" ] || \ $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"} + # additional request options + local opt dhcpopts + for opt in $reqopts; do + append dhcpopts "-O $opt" + done + # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp) - local dhcpopts - [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q" + [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &" [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= $DEBUG eval udhcpc -t 0 -i "$iface" \ @@ -371,8 +379,7 @@ setup_interface() { ${clientid:+-c $clientid} \ ${vendorid:+-V $vendorid} \ -b -p "$pidfile" $broadcast \ - ${reqopts:+-O $reqopts} \ - ${dhcpopts:- -O rootpath -R &} + ${dhcpopts} ;; none) setup_interface_none "$iface" "$config" @@ -415,9 +422,7 @@ unbridge() { for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null - do_sysctl net.ipv6.conf.$dev.disable_ipv6 0 - [ "${dev##wlan}" != "$dev" ] && \ - do_sysctl net.ipv6.conf.mon.$dev.disable_ipv6 0 + do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0 done } }