From 140a5b22d944ff4949fcb50fd72a0305fe9e3c1a Mon Sep 17 00:00:00 2001
From: Steven Barth <cyrus@openwrt.org>
Date: Fri, 17 Jan 2014 14:00:04 +0000
Subject: [PATCH] odhcp6c: Use sourcerouting by default
SVN-Revision: 39311
---
package/network/ipv6/odhcp6c/files/dhcpv6.script | 2 +-
package/network/ipv6/odhcp6c/files/dhcpv6.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 8bcf76681c..13732df086 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -68,7 +68,7 @@ setup_interface () {
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
else
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
- for prefix in $PREFIXES; do
+ for prefix in $PREFIXES $ADDRESSES; do
local paddr="${prefix%%,*}"
proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"
done
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 0638d28f5f..cffb3ec22a 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -49,7 +49,7 @@ proto_dhcpv6_setup() {
[ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
- [ "$sourcerouting" = "1" ] && proto_export "SOURCE_ROUTING=1"
+ [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
proto_export "INTERFACE=$config"
proto_run_command "$config" odhcp6c \
--
GitLab