X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9c2c7fac4771a9262834926f0d4ac95fdb6fc43f..d4c03cdd539a40259cbbf3bb06c91c8a44918e08:/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 845b33eb7..cab2e06f0 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -24,6 +24,7 @@ find_config() { } scan_interfaces() { + local cfgfile="$1" local mode iftype iface ifname device interfaces= config_cb() { @@ -50,7 +51,7 @@ scan_interfaces() { ;; esac } - config_load network + config_load "${cfgfile:-network}" } add_vlan() { @@ -62,19 +63,18 @@ add_vlan() { } } -setup_interface() { +# 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 proto - local macaddr - - [ -n "$config" ] || { - config=$(find_config "$iface") - [ "$?" = 0 ] || return 1 - } - proto="${3:-$(config_get "$config" proto)}" - config_get iftype "$config" type + # 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. + [ "$iface" = "br-$config" ] && return 0; ifconfig "$iface" 2>/dev/null >/dev/null && { # make sure the interface is removed from any existing bridge and brought down @@ -86,20 +86,50 @@ setup_interface() { add_vlan "$iface" # Setup bridging + config_get iftype "$config" type 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" + [ -x /usr/sbin/brctl ] && { + ifconfig "$iface" up 2>/dev/null >/dev/null + ifconfig "br-$config" 2>/dev/null >/dev/null && { + $DEBUG brctl addif "br-$config" "$iface" + # Bridge existed already. No further processing necesary + } || { + $DEBUG brctl addbr "br-$config" + $DEBUG brctl setfd "br-$config" 0 + $DEBUG brctl addif "br-$config" "$iface" + # 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. + } + return 1 } ;; esac + return 0 +} + +setup_interface() { + local iface="$1" + local config="$2" + local proto + local macaddr + + [ -n "$config" ] || { + config=$(find_config "$iface") + [ "$?" = 0 ] || return 1 + } + proto="${3:-$(config_get "$config" proto)}" + + prepare_interface "$iface" "$config" || 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 config_get mtu "$config" mtu @@ -116,17 +146,19 @@ setup_interface() { config_get ip6addr "$config" ip6addr config_get gateway "$config" gateway config_get dns "$config" dns + config_get bcast "$config" broadcast - $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 ] || { + [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" + [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" inet6 add "$ip6addr" + [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" + [ -z "$bcast" ] || $DEBUG ifconfig "$iface" broadcast "$bcast" + [ -z "$dns" -o -f /tmp/resolv.conf.auto ] || { for ns in $dns; do - echo "nameserver $ns" >> /tmp/resolv.conf + echo "nameserver $ns" >> /tmp/resolv.conf.auto done } - env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug "iface" & + env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" & ;; dhcp) # prevent udhcpc from starting more than once @@ -164,7 +196,8 @@ setup_interface() { unbridge() { local dev="$1" local brdev - + + [ -x /usr/sbin/brctl ] || return 0 brctl show | grep "$dev" >/dev/null && { # interface is still part of a bridge, correct that