Imported Upstream version 0.9.2

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / ip_adapter / arduino / caipclient_wifi.cpp

diff --git a/resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_wifi.cpp b/resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_wifi.cpp
index 38acd84..9dda5aa 100644 (file)
--- a/resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_wifi.cpp
+++ b/resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_wifi.cpp
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 ******************************************************************/
-#include "caipinterface_singlethread.h"
+#include "caipinterface.h"
 
 #include <Arduino.h>
 #include <WiFi.h>
@@ -30,7 +30,7 @@
 #include "logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
-#include "caipadapter_singlethread.h"
+#include "caipadapter.h"
 #include "caadapterutils.h"
 
 /// This is the max buffer size between Arduino and WiFi Shield
@@ -49,32 +49,32 @@ void CAIPSetUnicastPort(uint16_t port)
 
 }
 
-uint32_t CAIPSendData(const char *remoteAddress, uint16_t port,
-                      const char *data, uint32_t dataLength, bool isMulticast)
+void CAIPSendData(CAEndpoint_t *endpoint,
+                  const void *data, uint32_t dataLength, bool isMulticast)
 {
     OIC_LOG(DEBUG, TAG, "IN");
 
-    VERIFY_NON_NULL_RET(data, TAG, "data", 0);
-    VERIFY_NON_NULL_RET(remoteAddress, TAG, "address", 0);
+    VERIFY_NON_NULL_VOID(data, TAG, "data");
+    VERIFY_NON_NULL_VOID(endpoint, TAG, "endpoint");
 
-    OIC_LOG_V(DEBUG, TAG, "remoteip: %s", remoteAddress);
-    OIC_LOG_V(DEBUG, TAG, "port: %d", port);
+    OIC_LOG_V(DEBUG, TAG, "remoteip: %s", endpoint->addr);
+    OIC_LOG_V(DEBUG, TAG, "port: %d", endpoint->port);
 
     uint8_t ip[4] = {0};
     uint16_t parsedPort = 0;
-    CAResult_t res = CAParseIPv4AddressInternal(remoteAddress, ip, sizeof(ip),
+    CAResult_t res = CAParseIPv4AddressInternal(endpoint->addr, ip, sizeof(ip),
                                                 &parsedPort);
     if (res != CA_STATUS_OK)
     {
         OIC_LOG_V(ERROR, TAG, "Remote adrs parse fail %d", res);
-        return 0;
+        return;
     }
 
     IPAddress remoteIp(ip);
-    Udp.beginPacket(remoteIp, (uint16_t)port);
+    Udp.beginPacket(remoteIp, endpoint->port);
 
     uint32_t bytesWritten = 0;
-    while(bytesWritten < dataLength)
+    while (bytesWritten < dataLength)
     {
         // get remaining bytes
         size_t writeCount = dataLength - bytesWritten;
@@ -94,9 +94,9 @@ uint32_t CAIPSendData(const char *remoteAddress, uint16_t port,
     if (Udp.endPacket() == 0)
     {
         OIC_LOG(ERROR, TAG, "Failed to send");
-        return 0;
+        return;
     }
     OIC_LOG(DEBUG, TAG, "OUT");
-    return bytesWritten;
+    return;
 }