KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netifd: added support for setting up 6rd from DHCP

Browse source 
SVN-Revision: 36626
This commit is contained in:
Steven Barth 2013-05-13 17:12:30 +00:00
parent ad93a571c6
commit ea71678b09
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
package/network/config/netifd/files/lib/netifd/dhcp.script
View file

@ -35,6 +35,30 @@ setup_interface () {
done
proto_send_update "$INTERFACE"
if [ -n "$IFACE6RD" -a -n "$ip6rd" ]; then
local v4mask="${ip6rd%% *}"
ip6rd="${ip6rd#* }"
local ip6rdprefixlen="${ip6rd%% *}"
ip6rd="${ip6rd#* }"
local ip6rdprefix="${ip6rd%% *}"
ip6rd="${ip6rd#* }"
local ip6rdbr="${ip6rd%% *}"
uci -q batch <<-EOF >/dev/null
set network.$IFACE6RD.proto=6rd
set network.$IFACE6RD.auto=0
set network.$IFACE6RD.peeraddr=$ip6rdbr
set network.$IFACE6RD.ip4prefixlen=$v4mask
set network.$IFACE6RD.ip6prefix=$ip6rdprefix
set network.$IFCAE6RD.ip6prefixlen=$ip6rdprefixlen
commit network
EOF
ifdown "$IFACE6RD"
/etc/init.d/network reload
ifup "$IFACE6RD"
fi
# TODO
# [ -n "$ntpsrv" ] && change_state network "$ifc" lease_ntpsrv "$ntpsrv"
# [ -n "$timesvr" ] && change_state network "$ifc" lease_timesrv "$timesvr"

6
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
View file

@ -12,14 +12,15 @@ proto_dhcp_init_config() {
proto_config_add_string "vendorid"
proto_config_add_boolean "broadcast"
proto_config_add_string "reqopts"
proto_config_add_string "iface6rd"
}
proto_dhcp_setup() {
local config="$1"
local iface="$2"
local ipaddr hostname clientid vendorid broadcast reqopts
json_get_vars ipaddr hostname clientid vendorid broadcast reqopts
local ipaddr hostname clientid vendorid broadcast reqopts iface6rd
json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd
local opt dhcpopts
for opt in $reqopts; do
@ -28,6 +29,7 @@ proto_dhcp_setup() {
[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
proto_export "INTERFACE=$config"
proto_run_command "$config" udhcpc \