//This function is called back by libcoap when a response is received
static void HandleCoAPResponses(struct coap_context_t *ctx,
const coap_queue_t * rcvdResponse) {
+ uint8_t haltResponse = 0;
OCResponse * response = NULL;
OCCoAPToken rcvdToken;
OCClientResponse clientResponse;
uint8_t * rcvMaxAgeOption = NULL;
uint32_t sequenceNumber = OC_RESOURCE_NO_OBSERVE;
uint32_t maxAge = 0;
+ char * resourceTypeName = NULL;
OCStackResult result = OC_STACK_ERROR;
coap_pdu_t *sendPdu = NULL;
coap_pdu_t * recvPdu = NULL;
tok = strtok(NULL, ":");
maxAge = (uint32_t )atoi(tok);
OC_LOG_V(DEBUG, TAG, "The received TTL is %u", maxAge);
+ tok = strtok(NULL, ":");
bufRes[strlen((char *)bufRes)] = ':';
+ if(tok) {
+ resourceTypeName = (char *)OCMalloc(strlen(tok));
+ if(!resourceTypeName)
+ {
+ goto exit;
+ }
+ strcpy(resourceTypeName, tok);
+ bufRes[strlen((char *)bufRes)] = ':';
+ OC_LOG_V(DEBUG, TAG, "----------------resourceTypeName %s",
+ resourceTypeName);
+ }
}
#endif
OC_LOG(INFO, TAG, "===============Presence changed, calling up the stack");
cbNode->sequenceNumber = clientResponse.sequenceNumber;;
}
+
+ if(resourceTypeName && response->cbNode->filterResourceType)
+ {
+ if(strcmp(resourceTypeName,
+ (const char *)response->cbNode->filterResourceType)!=0)
+ {
+ //Ignore presence callback if resource type does not match filter.
+ haltResponse = 1;
+ }
+ }
}
else if(isMulticastPresence)
{
}
#endif
}
- HandleStackResponses(response);
+ if(!haltResponse)
+ {
+ HandleStackResponses(response);
+ }
}
else if(!cbNode && isObserveNotification)
{
static void incrementSequenceNumber(OCResource * resPtr);
static OCStackResult verifyUriQueryLength(const char * inputUri,
uint16_t uriLen);
+OCStackResult getResourceType(const char * uri, unsigned char** resourceType, char ** newURI);
//-----------------------------------------------------------------------------
OCCoAPToken token;
ClientCB *clientCB = NULL;
unsigned char * requestUri = NULL;
+ unsigned char * resourceType = NULL;
+ char * newURI = (char *)requiredUri;
(void) referenceUri;
OC_LOG(INFO, TAG, PCF("Entering OCDoResource"));
goto exit;
}
+#ifdef WITH_PRESENCE
+ if(method == OC_REST_PRESENCE)
+ {
+ result = getResourceType(requiredUri, &resourceType, &newURI);
+ if(result != OC_STACK_OK)
+ {
+ goto exit;
+ }
+ }
+#endif // WITH_PRESENCE
+
requestUri = (unsigned char *) OCMalloc(uriLen + 1);
if(requestUri)
{
- memcpy(requestUri, requiredUri, (uriLen + 1));
+ memcpy(requestUri, newURI, (uriLen + 1));
}
else
{
// with the request
OCGenerateCoAPToken(&token);
- if((result = AddClientCB(&clientCB, cbData, &token, *handle, method, requestUri)) != OC_STACK_OK)
+ if((result = AddClientCB(&clientCB, cbData, &token, *handle, method, requestUri, resourceType))
+ != OC_STACK_OK)
{
result = OC_STACK_NO_MEMORY;
goto exit;
}
// Make call to OCCoAP layer
- result = OCDoCoAPResource(method, qos, &token, requiredUri, request, options, numOptions);
+ result = OCDoCoAPResource(method, qos, &token, newURI, request, options, numOptions);
exit:
+ if(newURI != requiredUri)
+ {
+ OCFree(newURI);
+ }
if (result != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, PCF("OCDoResource error"));
// a different random 32-bit integer number is used
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- return OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ return SendPresenceNotification(NULL, OC_LOW_QOS);
}
/**
result = OCChangeResourceProperty(
&(((OCResource *) presenceResource.handle)->resourceProperties),
OC_ACTIVE, 0);
- result = OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ result = SendPresenceNotification(NULL, OC_LOW_QOS);
+
return result;
}
#endif
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(pointer->rsrcType, OC_LOW_QOS);
}
#endif
exit:
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(((OCResource *) resourceHandle)->rsrcType, OC_LOW_QOS);
}
#endif
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(((OCResource *) resourceHandle)->rsrcType, OC_LOW_QOS);
}
#endif
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(resource->rsrcType, OC_LOW_QOS);
}
#endif
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(resource->rsrcType, OC_LOW_QOS);
}
#endif
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(resource->rsrcType, OC_LOW_QOS);
}
#endif
}
/**
+ * Notify Presence subscribers that a resource has been modified
+ *
+ * @param resourceType - Handle to the resourceType linked list of resource
+ * that was modified.
+ * @param qos - Quality Of Service
+ *
+ */
+OCStackResult SendPresenceNotification(OCResourceType *resourceType, OCQualityOfService qos)
+{
+ OCResource *resPtr = NULL;
+ OCStackResult result;
+ OCMethod method = OC_REST_PRESENCE;
+ uint32_t maxAge = 0;
+ resPtr = findResource((OCResource *) presenceResource.handle);
+ if(NULL == resPtr)
+ {
+ return OC_STACK_NO_RESOURCE;
+ }
+ if((((OCResource *) presenceResource.handle)->resourceProperties) & OC_ACTIVE)
+ {
+ maxAge = presenceResource.presenceTTL;
+ }
+ else
+ {
+ maxAge = 0;
+ }
+
+ result = SendObserverNotification(method, resPtr, maxAge, resourceType, qos);
+
+ return result;
+}
+
+/**
* Notify observers that an observed value has changed.
*
* @param handle - handle of resource
// Verify that the resource exists
resPtr = findResource ((OCResource *) handle);
- if (NULL == resPtr || myStackMode == OC_CLIENT)
+ if (NULL == resPtr)
{
return OC_STACK_NO_RESOURCE;
- } else {
- #ifdef WITH_PRESENCE
- if(strcmp(resPtr->uri, OC_PRESENCE_URI))
- {
- #endif
- //only increment in the case of regular observing (not presence)
- incrementSequenceNumber(resPtr);
- method = OC_REST_OBSERVE;
- maxAge = 0x2FFFF;
- #ifdef WITH_PRESENCE
- }
- else
- {
- method = OC_REST_PRESENCE;
- if((((OCResource *) presenceResource.handle)->resourceProperties) & OC_ACTIVE)
- {
- maxAge = presenceResource.presenceTTL;
- }
- else
- {
- maxAge = 0;
- }
-
- }
- #endif
- result = SendObserverNotification (method, resPtr, maxAge, qos);
+ }
+ else
+ {
+ //only increment in the case of regular observing (not presence)
+ incrementSequenceNumber(resPtr);
+ method = OC_REST_OBSERVE;
+ maxAge = 0x2FFFF;
+ result = SendObserverNotification (method, resPtr, maxAge, NULL, qos);
return result;
}
}
if(presenceResource.handle)
{
((OCResource *)presenceResource.handle)->sequenceNum = OCGetRandom();
- OCNotifyAllObservers(presenceResource.handle, OC_LOW_QOS);
+ SendPresenceNotification(resource->rsrcType, OC_LOW_QOS);
}
#endif
void insertResourceType(OCResource *resource, OCResourceType *resourceType) {
OCResourceType *pointer;
- if (!resource->rsrcType) {
+ if (resource && !resource->rsrcType) {
resource->rsrcType = resourceType;
} else {
- pointer = resource->rsrcType;
+ if(resource)
+ {
+ pointer = resource->rsrcType;
+ }
+ else
+ {
+ pointer = resourceType;
+ }
while (pointer->next) {
pointer = pointer->next;
}
return pointer;
}
+/**
+ * Retrieves a resource type based upon a uri string if the uri string contains only just one
+ * resource attribute (and that has to be of type "rt").
+ *
+ * @remark This API malloc's memory for the resource type and newURI. Do not malloc resourceType
+ * or newURI before passing in.
+ *
+ * @param uri - Valid URI for "requiredUri" parameter to OCDoResource API.
+ * @param resourceType - The resource type to be populated; pass by reference.
+ * @param newURI - Return URI without resourceType appended to the end of it. This is used to
+ * ensure that the uri parameter is not modified; pass by reference.
+ *
+ * @return
+ * OC_STACK_INVALID_URI - Returns this if the URI is invalid/NULL.
+ * OC_STACK_INVALID_PARAM - Returns this if the resourceType parameter is invalid/NULL.
+ * OC_STACK_OK - Success
+ */
+OCStackResult getResourceType(const char * uri, unsigned char** resourceType, char ** newURI)
+{
+ if(!uri)
+ {
+ return OC_STACK_INVALID_URI;
+ }
+ if(!resourceType || !newURI)
+ {
+ return OC_STACK_INVALID_PARAM;
+ }
+ char * ptr = NULL;
+ char * leftToken = NULL;
+ char * tempURI = (char *) OCMalloc(strlen(uri));
+ if(!tempURI)
+ {
+ goto exit;
+ }
+ ptr = tempURI;
+ strcpy(tempURI, uri);
+ leftToken = strtok((char *)tempURI, "?");
+
+ while(leftToken != NULL)
+ {
+ if(strncmp(leftToken, "rt=", 3) == 0)
+ {
+ *resourceType = (unsigned char *) OCMalloc(strlen(leftToken)-3);
+ if(!*resourceType)
+ {
+ goto exit;
+ }
+ strcpy((char *)*resourceType, ((const char *)&leftToken[3]));
+ break;
+ }
+ leftToken = strtok(NULL, "?");
+ }
+
+ *newURI = ptr;
+
+ return OC_STACK_OK;
+
+ exit:
+ return OC_STACK_NO_MEMORY;
+}
+
projects / platform / upstream / iotivity.git / commitdiff