X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fprovisioning%2Fsrc%2Fpmutility.c;h=b72c28cc1f97dc5152c63ec7672aa20d8aaca387;hb=a2593578edc02d063c1335a3e89b19a3b5a4b1ad;hp=0f46c361609d0ba437cd660390fba1aa4a0330be;hpb=068b9d878cead4b54ceaba89cb9d9c19b1c5dcb1;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c index 0f46c36..b72c28c 100644 --- a/resource/csdk/security/provisioning/src/pmutility.c +++ b/resource/csdk/security/provisioning/src/pmutility.c @@ -21,14 +21,17 @@ #define _POSIX_C_SOURCE 200112L #endif +#if HAVE_UNISTD_H #include +#endif +#ifdef HAVE_STRING_H #include -#include -#include +#endif #include "ocstack.h" #include "oic_malloc.h" #include "oic_string.h" +#include "oic_time.h" #include "logger.h" #include "cJSON.h" #include "utlist.h" @@ -38,12 +41,79 @@ #include "srmresourcestrings.h" //@note: SRM's internal header #include "doxmresource.h" //@note: SRM's internal header #include "pstatresource.h" //@note: SRM's internal header +#include "verresource.h" //@note: SRM's internal header #include "pmtypes.h" #include "pmutility.h" +#include "srmutility.h" + #define TAG ("PM-UTILITY") +typedef struct _DiscoveryInfo{ + OCProvisionDev_t **ppDevicesList; + bool isOwnedDiscovery; +} DiscoveryInfo; + +/* + * Function to discover secre port information through unicast + * + * @param[in] discoveryInfo The pointer of discovery information to matain result of discovery + * @param[in] clientResponse Response information(It will contain payload) + * + * @return OC_STACK_OK on success otherwise error. + */ +static OCStackResult SecurePortDiscovery(DiscoveryInfo* discoveryInfo, + const OCClientResponse *clientResponse); + +/* + * Function to discover security version information through unicast + * + * @param[in] discoveryInfo The pointer of discovery information to matain result of discovery + * @param[in] clientResponse Response information(It will contain payload) + * + * @return OC_STACK_OK on success otherwise error. + */ +static OCStackResult SecurityVersionDiscovery(DiscoveryInfo* discoveryInfo, + const OCClientResponse *clientResponse); + +/** + * Callback handler for PMDeviceDiscovery API. + * + * @param[in] ctx User context + * @param[in] handle Handler for response + * @param[in] clientResponse Response information (It will contain payload) + * @return OC_STACK_KEEP_TRANSACTION to keep transaction and + * OC_STACK_DELETE_TRANSACTION to delete it. + */ +static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNUSED, + OCClientResponse *clientResponse); + +/** + * Callback handler for getting secure port information using /oic/res discovery. + * + * @param[in] ctx user context + * @param[in] handle Handle for response + * @param[in] clientResponse Response information(It will contain payload) + * + * @return OC_STACK_KEEP_TRANSACTION to keep transaction and + * OC_STACK_DELETE_TRANSACTION to delete it. + */ +static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle UNUSED, + OCClientResponse *clientResponse); + +/** + * Callback handler for security version discovery. + * + * @param[in] ctx User context + * @param[in] handle Handler for response + * @param[in] clientResponse Response information (It will contain payload) + * @return OC_STACK_KEEP_TRANSACTION to keep transaction and + * OC_STACK_DELETE_TRANSACTION to delete it. + */ +static OCStackApplicationResult SecVersionDiscoveryHandler(void *ctx, OCDoHandle UNUSED, + OCClientResponse *clientResponse); + /** * Function to search node in linked list that matches given IP and port. * @@ -57,7 +127,7 @@ OCProvisionDev_t* GetDevice(OCProvisionDev_t **ppDevicesList, const char* addr, { if(NULL == addr || NULL == *ppDevicesList) { - OC_LOG_V(ERROR, TAG, "Invalid Input parameters in [%s]\n", __FUNCTION__); + OIC_LOG_V(ERROR, TAG, "Invalid Input parameters in [%s]\n", __FUNCTION__); return NULL; } @@ -82,11 +152,12 @@ OCProvisionDev_t* GetDevice(OCProvisionDev_t **ppDevicesList, const char* addr, * @param[in] port port of remote server. * @param[in] adapter adapter type of endpoint. * @param[in] doxm pointer to doxm instance. + * @param[in] connType connectivity type of endpoint * * @return OC_STACK_OK for success and errorcode otherwise. */ OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, const uint16_t port, - OCTransportAdapter adapter, OicSecDoxm_t *doxm) + OCTransportAdapter adapter, OCConnectivityType connType, OicSecDoxm_t *doxm) { if (NULL == addr) { @@ -99,7 +170,7 @@ OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, cons ptr = (OCProvisionDev_t *)OICCalloc(1, sizeof (OCProvisionDev_t)); if (NULL == ptr) { - OC_LOG(ERROR, TAG, "Error while allocating memory for linkedlist node !!"); + OIC_LOG(ERROR, TAG, "Error while allocating memory for linkedlist node !!"); return OC_STACK_NO_MEMORY; } @@ -109,6 +180,9 @@ OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, cons ptr->securePort = DEFAULT_SECURE_PORT; ptr->endpoint.adapter = adapter; ptr->next = NULL; + ptr->connType = connType; + ptr->devStatus = DEV_STATUS_ON; //AddDevice is called when discovery(=alive) + OICStrcpy(ptr->secVer, MAX_VERSION_LEN, DEFAULT_SEC_VERSION); // version initialization LL_PREPEND(*ppDevicesList, ptr); } @@ -126,14 +200,14 @@ OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, cons * * @return OC_STACK_OK for success and errorcode otherwise. */ -OCStackResult UpdateSecurePortOfDevice(OCProvisionDev_t **ppDevicesList, const char *addr, uint16_t port, - uint16_t securePort) +OCStackResult UpdateSecurePortOfDevice(OCProvisionDev_t **ppDevicesList, const char *addr, + uint16_t port, uint16_t securePort) { OCProvisionDev_t *ptr = GetDevice(ppDevicesList, addr, port); if(!ptr) { - OC_LOG(ERROR, TAG, "Can not find device information in the discovery device list"); + OIC_LOG(ERROR, TAG, "Can not find device information in the discovery device list"); return OC_STACK_ERROR; } @@ -143,18 +217,49 @@ OCStackResult UpdateSecurePortOfDevice(OCProvisionDev_t **ppDevicesList, const c } /** - * This function deletes list of provision target devices + * Function to set security version information from the given list of devices. * * @param[in] pList List of OCProvisionDev_t. + * @param[in] addr address of target device. + * @param[in] port port of remote server. + * @param[in] secVer security version information. + * + * @return OC_STACK_OK for success and errorcode otherwise. + */ +OCStackResult UpdateSecVersionOfDevice(OCProvisionDev_t **ppDevicesList, const char *addr, + uint16_t port, const char* secVer) +{ + if (NULL == secVer) + { + return OC_STACK_INVALID_PARAM; + } + + OCProvisionDev_t *ptr = GetDevice(ppDevicesList, addr, port); + + if(!ptr) + { + OIC_LOG(ERROR, TAG, "Can not find device information in the discovery device list"); + return OC_STACK_ERROR; + } + + OICStrcpy(ptr->secVer, MAX_VERSION_LEN, secVer); + + return OC_STACK_OK; +} + +/** + * This function deletes list of provision target devices + * + * @param[in] pDevicesList List of OCProvisionDev_t. */ -void DeleteDeviceList(OCProvisionDev_t **ppDevicesList) +void PMDeleteDeviceList(OCProvisionDev_t *pDevicesList) { - if(*ppDevicesList) + if(pDevicesList) { OCProvisionDev_t *del = NULL, *tmp = NULL; - LL_FOREACH_SAFE(*ppDevicesList, del, tmp) + LL_FOREACH_SAFE(pDevicesList, del, tmp) { - LL_DELETE(*ppDevicesList, del); + LL_DELETE(pDevicesList, del); DeleteDoxmBinData(del->doxm); DeletePstatBinData(del->pstat); @@ -163,47 +268,99 @@ void DeleteDeviceList(OCProvisionDev_t **ppDevicesList) } } +OCProvisionDev_t* PMCloneOCProvisionDev(const OCProvisionDev_t* src) +{ + OIC_LOG(DEBUG, TAG, "IN PMCloneOCProvisionDev"); + + if (!src) + { + OIC_LOG(ERROR, TAG, "PMCloneOCProvisionDev : Invalid parameter"); + return NULL; + } + + // TODO: Consider use VERIFY_NON_NULL instead of if ( null check ) { goto exit; } + OCProvisionDev_t* newDev = (OCProvisionDev_t*)OICCalloc(1, sizeof(OCProvisionDev_t)); + VERIFY_NON_NULL(TAG, newDev, ERROR); + + memcpy(&newDev->endpoint, &src->endpoint, sizeof(OCDevAddr)); + + if (src->pstat) + { + newDev->pstat= (OicSecPstat_t*)OICCalloc(1, sizeof(OicSecPstat_t)); + VERIFY_NON_NULL(TAG, newDev->pstat, ERROR); + + memcpy(newDev->pstat, src->pstat, sizeof(OicSecPstat_t)); + // We have to assign NULL for not necessary information to prevent memory corruption. + newDev->pstat->sm = NULL; + } + + if (src->doxm) + { + newDev->doxm = (OicSecDoxm_t*)OICCalloc(1, sizeof(OicSecDoxm_t)); + VERIFY_NON_NULL(TAG, newDev->doxm, ERROR); + + memcpy(newDev->doxm, src->doxm, sizeof(OicSecDoxm_t)); + // We have to assign NULL for not necessary information to prevent memory corruption. + newDev->doxm->oxmType = NULL; + newDev->doxm->oxm = NULL; + } + + if (0 == strlen(src->secVer)) + { + OICStrcpy(newDev->secVer, MAX_VERSION_LEN, DEFAULT_SEC_VERSION); + } + else + { + OICStrcpy(newDev->secVer, MAX_VERSION_LEN, src->secVer); + } + + newDev->securePort = src->securePort; + newDev->devStatus = src->devStatus; + newDev->connType = src->connType; + newDev->next = NULL; + + OIC_LOG(DEBUG, TAG, "OUT PMCloneOCProvisionDev"); + + return newDev; + +exit: + OIC_LOG(ERROR, TAG, "PMCloneOCProvisionDev : Failed to allocate memory"); + if (newDev) + { + OICFree(newDev->pstat); + OICFree(newDev->doxm); + OICFree(newDev); + } + return NULL; +} + /** * Timeout implementation for secure discovery. When performing secure discovery, * we should wait a certain period of time for getting response of each devices. * * @param[in] waittime Timeout in seconds. + * @param[in] waitForStackResponse if true timeout function will call OCProcess while waiting. * @return OC_STACK_OK on success otherwise error. */ -OCStackResult PMTimeout(unsigned short waittime) +OCStackResult PMTimeout(unsigned short waittime, bool waitForStackResponse) { - struct timespec startTime = {.tv_sec=0, .tv_nsec=0}; - struct timespec currTime = {.tv_sec=0, .tv_nsec=0}; - OCStackResult res = OC_STACK_OK; -#ifdef _POSIX_MONOTONIC_CLOCK - int clock_res = clock_gettime(CLOCK_MONOTONIC, &startTime); -#else - int clock_res = clock_gettime(CLOCK_REALTIME, &startTime); -#endif - if (0 != clock_res) - { - return OC_STACK_ERROR; - } + + uint64_t startTime = OICGetCurrentTime(TIME_IN_MS); while (OC_STACK_OK == res) { -#ifdef _POSIX_MONOTONIC_CLOCK - clock_res = clock_gettime(CLOCK_MONOTONIC, &currTime); -#else - clock_res = clock_gettime(CLOCK_REALTIME, &currTime); -#endif - if (0 != clock_res) - { - return OC_STACK_TIMEOUT; - } - long elapsed = (currTime.tv_sec - startTime.tv_sec); + uint64_t currTime = OICGetCurrentTime(TIME_IN_MS); + + long elapsed = (long)((currTime - startTime) / MS_PER_SEC); if (elapsed > waittime) { return OC_STACK_OK; } - res = OCProcess(); + if (waitForStackResponse) + { + res = OCProcess(); + } } - return res; } @@ -256,89 +413,228 @@ uint16_t GetSecurePortFromJSON(char* jsonStr) return (uint16_t)jsonPort->valueint; } +bool PMGenerateQuery(bool isSecure, + const char* address, uint16_t port, + OCConnectivityType connType, + char* buffer, size_t bufferSize, const char* uri) +{ + if(!address || !buffer || !uri) + { + OIC_LOG(ERROR, TAG, "PMGenerateQuery : Invalid parameters."); + return false; + } + + int snRet = 0; + char* prefix = (isSecure == true) ? COAPS_PREFIX : COAP_PREFIX; + + switch(connType & CT_MASK_ADAPTER) + { + case CT_ADAPTER_IP: + switch(connType & CT_MASK_FLAGS & ~CT_FLAG_SECURE) + { + case CT_IP_USE_V4: + snRet = snprintf(buffer, bufferSize, "%s%s:%d%s", + prefix, address, port, uri); + break; + case CT_IP_USE_V6: + snRet = snprintf(buffer, bufferSize, "%s[%s]:%d%s", + prefix, address, port, uri); + break; + default: + OIC_LOG(ERROR, TAG, "Unknown address format."); + return false; + } + // snprintf return value check + if (snRet < 0) + { + OIC_LOG_V(ERROR, TAG, "PMGenerateQuery : Error (snprintf) %d\n", snRet); + return false; + } + else if ((size_t)snRet >= bufferSize) + { + OIC_LOG_V(ERROR, TAG, "PMGenerateQuery : Truncated (snprintf) %d\n", snRet); + return false; + } + + break; + // TODO: We need to verify tinyDTLS in below cases + case CT_ADAPTER_GATT_BTLE: + case CT_ADAPTER_RFCOMM_BTEDR: + OIC_LOG(ERROR, TAG, "Not supported connectivity adapter."); + return false; + break; + default: + OIC_LOG(ERROR, TAG, "Unknown connectivity adapter."); + return false; + } + + return true; +} + +static OCStackApplicationResult SecurityVersionDiscoveryHandler(void *ctx, OCDoHandle UNUSED, + OCClientResponse *clientResponse) +{ + if (ctx == NULL) + { + OIC_LOG(ERROR, TAG, "Lost List of device information"); + return OC_STACK_KEEP_TRANSACTION; + } + (void)UNUSED; + if (clientResponse) + { + if (NULL == clientResponse->payload) + { + OIC_LOG(INFO, TAG, "Skiping Null payload"); + return OC_STACK_KEEP_TRANSACTION; + } + if (OC_STACK_OK != clientResponse->result) + { + OIC_LOG(INFO, TAG, "Error in response"); + return OC_STACK_KEEP_TRANSACTION; + } + else + { + if (PAYLOAD_TYPE_SECURITY != clientResponse->payload->type) + { + OIC_LOG(INFO, TAG, "Unknown payload type"); + return OC_STACK_KEEP_TRANSACTION; + } + + OicSecVer_t *ptrVer = NULL; + uint8_t *payload = ((OCSecurityPayload*)clientResponse->payload)->securityData; + size_t size = ((OCSecurityPayload*)clientResponse->payload)->payloadSize; + + OCStackResult res = CBORPayloadToVer(payload, size, &ptrVer); + if ((NULL == ptrVer) && (OC_STACK_OK != res)) + { + OIC_LOG(INFO, TAG, "Ignoring malformed CBOR"); + return OC_STACK_KEEP_TRANSACTION; + } + else + { + OIC_LOG(DEBUG, TAG, "Successfully converted ver cbor to bin."); + + //If this is owend device discovery we have to filter out the responses. + DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; + res = UpdateSecVersionOfDevice(pDInfo->ppDevicesList, clientResponse->devAddr.addr, + clientResponse->devAddr.port, ptrVer->secv); + if (OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Error while getting security version."); + DeleteVerBinData(ptrVer); + return OC_STACK_KEEP_TRANSACTION; + } + + OIC_LOG(INFO, TAG, "= Discovered security version ="); + OIC_LOG_V(DEBUG, TAG, "IP %s", clientResponse->devAddr.addr); + OIC_LOG_V(DEBUG, TAG, "PORT %d", clientResponse->devAddr.port); + OIC_LOG_V(DEBUG, TAG, "VERSION %s", ptrVer->secv); + + OIC_LOG(INFO, TAG, "Exiting SecVersionDiscoveryHandler."); + DeleteVerBinData(ptrVer); + } + } + } + else + { + OIC_LOG(INFO, TAG, "Skiping Null response"); + return OC_STACK_KEEP_TRANSACTION; + } + + return OC_STACK_DELETE_TRANSACTION; +} -/** - * Callback handler for getting secure port information using /oic/res discovery. - * - * @param[in] ctx user context - * @param[in] handle Handle for response - * @param[in] clientResponse Response information(It will contain payload) - * - * @return OC_STACK_KEEP_TRANSACTION to keep transaction and - * OC_STACK_DELETE_TRANSACTION to delete it. - */ static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle UNUSED, OCClientResponse *clientResponse) { if (ctx == NULL) { - OC_LOG(ERROR, TAG, "Lost List of device information"); - return OC_STACK_KEEP_TRANSACTION; + OIC_LOG(ERROR, TAG, "Lost List of device information"); + return OC_STACK_DELETE_TRANSACTION; } (void)UNUSED; if (clientResponse) { if (NULL == clientResponse->payload) { - OC_LOG(INFO, TAG, "Skiping Null payload"); + OIC_LOG(INFO, TAG, "Skiping Null payload"); } else { if (PAYLOAD_TYPE_DISCOVERY != clientResponse->payload->type) { - OC_LOG(INFO, TAG, "Wrong payload type"); - return OC_STACK_KEEP_TRANSACTION; + OIC_LOG(INFO, TAG, "Wrong payload type"); + return OC_STACK_DELETE_TRANSACTION; } - OCDiscoveryPayload* discover = (OCDiscoveryPayload*) clientResponse->payload; uint16_t securePort = 0; + OCResourcePayload* resPayload = ((OCDiscoveryPayload*)clientResponse->payload)->resources; - if (discover && discover->resources && discover->resources->secure) + // Use seure port of doxm for OTM and Provision. + while (resPayload) + { + if (0 == strncmp(resPayload->uri, OIC_RSRC_DOXM_URI, strlen(OIC_RSRC_DOXM_URI))) + { + OIC_LOG_V(INFO,TAG,"resPaylod->uri:%s",resPayload->uri); + OIC_LOG(INFO, TAG, "Found doxm resource."); + break; + } + else + { + resPayload = resPayload->next; + } + } + if (NULL == resPayload) + { + OIC_LOG(ERROR, TAG, "Can not find doxm resource."); + return OC_STACK_DELETE_TRANSACTION; + } + if (resPayload && resPayload->secure) { - securePort = discover->resources->port; + securePort = resPayload->port; } else { - OC_LOG(INFO, TAG, "Secure Port info is missing"); - return OC_STACK_KEEP_TRANSACTION; + OIC_LOG(INFO, TAG, "Can not find secure port information."); + return OC_STACK_DELETE_TRANSACTION; } - OCProvisionDev_t** ppDevicesList = (OCProvisionDev_t**) ctx; - - OCStackResult res = UpdateSecurePortOfDevice(ppDevicesList, clientResponse->devAddr.addr, + DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; + OCStackResult res = UpdateSecurePortOfDevice(pDInfo->ppDevicesList, + clientResponse->devAddr.addr, clientResponse->devAddr.port, securePort); if (OC_STACK_OK != res) { - OC_LOG(ERROR, TAG, "Error while getting secure port."); - return OC_STACK_KEEP_TRANSACTION; + OIC_LOG(ERROR, TAG, "Error while getting secure port."); + return OC_STACK_DELETE_TRANSACTION; + } + + res = SecurityVersionDiscovery(pDInfo, clientResponse); + if(OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Failed to SecurityVersionDiscovery"); + return OC_STACK_DELETE_TRANSACTION; } - OC_LOG(INFO, TAG, "Exiting SecurePortDiscoveryHandler."); + + OIC_LOG(INFO, TAG, "Exiting SecurePortDiscoveryHandler."); } - return OC_STACK_KEEP_TRANSACTION; + return OC_STACK_DELETE_TRANSACTION; } else { - OC_LOG(INFO, TAG, "Skiping Null response"); + OIC_LOG(INFO, TAG, "Skiping Null response"); } + return OC_STACK_DELETE_TRANSACTION; } -/** - * Callback handler for PMDeviceDiscovery API. - * - * @param[in] ctx User context - * @param[in] handle Handler for response - * @param[in] clientResponse Response information (It will contain payload) - * @return OC_STACK_KEEP_TRANSACTION to keep transaction and - * OC_STACK_DELETE_TRANSACTION to delete it. - */ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNUSED, OCClientResponse *clientResponse) { if (ctx == NULL) { - OC_LOG(ERROR, TAG, "Lost List of device information"); + OIC_LOG(ERROR, TAG, "Lost List of device information"); return OC_STACK_KEEP_TRANSACTION; } (void)UNUSED; @@ -346,68 +642,96 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU { if (NULL == clientResponse->payload) { - OC_LOG(INFO, TAG, "Skiping Null payload"); + OIC_LOG(INFO, TAG, "Skiping Null payload"); return OC_STACK_KEEP_TRANSACTION; } if (OC_STACK_OK != clientResponse->result) { - OC_LOG(INFO, TAG, "Error in response"); + OIC_LOG(INFO, TAG, "Error in response"); return OC_STACK_KEEP_TRANSACTION; } else { if (PAYLOAD_TYPE_SECURITY != clientResponse->payload->type) { - OC_LOG(INFO, TAG, "Unknown payload type"); + OIC_LOG(INFO, TAG, "Unknown payload type"); return OC_STACK_KEEP_TRANSACTION; } - OicSecDoxm_t *ptrDoxm = JSONToDoxmBin( - ((OCSecurityPayload*)clientResponse->payload)->securityData); - if (NULL == ptrDoxm) + + OicSecDoxm_t *ptrDoxm = NULL; + uint8_t *payload = ((OCSecurityPayload*)clientResponse->payload)->securityData; + size_t size = ((OCSecurityPayload*)clientResponse->payload)->payloadSize; + + OCStackResult res = CBORPayloadToDoxm(payload, size, &ptrDoxm); + if ((NULL == ptrDoxm) || (OC_STACK_OK != res)) { - OC_LOG(INFO, TAG, "Ignoring malformed JSON"); + OIC_LOG(INFO, TAG, "Ignoring malformed CBOR"); return OC_STACK_KEEP_TRANSACTION; } else { - OC_LOG(DEBUG, TAG, "Successfully converted doxm json to bin."); + OIC_LOG(DEBUG, TAG, "Successfully converted doxm cbor to bin."); - OCProvisionDev_t **ppDevicesList = (OCProvisionDev_t**) ctx; + //If this is owend device discovery we have to filter out the responses. + DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; + OCProvisionDev_t **ppDevicesList = pDInfo->ppDevicesList; - OCStackResult res = AddDevice(ppDevicesList, clientResponse->devAddr.addr, - clientResponse->devAddr.port, - clientResponse->devAddr.adapter, ptrDoxm); - if (OC_STACK_OK != res) + // Get my device ID from doxm resource + OicUuid_t myId; + memset(&myId, 0, sizeof(myId)); + OCStackResult res = GetDoxmDevOwnerId(&myId); + if(OC_STACK_OK != res) { - OC_LOG(ERROR, TAG, "Error while adding data to linkedlist."); + OIC_LOG(ERROR, TAG, "Error while getting my device ID."); DeleteDoxmBinData(ptrDoxm); return OC_STACK_KEEP_TRANSACTION; } - //Try to the unicast discovery to getting secure port - char query[MAX_QUERY_LENGTH] = { 0, }; - sprintf(query, "%s%s:%d%s", - COAP_PREFIX, - clientResponse->devAddr.addr, clientResponse->devAddr.port, - OC_RSRVD_WELL_KNOWN_URI); - - OCCallbackData cbData; - cbData.cb = &SecurePortDiscoveryHandler; - cbData.context = ctx; - cbData.cd = NULL; - OCStackResult ret = OCDoResource(NULL, OC_REST_GET, query, 0, 0, - CT_ADAPTER_IP, OC_LOW_QOS, &cbData, NULL, 0); - // TODO: Should we use the default secure port in case of error? - if(OC_STACK_OK != ret) + // If this is owned discovery response but owner is not me then discard it. + if( (pDInfo->isOwnedDiscovery) && + (0 != memcmp(&ptrDoxm->owner.id, &myId.id, sizeof(myId.id))) ) { - UpdateSecurePortOfDevice(ppDevicesList, clientResponse->devAddr.addr, - clientResponse->devAddr.port, DEFAULT_SECURE_PORT); + OIC_LOG(DEBUG, TAG, "Discovered device is not owend by me"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; } - else + + res = GetDoxmDeviceID(&myId); + if(OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Error while getting my UUID."); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + //if this is owned discovery and this is PT's reply, discard it + if((pDInfo->isOwnedDiscovery) && + (0 == memcmp(&ptrDoxm->deviceID.id, &myId.id, sizeof(myId.id))) ) + { + OIC_LOG(DEBUG, TAG, "discarding provision tool's reply"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + + res = AddDevice(ppDevicesList, clientResponse->devAddr.addr, + clientResponse->devAddr.port, + clientResponse->devAddr.adapter, + clientResponse->connType, ptrDoxm); + if (OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Error while adding data to linkedlist."); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + + res = SecurePortDiscovery(pDInfo, clientResponse); + if(OC_STACK_OK != res) { - OC_LOG_V(ERROR, TAG, "OCDoResource with [%s] Success", query); + OIC_LOG(ERROR, TAG, "Failed to SecurePortDiscovery"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; } - OC_LOG(INFO, TAG, "Exiting ProvisionDiscoveryHandler."); + + OIC_LOG(INFO, TAG, "Exiting ProvisionDiscoveryHandler."); } return OC_STACK_KEEP_TRANSACTION; @@ -415,7 +739,7 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU } else { - OC_LOG(INFO, TAG, "Skiping Null response"); + OIC_LOG(INFO, TAG, "Skiping Null response"); return OC_STACK_KEEP_TRANSACTION; } @@ -433,43 +757,193 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU */ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisionDev_t **ppDevicesList) { - OC_LOG(DEBUG, TAG, "IN PMDeviceDiscovery"); + OIC_LOG(DEBUG, TAG, "IN PMDeviceDiscovery"); if (NULL != *ppDevicesList) { - OC_LOG(ERROR, TAG, "List is not null can cause memory leak"); + OIC_LOG(ERROR, TAG, "List is not null can cause memory leak"); return OC_STACK_INVALID_PARAM; } const char DOXM_OWNED_FALSE_MULTICAST_QUERY[] = "/oic/sec/doxm?Owned=FALSE"; const char DOXM_OWNED_TRUE_MULTICAST_QUERY[] = "/oic/sec/doxm?Owned=TRUE"; + DiscoveryInfo *pDInfo = OICCalloc(1, sizeof(DiscoveryInfo)); + if(NULL == pDInfo) + { + OIC_LOG(ERROR, TAG, "PMDeviceDiscovery : Memory allocation failed."); + return OC_STACK_NO_MEMORY; + } + + pDInfo->ppDevicesList = ppDevicesList; + pDInfo->isOwnedDiscovery = isOwned; + OCCallbackData cbData; cbData.cb = &DeviceDiscoveryHandler; - cbData.context = (void *)ppDevicesList; + cbData.context = (void *)pDInfo; cbData.cd = NULL; OCStackResult res = OC_STACK_ERROR; const char* query = isOwned ? DOXM_OWNED_TRUE_MULTICAST_QUERY : DOXM_OWNED_FALSE_MULTICAST_QUERY; - res = OCDoResource(NULL, OC_REST_DISCOVER, query, 0, 0, - CT_DEFAULT, OC_LOW_QOS, &cbData, NULL, 0); + OCDoHandle handle = NULL; + res = OCDoResource(&handle, OC_REST_DISCOVER, query, 0, 0, + CT_DEFAULT, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { - OC_LOG(ERROR, TAG, "OCStack resource error"); - goto exit; + OIC_LOG(ERROR, TAG, "OCStack resource error"); + OICFree(pDInfo); + return res; } //Waiting for each response. - res = PMTimeout(waittime); + res = PMTimeout(waittime, true); if(OC_STACK_OK != res) { - OC_LOG(ERROR, TAG, "Failed to wait response for secure discovery."); - goto exit; + OIC_LOG(ERROR, TAG, "Failed to wait response for secure discovery."); + OICFree(pDInfo); + OCStackResult resCancel = OCCancel(handle, OC_HIGH_QOS, NULL, 0); + if(OC_STACK_OK != resCancel) + { + OIC_LOG(ERROR, TAG, "Failed to remove registered callback"); + } + return res; } - - OC_LOG(DEBUG, TAG, "OUT PMDeviceDiscovery"); -exit: + res = OCCancel(handle,OC_HIGH_QOS,NULL,0); + if (OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Failed to remove registered callback"); + OICFree(pDInfo); + return res; + } + OIC_LOG(DEBUG, TAG, "OUT PMDeviceDiscovery"); + OICFree(pDInfo); return res; } + +static OCStackResult SecurePortDiscovery(DiscoveryInfo* discoveryInfo, + const OCClientResponse *clientResponse) +{ + OIC_LOG(DEBUG, TAG, "IN SecurePortDiscovery"); + + if(NULL == discoveryInfo || NULL == clientResponse) + { + return OC_STACK_INVALID_PARAM; + } + //Try to the unicast discovery to getting secure port + char query[MAX_URI_LENGTH+MAX_QUERY_LENGTH+1] = {0}; + if(!PMGenerateQuery(false, + clientResponse->devAddr.addr, clientResponse->devAddr.port, + clientResponse->connType, + query, sizeof(query), OC_RSRVD_WELL_KNOWN_URI)) + { + OIC_LOG(ERROR, TAG, "SecurePortDiscovery : Failed to generate query"); + return OC_STACK_ERROR; + } + OIC_LOG_V(DEBUG, TAG, "Query=%s", query); + + OCCallbackData cbData; + cbData.cb = &SecurePortDiscoveryHandler; + cbData.context = (void*)discoveryInfo; + cbData.cd = NULL; + OCStackResult ret = OCDoResource(NULL, OC_REST_DISCOVER, query, 0, 0, + clientResponse->connType, OC_HIGH_QOS, &cbData, NULL, 0); + if(OC_STACK_OK != ret) + { + OIC_LOG(ERROR, TAG, "Failed to Secure Port Discovery"); + return ret; + } + else + { + OIC_LOG_V(INFO, TAG, "OCDoResource with [%s] Success", query); + } + + OIC_LOG(DEBUG, TAG, "OUT SecurePortDiscovery"); + + return ret; +} + +static OCStackResult SecurityVersionDiscovery(DiscoveryInfo* discoveryInfo, + const OCClientResponse *clientResponse) +{ + OIC_LOG(DEBUG, TAG, "IN SecurityVersionDiscovery"); + + if(NULL == discoveryInfo || NULL == clientResponse) + { + return OC_STACK_INVALID_PARAM; + } + + //Try to the unicast discovery to getting security version + char query[MAX_URI_LENGTH+MAX_QUERY_LENGTH+1] = {0}; + if(!PMGenerateQuery(false, + clientResponse->devAddr.addr, clientResponse->devAddr.port, + clientResponse->connType, + query, sizeof(query), OIC_RSRC_VER_URI)) + { + OIC_LOG(ERROR, TAG, "SecurityVersionDiscovery : Failed to generate query"); + return OC_STACK_ERROR; + } + OIC_LOG_V(DEBUG, TAG, "Query=%s", query); + + OCCallbackData cbData; + cbData.cb = &SecurityVersionDiscoveryHandler; + cbData.context = (void*)discoveryInfo; + cbData.cd = NULL; + OCStackResult ret = OCDoResource(NULL, OC_REST_DISCOVER, query, 0, 0, + clientResponse->connType, OC_HIGH_QOS, &cbData, NULL, 0); + if(OC_STACK_OK != ret) + { + OIC_LOG(ERROR, TAG, "Failed to Security Version Discovery"); + return ret; + } + else + { + OIC_LOG_V(INFO, TAG, "OCDoResource with [%s] Success", query); + } + + OIC_LOG(DEBUG, TAG, "OUT SecurityVersionDiscovery"); + + return ret; +} + +/** + * Function to print OCProvisionDev_t for debug purpose. + * + * @param[in] pDev Pointer to OCProvisionDev_t. It's information will be printed by OIC_LOG_XX + * + */ +void PMPrintOCProvisionDev(const OCProvisionDev_t* pDev) +{ + if (pDev) + { + OIC_LOG(DEBUG, TAG, "+++++ OCProvisionDev_t Information +++++"); + OIC_LOG_V(DEBUG, TAG, "IP %s", pDev->endpoint.addr); + OIC_LOG_V(DEBUG, TAG, "PORT %d", pDev->endpoint.port); + OIC_LOG_V(DEBUG, TAG, "S-PORT %d", pDev->securePort); + OIC_LOG(DEBUG, TAG, "++++++++++++++++++++++++++++++++++++++++"); + } + else + { + OIC_LOG(DEBUG, TAG, "+++++ OCProvisionDev_t is NULL +++++"); + } +} + +bool PMDeleteFromUUIDList(OCUuidList_t *pUuidList, OicUuid_t *targetId) +{ + if(pUuidList == NULL || targetId == NULL) + { + return false; + } + OCUuidList_t *tmp1 = NULL,*tmp2=NULL; + LL_FOREACH_SAFE(pUuidList, tmp1, tmp2) + { + if(0 == memcmp(tmp1->dev.id, targetId->id, sizeof(targetId->id))) + { + LL_DELETE(pUuidList, tmp1); + OICFree(tmp1); + return true; + } + } + return false; +}