Update cloud project

[platform/upstream/iotivity.git] / cloud / samples / client / cloud_connector.c

diff --git a/cloud/samples/client/cloud_connector.c b/cloud/samples/client/cloud_connector.c
index 4083a5c..9c3924a 100644 (file)
--- a/cloud/samples/client/cloud_connector.c
+++ b/cloud/samples/client/cloud_connector.c
@@ -83,55 +83,12 @@ static OCStackResult createStringLL(uint8_t numElements, OCResourceHandle handle
     return OC_STACK_OK;
 }
 
-OCStackResult parseHost(const char *host, int *port, char *addr)
-{
-    //Parse addr, port from host
-    if (strstr(host, DEFAULT_COAP_TCP_HOST) != NULL)
-    {
-        *port = DEFAULT_COAP_TCP_PORT;
-        strncpy(addr, host + strlen(DEFAULT_COAP_TCP_HOST),
-                strlen(host) - strlen(DEFAULT_COAP_TCP_HOST));
-    }
-    else if (strstr(host, DEFAULT_COAP_TCP_SECURE_HOST) != NULL)
-    {
-        *port = DEFAULT_COAP_TCP_SECURE_PORT;
-        strncpy(addr, host + strlen(DEFAULT_COAP_TCP_SECURE_HOST),
-                strlen(host) - strlen(DEFAULT_COAP_TCP_SECURE_HOST));
-    }
-    else
-    {
-        return OC_STACK_INVALID_URI;
-    }
-
-    if (strchr(addr, ':') != NULL)
-    {
-        char *strPort = strchr(addr, ':');
-        *port = atoi(strPort + 1);
-        addr[strlen(addr) - strlen(strPort)] = '\0';
-    }
-
-    return OC_STACK_OK;
-}
-
 OCStackResult OCCloudRegisterLogin(const char *host, const char *auth_provider,
                                    const char *auth_code, OCClientResponseHandler response)
 {
     char    targetUri[MAX_URI_LENGTH * 2] = { 0, };
     snprintf(targetUri, MAX_URI_LENGTH * 2, "%s%s", host, DEFAULT_AUTH_REGISTER_LOGIN);
 
-    int     port = 0;
-    char    addr[MAX_ADDR_STR_SIZE] = { 0, };
-
-    if (parseHost(host, &port, (char *)&addr) != OC_STACK_OK)
-    {
-        return OC_STACK_INVALID_URI;
-    }
-
-    OCDevAddr authAddr;
-    memset(&authAddr, 0, sizeof(OCDevAddr));
-    OICStrcpy(authAddr.addr, MAX_ADDR_STR_SIZE, addr);
-    authAddr.port = port;
-
     OCCallbackData cbData;
     memset(&cbData, 0, sizeof(OCCallbackData));
     cbData.cb = response;
@@ -147,7 +104,7 @@ OCStackResult OCCloudRegisterLogin(const char *host, const char *auth_provider,
     OCRepPayloadSetPropString(registerPayload, "authprovider", auth_provider);
     OCRepPayloadSetPropString(registerPayload, "authcode", auth_code);
 
-    return OCDoResource(NULL, OC_REST_POST, targetUri, &authAddr, (OCPayload *)registerPayload,
+    return OCDoResource(NULL, OC_REST_POST, targetUri, NULL, (OCPayload *)registerPayload,
                         CT_ADAPTER_TCP, OC_LOW_QOS, &cbData, NULL, 0);
 
 no_memory:
@@ -161,19 +118,6 @@ OCStackResult OCCloudLoginout(const char *host, const char *query, const char *a
     char    targetUri[MAX_URI_LENGTH * 2] = { 0, };
     snprintf(targetUri, MAX_URI_LENGTH * 2, "%s%s", host, query);
 
-    int     port = 0;
-    char    addr[MAX_ADDR_STR_SIZE] = { 0, };
-
-    if (parseHost(host, &port, (char *)&addr) != OC_STACK_OK)
-    {
-        return OC_STACK_INVALID_URI;
-    }
-
-    OCDevAddr authAddr;
-    memset(&authAddr, 0, sizeof(OCDevAddr));
-    OICStrcpy(authAddr.addr, MAX_ADDR_STR_SIZE, addr);
-    authAddr.port = port;
-
     OCCallbackData cbData;
     memset(&cbData, 0, sizeof(OCCallbackData));
     cbData.cb = response;
@@ -188,7 +132,7 @@ OCStackResult OCCloudLoginout(const char *host, const char *query, const char *a
 
     OCRepPayloadSetPropString(loginoutPayload, "session", auth_session);
 
-    return OCDoResource(NULL, OC_REST_POST, targetUri, &authAddr, (OCPayload *)loginoutPayload,
+    return OCDoResource(NULL, OC_REST_POST, targetUri, NULL, (OCPayload *)loginoutPayload,
                         CT_ADAPTER_TCP, OC_LOW_QOS, &cbData, NULL, 0);
 
 no_memory:
@@ -215,19 +159,6 @@ OCStackResult OCCloudPublish(const char *host, const char *query,
     char    targetUri[MAX_URI_LENGTH * 2] = { 0, };
     snprintf(targetUri, MAX_URI_LENGTH * 2, "%s%s", host, query);
 
-    int     port = 0;
-    char    addr[MAX_ADDR_STR_SIZE] = { 0, };
-
-    if (parseHost(host, &port, (char *)&addr) != OC_STACK_OK)
-    {
-        return OC_STACK_INVALID_URI;
-    }
-
-    OCDevAddr rdAddr;
-    memset(&rdAddr, 0, sizeof(OCDevAddr));
-    OICStrcpy(rdAddr.addr, MAX_ADDR_STR_SIZE, addr);
-    rdAddr.port = port;
-
     // Gather all resources locally and do publish
     OCCallbackData cbData;
     memset(&cbData, 0, sizeof(OCCallbackData));
@@ -331,7 +262,7 @@ OCStackResult OCCloudPublish(const char *host, const char *query,
         goto no_memory;
     }
 
-    return OCDoResource(NULL, OC_REST_POST, targetUri, &rdAddr, (OCPayload *)rdPayload,
+    return OCDoResource(NULL, OC_REST_POST, targetUri, NULL, (OCPayload *)rdPayload,
                         CT_ADAPTER_TCP, OC_LOW_QOS, &cbData, NULL, 0);
 
 no_memory: