X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/796dcb6b2ea7bc246b6e31024ab2f0f8c14338ca..02e3b0f5531da86339e8da86b1f78a9b6aba7f50:/package/base-files/files/lib/network/config.sh diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 2ca04faeb..cf5b197b5 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -3,6 +3,29 @@ # DEBUG="echo" +do_sysctl() { + [ -n "$2" ] && \ + sysctl -n -e -w "$1=$2" >/dev/null || \ + 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 @@ -90,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" } } @@ -150,6 +173,9 @@ prepare_interface() { ifconfig "$iface" down ifconfig "$iface" hw ether "$vifmac" up } + + # Apply sysctl settings + map_sysctls "$config" "$iface" } # Setup VLAN interfaces @@ -170,8 +196,9 @@ 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" # Bridge existed already. No further processing necesary } || { @@ -179,10 +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. @@ -201,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() { @@ -219,16 +248,22 @@ setup_interface_static() { config_get ip6addr "$config" ip6addr [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1 - local gateway ip6gw dns bcast + local gateway ip6gw dns bcast metric config_get gateway "$config" gateway config_get ip6gw "$config" ip6gw config_get dns "$config" dns 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" dev "$iface" - [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" dev "$iface" + [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface" + [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" ${metric:+metric $metric} dev "$iface" [ -z "$dns" ] || add_dns "$config" $dns config_get type "$config" TYPE @@ -315,12 +350,13 @@ setup_interface() { } # Interface settings - grep "$iface:" /proc/net/dev > /dev/null && { - local mtu macaddr + grep -qE "^ *$iface:" /proc/net/dev && { + local mtu macaddr txqueuelen config_get mtu "$config" mtu config_get macaddr "$config" macaddr + config_get txqueuelen "$config" txqueuelen [ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down - $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up + $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} ${txqueuelen:+txqueuelen $txqueuelen} up } set_interface_ifname "$config" "$iface" @@ -330,31 +366,40 @@ setup_interface() { setup_interface_static "$iface" "$config" ;; dhcp) - local lockfile="/var/lock/dhcp-$iface" - lock "$lockfile" - - # prevent udhcpc from starting more than once + # kill running udhcpc instance local pidfile="/var/run/dhcp-${iface}.pid" - local pid="$(cat "$pidfile" 2>/dev/null)" - if [ -d "/proc/$pid" ] && grep -qs udhcpc "/proc/${pid}/cmdline"; then - lock -u "$lockfile" - else - local ipaddr netmask hostname proto1 clientid - config_get ipaddr "$config" ipaddr - config_get netmask "$config" netmask - config_get hostname "$config" hostname - config_get proto1 "$config" proto - config_get clientid "$config" clientid - - [ -z "$ipaddr" ] || \ - $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"} - - # 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" - $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -O rootpath -R &} - lock -u "$lockfile" - fi + service_kill udhcpc "$pidfile" + + local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts + config_get ipaddr "$config" ipaddr + config_get netmask "$config" netmask + config_get hostname "$config" hostname + config_get proto1 "$config" proto + config_get clientid "$config" clientid + config_get vendorid "$config" vendorid + config_get_bool broadcast "$config" broadcast 0 + config_get reqopts "$config" reqopts + + [ -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) + [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &" + [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= + + $DEBUG eval udhcpc -t 0 -i "$iface" \ + ${ipaddr:+-r $ipaddr} \ + ${hostname:+-H $hostname} \ + ${clientid:+-c $clientid} \ + ${vendorid:+-V $vendorid} \ + -b -p "$pidfile" $broadcast \ + ${dhcpopts} ;; none) setup_interface_none "$iface" "$config" @@ -382,12 +427,7 @@ stop_interface_dhcp() { remove_dns "$config" local pidfile="/var/run/dhcp-${ifname}.pid" - local pid="$(cat "$pidfile" 2>/dev/null)" - [ -d "/proc/$pid" ] && { - grep -qs udhcpc "/proc/$pid/cmdline" && kill -TERM $pid && \ - while grep -qs udhcpc "/proc/$pid/cmdline"; do sleep 1; done - rm -f "$pidfile" - } + service_kill udhcpc "$pidfile" uci -P /var/state revert "network.$config" } @@ -402,6 +442,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 done } }