From: js126.lee Date: Thu, 9 Jun 2016 04:49:53 +0000 (+0900) Subject: Change request method on OTM X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=220cddcc7651887e3a797af86cd548222f15430e;p=contrib%2Fiotivity.git Change request method on OTM Post is used for UPDATE. Put is used for CREATE. Patch 1: Change request method form PUT to POST on update case. Patch 2: Change hadler on doxmresource.c Change-Id: I9d90e7d7cfce99de5f8ad8848912590af2d59f09 Signed-off-by: js126.lee Reviewed-on: https://gerrit.iotivity.org/gerrit/8565 Reviewed-by: Chul Lee Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh --- diff --git a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c index e098886..936af80 100644 --- a/resource/csdk/security/provisioning/src/ownershiptransfermanager.c +++ b/resource/csdk/security/provisioning/src/ownershiptransfermanager.c @@ -136,7 +136,7 @@ static OCStackResult StartOwnershipTransfer(void* ctx, OCProvisionDev_t* selecte * @param[in] otmCtx Context value of ownership transfer. * @return OC_STACK_OK on success */ -static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx); +static OCStackResult PostOwnerTransferModeToResource(OTMContext_t* otmCtx); /** * Function to send request to resource to get its pstat resource information. @@ -154,7 +154,7 @@ static OCStackResult GetProvisioningStatusResource(OTMContext_t* otmCtx); * @param[in] otmCtx Context value of ownership transfer. * @return OC_STACK_OK on success */ -static OCStackResult PutOwnerUuid(OTMContext_t* otmCtx); +static OCStackResult PostOwnerUuid(OTMContext_t* otmCtx); /** * Function to update the operation mode. As per the spec. Operation mode in client driven @@ -163,7 +163,7 @@ static OCStackResult PutOwnerUuid(OTMContext_t* otmCtx); * @param[in] otmCtx Context value of ownership transfer. * @return OC_STACK_OK on success */ -static OCStackResult PutUpdateOperationMode(OTMContext_t* otmCtx); +static OCStackResult PostUpdateOperationMode(OTMContext_t* otmCtx); /** * Function to update the owner credential to new device @@ -181,7 +181,7 @@ static OCStackResult PutOwnerCredential(OTMContext_t* otmCtx); * @param[in] otmCtx Context value of ownership transfer. * @return OC_STACK_OK on success */ -static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx); +static OCStackResult PostOwnershipInformation(OTMContext_t* otmCtx); /** * Function to update pstat as Ready for provisioning. @@ -191,7 +191,7 @@ static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx); * @param[in] selectedDevice selected device information to performing provisioning. * @return OC_STACK_OK on success */ -static OCStackResult PutProvisioningStatus(OTMContext_t* otmCtx); +static OCStackResult PostProvisioningStatus(OTMContext_t* otmCtx); /** * Function to update pstat as Ready for Normal Operation. @@ -201,7 +201,7 @@ static OCStackResult PutProvisioningStatus(OTMContext_t* otmCtx); * @param[in] selectedDevice selected device information to performing provisioning. * @return OC_STACK_OK on success */ -static OCStackResult PutNormalOperationStatus(OTMContext_t* otmCtx); +static OCStackResult PostNormalOperationStatus(OTMContext_t* otmCtx); static bool IsComplete(OTMContext_t* otmCtx) { @@ -315,8 +315,8 @@ void DTLSHandshakeCB(const CAEndpoint_t *endpoint, const CAErrorInfo_t *info) false == newDevDoxm->owned && memcmp(&(newDevDoxm->owner), &emptyUuid, sizeof(OicUuid_t)) == 0) { - //Send request : PUT /oic/sec/doxm [{... , "devowner":"PT's UUID"}] - res = PutOwnerUuid(g_otmCtx); + //Send request : POST /oic/sec/doxm [{... , "devowner":"PT's UUID"}] + res = PostOwnerUuid(g_otmCtx); if(OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "OperationModeUpdate : Failed to send owner information"); @@ -535,8 +535,8 @@ static OCStackApplicationResult ListMethodsHandler(void *ctx, OCDoHandle UNUSED, //Select operation mode (Currently supported SINGLE_SERVICE_CLIENT_DRIVEN only) SelectOperationMode(otmCtx->selectedDeviceInfo, &(otmCtx->selectedDeviceInfo->pstat->om)); - //Send request : PUT /oic/sec/pstat [{"om":"bx11", .. }] - OCStackResult res = PutUpdateOperationMode(otmCtx); + //Send request : POST /oic/sec/pstat [{"om":"bx11", .. }] + OCStackResult res = PostUpdateOperationMode(otmCtx); if (OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "Error while updating operation mode."); @@ -738,11 +738,11 @@ static OCStackApplicationResult OwnerCredentialHandler(void *ctx, OCDoHandle UNU } } - //PUT /oic/sec/doxm [{ ..., "owned":"TRUE" }] - res = PutOwnershipInformation(otmCtx); + //POST /oic/sec/doxm [{ ..., "owned":"TRUE" }] + res = PostOwnershipInformation(otmCtx); if(OC_STACK_OK != res) { - OIC_LOG(ERROR, TAG, "Failed to put ownership information to new device"); + OIC_LOG(ERROR, TAG, "Failed to post ownership information to new device"); SetResult(otmCtx, res); return OC_STACK_DELETE_TRANSACTION; } @@ -789,7 +789,7 @@ static OCStackApplicationResult OwnershipInformationHandler(void *ctx, OCDoHandl OIC_LOG(INFO, TAG, "Ownership transfer was successfully completed."); OIC_LOG(INFO, TAG, "Set Ready for provisioning state ."); - res = PutProvisioningStatus(otmCtx); + res = PostProvisioningStatus(otmCtx); if(OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "Failed to update pstat"); @@ -837,7 +837,7 @@ static OCStackApplicationResult ProvisioningStatusHandler(void *ctx, OCDoHandle { OIC_LOG(INFO, TAG, "Device state is in Ready for Provisionig."); - res = PutNormalOperationStatus(otmCtx); + res = PostNormalOperationStatus(otmCtx); if(OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "Failed to update pstat"); @@ -993,9 +993,9 @@ static OCStackResult PutOwnerCredential(OTMContext_t* otmCtx) return OC_STACK_OK; } -static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx) +static OCStackResult PostOwnerTransferModeToResource(OTMContext_t* otmCtx) { - OIC_LOG(DEBUG, TAG, "IN PutOwnerTransferModeToResource"); + OIC_LOG(DEBUG, TAG, "IN PostOwnerTransferModeToResource"); if(!otmCtx || !otmCtx->selectedDeviceInfo) { @@ -1012,7 +1012,7 @@ static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_DOXM_URI)) { - OIC_LOG(ERROR, TAG, "PutOwnerTransferModeToResource : Failed to generate query"); + OIC_LOG(ERROR, TAG, "PostOwnerTransferModeToResource : Failed to generate query"); return OC_STACK_ERROR; } OIC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1036,7 +1036,7 @@ static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx) cbData.cb = &OwnerTransferModeHandler; cbData.context = (void *)otmCtx; cbData.cd = NULL; - res = OCDoResource(NULL, OC_REST_PUT, query, + res = OCDoResource(NULL, OC_REST_POST, query, &deviceInfo->endpoint, (OCPayload *)secPayload, deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) @@ -1044,7 +1044,7 @@ static OCStackResult PutOwnerTransferModeToResource(OTMContext_t* otmCtx) OIC_LOG(ERROR, TAG, "OCStack resource error"); } - OIC_LOG(DEBUG, TAG, "OUT PutOwnerTransferModeToResource"); + OIC_LOG(DEBUG, TAG, "OUT PostOwnerTransferModeToResource"); return res; } @@ -1087,9 +1087,9 @@ static OCStackResult GetProvisioningStatusResource(OTMContext_t* otmCtx) return res; } -static OCStackResult PutOwnerUuid(OTMContext_t* otmCtx) +static OCStackResult PostOwnerUuid(OTMContext_t* otmCtx) { - OIC_LOG(DEBUG, TAG, "IN PutOwnerUuid"); + OIC_LOG(DEBUG, TAG, "IN PostOwnerUuid"); if(!otmCtx || !otmCtx->selectedDeviceInfo) { @@ -1104,12 +1104,12 @@ static OCStackResult PutOwnerUuid(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_DOXM_URI)) { - OIC_LOG(ERROR, TAG, "PutOwnershipInformation : Failed to generate query"); + OIC_LOG(ERROR, TAG, "PostOwnerUuid : Failed to generate query"); return OC_STACK_ERROR; } OIC_LOG_V(DEBUG, TAG, "Query=%s", query); - //PUT PT's uuid to new device + //Post PT's uuid to new device OCSecurityPayload* secPayload = (OCSecurityPayload*)OICCalloc(1, sizeof(OCSecurityPayload)); if(!secPayload) { @@ -1132,21 +1132,21 @@ static OCStackResult PutOwnerUuid(OTMContext_t* otmCtx) cbData.context = (void *)otmCtx; cbData.cd = NULL; - res = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload *)secPayload, + res = OCDoResource(NULL, OC_REST_POST, query, 0, (OCPayload *)secPayload, deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); } - OIC_LOG(DEBUG, TAG, "OUT PutOwnerUuid"); + OIC_LOG(DEBUG, TAG, "OUT PostOwnerUuid"); return res; } -static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx) +static OCStackResult PostOwnershipInformation(OTMContext_t* otmCtx) { - OIC_LOG(DEBUG, TAG, "IN PutOwnershipInformation"); + OIC_LOG(DEBUG, TAG, "IN PostOwnershipInformation"); if(!otmCtx || !otmCtx->selectedDeviceInfo) { @@ -1161,7 +1161,7 @@ static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_DOXM_URI)) { - OIC_LOG(ERROR, TAG, "PutOwnershipInformation : Failed to generate query"); + OIC_LOG(ERROR, TAG, "PostOwnershipInformation : Failed to generate query"); return OC_STACK_ERROR; } OIC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1191,21 +1191,21 @@ static OCStackResult PutOwnershipInformation(OTMContext_t* otmCtx) cbData.context = (void *)otmCtx; cbData.cd = NULL; - res = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload*)secPayload, + res = OCDoResource(NULL, OC_REST_POST, query, 0, (OCPayload*)secPayload, deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); } - OIC_LOG(DEBUG, TAG, "OUT PutOwnershipInformation"); + OIC_LOG(DEBUG, TAG, "OUT PostOwnershipInformation"); return res; } -static OCStackResult PutUpdateOperationMode(OTMContext_t* otmCtx) +static OCStackResult PostUpdateOperationMode(OTMContext_t* otmCtx) { - OIC_LOG(DEBUG, TAG, "IN PutUpdateOperationMode"); + OIC_LOG(DEBUG, TAG, "IN PostUpdateOperationMode"); if(!otmCtx || !otmCtx->selectedDeviceInfo) { @@ -1219,7 +1219,7 @@ static OCStackResult PutUpdateOperationMode(OTMContext_t* otmCtx) deviceInfo->connType, query, sizeof(query), OIC_RSRC_PSTAT_URI)) { - OIC_LOG(ERROR, TAG, "PutUpdateOperationMode : Failed to generate query"); + OIC_LOG(ERROR, TAG, "PostUpdateOperationMode : Failed to generate query"); return OC_STACK_ERROR; } OIC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1244,14 +1244,14 @@ static OCStackResult PutUpdateOperationMode(OTMContext_t* otmCtx) cbData.cb = &OperationModeUpdateHandler; cbData.context = (void *)otmCtx; cbData.cd = NULL; - res = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload *)secPayload, + res = OCDoResource(NULL, OC_REST_POST, query, 0, (OCPayload *)secPayload, deviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); } - OIC_LOG(DEBUG, TAG, "OUT PutUpdateOperationMode"); + OIC_LOG(DEBUG, TAG, "OUT PostUpdateOperationMode"); return res; } @@ -1274,8 +1274,8 @@ static OCStackResult StartOwnershipTransfer(void* ctx, OCProvisionDev_t* selecte } OIC_LOG_V(DEBUG, TAG, "Selected provisoning method = %d", selectedDevice->doxm->oxmSel); - //Send Req: PUT /oic/sec/doxm [{..."OxmSel" :g_OTMDatas[Index of Selected OxM].OXMString,...}] - res = PutOwnerTransferModeToResource(otmCtx); + //Send Req: POST /oic/sec/doxm [{..."OxmSel" :g_OTMDatas[Index of Selected OxM].OXMString,...}] + res = PostOwnerTransferModeToResource(otmCtx); if(OC_STACK_OK != res) { OIC_LOG(WARNING, TAG, "Failed to select the provisioning method"); @@ -1402,9 +1402,9 @@ error: return res; } -OCStackResult PutProvisioningStatus(OTMContext_t* otmCtx) +OCStackResult PostProvisioningStatus(OTMContext_t* otmCtx) { - OIC_LOG(INFO, TAG, "IN PutProvisioningStatus"); + OIC_LOG(INFO, TAG, "IN PostProvisioningStatus"); if(!otmCtx || !otmCtx->selectedDeviceInfo) { @@ -1438,7 +1438,7 @@ OCStackResult PutProvisioningStatus(OTMContext_t* otmCtx) otmCtx->selectedDeviceInfo->connType, query, sizeof(query), OIC_RSRC_PSTAT_URI)) { - OIC_LOG(ERROR, TAG, "PutProvisioningStatus : Failed to generate query"); + OIC_LOG(ERROR, TAG, "PostProvisioningStatus : Failed to generate query"); return OC_STACK_ERROR; } OIC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1447,7 +1447,7 @@ OCStackResult PutProvisioningStatus(OTMContext_t* otmCtx) cbData.cb = &ProvisioningStatusHandler; cbData.context = (void*)otmCtx; cbData.cd = NULL; - OCStackResult ret = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload*)secPayload, + OCStackResult ret = OCDoResource(NULL, OC_REST_POST, query, 0, (OCPayload*)secPayload, otmCtx->selectedDeviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); OIC_LOG_V(INFO, TAG, "OCDoResource returned: %d",ret); if (ret != OC_STACK_OK) @@ -1455,14 +1455,14 @@ OCStackResult PutProvisioningStatus(OTMContext_t* otmCtx) OIC_LOG(ERROR, TAG, "OCStack resource error"); } - OIC_LOG(INFO, TAG, "OUT PutProvisioningStatus"); + OIC_LOG(INFO, TAG, "OUT PostProvisioningStatus"); return ret; } -OCStackResult PutNormalOperationStatus(OTMContext_t* otmCtx) +OCStackResult PostNormalOperationStatus(OTMContext_t* otmCtx) { - OIC_LOG(INFO, TAG, "IN PutNormalOperationStatus"); + OIC_LOG(INFO, TAG, "IN PostNormalOperationStatus"); if(!otmCtx || !otmCtx->selectedDeviceInfo) { @@ -1496,7 +1496,7 @@ OCStackResult PutNormalOperationStatus(OTMContext_t* otmCtx) otmCtx->selectedDeviceInfo->connType, query, sizeof(query), OIC_RSRC_PSTAT_URI)) { - OIC_LOG(ERROR, TAG, "PutNormalOperationStatus : Failed to generate query"); + OIC_LOG(ERROR, TAG, "PostNormalOperationStatus : Failed to generate query"); return OC_STACK_ERROR; } OIC_LOG_V(DEBUG, TAG, "Query=%s", query); @@ -1505,7 +1505,7 @@ OCStackResult PutNormalOperationStatus(OTMContext_t* otmCtx) cbData.cb = &ReadyForNomalStatusHandler; cbData.context = (void*)otmCtx; cbData.cd = NULL; - OCStackResult ret = OCDoResource(NULL, OC_REST_PUT, query, 0, (OCPayload*)secPayload, + OCStackResult ret = OCDoResource(NULL, OC_REST_POST, query, 0, (OCPayload*)secPayload, otmCtx->selectedDeviceInfo->connType, OC_HIGH_QOS, &cbData, NULL, 0); OIC_LOG_V(INFO, TAG, "OCDoResource returned: %d",ret); if (ret != OC_STACK_OK) @@ -1513,7 +1513,7 @@ OCStackResult PutNormalOperationStatus(OTMContext_t* otmCtx) OIC_LOG(ERROR, TAG, "OCStack resource error"); } - OIC_LOG(INFO, TAG, "OUT PutNormalOperationStatus"); + OIC_LOG(INFO, TAG, "OUT PostNormalOperationStatus"); return ret; } diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c index 19c1244..6cfbc4b 100644 --- a/resource/csdk/security/src/doxmresource.c +++ b/resource/csdk/security/src/doxmresource.c @@ -579,9 +579,9 @@ static OCEntityHandlerResult HandleDoxmGetRequest (const OCEntityHandlerRequest return ehRet; } -static OCEntityHandlerResult HandleDoxmPutRequest(const OCEntityHandlerRequest * ehRequest) +static OCEntityHandlerResult HandleDoxmPostRequest(const OCEntityHandlerRequest * ehRequest) { - OIC_LOG (DEBUG, TAG, "Doxm EntityHandle processing PUT request"); + OIC_LOG (DEBUG, TAG, "Doxm EntityHandle processing POST request"); OCEntityHandlerResult ehRet = OC_EH_ERROR; OicUuid_t emptyOwner = {.id = {0} }; @@ -845,8 +845,8 @@ OCEntityHandlerResult DoxmEntityHandler(OCEntityHandlerFlag flag, ehRet = HandleDoxmGetRequest(ehRequest); break; - case OC_REST_PUT: - ehRet = HandleDoxmPutRequest(ehRequest); + case OC_REST_POST: + ehRet = HandleDoxmPostRequest(ehRequest); break; default: diff --git a/resource/csdk/security/src/pstatresource.c b/resource/csdk/security/src/pstatresource.c index b3e63ac..75793c2 100644 --- a/resource/csdk/security/src/pstatresource.c +++ b/resource/csdk/security/src/pstatresource.c @@ -350,10 +350,10 @@ static OCEntityHandlerResult HandlePstatGetRequest (const OCEntityHandlerRequest * resource or create a new resource. * For pstat, it updates only tm and om. */ -static OCEntityHandlerResult HandlePstatPutRequest(const OCEntityHandlerRequest *ehRequest) +static OCEntityHandlerResult HandlePstatPostRequest(const OCEntityHandlerRequest *ehRequest) { OCEntityHandlerResult ehRet = OC_EH_ERROR; - OIC_LOG(INFO, TAG, "HandlePstatPutRequest processing PUT request"); + OIC_LOG(INFO, TAG, "HandlePstatPostRequest processing POST request"); OicSecPstat_t *pstat = NULL; if (ehRequest->payload) @@ -441,8 +441,8 @@ static OCEntityHandlerResult HandlePstatPutRequest(const OCEntityHandlerRequest case OC_REST_GET: ehRet = HandlePstatGetRequest(ehRequest); break; - case OC_REST_PUT: - ehRet = HandlePstatPutRequest(ehRequest); + case OC_REST_POST: + ehRet = HandlePstatPostRequest(ehRequest); break; default: ehRet = OC_EH_ERROR;