2006-07-30 06:09:09 +03:00
|
|
|
#!/bin/sh
|
|
|
|
# Copyright (C) 2006 OpenWrt.org
|
|
|
|
|
|
|
|
# DEBUG="echo"
|
|
|
|
|
|
|
|
find_config() {
|
2006-08-27 13:05:58 +03:00
|
|
|
local iftype device iface ifaces ifn
|
2006-07-30 06:09:09 +03:00
|
|
|
for ifn in $interfaces; do
|
2006-07-30 16:21:18 +03:00
|
|
|
config_get iftype "$ifn" type
|
2006-07-30 06:09:09 +03:00
|
|
|
config_get iface "$ifn" ifname
|
2006-08-27 13:05:58 +03:00
|
|
|
case "$iftype" in
|
|
|
|
bridge) config_get ifaces "$ifn" ifnames;;
|
|
|
|
esac
|
2006-08-04 12:50:11 +03:00
|
|
|
config_get device "$ifn" device
|
2006-08-27 13:05:58 +03:00
|
|
|
for ifc in $device $iface $ifaces; do
|
2007-06-15 19:07:09 +03:00
|
|
|
[ ."$ifc" = ."$1" ] && {
|
2006-07-30 06:09:09 +03:00
|
|
|
echo "$ifn"
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
done
|
|
|
|
done
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
scan_interfaces() {
|
2009-08-07 03:08:06 +03:00
|
|
|
local cfgfile="${1:-network}"
|
2006-07-30 06:09:09 +03:00
|
|
|
interfaces=
|
|
|
|
config_cb() {
|
2006-11-03 23:57:35 +02:00
|
|
|
case "$1" in
|
|
|
|
interface)
|
|
|
|
config_set "$2" auto 1
|
|
|
|
;;
|
|
|
|
esac
|
2009-08-07 03:08:06 +03:00
|
|
|
local iftype ifname device proto
|
2006-07-30 16:21:18 +03:00
|
|
|
config_get iftype "$CONFIG_SECTION" TYPE
|
|
|
|
case "$iftype" in
|
2006-07-30 06:09:09 +03:00
|
|
|
interface)
|
|
|
|
append interfaces "$CONFIG_SECTION"
|
2009-08-07 03:08:06 +03:00
|
|
|
config_get proto "$CONFIG_SECTION" proto
|
2006-08-27 14:11:55 +03:00
|
|
|
config_get iftype "$CONFIG_SECTION" type
|
2006-10-09 15:35:31 +03:00
|
|
|
config_get ifname "$CONFIG_SECTION" ifname
|
2009-08-07 03:08:06 +03:00
|
|
|
config_get device "$CONFIG_SECTION" device "$ifname"
|
|
|
|
config_set "$CONFIG_SECTION" device "$device"
|
2006-08-24 16:46:47 +03:00
|
|
|
case "$iftype" in
|
|
|
|
bridge)
|
2009-08-07 03:08:06 +03:00
|
|
|
config_set "$CONFIG_SECTION" ifnames "$device"
|
2006-08-24 16:46:47 +03:00
|
|
|
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
|
|
|
|
;;
|
|
|
|
esac
|
2006-08-23 21:47:31 +03:00
|
|
|
( type "scan_$proto" ) >/dev/null 2>/dev/null && eval "scan_$proto '$CONFIG_SECTION'"
|
2006-07-30 06:09:09 +03:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
2009-08-07 03:08:06 +03:00
|
|
|
config_load "${cfgfile}"
|
2006-07-30 06:09:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
add_vlan() {
|
|
|
|
local vif="${1%\.*}"
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2006-07-30 06:09:09 +03:00
|
|
|
[ "$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##*\.}"
|
2008-08-01 06:01:25 +03:00
|
|
|
return 0
|
2006-07-30 06:09:09 +03:00
|
|
|
}
|
2008-08-01 06:01:25 +03:00
|
|
|
return 1
|
2006-07-30 06:09:09 +03:00
|
|
|
}
|
|
|
|
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
# add dns entries if they are not in resolv.conf yet
|
|
|
|
add_dns() {
|
|
|
|
local cfg="$1"; shift
|
|
|
|
|
2010-05-30 21:40:22 +03:00
|
|
|
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
|
|
|
|
}
|
|
|
|
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
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
|
|
|
|
|
2010-05-30 21:40:22 +03:00
|
|
|
[ -n "$cfg" ] && {
|
|
|
|
uci_set_state network "$cfg" dns "$add"
|
|
|
|
uci_set_state network "$cfg" resolv_dns "$add"
|
|
|
|
}
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
# remove dns entries of the given iface
|
|
|
|
remove_dns() {
|
|
|
|
local cfg="$1"
|
|
|
|
|
2010-05-30 21:40:22 +03:00
|
|
|
[ -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
|
|
|
|
}
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
|
2010-05-30 21:40:22 +03:00
|
|
|
uci_revert_state network "$cfg" dns
|
|
|
|
uci_revert_state network "$cfg" resolv_dns
|
|
|
|
}
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
}
|
|
|
|
|
2008-07-30 08:22:02 +03:00
|
|
|
# sort the device list, drop duplicates
|
|
|
|
sort_list() {
|
|
|
|
local arg="$*"
|
|
|
|
(
|
|
|
|
for item in $arg; do
|
|
|
|
echo "$item"
|
|
|
|
done
|
|
|
|
) | sort -u
|
|
|
|
}
|
|
|
|
|
2007-02-25 14:52:02 +02:00
|
|
|
# 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() {
|
2006-07-30 06:09:09 +03:00
|
|
|
local iface="$1"
|
|
|
|
local config="$2"
|
2009-03-25 21:13:15 +02:00
|
|
|
local vifmac="$3"
|
2006-07-30 06:09:09 +03:00
|
|
|
|
2007-02-25 14:52:02 +02:00
|
|
|
# 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.
|
2007-11-30 11:43:05 +02:00
|
|
|
[ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2006-10-15 18:50:02 +03:00
|
|
|
ifconfig "$iface" 2>/dev/null >/dev/null && {
|
2009-08-07 03:08:06 +03:00
|
|
|
local proto
|
2009-06-01 21:07:44 +03:00
|
|
|
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)
|
2006-10-15 18:50:02 +03:00
|
|
|
unbridge "$iface"
|
2009-06-01 21:07:44 +03:00
|
|
|
[ "$proto" = none ] || ifconfig "$iface" 0.0.0.0
|
2009-03-25 21:13:15 +02:00
|
|
|
|
|
|
|
# Change interface MAC address if requested
|
|
|
|
[ -n "$vifmac" ] && {
|
|
|
|
ifconfig "$iface" down
|
|
|
|
ifconfig "$iface" hw ether "$vifmac" up
|
|
|
|
}
|
2006-10-15 18:50:02 +03:00
|
|
|
}
|
|
|
|
|
2006-07-30 06:09:09 +03:00
|
|
|
# Setup VLAN interfaces
|
2008-08-01 06:01:25 +03:00
|
|
|
add_vlan "$iface" && return 1
|
2007-04-02 12:41:56 +03:00
|
|
|
ifconfig "$iface" 2>/dev/null >/dev/null || return 0
|
2006-07-30 06:09:09 +03:00
|
|
|
|
|
|
|
# Setup bridging
|
2009-08-07 03:08:06 +03:00
|
|
|
local iftype
|
2007-02-25 14:52:02 +02:00
|
|
|
config_get iftype "$config" type
|
2006-07-30 06:09:09 +03:00
|
|
|
case "$iftype" in
|
|
|
|
bridge)
|
2010-05-27 17:07:39 +03:00
|
|
|
local macaddr
|
|
|
|
config_get macaddr "$config" macaddr
|
2007-01-20 17:28:47 +02:00
|
|
|
[ -x /usr/sbin/brctl ] && {
|
2010-06-02 23:39:26 +03:00
|
|
|
# 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
|
|
|
|
|
2007-01-20 17:28:47 +02:00
|
|
|
ifconfig "br-$config" 2>/dev/null >/dev/null && {
|
2009-08-07 03:08:06 +03:00
|
|
|
local newdevs devices
|
2008-07-30 08:22:02 +03:00
|
|
|
config_get devices "$config" device
|
|
|
|
for dev in $(sort_list "$devices" "$iface"); do
|
|
|
|
append newdevs "$dev"
|
|
|
|
done
|
|
|
|
uci_set_state network "$config" device "$newdevs"
|
2009-09-16 17:21:19 +03:00
|
|
|
$DEBUG ifconfig "$iface" 0.0.0.0
|
2007-01-20 17:28:47 +02:00
|
|
|
$DEBUG brctl addif "br-$config" "$iface"
|
2007-02-25 14:52:02 +02:00
|
|
|
# Bridge existed already. No further processing necesary
|
2007-01-20 17:28:47 +02:00
|
|
|
} || {
|
2009-08-07 03:08:06 +03:00
|
|
|
local stp
|
|
|
|
config_get_bool stp "$config" stp 0
|
2007-01-20 17:28:47 +02:00
|
|
|
$DEBUG brctl addbr "br-$config"
|
|
|
|
$DEBUG brctl setfd "br-$config" 0
|
2007-07-04 08:05:46 +03:00
|
|
|
$DEBUG ifconfig "br-$config" up
|
2009-09-16 17:21:19 +03:00
|
|
|
$DEBUG ifconfig "$iface" 0.0.0.0
|
2007-01-20 17:28:47 +02:00
|
|
|
$DEBUG brctl addif "br-$config" "$iface"
|
2009-08-07 03:08:06 +03:00
|
|
|
$DEBUG brctl stp "br-$config" $stp
|
2007-02-25 14:52:02 +02:00
|
|
|
# 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.
|
2007-01-20 17:28:47 +02:00
|
|
|
}
|
2010-05-27 17:07:39 +03:00
|
|
|
ifconfig "$iface" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null
|
2007-02-25 14:52:02 +02:00
|
|
|
return 1
|
2006-07-30 06:09:09 +03:00
|
|
|
}
|
|
|
|
;;
|
|
|
|
esac
|
2007-02-25 14:52:02 +02:00
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
2008-04-03 00:27:28 +03:00
|
|
|
set_interface_ifname() {
|
|
|
|
local config="$1"
|
|
|
|
local ifname="$2"
|
|
|
|
|
2009-08-07 03:08:06 +03:00
|
|
|
local device
|
2008-04-03 00:27:28 +03:00
|
|
|
config_get device "$1" device
|
2008-04-07 19:02:50 +03:00
|
|
|
uci_set_state network "$config" ifname "$ifname"
|
|
|
|
uci_set_state network "$config" device "$device"
|
2008-04-03 00:27:28 +03:00
|
|
|
}
|
|
|
|
|
2008-08-20 14:17:40 +03:00
|
|
|
setup_interface_none() {
|
2008-08-20 14:45:23 +03:00
|
|
|
env -i ACTION="ifup" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
|
2008-08-20 14:17:40 +03:00
|
|
|
}
|
|
|
|
|
2008-08-07 18:28:48 +03:00
|
|
|
setup_interface_static() {
|
|
|
|
local iface="$1"
|
|
|
|
local config="$2"
|
|
|
|
|
2009-08-07 03:08:06 +03:00
|
|
|
local ipaddr netmask ip6addr
|
2008-08-07 18:28:48 +03:00
|
|
|
config_get ipaddr "$config" ipaddr
|
|
|
|
config_get netmask "$config" netmask
|
|
|
|
config_get ip6addr "$config" ip6addr
|
|
|
|
[ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2009-08-07 03:08:06 +03:00
|
|
|
local gateway ip6gw dns bcast
|
2008-08-07 18:28:48 +03:00
|
|
|
config_get gateway "$config" gateway
|
|
|
|
config_get ip6gw "$config" ip6gw
|
|
|
|
config_get dns "$config" dns
|
|
|
|
config_get bcast "$config" broadcast
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2008-08-07 18:28:48 +03:00
|
|
|
[ -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"
|
2010-05-30 21:40:22 +03:00
|
|
|
[ -z "$dns" ] || add_dns "$config" $dns
|
2008-08-07 18:28:48 +03:00
|
|
|
|
2009-08-04 03:06:47 +03:00
|
|
|
config_get type "$config" TYPE
|
2009-04-13 03:43:23 +03:00
|
|
|
[ "$type" = "alias" ] && return 0
|
|
|
|
|
2008-08-07 18:28:48 +03:00
|
|
|
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"
|
|
|
|
|
2009-08-07 03:08:06 +03:00
|
|
|
local cfg
|
2008-08-07 18:28:48 +03:00
|
|
|
config_get cfg "$config" interface
|
|
|
|
[ "$parent" == "$cfg" ] || return 0
|
|
|
|
|
2010-06-02 23:39:26 +03:00
|
|
|
# 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
|
|
|
|
|
2008-08-07 18:28:48 +03:00
|
|
|
# alias counter
|
2009-08-07 03:08:06 +03:00
|
|
|
local ctr
|
|
|
|
config_get ctr "$parent" alias_count 0
|
2008-08-07 18:28:48 +03:00
|
|
|
ctr="$(($ctr + 1))"
|
|
|
|
config_set "$parent" alias_count "$ctr"
|
|
|
|
|
|
|
|
# alias list
|
2009-08-07 03:08:06 +03:00
|
|
|
local list
|
2008-08-07 18:28:48 +03:00
|
|
|
config_get list "$parent" aliases
|
|
|
|
append list "$config"
|
|
|
|
config_set "$parent" aliases "$list"
|
|
|
|
|
2010-06-02 23:39:26 +03:00
|
|
|
use_iface="$use_iface:$ctr"
|
|
|
|
set_interface_ifname "$config" "$use_iface"
|
2009-08-07 03:08:06 +03:00
|
|
|
|
|
|
|
local proto
|
|
|
|
config_get proto "$config" proto "static"
|
|
|
|
case "${proto}" in
|
2008-08-07 18:28:48 +03:00
|
|
|
static)
|
2010-06-02 23:39:26 +03:00
|
|
|
setup_interface_static "$use_iface" "$config"
|
2008-08-07 18:28:48 +03:00
|
|
|
;;
|
2009-08-04 03:06:47 +03:00
|
|
|
*)
|
2008-08-07 18:28:48 +03:00
|
|
|
echo "Unsupported type '$proto' for alias config '$config'"
|
|
|
|
return 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
2007-02-25 14:52:02 +02:00
|
|
|
setup_interface() {
|
2010-06-02 23:39:26 +03:00
|
|
|
local iface="$1"
|
2007-02-25 14:52:02 +02:00
|
|
|
local config="$2"
|
2009-08-07 03:08:06 +03:00
|
|
|
local proto="$3"
|
2009-03-25 21:13:15 +02:00
|
|
|
local vifmac="$4"
|
2007-02-25 14:52:02 +02:00
|
|
|
|
|
|
|
[ -n "$config" ] || {
|
2010-06-02 23:39:26 +03:00
|
|
|
config=$(find_config "$iface")
|
2007-02-25 14:52:02 +02:00
|
|
|
[ "$?" = 0 ] || return 1
|
|
|
|
}
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2010-06-02 23:39:26 +03:00
|
|
|
prepare_interface "$iface" "$config" "$vifmac" || return 0
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2010-06-02 23:39:26 +03:00
|
|
|
[ "$iface" = "br-$config" ] && {
|
2009-08-04 03:06:47 +03:00
|
|
|
# need to bring up the bridge and wait a second for
|
2007-02-25 14:52:02 +02:00
|
|
|
# it to switch to the 'forwarding' state, otherwise
|
|
|
|
# it will lose its routes...
|
2010-06-02 23:39:26 +03:00
|
|
|
ifconfig "$iface" up
|
2007-02-25 14:52:02 +02:00
|
|
|
sleep 1
|
|
|
|
}
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2006-07-30 06:09:09 +03:00
|
|
|
# Interface settings
|
2010-06-02 23:39:26 +03:00
|
|
|
grep "$iface:" /proc/net/dev > /dev/null && {
|
2009-08-07 03:08:06 +03:00
|
|
|
local mtu macaddr
|
|
|
|
config_get mtu "$config" mtu
|
|
|
|
config_get macaddr "$config" macaddr
|
2010-06-02 23:39:26 +03:00
|
|
|
[ -n "$macaddr" ] && $DEBUG ifconfig "$iface" down
|
|
|
|
$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
|
2009-06-01 21:09:05 +03:00
|
|
|
}
|
2010-06-02 23:39:26 +03:00
|
|
|
set_interface_ifname "$config" "$iface"
|
2006-07-30 06:09:09 +03:00
|
|
|
|
2009-08-07 03:08:06 +03:00
|
|
|
[ -n "$proto" ] || config_get proto "$config" proto
|
2006-07-30 06:09:09 +03:00
|
|
|
case "$proto" in
|
|
|
|
static)
|
2010-06-02 23:39:26 +03:00
|
|
|
setup_interface_static "$iface" "$config"
|
2006-07-30 06:09:09 +03:00
|
|
|
;;
|
|
|
|
dhcp)
|
2010-09-19 18:18:07 +03:00
|
|
|
# kill running udhcpc instance
|
2010-06-02 23:39:26 +03:00
|
|
|
local pidfile="/var/run/dhcp-${iface}.pid"
|
2010-09-19 18:18:07 +03:00
|
|
|
service_kill udhcpc "$pidfile"
|
|
|
|
|
2010-10-07 00:22:17 +03:00
|
|
|
local ipaddr netmask hostname proto1 clientid vendorid broadcast
|
2010-09-19 18:18:07 +03:00
|
|
|
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
|
2010-10-07 00:22:17 +03:00
|
|
|
config_get vendorid "$config" vendorid
|
2010-09-19 18:18:07 +03:00
|
|
|
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} \
|
2010-10-07 00:22:17 +03:00
|
|
|
${vendorid:+-V $vendorid} \
|
2010-09-19 18:18:07 +03:00
|
|
|
-b -p "$pidfile" $broadcast \
|
|
|
|
${dhcpopts:- -O rootpath -R &}
|
2006-07-30 06:09:09 +03:00
|
|
|
;;
|
2008-08-20 14:17:40 +03:00
|
|
|
none)
|
2010-06-02 23:39:26 +03:00
|
|
|
setup_interface_none "$iface" "$config"
|
2008-08-20 14:17:40 +03:00
|
|
|
;;
|
2006-07-30 06:09:09 +03:00
|
|
|
*)
|
|
|
|
if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
|
2010-06-02 23:39:26 +03:00
|
|
|
eval "setup_interface_$proto '$iface' '$config' '$proto'"
|
2006-07-30 06:09:09 +03:00
|
|
|
else
|
|
|
|
echo "Interface type $proto not supported."
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
|
2010-02-12 04:06:57 +02:00
|
|
|
stop_interface_dhcp() {
|
|
|
|
local config="$1"
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
|
2010-05-30 21:40:22 +03:00
|
|
|
local ifname
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
config_get ifname "$config" ifname
|
|
|
|
|
|
|
|
local lock="/var/lock/dhcp-${ifname}"
|
|
|
|
[ -f "$lock" ] && lock -u "$lock"
|
|
|
|
|
2010-05-30 21:40:22 +03:00
|
|
|
remove_dns "$config"
|
|
|
|
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
local pidfile="/var/run/dhcp-${ifname}.pid"
|
2010-09-19 18:18:07 +03:00
|
|
|
service_kill udhcpc "$pidfile"
|
[backfire] merge ppp, pppoe, pptp and 3g fixes
r21283, r21284, r21285, r21287, r21302, r21303, r21341,
r21361, r21379, r21383, r21386, r21387, r21388, r21389,
r21390, r21391, r21392, r21393, r21426, r21556, r21563
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21564 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-24 20:06:58 +03:00
|
|
|
|
2010-02-12 04:06:57 +02:00
|
|
|
uci -P /var/state revert "network.$config"
|
|
|
|
}
|
|
|
|
|
2006-10-15 18:50:02 +03:00
|
|
|
unbridge() {
|
|
|
|
local dev="$1"
|
|
|
|
local brdev
|
2009-08-04 03:06:47 +03:00
|
|
|
|
2007-02-28 01:34:14 +02:00
|
|
|
[ -x /usr/sbin/brctl ] || return 0
|
2010-03-14 23:10:07 +02:00
|
|
|
brctl show 2>/dev/null | grep "$dev" >/dev/null && {
|
2006-10-15 18:50:02 +03:00
|
|
|
# interface is still part of a bridge, correct that
|
|
|
|
|
|
|
|
for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
|
|
|
|
brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
|
|
|
|
done
|
|
|
|
}
|
|
|
|
}
|