projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[package] base-files: add udhcpc vendorid option (#7744)
[openwrt.git] / 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 12a3378..d285da2 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -66,6 +66,52 @@ add_vlan() {
        return 1
 }
 
        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="$*"
 # sort the device list, drop duplicates
 sort_list() {
        local arg="$*"
@@ -115,7 +161,18 @@ prepare_interface() {
        config_get iftype "$config" type
        case "$iftype" in
                bridge)
        config_get iftype "$config" type
        case "$iftype" in
                bridge)
+                       local macaddr
+                       config_get macaddr "$config" macaddr
                        [ -x /usr/sbin/brctl ] && {
                        [ -x /usr/sbin/brctl ] && {
+                               # Remove IPv6 link local addr before adding the iface to the bridge
+                               local llv6="$(ifconfig "$iface")"
+                               case "$llv6" in
+                                       *fe80:*/64*)
+                                               llv6="${llv6#* fe80:}"
+                                               ifconfig "$iface" del "fe80:${llv6%% *}"
+                                       ;;
+                               esac
+
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                                        config_get devices "$config" device
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                                        config_get devices "$config" device
@@ -123,6 +180,7 @@ prepare_interface() {
                                                append newdevs "$dev"
                                        done
                                        uci_set_state network "$config" device "$newdevs"
                                                append newdevs "$dev"
                                        done
                                        uci_set_state network "$config" device "$newdevs"
+                                       $DEBUG ifconfig "$iface" 0.0.0.0
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {
@@ -131,13 +189,14 @@ prepare_interface() {
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
+                                       $DEBUG ifconfig "$iface" 0.0.0.0
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
                                        # 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.
                                }
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
                                        # 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
                        }
                ;;
                                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"
        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() {
 }
 
 setup_interface_none() {
@@ -180,13 +238,7 @@ setup_interface_static() {
        [ -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 "$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 "$dns" ] || add_dns "$config" $dns
 
        config_get type "$config" TYPE
        [ "$type" = "alias" ] && return 0
 
        config_get type "$config" TYPE
        [ "$type" = "alias" ] && return 0
@@ -203,6 +255,25 @@ setup_interface_alias() {
        config_get cfg "$config" interface
        [ "$parent" == "$cfg" ] || return 0
 
        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
        # alias counter
        local ctr
        config_get ctr "$parent" alias_count 0
@@ -215,14 +286,14 @@ setup_interface_alias() {
        append list "$config"
        config_set "$parent" aliases "$list"
 
        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)
 
        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'"
                ;;
                *)
                        echo "Unsupported type '$proto' for alias config '$config'"
@@ -254,43 +325,49 @@ setup_interface() {
 
        # Interface settings
        grep "$iface:" /proc/net/dev > /dev/null && {
 
        # Interface settings
        grep "$iface:" /proc/net/dev > /dev/null && {
-               local mtu macaddr
+               local mtu macaddr txqueuelen
                config_get mtu "$config" mtu
                config_get macaddr "$config" macaddr
                config_get mtu "$config" mtu
                config_get macaddr "$config" macaddr
+               config_get txqueuelen "$config" txqueuelen
                [ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down
                [ -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"
 
        }
        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)
        [ -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
+                       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
+
+                       [ -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"
+                       [ "$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:- -O rootpath -R &}
                ;;
                none)
                        setup_interface_none "$iface" "$config"
                ;;
                none)
                        setup_interface_none "$iface" "$config"
@@ -304,18 +381,23 @@ setup_interface() {
                        fi
                ;;
        esac
                        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() {
 }
 
 unbridge() {
@@ -323,7 +405,7 @@ unbridge() {
        local brdev
 
        [ -x /usr/sbin/brctl ] || return 0
        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
                # interface is still part of a bridge, correct that
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
Personal OpenWRT clone
This page took 0.033762 seconds and 4 git commands to generate.