esac
config_get device "$ifn" device
for ifc in $device $iface $ifaces; do
- [ "$ifc" = "$1" ] && {
+ [ ."$ifc" = ."$1" ] && {
echo "$ifn"
return 0
}
}
scan_interfaces() {
+ local cfgfile="$1"
local mode iftype iface ifname device
interfaces=
config_cb() {
append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type
config_get ifname "$CONFIG_SECTION" ifname
- config_set "$CONFIG_SECTION" device "$ifname"
+ config_get device "$CONFIG_SECTION" device
+ config_set "$CONFIG_SECTION" device "${device:-$ifname}"
case "$iftype" in
bridge)
- config_set "$CONFIG_SECTION" ifnames "$ifname"
+ config_set "$CONFIG_SECTION" ifnames "${device:-$ifname}"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;;
esac
;;
esac
}
- config_load network
+ config_load "${cfgfile:-network}"
}
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 -e "$iface" ] && return 0;
ifconfig "$iface" 2>/dev/null >/dev/null && {
# make sure the interface is removed from any existing bridge and brought down
# Setup VLAN interfaces
add_vlan "$iface"
+ ifconfig "$iface" 2>/dev/null >/dev/null || return 0
# Setup bridging
+ config_get iftype "$config" type
+ config_get stp "$config" stp
case "$iftype" in
bridge)
[ -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"
- return 0
+ # Bridge existed already. No further processing necesary
} || {
$DEBUG brctl addbr "br-$config"
$DEBUG brctl setfd "br-$config" 0
+ $DEBUG ifconfig "br-$config" up
$DEBUG brctl addif "br-$config" "$iface"
- 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
+ $DEBUG brctl stp "br-$config" ${stp:-off}
+ # 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
+ return 1
}
;;
esac
+ return 0
+}
+
+set_interface_ifname() {
+ local config="$1"
+ local ifname="$2"
+
+ config_get device "$1" device
+ uci_set_state network "$config" ifname "$ifname"
+ uci_set_state network "$config" device "$device"
+}
+
+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 macaddr "$config" macaddr
- $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+ grep "$iface:" /proc/net/dev > /dev/null && \
+ $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+ set_interface_ifname "$config" "$iface"
pidfile="/var/run/$iface.pid"
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
+ [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
+
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"
- [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" inet6 add "$ip6addr"
+ [ -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"
- [ -z "$bcast" ] || $DEBUG ifconfig "$iface" broadcast "$bcast"
- [ -z "$dns" -o -f /tmp/resolv.conf.auto ] || {
+ [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw"
+ [ -z "$dns" ] || {
for ns in $dns; do
- echo "nameserver $ns" >> /tmp/resolv.conf.auto
+ 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
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)
- [ "$proto1" != "$proto" ] && dhcpopts="-n -q"
- $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
+ [ ."$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"
;;
*)
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
projects / openwrt.git / blobdiff