From 6ebf0ac2be293e9c1ebfc1cff67b7e7a2cd04b51 Mon Sep 17 00:00:00 2001 From: Chul Lee Date: Tue, 18 Oct 2016 16:54:18 +0900 Subject: [PATCH] Modify the subownerclient sample for IPv6 Change-Id: Ic04f1139ab482dc6082976eb39b6f15f79f71b8a Signed-off-by: Chul Lee Reviewed-on: https://gerrit.iotivity.org/gerrit/13375 Reviewed-by: dongik Lee Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh --- .../provisioning/sample/subownerclient.c | 68 +++++++++++++------ 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/resource/csdk/security/provisioning/sample/subownerclient.c b/resource/csdk/security/provisioning/sample/subownerclient.c index 308a1a4c8..137ad1a23 100644 --- a/resource/csdk/security/provisioning/sample/subownerclient.c +++ b/resource/csdk/security/provisioning/sample/subownerclient.c @@ -36,6 +36,7 @@ #include "securevirtualresourcetypes.h" #include "srmutility.h" #include "pmtypes.h" +#include "pmutility.h" #ifdef __cplusplus extern "C" @@ -173,14 +174,18 @@ static void LedCB(void *ctx, OCDoHandle UNUSED, { if(clientResponse) { - if(clientResponse->result == OC_STACK_OK) + if(OC_STACK_OK == clientResponse->result) { - printf("Get OC_STACK_OK from server\n"); + printf("Received OC_STACK_OK from server\n"); if(clientResponse->payload) { printf("Response ===================> %s\n", clientResponse->payload); } } + else if(OC_STACK_RESOURCE_CHANGED == clientResponse->result) + { + printf("Received OC_STACK_RESOURCE_CHANGED from server\n"); + } else { printf("Error in response : %d\n", clientResponse->result); @@ -386,20 +391,29 @@ static int sendGetLed() return -1; } - g_doneCB = false; - snprintf(query, MAX_URI_LENGTH, "coaps://%s:%d/a/led", selDev->endpoint.addr, selDev->securePort); - printf("query=%s\n", query); - if(OC_STACK_OK != OCDoResource(NULL, OC_REST_GET, query, NULL, NULL, selDev->connType, OC_HIGH_QOS, &cbData, NULL, 0)) - { - printf("********************************\n"); - printf("Failed to send GET request to %s\n", query); - printf("********************************\n"); - g_doneCB = true; + if(PMGenerateQuery(true, selDev->endpoint.addr, selDev->securePort, selDev->connType, + query, sizeof(query), "/a/led")) + { + g_doneCB = false; + printf("query=%s\n", query); + if(OC_STACK_OK != OCDoResource(NULL, OC_REST_GET, query, NULL, NULL, selDev->connType, + OC_HIGH_QOS, &cbData, NULL, 0)) + { + printf("********************************\n"); + printf("Failed to send GET request to %s\n", query); + printf("********************************\n"); + g_doneCB = true; + return -1; + } + + waitCallbackRet(); + } + else + { + printf("Failed to generate GET request for /a/led\n"); return -1; } - waitCallbackRet(); - return 0; } @@ -437,19 +451,29 @@ static int sendPutLed() return -1; } - g_doneCB = false; - snprintf(query, MAX_URI_LENGTH, "coaps://%s:%d/a/led", selDev->endpoint.addr, selDev->securePort); - if(OC_STACK_OK != OCDoResource(NULL, OC_REST_PUT, query, NULL, NULL, selDev->connType, OC_LOW_QOS, &cbData, NULL, 0)) + if(PMGenerateQuery(true, selDev->endpoint.addr, selDev->securePort, selDev->connType, + query, sizeof(query), "/a/led")) + { + g_doneCB = false; + printf("query=%s\n", query); + if(OC_STACK_OK != OCDoResource(NULL, OC_REST_PUT, query, NULL, NULL, selDev->connType, + OC_LOW_QOS, &cbData, NULL, 0)) + { + printf("********************************\n"); + printf("Failed to send PUT request to %s\n", query); + printf("********************************\n"); + g_doneCB = true; + return -1; + } + + waitCallbackRet(); + } + else { - printf("********************************\n"); - printf("Failed to send PUT request to %s\n", query); - printf("********************************\n"); - g_doneCB = true; + printf("Failed to generate PUT request for /a/led\n"); return -1; } - waitCallbackRet(); - return 0; } -- 2.34.1