Resolved Adruino build errors

Change-Id: I28b7e3a2844904a91b9abaacd1e634419a821069
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5875
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/connectivity/util/SConscript b/resource/csdk/connectivity/util/SConscript
index e67caa0..6305edb 100644 (file)
--- a/resource/csdk/connectivity/util/SConscript
+++ b/resource/csdk/connectivity/util/SConscript
@@ -24,7 +24,7 @@ env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
 # Source files to build common for platforms
 ######################################################################
 
-env.AppendUnique(CA_SRC = [os.path.join(src_dir,'cautilinterface.c')])
+env.AppendUnique(CA_SRC = [os.path.join('./../util/src','cautilinterface.c')])
 
 if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
     if ca_os in ['linux', 'tizen', 'arduino']:

diff --git a/resource/csdk/security/src/directpairing.c b/resource/csdk/security/src/directpairing.c
index dd1d85c..4c68f1e 100644 (file)
--- a/resource/csdk/security/src/directpairing.c
+++ b/resource/csdk/security/src/directpairing.c
@@ -21,10 +21,13 @@
 #define _POSIX_C_SOURCE 200112L\r
 #endif\r
 \r
+#ifndef WITH_ARDUINO\r
 #include <unistd.h>\r
 #include <string.h>\r
 #include <time.h>\r
 #include <sys/time.h>\r
+#endif\r
+#include <string.h>\r
 \r
 #include "ocstack.h"\r
 #include "oic_malloc.h"\r
@@ -69,56 +72,6 @@ static OCDirectPairingDev_t *g_dp_paired = NULL;
 static OCDirectPairingDev_t *g_dp_discover = NULL;\r
 static DPairData_t *g_dp_proceed_ctx = NULL;\r
 \r
-\r
-const char *getResult(OCStackResult result) {\r
-    switch (result) {\r
-    case OC_STACK_OK:\r
-        return "OC_STACK_OK";\r
-    case OC_STACK_RESOURCE_CREATED:\r
-        return "OC_STACK_RESOURCE_CREATED";\r
-    case OC_STACK_RESOURCE_DELETED:\r
-        return "OC_STACK_RESOURCE_DELETED";\r
-    case OC_STACK_INVALID_URI:\r
-        return "OC_STACK_INVALID_URI";\r
-    case OC_STACK_INVALID_QUERY:\r
-        return "OC_STACK_INVALID_QUERY";\r
-    case OC_STACK_INVALID_IP:\r
-        return "OC_STACK_INVALID_IP";\r
-    case OC_STACK_INVALID_PORT:\r
-        return "OC_STACK_INVALID_PORT";\r
-    case OC_STACK_INVALID_CALLBACK:\r
-        return "OC_STACK_INVALID_CALLBACK";\r
-    case OC_STACK_INVALID_METHOD:\r
-        return "OC_STACK_INVALID_METHOD";\r
-    case OC_STACK_NO_MEMORY:\r
-        return "OC_STACK_NO_MEMORY";\r
-    case OC_STACK_COMM_ERROR:\r
-        return "OC_STACK_COMM_ERROR";\r
-    case OC_STACK_INVALID_PARAM:\r
-        return "OC_STACK_INVALID_PARAM";\r
-    case OC_STACK_NOTIMPL:\r
-        return "OC_STACK_NOTIMPL";\r
-    case OC_STACK_NO_RESOURCE:\r
-        return "OC_STACK_NO_RESOURCE";\r
-    case OC_STACK_RESOURCE_ERROR:\r
-        return "OC_STACK_RESOURCE_ERROR";\r
-    case OC_STACK_SLOW_RESOURCE:\r
-        return "OC_STACK_SLOW_RESOURCE";\r
-    case OC_STACK_NO_OBSERVERS:\r
-        return "OC_STACK_NO_OBSERVERS";\r
-    case OC_STACK_UNAUTHORIZED_REQ:\r
-        return "OC_STACK_UNAUTHORIZED_REQ";\r
-    #ifdef WITH_PRESENCE\r
-    case OC_STACK_PRESENCE_STOPPED:\r
-        return "OC_STACK_PRESENCE_STOPPED";\r
-    #endif\r
-    case OC_STACK_ERROR:\r
-        return "OC_STACK_ERROR";\r
-    default:\r
-        return "UNKNOWN";\r
-    }\r
-}\r
-\r
 /**\r
  * Function to search node in linked list that matches given IP and port.\r
  *\r
@@ -319,12 +272,14 @@ bool DPGenerateQuery(bool isSecure,
             }\r
 \r
             break;\r
+#ifndef WITH_ARDUINO\r
         // TODO: We need to verify tinyDTLS in below cases\r
         case CT_ADAPTER_GATT_BTLE:\r
         case CT_ADAPTER_RFCOMM_BTEDR:\r
             OIC_LOG(ERROR, TAG, "Not supported connectivity adapter.");\r
             return false;\r
             break;\r
+#endif\r
         default:\r
             OIC_LOG(ERROR, TAG, "Unknown connectivity adapter.");\r
             return false;\r
@@ -872,7 +827,7 @@ static OCStackApplicationResult DirectPairingDiscoveryHandler(void* ctx, OCDoHan
     (void)UNUSED;\r
     if (clientResponse)\r
     {\r
-        OIC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result));\r
+        OIC_LOG_V(INFO, TAG, "StackResult: %s", clientResponse->result);\r
         OIC_LOG_V(INFO, TAG,\r
                 "Device =============> Discovered @ %s:%d",\r
                 clientResponse->devAddr.addr,\r
@@ -918,7 +873,7 @@ static OCStackApplicationResult DirectPairingDiscoveryHandler(void* ctx, OCDoHan
             if(wr_len <= 0 || (size_t)wr_len >= sizeof(rsrc_uri))\r
             {\r
                 OIC_LOG(ERROR, TAG, "rsrc_uri_string_print failed");\r
-                return OC_STACK_ERROR;\r
+                return OC_STACK_KEEP_TRANSACTION;\r
             }\r
 \r
             //Try to the unicast discovery to getting secure port\r
@@ -960,6 +915,7 @@ static OCStackApplicationResult DirectPairingDiscoveryHandler(void* ctx, OCDoHan
     return OC_STACK_DELETE_TRANSACTION;\r
 }\r
 \r
+#ifndef WITH_ARDUINO\r
 /**\r
  * Discover direct-pairing devices in the same IP subnet. .\r
  *\r
@@ -1049,4 +1005,4 @@ OCStackResult DPDeviceDiscovery(unsigned short waittime)
     OIC_LOG(DEBUG, TAG, "OUT DPDeviceDiscovery");\r
     return ret;\r
 }\r
-\r
+#endif\r