From 1848e034a447ad0e1a88400c3ce497478cbc6d18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Bonio?= Date: Wed, 13 Mar 2019 11:07:38 +0100 Subject: [PATCH] ioTivity [BinType] AP [Customer] iot-core MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit [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 Signed-off-by: DoHyun Pyun --- resource/csdk/connectivity/src/tcp_adapter/catcpserver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c index 13b3080..d65d266 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c @@ -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; } -- 2.7.4