diff options
| author | Steven Barth <cyrus@openwrt.org> | 2013-12-15 19:38:53 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2013-12-15 19:38:53 +0000 |
| commit | e49d67f1925f1582138c7fcd998c6952aa5d0909 (patch) | |
| tree | ed1d9b1c2f89b77edc9426e58d3d6d535ce56de1 /package/network/ipv6/6rd | |
| parent | 36197755dc955f1ff287270d58a607ce975cbce4 (diff) | |
| download | upstream-e49d67f1925f1582138c7fcd998c6952aa5d0909.tar.gz upstream-e49d67f1925f1582138c7fcd998c6952aa5d0909.tar.bz2 upstream-e49d67f1925f1582138c7fcd998c6952aa5d0909.zip | |
Convert DHCP->6rd and DHCPv6->DS-Lite autoconfig to dynamic interface
SVN-Revision: 39061
Diffstat (limited to 'package/network/ipv6/6rd')
| -rw-r--r-- | package/network/ipv6/6rd/Makefile | 2 | ||||
| -rw-r--r-- | package/network/ipv6/6rd/files/6rd.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile index c701596193..5a4807805c 100644 --- a/package/network/ipv6/6rd/Makefile +++ b/package/network/ipv6/6rd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6rd -PKG_VERSION:=4 +PKG_VERSION:=5 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh index 7d6cc3ebd3..a3935e1422 100644 --- a/package/network/ipv6/6rd/files/6rd.sh +++ b/package/network/ipv6/6rd/files/6rd.sh @@ -14,8 +14,8 @@ proto_6rd_setup() { local iface="$2" local link="6rd-$cfg" - local mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen - json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen + local mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink + json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink [ -z "$ip6prefix" -o -z "$peeraddr" ] && { proto_notify_error "$cfg" "MISSING_ADDRESS" @@ -57,6 +57,7 @@ proto_6rd_setup() { json_add_string local "$ipaddr" json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen" json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen" + [ -n "$tunlink" ] && json_add_string link "$tunlink" proto_close_tunnel proto_send_update "$cfg" @@ -77,6 +78,7 @@ proto_6rd_init_config() { proto_config_add_string "ip6prefix" proto_config_add_string "ip6prefixlen" proto_config_add_string "ip4prefixlen" + proto_config_add_string "tunlink" } [ -n "$INCLUDE_ONLY" ] || { |