X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsrc%2Focobserve.c;h=1d3e35988001fd573c8004ec8f58b97dfea9b609;hb=296901f09ec0136a393ef98aa752e84bff0ac06b;hp=6bcaa1cbe9c02ca914cece4c449a0ff574a397d6;hpb=67137cd18b3ad6e732d3f8e5db52f75a6a4566fb;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c index 6bcaa1c..1d3e359 100644 --- a/resource/csdk/stack/src/ocobserve.c +++ b/resource/csdk/stack/src/ocobserve.c @@ -42,7 +42,7 @@ #define VERIFY_NON_NULL(arg) { if (!arg) {OC_LOG(FATAL, TAG, #arg " is NULL"); goto exit;} } -static struct ResourceObserver * serverObsList = NULL; +static struct ResourceObserver * g_serverObsList = NULL; /** * Determine observe QOS based on the QOS of the request. * The qos passed as a parameter overrides what the client requested. @@ -57,28 +57,28 @@ static struct ResourceObserver * serverObsList = NULL; static OCQualityOfService DetermineObserverQoS(OCMethod method, ResourceObserver * resourceObserver, OCQualityOfService appQoS) { - if(!resourceObserver) + if (!resourceObserver) { OC_LOG(ERROR, TAG, "DetermineObserverQoS called with invalid resourceObserver"); return OC_NA_QOS; } OCQualityOfService decidedQoS = appQoS; - if(appQoS == OC_NA_QOS) + if (appQoS == OC_NA_QOS) { decidedQoS = resourceObserver->qos; } - if(appQoS != OC_HIGH_QOS) + if (appQoS != OC_HIGH_QOS) { OC_LOG_V(INFO, TAG, "Current NON count for this observer is %d", resourceObserver->lowQosCount); #ifdef WITH_PRESENCE - if((resourceObserver->forceHighQos \ + if ((resourceObserver->forceHighQos \ || resourceObserver->lowQosCount >= MAX_OBSERVER_NON_COUNT) \ && method != OC_REST_PRESENCE) #else - if(resourceObserver->forceHighQos \ + if (resourceObserver->forceHighQos \ || resourceObserver->lowQosCount >= MAX_OBSERVER_NON_COUNT) #endif { @@ -105,13 +105,13 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, #endif { OC_LOG(INFO, TAG, "Entering SendObserverNotification"); - if(!resPtr) + if (!resPtr) { return OC_STACK_INVALID_PARAM; } OCStackResult result = OC_STACK_ERROR; - ResourceObserver * resourceObserver = serverObsList; + ResourceObserver * resourceObserver = g_serverObsList; uint8_t numObs = 0; OCServerRequest * request = NULL; OCEntityHandlerRequest ehRequest = {0}; @@ -125,7 +125,7 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, { numObs++; #ifdef WITH_PRESENCE - if(method != OC_REST_PRESENCE) + if (method != OC_REST_PRESENCE) { #endif qos = DetermineObserverQoS(method, resourceObserver, qos); @@ -137,10 +137,10 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, resourceObserver->resUri, 0, resourceObserver->acceptFormat, &resourceObserver->devAddr); - if(request) + if (request) { request->observeResult = OC_STACK_OK; - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { result = FormOCEntityHandlerRequest( &ehRequest, @@ -156,11 +156,11 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, request->rcvdVendorSpecificHeaderOptions, OC_OBSERVE_NO_OPTION, 0); - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { ehResult = resPtr->entityHandler(OC_REQUEST_FLAG, &ehRequest, resPtr->entityHandlerCallbackParam); - if(ehResult == OC_EH_ERROR) + if (ehResult == OC_EH_ERROR) { FindAndDeleteServerRequest(request); } @@ -183,18 +183,18 @@ OCStackResult SendAllObserverNotification (OCMethod method, OCResource *resPtr, resourceObserver->resUri, 0, resourceObserver->acceptFormat, &resourceObserver->devAddr); - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { OCPresencePayload* presenceResBuf = OCPresencePayloadCreate( resPtr->sequenceNum, maxAge, trigger, resourceType ? resourceType->resourcetypename : NULL); - if(!presenceResBuf) + if (!presenceResBuf) { return OC_STACK_NO_MEMORY; } - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { ehResponse.ehResult = OC_EH_OK; ehResponse.payload = (OCPayload*)presenceResBuf; @@ -240,7 +240,7 @@ OCStackResult SendListObserverNotification (OCResource * resource, OCQualityOfService qos) { (void)maxAge; - if(!resource || !obsIdList || !payload) + if (!resource || !obsIdList || !payload) { return OC_STACK_INVALID_PARAM; } @@ -256,7 +256,7 @@ OCStackResult SendListObserverNotification (OCResource * resource, while(numIds) { observer = GetObserverUsingId (*obsIdList); - if(observer) + if (observer) { // Found observer - verify if it matches the resource handle if (observer->resource == resource) @@ -270,15 +270,15 @@ OCStackResult SendListObserverNotification (OCResource * resource, observer->resUri, 0, observer->acceptFormat, &observer->devAddr); - if(request) + if (request) { request->observeResult = OC_STACK_OK; - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { OCEntityHandlerResponse ehResponse = {0}; ehResponse.ehResult = OC_EH_OK; ehResponse.payload = (OCPayload*)OCRepPayloadCreate(); - if(!ehResponse.payload) + if (!ehResponse.payload) { FindAndDeleteServerRequest(request); continue; @@ -288,7 +288,7 @@ OCStackResult SendListObserverNotification (OCResource * resource, ehResponse.requestHandle = (OCRequestHandle) request; ehResponse.resourceHandle = (OCResourceHandle) resource; result = OCDoResponse(&ehResponse); - if(result == OC_STACK_OK) + if (result == OC_STACK_OK) { OC_LOG_V(INFO, TAG, "Observer id %d notified.", *obsIdList); @@ -320,11 +320,11 @@ OCStackResult SendListObserverNotification (OCResource * resource, numIds--; } - if(numSentNotification == numberOfIds && !observeErrorFlag) + if (numSentNotification == numberOfIds && !observeErrorFlag) { return OC_STACK_OK; } - else if(numSentNotification == 0) + else if (numSentNotification == 0) { return OC_STACK_NO_OBSERVERS; } @@ -375,14 +375,13 @@ OCStackResult AddObserver (const char *resUri, { return OC_STACK_RESOURCE_ERROR; } - ResourceObserver *obsNode = NULL; - if(!resUri || !token || !*token) + if (!resUri || !token || !*token) { return OC_STACK_INVALID_PARAM; } - obsNode = (ResourceObserver *) OICCalloc(1, sizeof(ResourceObserver)); + ResourceObserver *obsNode = (ResourceObserver *) OICCalloc(1, sizeof(ResourceObserver)); if (obsNode) { obsNode->observeId = obsId; @@ -392,14 +391,14 @@ OCStackResult AddObserver (const char *resUri, obsNode->qos = qos; obsNode->acceptFormat = acceptFormat; - if(query) + if (query) { obsNode->query = OICStrdup(query); VERIFY_NON_NULL (obsNode->query); } // If tokenLength is zero, the return value depends on the // particular library implementation (it may or may not be a null pointer). - if(tokenLength) + if (tokenLength) { obsNode->token = (CAToken_t)OICMalloc(tokenLength); VERIFY_NON_NULL (obsNode->token); @@ -410,7 +409,7 @@ OCStackResult AddObserver (const char *resUri, obsNode->devAddr = *devAddr; obsNode->resource = resHandle; - LL_APPEND (serverObsList, obsNode); + LL_APPEND (g_serverObsList, obsNode); return OC_STACK_OK; } @@ -431,7 +430,7 @@ ResourceObserver* GetObserverUsingId (const OCObservationId observeId) if (observeId) { - LL_FOREACH (serverObsList, out) + LL_FOREACH (g_serverObsList, out) { if (out->observeId == observeId) { @@ -447,16 +446,16 @@ ResourceObserver* GetObserverUsingToken (const CAToken_t token, uint8_t tokenLen { ResourceObserver *out = NULL; - if(token && *token) + if (token && *token) { OC_LOG(INFO, TAG, "Looking for token"); OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)token, tokenLength); OC_LOG(INFO, TAG, "\tFound token:"); - LL_FOREACH (serverObsList, out) + LL_FOREACH (g_serverObsList, out) { OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)out->token, tokenLength); - if((memcmp(out->token, token, tokenLength) == 0)) + if ((memcmp(out->token, token, tokenLength) == 0)) { return out; } @@ -473,19 +472,17 @@ ResourceObserver* GetObserverUsingToken (const CAToken_t token, uint8_t tokenLen OCStackResult DeleteObserverUsingToken (CAToken_t token, uint8_t tokenLength) { - if(!token || !*token) + if (!token || !*token) { return OC_STACK_INVALID_PARAM; } - ResourceObserver *obsNode = NULL; - - obsNode = GetObserverUsingToken (token, tokenLength); + ResourceObserver *obsNode = GetObserverUsingToken (token, tokenLength); if (obsNode) { OC_LOG_V(INFO, TAG, "deleting observer id %u with token", obsNode->observeId); OC_LOG_BUFFER(INFO, TAG, (const uint8_t *)obsNode->token, tokenLength); - LL_DELETE (serverObsList, obsNode); + LL_DELETE (g_serverObsList, obsNode); OICFree(obsNode->resUri); OICFree(obsNode->query); OICFree(obsNode->token); @@ -499,14 +496,14 @@ void DeleteObserverList() { ResourceObserver *out = NULL; ResourceObserver *tmp = NULL; - LL_FOREACH_SAFE (serverObsList, out, tmp) + LL_FOREACH_SAFE (g_serverObsList, out, tmp) { - if(out) + if (out) { DeleteObserverUsingToken ((out->token), out->tokenLength); } } - serverObsList = NULL; + g_serverObsList = NULL; } /* @@ -523,7 +520,7 @@ CreateObserveHeaderOption (CAHeaderOption_t **caHdrOpt, uint8_t numOptions, uint8_t observeFlag) { - if(!caHdrOpt) + if (!caHdrOpt) { return OC_STACK_INVALID_PARAM; } @@ -567,12 +564,12 @@ GetObserveHeaderOption (uint32_t * observationOption, CAHeaderOption_t *options, uint8_t * numOptions) { - if(!observationOption) + if (!observationOption) { return OC_STACK_INVALID_PARAM; } - if(!options || !numOptions) + if (!options || !numOptions) { OC_LOG (INFO, TAG, "No options present"); return OC_STACK_OK; @@ -580,7 +577,7 @@ GetObserveHeaderOption (uint32_t * observationOption, for(uint8_t i = 0; i < *numOptions; i++) { - if(options[i].protocolID == CA_COAP_ID && + if (options[i].protocolID == CA_COAP_ID && options[i].optionID == COAP_OPTION_OBSERVE) { *observationOption = options[i].optionData[0];