48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
|
From 8ecfa95fff384ed047fd804016abdbbdcdd96d27 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Keisuke MORI <kskmori@intellilink.co.jp>
|
||
|
|
Date: Wed, 11 Sep 2019 15:33:37 +0900
|
||
|
|
Subject: [PATCH] Low: IPaddr2: fix to work properly with unsanitized IPv6
|
||
|
|
addresses
|
||
|
|
|
||
|
|
`ip route get` shows the sanitized address at $1 or $2 depending on
|
||
|
|
the address is already assigned to the node or not.
|
||
|
|
```
|
||
|
|
[root@centos73-1 ~]# /sbin/ip route get 2001:db8:101::0001
|
||
|
|
2001:db8:101::1 dev eth1 proto ra src 2001:db8:101:0:XXXX:XXXX:XXXX:XXXX metric 100
|
||
|
|
[root@centos73-1 ~]# /sbin/ip addr add 2001:db8:101::0001/64 dev eth1
|
||
|
|
[root@centos73-1 ~]# /sbin/ip route get 2001:db8:101::0001
|
||
|
|
local 2001:db8:101::1 dev lo table local proto none src 2001:db8:101::1 metric 0
|
||
|
|
```
|
||
|
|
|
||
|
|
It can not be sanitized if the address is unreachable and on the recent distributions
|
||
|
|
(probably depending on the iproute package version)
|
||
|
|
```
|
||
|
|
[root@centos73-1 ~]# /sbin/ip route get 2001:db8:201::0001
|
||
|
|
unreachable 2001:db8:201::1 dev lo table unspec proto kernel src 2001:db8:101:0:XXXX:XXXX:XXXX:XXXX metric 429496
|
||
|
|
```
|
||
|
|
```
|
||
|
|
[root@rhel80-1 ~]# /sbin/ip route get 200:db8:201::0001
|
||
|
|
RTNETLINK answers: Network is unreachable
|
||
|
|
```
|
||
|
|
---
|
||
|
|
heartbeat/IPaddr2 | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
|
||
|
|
index 041ace3a2..4f28ddab6 100755
|
||
|
|
--- a/heartbeat/IPaddr2
|
||
|
|
+++ b/heartbeat/IPaddr2
|
||
|
|
@@ -477,6 +477,12 @@ ip_init() {
|
||
|
|
fi
|
||
|
|
else
|
||
|
|
FAMILY=inet6
|
||
|
|
+ # address sanitization defined in RFC5952
|
||
|
|
+ SANITIZED_IP=$($IP2UTIL route get $OCF_RESKEY_ip | awk '$1~/:/ {print $1} $2~/:/ {print $2}')
|
||
|
|
+ if [ -n "$SANITIZED_IP" ]; then
|
||
|
|
+ OCF_RESKEY_ip="$SANITIZED_IP"
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
if ocf_is_true $OCF_RESKEY_lvs_support ;then
|
||
|
|
ocf_exit_reason "The IPv6 does not support lvs_support"
|
||
|
|
exit $OCF_ERR_CONFIGURED
|