ioTivity [BinType] AP [Customer] iot-core 17/201717/1
authorMichał Bonio <m.bonio@samsung.com>
Wed, 13 Mar 2019 10:07:38 +0000 (11:07 +0100)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Tue, 19 Mar 2019 03:38:27 +0000 (12:38 +0900)
[Issue#] CONPRO-1393
[Request] SRPOL
[Occurrence Version] n/a

[Problem] Build failed for platform others than Tizen
[Cause & Measure] Tizen specific code has not been commented out
[Checking Method] Build IoTivity

[Team] IoT Connection
[Developer] Michał Bonio
[Solution company] Samsung
[Change Type] Fix

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/1eeeedf56e0f1f962065896107ff21ba786bf6b7
(cherry picked from 1eeeedf56e0f1f962065896107ff21ba786bf6b7)

Change-Id: I7f3d32b2dcaeea769d7e249d3e0a6861812414f2
Signed-off-by: Michał Bonio <m.bonio@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c

index 13b3080..d65d266 100644 (file)
@@ -868,8 +868,10 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
     OIC_LOG_V(INFO, TAG, "try to connect with [%s:%u]",
               svritem->sep.endpoint.addr, svritem->sep.endpoint.port);
 
+#if defined(__TIZEN__)
     char *proxy_addr = CAGetCloudAddressForProxy();
     OIC_LOG_V(INFO, TAG, "Proxy : '%s'", proxy_addr ? proxy_addr : "(nil)");
+#endif
 
     // #1. create tcp socket.
     int fd = socket(family, SOCK_STREAM, IPPROTO_TCP);
@@ -925,6 +927,7 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
         return CA_SOCKET_OPERATION_FAILED;
     }
 
+#if defined(__TIZEN__)
     // #5. Send HTTP CONNECT to proxy if proxy
 
     const char *cloud_address = CAGetCloudAddressForProxy();
@@ -967,6 +970,7 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
             return CA_SOCKET_OPERATION_FAILED;
         }
     }
+#endif
 
     return CA_STATUS_OK;
 }