X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fnetwork%2Fconfig.sh;h=c6d909fd0aaf25b6a34b9f173dbd4707c430fe83;hp=8188203d31726a73d705bb6735b8ebd7bcb8a251;hb=6e9391d0f5b00d5c565b9b3212e82f1b3b210617;hpb=b8694ccee6097b87a9b0567b014d435741dde6de

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 8188203d31..c6d909fd0a 100755
--- 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
-			[ "$ifc" = "$1" ] && {
+			[ ."$ifc" = ."$1" ] && {
 				echo "$ifn"
 				return 0
 			}
@@ -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.
+	[ "br-$config" = "$iface" -o -f "$iface" ] && return 0;
 	
 	ifconfig "$iface" 2>/dev/null >/dev/null && {
 		# make sure the interface is removed from any existing bridge and brought down
@@ -84,26 +84,57 @@ setup_interface() {
 
 	# Setup VLAN interfaces
 	add_vlan "$iface"
+	ifconfig "$iface" 2>/dev/null >/dev/null || return 0
 
 	# 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
-	config_get macddr "$config" macaddr
+	config_get macaddr "$config" macaddr
 	$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
 
 	pidfile="/var/run/$iface.pid"
@@ -116,16 +147,21 @@ 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"
-			[ -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" add "$ip6addr"
+			[ -z "$gateway" ] || $DEBUG route add default gw "$gateway"
+			[ -z "$bcast" ] || $DEBUG ifconfig "$iface" broadcast "$bcast"
+			[ -z "$dns" ] || {
 				for ns in $dns; do
-					echo "nameserver $ns" >> /tmp/resolv.conf
+					grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || {
+						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
@@ -145,7 +181,7 @@ setup_interface() {
 				$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"
+			[ ."$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"
 		;;
@@ -163,7 +199,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