From 1b12d3e1cd9efdfab05db9ae56d9c752f3886d5b Mon Sep 17 00:00:00 2001
From: rongli <rongli@nestlabs.com>
Date: Sun, 14 Aug 2016 23:51:51 +0800
Subject: [PATCH] update child's keep alive (#375)

- use defined MLE_END_DEVICE_TIMEOUT(240s) as child's timeout period;
- all 4 keep-alive attempts completed in MLE_END_DEVICE_TIMEOUT;
---
 src/core/thread/mle.cpp           | 16 ++++++++--------
 src/core/thread/mle_constants.hpp |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index d1343082f..8850abae2 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -74,7 +74,7 @@ Mle::Mle(ThreadNetif &aThreadNetif) :
     mParentLinkQuality2 = 0;
     mParentLinkQuality1 = 0;
     mRetrieveNewNetworkData = false;
-    mTimeout = kMaxNeighborAge;
+    mTimeout = kMleEndDeviceTimeout;
 
     memset(&mLeaderData, 0, sizeof(mLeaderData));
     memset(&mParent, 0, sizeof(mParent));
@@ -348,7 +348,7 @@ ThreadError Mle::SetStateChild(uint16_t aRloc16)
 
     if ((mDeviceMode & ModeTlv::kModeRxOnWhenIdle) != 0)
     {
-        mParentRequestTimer.Start(Timer::SecToMsec(mTimeout / 2));
+        mParentRequestTimer.Start(Timer::SecToMsec(mTimeout / kMaxChildKeepAliveAttempts));
     }
 
     if ((mDeviceMode & ModeTlv::kModeFFD) != 0)
@@ -367,9 +367,9 @@ uint32_t Mle::GetTimeout(void) const
 
 ThreadError Mle::SetTimeout(uint32_t aTimeout)
 {
-    if (aTimeout < 2)
+    if (aTimeout < 4)
     {
-        aTimeout = 2;
+        aTimeout = 4;
     }
 
     mTimeout = aTimeout;
@@ -380,7 +380,7 @@ ThreadError Mle::SetTimeout(uint32_t aTimeout)
 
         if ((mDeviceMode & ModeTlv::kModeRxOnWhenIdle) != 0)
         {
-            mParentRequestTimer.Start(Timer::SecToMsec(mTimeout / 2));
+            mParentRequestTimer.Start(Timer::SecToMsec(mTimeout / kMaxChildKeepAliveAttempts));
         }
     }
 
@@ -968,7 +968,7 @@ void Mle::HandleParentRequestTimer(void)
             if (mDeviceMode & ModeTlv::kModeRxOnWhenIdle)
             {
                 SendChildUpdateRequest();
-                mParentRequestTimer.Start(Timer::SecToMsec(mTimeout / 2));
+                mParentRequestTimer.Start(Timer::SecToMsec(mTimeout / kMaxChildKeepAliveAttempts));
             }
         }
         else
@@ -1968,7 +1968,7 @@ ThreadError Mle::HandleChildIdResponse(const Message &aMessage, const Ip6::Messa
 
     if ((mDeviceMode & ModeTlv::kModeRxOnWhenIdle) == 0)
     {
-        mMesh.SetPollPeriod(Timer::SecToMsec(mTimeout / 2));
+        mMesh.SetPollPeriod(Timer::SecToMsec(mTimeout / kMaxChildKeepAliveAttempts));
         mMesh.SetRxOnWhenIdle(false);
     }
     else
@@ -2078,7 +2078,7 @@ ThreadError Mle::HandleChildUpdateResponse(const Message &aMessage, const Ip6::M
 
         if ((mode.GetMode() & ModeTlv::kModeRxOnWhenIdle) == 0)
         {
-            mMesh.SetPollPeriod(Timer::SecToMsec(mTimeout / 2));
+            mMesh.SetPollPeriod(Timer::SecToMsec(mTimeout / kMaxChildKeepAliveAttempts));
             mMesh.SetRxOnWhenIdle(false);
         }
         else
diff --git a/src/core/thread/mle_constants.hpp b/src/core/thread/mle_constants.hpp
index df8478517..d3abd97d6 100644
--- a/src/core/thread/mle_constants.hpp
+++ b/src/core/thread/mle_constants.hpp
@@ -45,6 +45,7 @@ namespace Mle {
 enum
 {
     kMaxChildren                = OPENTHREAD_CONFIG_MAX_CHILDREN,
+    kMaxChildKeepAliveAttempts  = 4,    ///< Maximum keep alive attempts before attempting to reattach to a new Parent
 };
 
 /**
@@ -90,6 +91,7 @@ enum
     kMaxLeaderToRouterTimeout   = 90,   ///< INFINITE_COST_TIMEOUT (seconds)
     kReedAdvertiseInterval      = 570,  ///< REED_ADVERTISEMENT_INTERVAL (seconds)
     kReedAdvertiseJitter        = 60,   ///< REED_ADVERTISEMENT_JITTER (seconds)
+    kMleEndDeviceTimeout        = 240,  ///< MLE_END_DEVICE_TIMEOUT (secondes)
 };
 
 enum