update TCP & ARDUINO filter in secure mode
authorjihwan.seo <jihwan.seo@samsung.com>
Wed, 7 Sep 2016 06:50:15 +0000 (15:50 +0900)
committerAshok Babu Channa <ashok.channa@samsung.com>
Wed, 7 Sep 2016 10:10:26 +0000 (10:10 +0000)
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>
resource/csdk/security/src/directpairing.c

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