qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 07:01:44 +02:00
Code

[package] base-files:

Browse Source 
- add aliases to device by default (not ifname)
	- introduce option "layer" to select the target ifname to attach the alias to:
		- 3 use tun device (tun over bridge over device) fallback to bridge or device
		- 2 use bridge (bridge over device) fallback to device
		- 1 use device


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21655 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-06-02 00:22:13 +00:00
parent 76b64a8176
commit 796dcb6b2e
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/base-files/files/etc/hotplug.d/iface/10-routes
View File

@ -93,8 +93,9 @@ case "$ACTION" in
;;
ifdown)
# Bring down named aliases
local device=$(uci_get_state network "$INTERFACE" device)
local ifn
for ifn in $(ifconfig | sed -ne "s/^\($DEVICE:[^[:space:]]\+\).*/\1/p"); do
for ifn in $(ifconfig | sed -ne "s/^\(\($DEVICE${device:+\|$device}\|br-$INTERFACE\):[^[:space:]]\+\).*/\1/p"); do
ifconfig "$ifn" down
done
;;

25
package/base-files/files/lib/network/config.sh
View File

@ -246,6 +246,25 @@ setup_interface_alias() {
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
@ -258,14 +277,14 @@ setup_interface_alias() {
append list "$config"
config_set "$parent" aliases "$list"
iface="$iface:$ctr"
set_interface_ifname "$config" "$iface"
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 "$iface" "$config"
setup_interface_static "$use_iface" "$config"
;;
*)
echo "Unsupported type '$proto' for alias config '$config'"