X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fprovisioning%2Fsrc%2Fpmutility.c;h=debfd30e05d00331e7f8598c382bcd57c70788a0;hb=c98a79d81861a978f9dee7457ea3847cd36de619;hp=31208db6346a14914f157fb32d004d231a43cbb4;hpb=c5ba0ff1afee1c801e4287f683e13b2b4d23c3d7;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c index 31208db..debfd30 100644 --- a/resource/csdk/security/provisioning/src/pmutility.c +++ b/resource/csdk/security/provisioning/src/pmutility.c @@ -21,14 +21,18 @@ #define _POSIX_C_SOURCE 200112L #endif +#include "iotivity_config.h" +#ifdef 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,6 +42,7 @@ #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" @@ -48,9 +53,72 @@ typedef struct _DiscoveryInfo{ OCProvisionDev_t **ppDevicesList; + OCProvisionDev_t *pCandidateList; bool isOwnedDiscovery; + bool isSingleDiscovery; + bool isFound; + const OicUuid_t *targetId; } 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. * @@ -85,23 +153,21 @@ OCProvisionDev_t* GetDevice(OCProvisionDev_t **ppDevicesList, const char* addr, * Add device information to list. * * @param[in] pList List of OCProvisionDev_t. - * @param[in] addr address of target device. - * @param[in] port port of remote server. - * @param[in] adapter adapter type of endpoint. + * @param[in] endpoint target device endpoint. + * @param[in] connType connectivity 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. + * @return OC_STACK_OK for success and error code otherwise. */ -OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, const uint16_t port, - OCTransportAdapter adapter, OCConnectivityType connType, OicSecDoxm_t *doxm) +OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, OCDevAddr* endpoint, + OCConnectivityType connType, OicSecDoxm_t *doxm) { - if (NULL == addr) + if (NULL == endpoint) { return OC_STACK_INVALID_PARAM; } - OCProvisionDev_t *ptr = GetDevice(ppDevicesList, addr, port); + OCProvisionDev_t *ptr = GetDevice(ppDevicesList, endpoint->addr, endpoint->port); if(!ptr) { ptr = (OCProvisionDev_t *)OICCalloc(1, sizeof (OCProvisionDev_t)); @@ -111,14 +177,14 @@ OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, cons return OC_STACK_NO_MEMORY; } - OICStrcpy(ptr->endpoint.addr, MAX_ADDR_STR_SIZE, addr); - ptr->endpoint.port = port; + ptr->endpoint = *endpoint; ptr->doxm = doxm; 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 + ptr->handle = NULL; LL_PREPEND(*ppDevicesList, ptr); } @@ -127,6 +193,35 @@ OCStackResult AddDevice(OCProvisionDev_t **ppDevicesList, const char* addr, cons } /** + * Move device object between two device lists. + * + * @param[in] ppDstDevicesList Destination list of OCProvisionDev_t. + * @param[in] ppSrcDevicesList Source list of OCProvisionDev_t. + * @param[in] endpoint target device endpoint. + * + * @return OC_STACK_OK for success and error code otherwise. + */ +OCStackResult MoveDeviceList(OCProvisionDev_t **ppDstDevicesList, + OCProvisionDev_t **ppSrcDevicesList, OCDevAddr* endpoint) +{ + if (NULL == ppSrcDevicesList || NULL == endpoint) + { + return OC_STACK_INVALID_PARAM; + } + + OCProvisionDev_t *ptr = GetDevice(ppSrcDevicesList, endpoint->addr, endpoint->port); + if(ptr) + { + LL_DELETE(*ppSrcDevicesList, ptr); + LL_PREPEND(*ppDstDevicesList, ptr); + OIC_LOG_V(DEBUG, TAG, "MoveDeviceList success : %s(%d)", endpoint->addr, endpoint->port); + return OC_STACK_OK; + } + + return OC_STACK_ERROR; +} + +/** * Function to set secure port information from the given list of devices. * * @param[in] pList List of OCProvisionDev_t. @@ -136,8 +231,12 @@ 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) +static OCStackResult UpdateSecurePortOfDevice(OCProvisionDev_t **ppDevicesList, const char *addr, + uint16_t port, uint16_t securePort +#ifdef __WITH_TLS__ + ,uint16_t tcpPort +#endif + ) { OCProvisionDev_t *ptr = GetDevice(ppDevicesList, addr, port); @@ -149,6 +248,41 @@ OCStackResult UpdateSecurePortOfDevice(OCProvisionDev_t **ppDevicesList, const c ptr->securePort = securePort; +#ifdef __WITH_TLS__ + ptr->tcpPort = tcpPort; +#endif + + return OC_STACK_OK; +} + +/** + * 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; } @@ -210,6 +344,15 @@ OCProvisionDev_t* PMCloneOCProvisionDev(const OCProvisionDev_t* src) 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; @@ -240,31 +383,14 @@ exit: */ 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; @@ -327,8 +453,8 @@ uint16_t GetSecurePortFromJSON(char* jsonStr) } bool PMGenerateQuery(bool isSecure, - const char* address, const uint16_t port, - const OCConnectivityType connType, + const char* address, uint16_t port, + OCConnectivityType connType, char* buffer, size_t bufferSize, const char* uri) { if(!address || !buffer || !uri) @@ -342,6 +468,8 @@ bool PMGenerateQuery(bool isSecure, switch(connType & CT_MASK_ADAPTER) { + case CT_ADAPTER_TCP: + prefix = (isSecure == true) ? COAPS_TCP_PREFIX : COAP_TCP_PREFIX; case CT_ADAPTER_IP: switch(connType & CT_MASK_FLAGS & ~CT_FLAG_SECURE) { @@ -384,16 +512,79 @@ bool PMGenerateQuery(bool isSecure, return true; } -/** - * 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 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; +} + static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle UNUSED, OCClientResponse *clientResponse) { @@ -420,6 +611,25 @@ static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle uint16_t securePort = 0; OCResourcePayload* resPayload = ((OCDiscoveryPayload*)clientResponse->payload)->resources; + // 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 = resPayload->port; @@ -429,17 +639,58 @@ static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle OIC_LOG(INFO, TAG, "Can not find secure port information."); return OC_STACK_DELETE_TRANSACTION; } - +#ifdef __WITH_TLS__ + OIC_LOG_V(DEBUG, TAG, "%s: TCP port from discovery = %d", __func__, resPayload->tcpPort); +#endif DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; - OCProvisionDev_t **ppDevicesList = pDInfo->ppDevicesList; + OCProvisionDev_t *ptr = GetDevice(&pDInfo->pCandidateList, + clientResponse->devAddr.addr, + clientResponse->devAddr.port); + if(!ptr) + { + OIC_LOG(ERROR, TAG, "Can not find device information in the discovery candidate device list"); + return OC_STACK_DELETE_TRANSACTION; + } - OCStackResult res = UpdateSecurePortOfDevice(ppDevicesList, clientResponse->devAddr.addr, - clientResponse->devAddr.port, securePort); + OCStackResult res = UpdateSecurePortOfDevice(&pDInfo->pCandidateList, + clientResponse->devAddr.addr, + clientResponse->devAddr.port, + securePort +#ifdef __WITH_TLS__ + ,resPayload->tcpPort +#endif + ); if (OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "Error while getting secure port."); return OC_STACK_DELETE_TRANSACTION; } + + res = MoveDeviceList(pDInfo->ppDevicesList, &pDInfo->pCandidateList, &clientResponse->devAddr); + if(OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Error while move the discovered device to list."); + return OC_STACK_DELETE_TRANSACTION; + } + + if(pDInfo->isSingleDiscovery) + { + pDInfo->isFound = true; + } + +/* + * Since security version discovery does not used anymore, disable security version discovery. + * Need to discussion to removing all version discovery related codes. + */ +#if 0 + res = SecurityVersionDiscovery(pDInfo, clientResponse); + if(OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Failed to SecurityVersionDiscovery"); + return OC_STACK_DELETE_TRANSACTION; + } +#endif + OIC_LOG(INFO, TAG, "Exiting SecurePortDiscoveryHandler."); } @@ -449,18 +700,10 @@ static OCStackApplicationResult SecurePortDiscoveryHandler(void *ctx, OCDoHandle { 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) { @@ -489,10 +732,13 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU OIC_LOG(INFO, TAG, "Unknown payload type"); return OC_STACK_KEEP_TRANSACTION; } + OicSecDoxm_t *ptrDoxm = NULL; - uint8_t *payload = ((OCSecurityPayload*)clientResponse->payload)->securityData1; - OCStackResult res = CBORPayloadToDoxm(payload, 0, &ptrDoxm); - if ((NULL == ptrDoxm) && (OC_STACK_OK != res)) + 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)) { OIC_LOG(INFO, TAG, "Ignoring malformed CBOR"); return OC_STACK_KEEP_TRANSACTION; @@ -503,7 +749,7 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU //If this is owend device discovery we have to filter out the responses. DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; - OCProvisionDev_t **ppDevicesList = pDInfo->ppDevicesList; + OCProvisionDev_t **ppDevicesList = &pDInfo->pCandidateList; // Get my device ID from doxm resource OicUuid_t myId; @@ -525,52 +771,47 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU 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) + res = GetDoxmDeviceID(&myId); + if(OC_STACK_OK != res) { - OIC_LOG(ERROR, TAG, "Error while adding data to linkedlist."); + OIC_LOG(ERROR, TAG, "Error while getting my UUID."); DeleteDoxmBinData(ptrDoxm); return OC_STACK_KEEP_TRANSACTION; } - char rsrc_uri[MAX_URI_LENGTH+1] = {0}; - int wr_len = snprintf(rsrc_uri, sizeof(rsrc_uri), "%s?%s=%s", - OC_RSRVD_WELL_KNOWN_URI, OC_RSRVD_RESOURCE_TYPE, OIC_RSRC_TYPE_SEC_DOXM); - if(wr_len <= 0 || (size_t)wr_len >= sizeof(rsrc_uri)) + //if targetId and discovered deviceID are different, discard it + if ((pDInfo->isSingleDiscovery) && + (0 != memcmp(&ptrDoxm->deviceID.id, &pDInfo->targetId->id, sizeof(pDInfo->targetId->id))) ) { - OIC_LOG(ERROR, TAG, "rsrc_uri_string_print failed"); - return OC_STACK_ERROR; + OIC_LOG(DEBUG, TAG, "Discovered device is not target device"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; } - //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), rsrc_uri)) + //if this is owned discovery and this is PT's reply, discard it + if (((pDInfo->isSingleDiscovery) || (pDInfo->isOwnedDiscovery)) && + (0 == memcmp(&ptrDoxm->deviceID.id, &myId.id, sizeof(myId.id))) ) { - OIC_LOG(ERROR, TAG, "DeviceDiscoveryHandler : Failed to generate query"); + OIC_LOG(DEBUG, TAG, "discarding provision tool's reply"); + DeleteDoxmBinData(ptrDoxm); return OC_STACK_KEEP_TRANSACTION; } - OIC_LOG_V(DEBUG, TAG, "Query=%s", query); - - OCCallbackData cbData; - cbData.cb = &SecurePortDiscoveryHandler; - cbData.context = ctx; - cbData.cd = NULL; - OCStackResult ret = OCDoResource(NULL, OC_REST_DISCOVER, query, 0, 0, - clientResponse->connType, OC_LOW_QOS, &cbData, NULL, 0); - // TODO: Should we use the default secure port in case of error? - if(OC_STACK_OK != ret) + + res = AddDevice(ppDevicesList, &clientResponse->devAddr, + clientResponse->connType, ptrDoxm); + if (OC_STACK_OK != res) { - OIC_LOG(ERROR, TAG, "Failed to Secure Port Discovery"); + OIC_LOG(ERROR, TAG, "Error while adding data to linkedlist."); + DeleteDoxmBinData(ptrDoxm); return OC_STACK_KEEP_TRANSACTION; } - else + + res = SecurePortDiscovery(pDInfo, clientResponse); + if(OC_STACK_OK != res) { - OIC_LOG_V(INFO, TAG, "OCDoResource with [%s] Success", query); + OIC_LOG(ERROR, TAG, "Failed to SecurePortDiscovery"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; } + OIC_LOG(INFO, TAG, "Exiting ProvisionDiscoveryHandler."); } @@ -586,6 +827,133 @@ static OCStackApplicationResult DeviceDiscoveryHandler(void *ctx, OCDoHandle UNU return OC_STACK_DELETE_TRANSACTION; } +static void DeviceDiscoveryDeleteHandler(void *ctx) +{ + OIC_LOG(DEBUG, TAG, "IN DeviceDiscoveryDeleteHandler"); + if (NULL == ctx) + { + OIC_LOG(WARNING, TAG, "Not found context in DeviceDiscoveryDeleteHandler"); + return; + } + + DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; + if (NULL != pDInfo->pCandidateList) + { + OCProvisionDev_t *pDev = NULL; + LL_FOREACH(pDInfo->pCandidateList, pDev) + { + OIC_LOG_V(DEBUG, TAG, "OCCancel - %s : %d", + pDev->endpoint.addr, pDev->endpoint.port); + OCCancel(pDev->handle,OC_HIGH_QOS,NULL,0); + } + PMDeleteDeviceList(pDInfo->pCandidateList); + } + OIC_LOG(DEBUG, TAG, "OUT DeviceDiscoveryDeleteHandler"); +} + +/** + * Discover owned/unowned device in the specified endpoint/deviceID. + * It will return the found device even though timeout is not exceeded. + * + * @param[in] waittime Timeout in seconds + * @param[in] deviceID deviceID of target device. + * @param[out] ppFoundDevice OCProvisionDev_t of found device + * + * @return OC_STACK_OK on success otherwise error.\n + * OC_STACK_INVALID_PARAM when deviceID is NULL or ppFoundDevice is not initailized. + */ +OCStackResult PMSingleDeviceDiscovery(unsigned short waittime, const OicUuid_t* deviceID, + OCProvisionDev_t **ppFoundDevice) +{ + OIC_LOG(DEBUG, TAG, "IN PMSingleDeviceDiscovery"); + + if (NULL != *ppFoundDevice) + { + OIC_LOG(ERROR, TAG, "List is not null can cause memory leak"); + return OC_STACK_INVALID_PARAM; + } + + if (NULL == deviceID) + { + OIC_LOG(ERROR, TAG, "Invalid device ID"); + return OC_STACK_INVALID_PARAM; + } + + + DiscoveryInfo *pDInfo = OICCalloc(1, sizeof(DiscoveryInfo)); + if(NULL == pDInfo) + { + OIC_LOG(ERROR, TAG, "PMSingleDeviceDiscovery : Memory allocation failed."); + return OC_STACK_NO_MEMORY; + } + + pDInfo->ppDevicesList = ppFoundDevice; + pDInfo->pCandidateList = NULL; + pDInfo->isOwnedDiscovery = false; + pDInfo->isSingleDiscovery = true; + pDInfo->isFound = false; + pDInfo->targetId = deviceID; + + OCCallbackData cbData; + cbData.cb = &DeviceDiscoveryHandler; + cbData.context = (void *)pDInfo; + cbData.cd = &DeviceDiscoveryDeleteHandler; + + OCStackResult res = OC_STACK_ERROR; + + char query[MAX_URI_LENGTH + MAX_QUERY_LENGTH + 1] = { '\0' }; + snprintf(query, MAX_URI_LENGTH + MAX_QUERY_LENGTH + 1, "/oic/sec/doxm"); + + 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) + { + OIC_LOG(ERROR, TAG, "OCStack resource error"); + OICFree(pDInfo); + return res; + } + + //Waiting for each response. + res = OC_STACK_OK; + uint64_t startTime = OICGetCurrentTime(TIME_IN_MS); + while (OC_STACK_OK == res && !pDInfo->isFound) + { + uint64_t currTime = OICGetCurrentTime(TIME_IN_MS); + + long elapsed = (long)((currTime - startTime) / MS_PER_SEC); + if (elapsed > waittime) + { + break; + } + res = OCProcess(); + } + + if(OC_STACK_OK != res) + { + 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; + } + + 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 PMSingleDeviceDiscovery"); + OICFree(pDInfo); + return res; +} + + /** * Discover owned/unowned devices in the same IP subnet. . * @@ -616,12 +984,15 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi } pDInfo->ppDevicesList = ppDevicesList; + pDInfo->pCandidateList = NULL; pDInfo->isOwnedDiscovery = isOwned; + pDInfo->isSingleDiscovery = false; + pDInfo->targetId = NULL; OCCallbackData cbData; cbData.cb = &DeviceDiscoveryHandler; cbData.context = (void *)pDInfo; - cbData.cd = NULL; + cbData.cd = &DeviceDiscoveryDeleteHandler; OCStackResult res = OC_STACK_ERROR; const char* query = isOwned ? DOXM_OWNED_TRUE_MULTICAST_QUERY : @@ -629,7 +1000,7 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi OCDoHandle handle = NULL; res = OCDoResource(&handle, OC_REST_DISCOVER, query, 0, 0, - CT_DEFAULT, OC_LOW_QOS, &cbData, NULL, 0); + CT_DEFAULT, OC_HIGH_QOS, &cbData, NULL, 0); if (res != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -643,14 +1014,14 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi { OIC_LOG(ERROR, TAG, "Failed to wait response for secure discovery."); OICFree(pDInfo); - OCStackResult resCancel = OCCancel(handle, OC_LOW_QOS, NULL, 0); + 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; } - res = OCCancel(handle,OC_LOW_QOS,NULL,0); + res = OCCancel(handle,OC_HIGH_QOS,NULL,0); if (OC_STACK_OK != res) { OIC_LOG(ERROR, TAG, "Failed to remove registered callback"); @@ -662,6 +1033,334 @@ OCStackResult PMDeviceDiscovery(unsigned short waittime, bool isOwned, OCProvisi return res; } +#ifdef _ENABLE_MULTIPLE_OWNER_ +static OCStackApplicationResult MOTDeviceDiscoveryHandler(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, "Skipping 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; + } + + 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)) + { + OIC_LOG(INFO, TAG, "Ignoring malformed CBOR"); + return OC_STACK_KEEP_TRANSACTION; + } + else + { + OIC_LOG(DEBUG, TAG, "Successfully converted doxm cbor to bin."); + + //If this is owend device discovery we have to filter out the responses. + DiscoveryInfo* pDInfo = (DiscoveryInfo*)ctx; + OCProvisionDev_t **ppDevicesList = pDInfo->ppDevicesList; + + // Get my device ID from doxm resource + OicUuid_t myId; + memset(&myId, 0, sizeof(myId)); + OCStackResult res = GetDoxmDevOwnerId(&myId); + if(OC_STACK_OK != res) + { + OIC_LOG(ERROR, TAG, "Error while getting my device ID."); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + + 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; + } + + if(pDInfo->isOwnedDiscovery) + { + OicSecSubOwner_t* subOwner = NULL; + LL_FOREACH(ptrDoxm->subOwners, subOwner) + { + if(memcmp(myId.id, subOwner->uuid.id, sizeof(myId.id)) == 0) + { + break; + } + } + + if(subOwner) + { + res = AddDevice(ppDevicesList, &clientResponse->devAddr, + 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) + { + OIC_LOG(ERROR, TAG, "Failed to SecurePortDiscovery"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + } + else + { + OIC_LOG(ERROR, TAG, "discarding device's reply, because not a SubOwner."); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + } + else + { + if(ptrDoxm->mom && OIC_MULTIPLE_OWNER_DISABLE != ptrDoxm->mom->mode) + { + res = AddDevice(ppDevicesList, &clientResponse->devAddr, + 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) + { + OIC_LOG(ERROR, TAG, "Failed to SecurePortDiscovery"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + } + else + { + OIC_LOG(ERROR, TAG, "discarding mom disabled device's reply"); + DeleteDoxmBinData(ptrDoxm); + return OC_STACK_KEEP_TRANSACTION; + } + } + + OIC_LOG(INFO, TAG, "Exiting ProvisionDiscoveryHandler."); + } + + return OC_STACK_KEEP_TRANSACTION; + } + } + else + { + OIC_LOG(INFO, TAG, "Skiping Null response"); + return OC_STACK_KEEP_TRANSACTION; + } + + return OC_STACK_DELETE_TRANSACTION; +} + + +/** + * Discover multiple OTM enabled devices in the same IP subnet. + * + * @param[in] waittime Timeout in seconds. + * @param[in] ppDevicesList List of OCProvisionDev_t. + * + * @return OC_STACK_OK on success otherwise error. + */ +OCStackResult PMMultipleOwnerDeviceDiscovery(unsigned short waittime, bool isMultipleOwned, OCProvisionDev_t **ppDevicesList) +{ + OIC_LOG(DEBUG, TAG, "IN PMMultipleOwnerEnabledDeviceDiscovery"); + + if (NULL != *ppDevicesList) + { + OIC_LOG(ERROR, TAG, "List is not null can cause memory leak"); + return OC_STACK_INVALID_PARAM; + } + + const char *DOXM_MOM_ENABLE_MULTICAST_QUERY = "/oic/sec/doxm?mom!=0&owned=TRUE"; + const char *DOXM_MULTIPLE_OWNED_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 = isMultipleOwned; + + OCCallbackData cbData; + cbData.cb = &MOTDeviceDiscoveryHandler; + cbData.context = (void *)pDInfo; + cbData.cd = NULL; + OCStackResult res = OC_STACK_ERROR; + + const char* query = isMultipleOwned ? DOXM_MULTIPLE_OWNED_MULTICAST_QUERY : + DOXM_MOM_ENABLE_MULTICAST_QUERY; + + 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) + { + OIC_LOG(ERROR, TAG, "OCStack resource error"); + OICFree(pDInfo); + return res; + } + + //Waiting for each response. + res = PMTimeout(waittime, true); + if(OC_STACK_OK != res) + { + 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; + } + 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 PMMultipleOwnerEnabledDeviceDiscovery"); + OICFree(pDInfo); + return res; +} + +#endif //_ENABLE_MULTIPLE_OWNER_ + +static OCStackResult SecurePortDiscovery(DiscoveryInfo* discoveryInfo, + const OCClientResponse *clientResponse) +{ + OIC_LOG(DEBUG, TAG, "IN SecurePortDiscovery"); + + if(NULL == discoveryInfo || NULL == clientResponse) + { + return OC_STACK_INVALID_PARAM; + } + + OCProvisionDev_t *pDev = GetDevice(&discoveryInfo->pCandidateList, + clientResponse->devAddr.addr, clientResponse->devAddr.port); + if(NULL == pDev) + { + OIC_LOG(ERROR, TAG, "SecurePortDiscovery : Failed to get device"); + return OC_STACK_ERROR; + } + + //Try to the unicast discovery to getting secure port + char query[MAX_URI_LENGTH+MAX_QUERY_LENGTH+1] = {0}; + if(!PMGenerateQuery(false, + pDev->endpoint.addr, pDev->endpoint.port, + pDev->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(&pDev->handle, OC_REST_DISCOVER, query, 0, 0, + pDev->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. * @@ -684,18 +1383,18 @@ void PMPrintOCProvisionDev(const OCProvisionDev_t* pDev) } } -bool PMDeleteFromUUIDList(OCUuidList_t *pUuidList, OicUuid_t *targetId) +bool PMDeleteFromUUIDList(OCUuidList_t **pUuidList, OicUuid_t *targetId) { - if(pUuidList == NULL || targetId == NULL) + if(*pUuidList == NULL || targetId == NULL) { return false; } OCUuidList_t *tmp1 = NULL,*tmp2=NULL; - LL_FOREACH_SAFE(pUuidList, tmp1, tmp2) + LL_FOREACH_SAFE(*pUuidList, tmp1, tmp2) { if(0 == memcmp(tmp1->dev.id, targetId->id, sizeof(targetId->id))) { - LL_DELETE(pUuidList, tmp1); + LL_DELETE(*pUuidList, tmp1); OICFree(tmp1); return true; }