X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/943fc97fb0340c01d8039bccbfc6c90ddcffc774..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 12a3378b8..a194ab8e2 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -3,6 +3,12 @@ # DEBUG="echo" +do_sysctl() { + [ -n "$2" ] && \ + sysctl -n -e -w "$1=$2" >/dev/null || \ + sysctl -n -e "$1" +} + find_config() { local iftype device iface ifaces ifn for ifn in $interfaces; do @@ -66,6 +72,52 @@ add_vlan() { return 1 } +# add dns entries if they are not in resolv.conf yet +add_dns() { + local cfg="$1"; shift + + remove_dns "$cfg" + + # We may be called by pppd's ip-up which has a nonstandard umask set. + # Create an empty file here and force its permission to 0644, otherwise + # dnsmasq will not be able to re-read the resolv.conf.auto . + [ ! -f /tmp/resolv.conf.auto ] && { + touch /tmp/resolv.conf.auto + chmod 0644 /tmp/resolv.conf.auto + } + + local dns + local add + for dns in "$@"; do + grep -qsF "nameserver $dns" /tmp/resolv.conf.auto || { + add="${add:+$add }$dns" + echo "nameserver $dns" >> /tmp/resolv.conf.auto + } + done + + [ -n "$cfg" ] && { + uci_set_state network "$cfg" dns "$add" + uci_set_state network "$cfg" resolv_dns "$add" + } +} + +# remove dns entries of the given iface +remove_dns() { + local cfg="$1" + + [ -n "$cfg" ] && { + [ -f /tmp/resolv.conf.auto ] && { + local dns=$(uci_get_state network "$cfg" resolv_dns) + for dns in $dns; do + sed -i -e "/^nameserver $dns$/d" /tmp/resolv.conf.auto + done + } + + uci_revert_state network "$cfg" dns + uci_revert_state network "$cfg" resolv_dns + } +} + # sort the device list, drop duplicates sort_list() { local arg="$*" @@ -115,6 +167,8 @@ prepare_interface() { config_get iftype "$config" type case "$iftype" in bridge) + local macaddr + config_get macaddr "$config" macaddr [ -x /usr/sbin/brctl ] && { ifconfig "br-$config" 2>/dev/null >/dev/null && { local newdevs devices @@ -123,6 +177,8 @@ prepare_interface() { append newdevs "$dev" 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 } || { @@ -130,14 +186,17 @@ 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. } - ifconfig "$iface" up 2>/dev/null >/dev/null + ifconfig "$iface" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null return 1 } ;; @@ -153,7 +212,6 @@ set_interface_ifname() { config_get device "$1" device uci_set_state network "$config" ifname "$ifname" uci_set_state network "$config" device "$device" - uci_set_state network "$config" started 1 } setup_interface_none() { @@ -170,23 +228,23 @@ 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 "$dns" ] || { - for ns in $dns; do - grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || { - echo "nameserver $ns" >> /tmp/resolv.conf.auto - } - done - } + [ -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 [ "$type" = "alias" ] && return 0 @@ -203,6 +261,25 @@ setup_interface_alias() { config_get cfg "$config" interface [ "$parent" == "$cfg" ] || return 0 + # parent device and ifname + local p_device p_type + config_get p_device "$cfg" device + config_get p_type "$cfg" type + + # select alias ifname + local layer use_iface + config_get layer "$config" layer 2 + case "$layer:$p_type" in + # layer 3: e.g. pppoe-wan or pptp-vpn + 3:*) use_iface="$iface" ;; + + # layer 2 and parent is bridge: e.g. br-wan + 2:bridge) use_iface="br-$cfg" ;; + + # layer 1: e.g. eth0 or ath0 + *) use_iface="$p_device" ;; + esac + # alias counter local ctr config_get ctr "$parent" alias_count 0 @@ -215,14 +292,14 @@ setup_interface_alias() { append list "$config" config_set "$parent" aliases "$list" - iface="$iface:$ctr" - set_interface_ifname "$config" "$iface" + use_iface="$use_iface:$ctr" + set_interface_ifname "$config" "$use_iface" local proto config_get proto "$config" proto "static" case "${proto}" in static) - setup_interface_static "$iface" "$config" + setup_interface_static "$use_iface" "$config" ;; *) echo "Unsupported type '$proto' for alias config '$config'" @@ -253,44 +330,56 @@ 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" - pidfile="/var/run/$iface.pid" [ -n "$proto" ] || config_get proto "$config" proto case "$proto" in static) setup_interface_static "$iface" "$config" ;; dhcp) - # prevent udhcpc from starting more than once - lock "/var/lock/dhcp-$iface" - local pid="$(cat "$pidfile" 2>/dev/null)" - if [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null; then - lock -u "/var/lock/dhcp-$iface" - 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:- -R &} - lock -u "/var/lock/dhcp-$iface" - fi + # kill running udhcpc instance + local pidfile="/var/run/dhcp-${iface}.pid" + 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" @@ -304,18 +393,23 @@ setup_interface() { fi ;; esac - [ "$proto" = none ] || { - for ifn in `ifconfig | grep "^$iface:" | awk '{print $1}'`; do - ifconfig "$ifn" down - done - } +} + +stop_interface_dhcp() { + local config="$1" + + local ifname + config_get ifname "$config" ifname + + local lock="/var/lock/dhcp-${ifname}" + [ -f "$lock" ] && lock -u "$lock" + + remove_dns "$config" + + local pidfile="/var/run/dhcp-${ifname}.pid" + service_kill udhcpc "$pidfile" - local aliases - config_set "$config" aliases "" - config_set "$config" alias_count 0 - config_foreach setup_interface_alias alias "$config" "$iface" - config_get aliases "$config" aliases - [ -z "$aliases" ] || uci_set_state network "$config" aliases "$aliases" + uci -P /var/state revert "network.$config" } unbridge() { @@ -323,11 +417,12 @@ unbridge() { local brdev [ -x /usr/sbin/brctl ] || return 0 - brctl show | grep "$dev" >/dev/null && { + brctl show 2>/dev/null | grep "$dev" >/dev/null && { # interface is still part of a bridge, correct that 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 } }