From c199d8bc6097a7232d492ccf5b30b6d2d27f0669 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 1 May 2020 11:08:31 +0200 Subject: [PATCH] Use fd80 instead of fe80 for 6in4 --- omr-6in4/files/bin/omr-6in4 | 4 ++-- omr-6in4/files/etc/uci-defaults/9010-omr-6in4 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4 index 594c9b2d0..34c03a17c 100755 --- a/omr-6in4/files/bin/omr-6in4 +++ b/omr-6in4/files/bin/omr-6in4 @@ -39,8 +39,8 @@ while true; do ipv6_addr=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@["ipv6-address"][0].address' | tr -d "\n") ip -6 addr add $ipv6_addr dev 6in4-omr6in4 > /dev/null 2>&1 ipv6_gw=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n") - [ "$ipv6_gw" = "::" ] && ipv6_gw='fe80::a00:1' - [ -z "$ipv6_gw" ] && ipv6_gw='fe80::a00:1' + [ "$ipv6_gw" = "::" ] && ipv6_gw='fd80::a00:1' + [ -z "$ipv6_gw" ] && ipv6_gw='fd80::a00:1' #[ -z "$ipv6_gw" ] && ipv6_gw='fe80::aff:ff01' ip -6 route replace default via ${ipv6_gw} dev 6in4-omr6in4 > /dev/null 2>&1 if [ "$(uci -q get openmptcprouter.settings.uci_route)" = "1" ]; then diff --git a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 index 56ca8b282..3247a243d 100755 --- a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 +++ b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 @@ -10,8 +10,8 @@ if [ "$(uci -q show network | grep omr6in4)" = "" ]; then set network.omr6in4.multipath=off set network.omr6in4.ipaddr=10.255.255.2 set network.omr6in4.peeraddr=10.255.255.1 - set network.omr6in4.gateway=fe80::a00:1 - set network.omr6in4.ip6addr='fe80::a00:2/128' + set network.omr6in4.gateway=fd80::a00:1 + set network.omr6in4.ip6addr='fd80::a00:2/128' set network.omr6in4.auto='0' commit network EOF @@ -27,7 +27,7 @@ fi if [ "$(uci -q get network.omr6in4.ip6addr)" = "" ]; then uci -q batch <<-EOF >/dev/null - set network.omr6in4.ip6addr=fe80::a00:2 + set network.omr6in4.ip6addr=fd80::a00:2 commit network EOF fi