From: h.marappa@samsung.com <h.marappa@samsung.com>
Date: Wed, 13 Mar 2019 14:03:43 +0000 (+0530)
Subject: Update catcpserver.c
X-Git-Tag: submit/tizen_5.0/20190410.045624~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d01693b37ed006b412ed6c711c515dd90530c2b;p=platform%2Fupstream%2Fiotivity.git

Update catcpserver.c

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

Change-Id: I28bf6c8d266ccd4334aea89f58431a704625c588
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
index d65d266..c8c87c3 100644
--- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
+++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
@@ -848,7 +848,8 @@ static CAResult_t CATCPConvertNameToAddr(int family, const char *host, uint16_t
     return CA_STATUS_OK;
 }
 
-static int __get_status_code_from_response(char * response) {
+#if defined(__TIZEN__)
+static int CAGetHTTPStatusCode(char * response) {
     char *resp, *code_plus, *ptrSave;
     int ret = -1;
 
@@ -860,6 +861,7 @@ static int __get_status_code_from_response(char * response) {
     free(resp);
     return ret;
 }
+#endif
 
 static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
 {
@@ -868,11 +870,6 @@ 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);
     if (-1 == fd)
@@ -931,19 +928,20 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
     // #5. Send HTTP CONNECT to proxy if proxy
 
     const char *cloud_address = CAGetCloudAddressForProxy();
+    OIC_LOG_V(INFO, TAG, "Proxy : '%s'", cloud_address ? cloud_address : "(nil)");
 
-    if(cloud_address && *cloud_address) {
+    if(cloud_address && *cloud_address)
+    {
         char message[4096];
         int len = sprintf(message,
                 "CONNECT %s HTTP/1.1\r\n"
                 "Host: %s\r\n\r\n", cloud_address, cloud_address
         );
 
-
-
         ssize_t l = send(fd, message, len, 0);
-        if(l != len) {
-            OIC_LOG_V(INFO, TAG, "failed to send HTTP CONNECT data (expected %d bytes, ret %d)", len, l);
+        if(l != len)
+	{
+            OIC_LOG_V(ERROR, TAG, "failed to send HTTP CONNECT data (expected %d bytes, ret %d)", len, l);
             close(fd);
             svritem->fd = -1;
             return CA_SOCKET_OPERATION_FAILED;
@@ -960,11 +958,12 @@ static CAResult_t CATCPCreateSocket(int family, CATCPSessionInfo_t *svritem)
         OIC_LOG_V(INFO, TAG, "Received data : '%s'", message);
         OIC_LOG_V(INFO, TAG, "Received len = %d", l);
 
-        int status_code = __get_status_code_from_response(message);
+        int status_code = CAGetHTTPStatusCode(message);
 
         OIC_LOG_V(INFO, TAG, "HTTP status_code : %d", status_code);
-        if(status_code < 200 || status_code > 299) {
-            OIC_LOG_V(ERROR, TAG, "Error, __get_status_code_from_response => %d", status_code);
+        if(status_code < 200 || status_code > 299)
+	{
+            OIC_LOG_V(ERROR, TAG, "Error, Wrong status code", status_code);
             close(fd);
             svritem->fd = -1;
             return CA_SOCKET_OPERATION_FAILED;