From: jihwan.seo <jihwan.seo@samsung.com>
Date: Wed, 7 Sep 2016 06:50:15 +0000 (+0900)
Subject: update TCP & ARDUINO filter in secure mode
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01a6b2912a8ecf4c8383e9943aad4fe15db61528;p=contrib%2Fiotivity.git

update TCP & ARDUINO filter in secure mode

Change-Id: I14a9d6a24b8dcac6acd7f92fbe5afee58297fdca
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
---

diff --git a/resource/csdk/security/src/directpairing.c b/resource/csdk/security/src/directpairing.c
index b3680cf..f4db381 100644
--- a/resource/csdk/security/src/directpairing.c
+++ b/resource/csdk/security/src/directpairing.c
@@ -255,10 +255,12 @@ bool DPGenerateQuery(bool isSecure,
     {
 // @todo: Remove this ifdef. On Arduino, CT_ADAPTER_TCP resolves to the same value
 // as CT_ADAPTER_IP, resulting in a compiler error.
-#if (!defined(WITH_ARDUINO)) || defined(WITH_TCP)
+#ifdef WITH_TCP
+#ifndef WITH_ARDUINO
         case CT_ADAPTER_TCP:
             prefix = (isSecure == true) ? QPREFIX_COAPS_TCP : QPREFIX_COAP_TCP;
-#endif // (!defined(WITH_ARDUINO)) || defined(WITH_TCP)
+#endif
+#endif
         case CT_ADAPTER_IP:
             switch(connType & CT_MASK_FLAGS & ~CT_FLAG_SECURE)
             {