diff options
author | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-26 12:42:53 +0000 |
---|---|---|
committer | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-26 12:42:53 +0000 |
commit | f457db83d826d18ab9ef8823b829b8015893111e (patch) | |
tree | f8fe86db70a4926806d88b73df9b244b9f7e8eb6 /package/network/ipv6/6relayd/files | |
parent | 749c9b0ead2d055a6c98daa0bdccd5b2f0742170 (diff) |
6relayd: compatibility with broken IPv6 devices
* Announce ULA as deprecated if other addresses are available
* Allow the announced DNS-server to be overwritten
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35803 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/6relayd/files')
-rw-r--r-- | package/network/ipv6/6relayd/files/6relayd.config | 1 | ||||
-rw-r--r-- | package/network/ipv6/6relayd/files/6relayd.init | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/package/network/ipv6/6relayd/files/6relayd.config b/package/network/ipv6/6relayd/files/6relayd.config index fd0d29d37..a4376c0a0 100644 --- a/package/network/ipv6/6relayd/files/6relayd.config +++ b/package/network/ipv6/6relayd/files/6relayd.config @@ -4,6 +4,7 @@ config server default option rd server option dhcpv6 server option fallback_relay 'rd dhcpv6 ndp' + option compat_ula 1 # Example #1: Create a relay for several networks in proxy mode diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init index 82cd24de4..410164a9d 100644 --- a/package/network/ipv6/6relayd/files/6relayd.init +++ b/package/network/ipv6/6relayd/files/6relayd.init @@ -66,14 +66,19 @@ start_6relayd() { fi # Configure feature options - local always_rewrite_dns + local always_rewrite_dns rewrite_dns_addr config_get_bool always_rewrite_dns "$cfg" always_rewrite_dns 0 - [ "$always_rewrite_dns" -eq 1 ] && append args "-n" + config_get rewrite_dns_addr "$cfg" rewrite_dns_addr + [ "$always_rewrite_dns" -eq 1 ] && append args "-n$rewrite_dns_addr" local always_assume_default config_get_bool always_assume_default "$cfg" always_assume_default 0 [ "$always_assume_default" -eq 1 ] && append args "-u" + local compat_ula + config_get_bool compat_ula "$cfg" compat_ula 0 + [ "$compat_ula" -eq 1 ] && append args "-c" + [ "$ndp" = "relay" ] && append args "-N -s -l" [ "$rd" = "relay" ] && append args "-Rrelay" [ "$rd" = "server" ] && append args "-Rserver" |