From b024d2ee727fddedc2d6290dfcb5c49433e30523 Mon Sep 17 00:00:00 2001 From: Soemin Tjong Date: Thu, 6 Apr 2017 15:28:59 -0700 Subject: [PATCH] Set request timeout to EXCHANGE_LIFETIME of CoAP. EXCHANGE_LIFETIME value is 247 seconds. Change-Id: I95b896e8459200fbd1a02598ea1537c96a8eccef Signed-off-by: Soemin Tjong Reviewed-on: https://gerrit.iotivity.org/gerrit/18591 Reviewed-by: Dave Thaler Reviewed-by: Way Vadhanasin Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- resource/IPCA/src/app.cpp | 2 +- resource/IPCA/src/callback.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resource/IPCA/src/app.cpp b/resource/IPCA/src/app.cpp index 278b4ab..2ea0096 100644 --- a/resource/IPCA/src/app.cpp +++ b/resource/IPCA/src/app.cpp @@ -116,7 +116,7 @@ void App::AppWorkerThread(App* app) const uint64_t PingPeriodMS = 30000; // Do device ping for Observed devices every 30 seconds. - // Outstanding requests should time out in 2 seconds per rfc 7252. + // Outstanding requests should time out in 247 seconds (EXCHANGE_LIFETIME) per rfc 7252. // Wake up every second to check. const size_t AppThreadSleepTimeSeconds = 1; std::chrono::seconds appThreadSleepTime(AppThreadSleepTimeSeconds); diff --git a/resource/IPCA/src/callback.cpp b/resource/IPCA/src/callback.cpp index cf78c3a..e321364 100644 --- a/resource/IPCA/src/callback.cpp +++ b/resource/IPCA/src/callback.cpp @@ -392,8 +392,7 @@ void Callback::RemoveCallbackInfo(size_t mapKey) void Callback::CompleteAndRemoveExpiredCallbackInfo(std::vector& cbInfoList) { - // @tbd: determine a good value for response timeout. - const int RequestTimeoutMs = 2000; // 2 seconds for request timeout. + const int RequestTimeoutMs = 247000; // This is EXCHANGE_LIFETIME defined in RFC7252. uint64_t currentTime = OICGetCurrentTime(TIME_IN_MS); -- 2.7.4