qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 19:25:21 +02:00
Code

[backfire] backport r25454

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25455 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-02-11 00:42:01 +00:00
parent 85d6d57eaa
commit 6d44b9f998
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=43.10 PKG_RELEASE:=43.11
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host PKG_BUILD_DEPENDS:=opkg/host

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

@ -90,6 +90,33 @@ case "$ACTION" in
ifconfig "$DEVICE" del "$ip6addr" ifconfig "$DEVICE" del "$ip6addr"
ifconfig "$DEVICE" add "$ip6addr" ifconfig "$DEVICE" add "$ip6addr"
} }
# Setup sysctls
local proto accept_ra send_rs
config_get proto "$INTERFACE" proto
if [ "$proto" = dhcp ]; then
accept_ra=1
send_rs=0
else
accept_ra=0
send_rs=1
fi
config_get_bool accept_ra "$INTERFACE" accept_ra $accept_ra
[ $accept_ra -eq 0 ] || {
logger -t ifup "Allowing Router Advertisements on $INTERFACE ($DEVICE)"
accept_ra=2
}
do_sysctl "net.ipv6.conf.$INTERFACE.accept_ra" $accept_ra
config_get_bool send_rs "$INTERFACE" send_rs $send_rs
[ $send_rs -eq 0 ] || {
logger -t ifup "Enabling Router Solicitations on $INTERFACE ($DEVICE)"
send_rs=2
}
do_sysctl "net.ipv6.conf.$INTERFACE.forwarding" $send_rs
# Setup routes # Setup routes
config_foreach "add_route" route config_foreach "add_route" route

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

@ -164,15 +164,6 @@ prepare_interface() {
local macaddr local macaddr
config_get macaddr "$config" macaddr config_get macaddr "$config" macaddr
[ -x /usr/sbin/brctl ] && { [ -x /usr/sbin/brctl ] && {
# 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
ifconfig "br-$config" 2>/dev/null >/dev/null && { ifconfig "br-$config" 2>/dev/null >/dev/null && {
local newdevs devices local newdevs devices
config_get devices "$config" device config_get devices "$config" device
@ -181,6 +172,7 @@ prepare_interface() {
done done
uci_set_state network "$config" device "$newdevs" uci_set_state network "$config" device "$newdevs"
$DEBUG ifconfig "$iface" 0.0.0.0 $DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
$DEBUG brctl addif "br-$config" "$iface" $DEBUG brctl addif "br-$config" "$iface"
# Bridge existed already. No further processing necesary # Bridge existed already. No further processing necesary
} || { } || {
@ -190,6 +182,7 @@ prepare_interface() {
$DEBUG brctl setfd "br-$config" 0 $DEBUG brctl setfd "br-$config" 0
$DEBUG ifconfig "br-$config" up $DEBUG ifconfig "br-$config" up
$DEBUG ifconfig "$iface" 0.0.0.0 $DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
$DEBUG brctl addif "br-$config" "$iface" $DEBUG brctl addif "br-$config" "$iface"
$DEBUG brctl stp "br-$config" $stp $DEBUG brctl stp "br-$config" $stp
# Creating the bridge here will have triggered a hotplug event, which will # Creating the bridge here will have triggered a hotplug event, which will