From c7089e2b81725a7b520d006a63dea1936f3df6bd Mon Sep 17 00:00:00 2001 From: "jinhyuck83.park" Date: Fri, 24 Feb 2017 10:22:52 +0900 Subject: [PATCH] exclude internal Discovery when User connection Preference is "CA_USER_PREF_CLOUD" with this modification, internal discovery only carry out in case D2D. Change-Id: If0938186c9c887a2fe67e5a351b2d4b27b4c7e44 Signed-off-by: jinhyuck83.park Reviewed-on: https://gerrit.iotivity.org/gerrit/17395 Reviewed-by: Jonggyu Ham Tested-by: jenkins-iotivity Reviewed-by: Ashok Babu Channa --- resource/csdk/stack/src/ocstack.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index f55880c..401aacd 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -1640,7 +1640,12 @@ void OCHandleResponse(const CAEndpoint_t* endPoint, const CAResponseInfo_t* resp response->devAddr.remoteId); #if defined(TCP_ADAPTER) && defined(WITH_CLOUD) - OCCMDiscoveryResource(response); + CAConnectUserPref_t connPrefer = CA_USER_PREF_CLOUD; + CAResult_t ret = CAUtilCMGetConnectionUserConfig(&connPrefer); + if (ret == CA_STATUS_OK && connPrefer != CA_USER_PREF_CLOUD) + { + OCCMDiscoveryResource(response); + } #endif } } -- 2.7.4