From dcc13419c304cfdf9271834a2d7fb75d290d670f Mon Sep 17 00:00:00 2001
From: Irving-cl <oos1111@sjtu.edu.cn>
Date: Tue, 5 Mar 2019 00:31:16 +0800
Subject: [PATCH] [thci] match meshlocalprefix accurately to classify the
 addresses correctly (#3639)

---
 tools/harness-thci/OpenThread.py         | 6 +++---
 tools/harness-thci/OpenThread_WpanCtl.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/harness-thci/OpenThread.py b/tools/harness-thci/OpenThread.py
index 3b5e84fa5..99a4f5e6e 100644
--- a/tools/harness-thci/OpenThread.py
+++ b/tools/harness-thci/OpenThread.py
@@ -254,7 +254,7 @@ class OpenThread(IThci):
                 # link local address
                 if ip6Addr.split(':')[4] != '0':
                     linkLocal64Addr = ip6Addr
-            elif ip6AddrPrefix == 'fd00':
+            elif ip6Addr.startswith(self.meshLocalPrefix):
                 # mesh local address
                 if ip6Addr.split(':')[4] == '0':
                     # rloc
@@ -1257,7 +1257,7 @@ class OpenThread(IThci):
         self.channelMask = "0x7fff800" #(0xffff << 11)
         self.panId = ModuleHelper.Default_PanId
         self.xpanId = ModuleHelper.Default_XpanId
-        self.localprefix = ModuleHelper.Default_MLPrefix
+        self.meshLocalPrefix = ModuleHelper.Default_MLPrefix
         self.pskc = "00000000000000000000000000000000"  # OT only accept hex format PSKc for now
         self.securityPolicySecs = ModuleHelper.Default_SecurityPolicy
         self.securityPolicyFlags = "onrcb"
@@ -1287,7 +1287,7 @@ class OpenThread(IThci):
             self.setXpanId(self.xpanId)
             self.setNetworkName(self.networkName)
             self.setNetworkKey(self.networkKey)
-            self.setMLPrefix(self.localprefix)
+            self.setMLPrefix(self.meshLocalPrefix)
             self.setPSKc(self.pskc)
             self.setActiveTimestamp(self.activetimestamp)
         except Exception, e:
diff --git a/tools/harness-thci/OpenThread_WpanCtl.py b/tools/harness-thci/OpenThread_WpanCtl.py
index 99987cb48..be184419e 100644
--- a/tools/harness-thci/OpenThread_WpanCtl.py
+++ b/tools/harness-thci/OpenThread_WpanCtl.py
@@ -332,7 +332,7 @@ class OpenThread_WpanCtl(IThci):
                 # link local address
                 if ip6Addr.split(':')[4] != '0':
                     linkLocal64Addr = ip6Addr
-            elif ip6AddrPrefix == 'fd00':
+            elif ip6Addr.startswith(self.meshLocalPrefix):
                 # mesh local address
                 if ip6Addr.split(':')[4] == '0':
                     # rloc
@@ -1451,7 +1451,7 @@ class OpenThread_WpanCtl(IThci):
         self.channelMask = "0x7fff800" #(0xffff << 11)
         self.panId = ModuleHelper.Default_PanId
         self.xpanId = ModuleHelper.Default_XpanId
-        self.localprefix = ModuleHelper.Default_MLPrefix
+        self.meshLocalPrefix = ModuleHelper.Default_MLPrefix
         self.pskc = "00000000000000000000000000000000"  # OT only accept hex format PSKc for now
         self.securityPolicySecs = ModuleHelper.Default_SecurityPolicy
         self.securityPolicyFlags = "onrcb"
@@ -1480,7 +1480,7 @@ class OpenThread_WpanCtl(IThci):
             self.setXpanId(self.xpanId)
             self.setNetworkName(self.networkName)
             self.setNetworkKey(self.networkKey)
-            self.setMLPrefix(self.localprefix)
+            self.setMLPrefix(self.meshLocalPrefix)
             self.setPSKc(self.pskc)
             self.setActiveTimestamp(self.activetimestamp)
         except Exception, e: