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 845b33e..d285da2 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -13,7 +13,7 @@ find_config() {
                esac
                config_get device "$ifn" device
                for ifc in $device $iface $ifaces; do
                esac
                config_get device "$ifn" device
                for ifc in $device $iface $ifaces; do
-                       [ "$ifc" = "$1" ] && {
+                       [ ."$ifc" = ."$1" ] && {
                                echo "$ifn"
                                return 0
                        }
                                echo "$ifn"
                                return 0
                        }
@@ -24,7 +24,7 @@ find_config() {
 }
 
 scan_interfaces() {
 }
 
 scan_interfaces() {
-       local mode iftype iface ifname device
+       local cfgfile="${1:-network}"
        interfaces=
        config_cb() {
                case "$1" in
        interfaces=
        config_cb() {
                case "$1" in
@@ -32,17 +32,19 @@ scan_interfaces() {
                                config_set "$2" auto 1
                        ;;
                esac
                                config_set "$2" auto 1
                        ;;
                esac
+               local iftype ifname device proto
                config_get iftype "$CONFIG_SECTION" TYPE
                case "$iftype" in
                        interface)
                config_get iftype "$CONFIG_SECTION" TYPE
                case "$iftype" in
                        interface)
-                               config_get proto "$CONFIG_SECTION" proto
                                append interfaces "$CONFIG_SECTION"
                                append interfaces "$CONFIG_SECTION"
+                               config_get proto "$CONFIG_SECTION" proto
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname
-                               config_set "$CONFIG_SECTION" device "$ifname"
+                               config_get device "$CONFIG_SECTION" device "$ifname"
+                               config_set "$CONFIG_SECTION" device "$device"
                                case "$iftype" in
                                        bridge)
                                case "$iftype" in
                                        bridge)
-                                               config_set "$CONFIG_SECTION" ifnames "$ifname"
+                                               config_set "$CONFIG_SECTION" ifnames "$device"
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
@@ -50,109 +52,329 @@ scan_interfaces() {
                        ;;
                esac
        }
                        ;;
                esac
        }
-       config_load network
+       config_load "${cfgfile}"
 }
 
 add_vlan() {
        local vif="${1%\.*}"
 }
 
 add_vlan() {
        local vif="${1%\.*}"
-       
+
        [ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || {
                ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif"
                $DEBUG vconfig add "$vif" "${1##*\.}"
        [ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || {
                ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif"
                $DEBUG vconfig add "$vif" "${1##*\.}"
+               return 0
        }
        }
+       return 1
 }
 
 }
 
-setup_interface() {
+# 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="$*"
+       (
+               for item in $arg; do
+                       echo "$item"
+               done
+       ) | sort -u
+}
+
+# Create the interface, if necessary.
+# Return status 0 indicates that the setup_interface() call should continue
+# Return status 1 means that everything is set up already.
+
+prepare_interface() {
        local iface="$1"
        local config="$2"
        local iface="$1"
        local config="$2"
-       local proto
-       local macaddr
+       local vifmac="$3"
 
 
-       [ -n "$config" ] || {
-               config=$(find_config "$iface")
-               [ "$?" = 0 ] || return 1
-       }
+       # if we're called for the bridge interface itself, don't bother trying
+       # to create any interfaces here. The scripts have already done that, otherwise
+       # the bridge interface wouldn't exist.
+       [ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
 
 
-       proto="${3:-$(config_get "$config" proto)}"
-       config_get iftype "$config" type
-       
        ifconfig "$iface" 2>/dev/null >/dev/null && {
        ifconfig "$iface" 2>/dev/null >/dev/null && {
-               # make sure the interface is removed from any existing bridge and brought down
-               ifconfig "$iface" down
+               local proto
+               config_get proto "$config" proto
+
+               # make sure the interface is removed from any existing bridge and deconfigured,
+               # (deconfigured only if the interface is not set to proto=none)
                unbridge "$iface"
                unbridge "$iface"
+               [ "$proto" = none ] || ifconfig "$iface" 0.0.0.0
+
+               # Change interface MAC address if requested
+               [ -n "$vifmac" ] && {
+                       ifconfig "$iface" down
+                       ifconfig "$iface" hw ether "$vifmac" up
+               }
        }
 
        # Setup VLAN interfaces
        }
 
        # Setup VLAN interfaces
-       add_vlan "$iface"
+       add_vlan "$iface" && return 1
+       ifconfig "$iface" 2>/dev/null >/dev/null || return 0
 
        # Setup bridging
 
        # Setup bridging
+       local iftype
+       config_get iftype "$config" type
        case "$iftype" in
                bridge)
        case "$iftype" in
                bridge)
-                       ifconfig "$iface" up 2>/dev/null >/dev/null
-                       ifconfig "br-$config" 2>/dev/null >/dev/null && {
-                               $DEBUG brctl addif "br-$config" "$iface"
-                               return 0
-                       } || {
-                               $DEBUG brctl addbr "br-$config"
-                               $DEBUG brctl setfd "br-$config" 0
-                               $DEBUG brctl addif "br-$config" "$iface"
-                               iface="br-$config"
+                       local macaddr
+                       config_get macaddr "$config" macaddr
+                       [ -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
+                                       for dev in $(sort_list "$devices" "$iface"); do
+                                               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
+                               } || {
+                                       local stp
+                                       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 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" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null
+                               return 1
                        }
                ;;
        esac
                        }
                ;;
        esac
-       
+       return 0
+}
+
+set_interface_ifname() {
+       local config="$1"
+       local ifname="$2"
+
+       local device
+       config_get device "$1" device
+       uci_set_state network "$config" ifname "$ifname"
+       uci_set_state network "$config" device "$device"
+}
+
+setup_interface_none() {
+       env -i ACTION="ifup" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
+}
+
+setup_interface_static() {
+       local iface="$1"
+       local config="$2"
+
+       local ipaddr netmask ip6addr
+       config_get ipaddr "$config" ipaddr
+       config_get netmask "$config" netmask
+       config_get ip6addr "$config" ip6addr
+       [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
+
+       local gateway ip6gw dns bcast
+       config_get gateway "$config" gateway
+       config_get ip6gw "$config" ip6gw
+       config_get dns "$config" dns
+       config_get bcast "$config" broadcast
+
+       [ -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" ] || add_dns "$config" $dns
+
+       config_get type "$config" TYPE
+       [ "$type" = "alias" ] && return 0
+
+       env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
+}
+
+setup_interface_alias() {
+       local config="$1"
+       local parent="$2"
+       local iface="$3"
+
+       local cfg
+       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
+       ctr="$(($ctr + 1))"
+       config_set "$parent" alias_count "$ctr"
+
+       # alias list
+       local list
+       config_get list "$parent" aliases
+       append list "$config"
+       config_set "$parent" aliases "$list"
+
+       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 "$use_iface" "$config"
+               ;;
+               *)
+                       echo "Unsupported type '$proto' for alias config '$config'"
+                       return 1
+               ;;
+       esac
+}
+
+setup_interface() {
+       local iface="$1"
+       local config="$2"
+       local proto="$3"
+       local vifmac="$4"
+
+       [ -n "$config" ] || {
+               config=$(find_config "$iface")
+               [ "$?" = 0 ] || return 1
+       }
+
+       prepare_interface "$iface" "$config" "$vifmac" || return 0
+
+       [ "$iface" = "br-$config" ] && {
+               # need to bring up the bridge and wait a second for
+               # it to switch to the 'forwarding' state, otherwise
+               # it will lose its routes...
+               ifconfig "$iface" up
+               sleep 1
+       }
+
        # Interface settings
        # Interface settings
-       config_get mtu "$config" mtu
-       config_get macaddr "$config" macaddr
-       $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+       grep "$iface:" /proc/net/dev > /dev/null && {
+               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} ${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)
        case "$proto" in
                static)
-                       config_get ipaddr "$config" ipaddr
-                       config_get netmask "$config" netmask
-                       [ -z "$ipaddr" -o -z "$netmask" ] && return 1
-                       
-                       config_get ip6addr "$config" ip6addr
-                       config_get gateway "$config" gateway
-                       config_get dns "$config" dns
-                       
-                       $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask"
-                       $DEBUG ifconfig "$iface" inet6 add "$ip6addr" 
-                       [ -z "$gateway" ] || route add default gw "$gateway"
-                       [ -z "$dns" -o -f /tmp/resolv.conf ] || {
-                               for ns in $dns; do
-                                       echo "nameserver $ns" >> /tmp/resolv.conf
-                               done
-                       }
-
-                       env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" &
+                       setup_interface_static "$iface" "$config"
                ;;
                dhcp)
                ;;
                dhcp)
-                       # prevent udhcpc from starting more than once
-                       lock "/var/lock/dhcp-$iface"
-                       pid="$(cat "$pidfile" 2>/dev/null)"
-                       [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && {
-                               lock -u "/var/lock/dhcp-$iface"
-                               return 0
-                       }
+                       # 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 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)
 
                        [ -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)
-                       [ "$proto1" != "$proto" ] && dhcpopts="-n -q"
-                       $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
-                       lock -u "/var/lock/dhcp-$iface"
+                       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"
                ;;
                *)
                        if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
                ;;
                *)
                        if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
-                               eval "setup_interface_$proto '$iface' '$config' '$proto'" 
+                               eval "setup_interface_$proto '$iface' '$config' '$proto'"
                        else
                                echo "Interface type $proto not supported."
                                return 1
                        else
                                echo "Interface type $proto not supported."
                                return 1
@@ -161,11 +383,29 @@ setup_interface() {
        esac
 }
 
        esac
 }
 
+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"
+
+       uci -P /var/state revert "network.$config"
+}
+
 unbridge() {
        local dev="$1"
        local brdev
 
 unbridge() {
        local dev="$1"
        local brdev
 
-       brctl show | grep "$dev" >/dev/null && {
+       [ -x /usr/sbin/brctl ] || return 0
+       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.032437 seconds and 4 git commands to generate.