#include "NSProviderResource.h"
#include <string.h>
+#include "rd_client.h"
NSNotificationResource NotificationResource;
NSMessageResource NotificationMessageResource;
NSSyncResource NotificationSyncResource;
NSTopicResource NotificationTopicResource;
-#if(defined WITH_CLOUD && defined RD_CLIENT)
+#if (defined WITH_CLOUD)
#define DEFAULT_CONTEXT_VALUE 0x99
OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle,
OCClientResponse *clientResponse)
{
(void) handle;
- if(ctx != (void *)DEFAULT_CONTEXT_VALUE)
+ if (ctx != (void *)DEFAULT_CONTEXT_VALUE)
{
NS_LOG(DEBUG, "Invalid Publish callback received");
- }
+ }
NS_LOG_V(DEBUG, "Publish resource response received code: %d", clientResponse->result);
NSResult NSPublishResourceToCloud(char *serverAddress)
{
-
NS_LOG(DEBUG, "NSPublishResourceToCloud - IN");
- NS_LOG_V(DEBUG, "Remote Server Address: %s", serverAddress);
+ NS_LOG_V(INFO_PRIVATE, "Remote Server Address: %s", serverAddress);
OCCallbackData cbData;
cbData.cb = NSHandlePublishCb;
cbData.context = (void *)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
- OCResourceHandle resourceHandles[1] = {NotificationResource.handle};
- OCStackResult res = OCRDPublish(serverAddress, CT_ADAPTER_TCP, resourceHandles, 1,
+ OCResourceHandle resourceHandles[1] = { NotificationResource.handle };
+ OCStackResult res = OCRDPublish(NULL, serverAddress, CT_ADAPTER_TCP, resourceHandles, 1,
&cbData, OC_LOW_QOS);
if (res != OC_STACK_OK)
}
#endif
-
NSResult NSCreateResource(char *uri)
{
NS_LOG(DEBUG, "NSCreateResource - IN");
+
if (!uri)
{
- NS_LOG(NS_ERROR, "Resource URI cannot be NULL");
+ NS_LOG(ERROR, "Resource URI cannot be NULL");
return NS_ERROR;
}
+ uint8_t resourceProperties;
+
if (strcmp(uri, NS_ROOT_URI) == 0)
{
- NotificationResource.accepter = 0;
+ NotificationResource.policy = true;
+ (NotificationResource.providerId)[0] = '\0';
NotificationResource.message_uri = NS_COLLECTION_MESSAGE_URI;
NotificationResource.sync_uri = NS_COLLECTION_SYNC_URI;
NotificationResource.topic_uri = NS_COLLECTION_TOPIC_URI;
+ NotificationResource.version = VERSION;
NotificationResource.handle = NULL;
- if (OCCreateResource(&NotificationResource.handle, NS_ROOT_TYPE, NS_DEFAULT_INTERFACE,
- NS_ROOT_URI, NSEntityHandlerNotificationCb, NULL, OC_DISCOVERABLE) != OC_STACK_OK)
+ if (NSGetResourceSecurity())
+ {
+ NS_LOG(DEBUG, "Create secured resource");
+ resourceProperties = OC_DISCOVERABLE | OC_SECURE;
+ }
+ else
+ {
+ resourceProperties = OC_DISCOVERABLE;
+ }
+
+ if (OCCreateResource(&NotificationResource.handle, NS_ROOT_TYPE, NS_INTERFACE_BASELINE,
+ NS_ROOT_URI, NSEntityHandlerNotificationCb, NULL,
+ resourceProperties) != OC_STACK_OK)
{
- NS_LOG(NS_ERROR, "Fail to Create Notification Resource");
+ NS_LOG(ERROR, "Fail to Create Notification Resource");
+ return NS_ERROR;
+ }
+
+ if (OCBindResourceInterfaceToResource(NotificationResource.handle, NS_INTERFACE_READ)
+ != OC_STACK_OK)
+ {
+ NS_LOG(ERROR, "Fail to bind Notification Resource Type");
return NS_ERROR;
}
}
NotificationMessageResource.title = NULL;
NotificationMessageResource.contentText = NULL;
NotificationMessageResource.sourceName = NULL;
+ NotificationMessageResource.topicName = NULL;
NotificationMessageResource.mediaContents = NULL;
+ if (NSGetResourceSecurity())
+ {
+ NS_LOG(DEBUG, "Create secured resource");
+ resourceProperties = OC_OBSERVABLE | OC_SECURE;
+ }
+ else
+ {
+ resourceProperties = OC_OBSERVABLE;
+ }
+
if (OCCreateResource(&NotificationMessageResource.handle, NS_COLLECTION_MESSAGE_TYPE,
- NS_DEFAULT_INTERFACE, NS_COLLECTION_MESSAGE_URI, NSEntityHandlerMessageCb, NULL,
- OC_OBSERVABLE) != OC_STACK_OK)
+ NS_INTERFACE_BASELINE, NS_COLLECTION_MESSAGE_URI, NSEntityHandlerMessageCb, NULL,
+ resourceProperties) != OC_STACK_OK)
{
- NS_LOG(NS_ERROR, "Fail to Create Notification Message Resource");
+ NS_LOG(ERROR, "Fail to Create Notification Message Resource");
+ return NS_ERROR;
+ }
+
+ if (OCBindResourceInterfaceToResource(NotificationMessageResource.handle, NS_INTERFACE_READ)
+ != OC_STACK_OK)
+ {
+ NS_LOG(ERROR, "Fail to bind Notification Message Resource Type");
return NS_ERROR;
}
}
else if (strcmp(uri, NS_COLLECTION_SYNC_URI) == 0)
{
- NotificationSyncResource.id = NULL;
+ NotificationSyncResource.messageId = 0;
+ (NotificationSyncResource.providerId)[0] = '\0';
NotificationSyncResource.state = NULL;
NotificationSyncResource.handle = NULL;
+ if (NSGetResourceSecurity())
+ {
+ NS_LOG(DEBUG, "Create secured resource");
+ resourceProperties = OC_OBSERVABLE | OC_SECURE;
+ }
+ else
+ {
+ resourceProperties = OC_OBSERVABLE;
+ }
+
if (OCCreateResource(&(NotificationSyncResource.handle), NS_COLLECTION_SYNC_TYPE,
- NS_DEFAULT_INTERFACE, NS_COLLECTION_SYNC_URI, NSEntityHandlerSyncCb, NULL,
- OC_OBSERVABLE) != OC_STACK_OK)
+ NS_INTERFACE_BASELINE, NS_COLLECTION_SYNC_URI, NSEntityHandlerSyncCb, NULL,
+ resourceProperties) != OC_STACK_OK)
{
- NS_LOG(NS_ERROR, "Fail to Create Notification Sync Resource");
+ NS_LOG(ERROR, "Fail to Create Notification Sync Resource");
+ return NS_ERROR;
+ }
+
+ if (OCBindResourceInterfaceToResource(NotificationSyncResource.handle,
+ NS_INTERFACE_READWRITE)
+ != OC_STACK_OK)
+ {
+ NS_LOG(ERROR, "Fail to bind Notification Sync Resource Type");
return NS_ERROR;
}
}
else if (strcmp(uri, NS_COLLECTION_TOPIC_URI) == 0)
{
+ (NotificationTopicResource.providerId)[0] = '\0';
(NotificationTopicResource.consumerId)[0] = '\0';
NotificationTopicResource.TopicList = NULL;
NotificationTopicResource.handle = NULL;
+ if (NSGetResourceSecurity())
+ {
+ NS_LOG(DEBUG, "Create secured resource");
+ resourceProperties = OC_RES_PROP_NONE | OC_SECURE;
+ }
+ else
+ {
+ resourceProperties = OC_RES_PROP_NONE;
+ }
+
if (OCCreateResource(&(NotificationTopicResource.handle), NS_COLLECTION_TOPIC_TYPE,
- NS_DEFAULT_INTERFACE, NS_COLLECTION_TOPIC_URI, NSEntityHandlerTopicCb, NULL,
- OC_DISCOVERABLE) != OC_STACK_OK)
+ NS_INTERFACE_BASELINE, NS_COLLECTION_TOPIC_URI, NSEntityHandlerTopicCb, NULL,
+ resourceProperties) != OC_STACK_OK)
{
- NS_LOG(NS_ERROR, "Fail to Create Notification Sync Resource");
+ NS_LOG(ERROR, "Fail to Create Notification Sync Resource");
+ return NS_ERROR;
+ }
+
+ if (OCBindResourceInterfaceToResource(NotificationTopicResource.handle,
+ NS_INTERFACE_READWRITE)
+ != OC_STACK_OK)
+ {
+ NS_LOG(ERROR, "Fail to bind Notification Topic Resource Type");
return NS_ERROR;
}
}
{
NS_LOG(DEBUG, "NSRegisterResource - IN");
- if (NSCreateResource(NS_COLLECTION_TOPIC_URI) != NS_OK)
- {
- NS_LOG(ERROR, "Fail to register Topic Resource");
- return NS_ERROR;
- }
-
- if (NSCreateResource(NS_COLLECTION_SYNC_URI) != NS_OK)
- {
- NS_LOG(ERROR, "Fail to register Sync Resource");
- return NS_ERROR;
- }
-
- if (NSCreateResource(NS_COLLECTION_MESSAGE_URI) != NS_OK)
- {
- NS_LOG(ERROR, "Fail to register Message Resource");
- return NS_ERROR;
- }
-
- if (NSCreateResource(NS_ROOT_URI) != NS_OK)
- {
- NS_LOG(ERROR, "Fail to register Notification Resource");
- return NS_ERROR;
- }
+ NS_CREATE_RESOURCE(
+ NSCreateResource(NS_COLLECTION_TOPIC_URI), "Fail to register Topic Resource");
+ NS_CREATE_RESOURCE(
+ NSCreateResource(NS_COLLECTION_SYNC_URI), "Fail to register Sync Resource");
+ NS_CREATE_RESOURCE(
+ NSCreateResource(NS_COLLECTION_MESSAGE_URI), "Fail to register Message Resource");
+ NS_CREATE_RESOURCE(
+ NSCreateResource(NS_ROOT_URI), "Fail to register Notification Resource");
NS_LOG(DEBUG, "NSRegisterResource - OUT");
return NS_OK;
{
NS_LOG(DEBUG, "NSUnRegisterResource - IN");
- if (OCDeleteResource(NotificationResource.handle) != OC_STACK_OK)
- {
- NS_LOG(ERROR, "Fail to Delete Notification Resource");
- return NS_ERROR;
- }
-
- if (OCDeleteResource(NotificationMessageResource.handle) != OC_STACK_OK)
- {
- NS_LOG(ERROR, "Fail to Delete Notification Message Resource");
- return NS_ERROR;
- }
-
- if (OCDeleteResource(NotificationSyncResource.handle) != OC_STACK_OK)
- {
- NS_LOG(ERROR, "Fail to Delete Notification Sync Resource");
- return NS_ERROR;
- }
-
- if (OCDeleteResource(NotificationTopicResource.handle) != OC_STACK_OK)
- {
- NS_LOG(ERROR, "Fail to Delete Notification Topic Resource");
- return NS_ERROR;
- }
+ NS_DELETE_RESOURCE(
+ OCDeleteResource(NotificationResource.handle), "Fail to Delete Notification Resource");
+ NS_DELETE_RESOURCE(OCDeleteResource(NotificationMessageResource.handle),
+ "Fail to Delete Notification Message Resource");
+ NS_DELETE_RESOURCE(OCDeleteResource(NotificationSyncResource.handle),
+ "Fail to Delete Notification Sync Resource");
+ NS_DELETE_RESOURCE(OCDeleteResource(NotificationTopicResource.handle),
+ "Fail to Delete Notification Topic Resource");
NotificationResource.handle = NULL;
NotificationMessageResource.handle = NULL;
return NS_OK;
}
-NSResult NSPutNotificationResource(int accepter, OCResourceHandle * handle)
+NSResult NSPutNotificationResource(bool policy, OCResourceHandle * handle)
{
NS_LOG(DEBUG, "NSPutNotificationResource - IN");
- NotificationResource.accepter = accepter;
+ NotificationResource.policy = policy;
+ OICStrcpy(NotificationResource.providerId, UUID_STRING_SIZE,
+ NSGetProviderInfo()->providerId);
NotificationResource.message_uri = NS_COLLECTION_MESSAGE_URI;
NotificationResource.sync_uri = NS_COLLECTION_SYNC_URI;
NotificationResource.topic_uri = NS_COLLECTION_TOPIC_URI;
+ NotificationResource.version = VERSION;
*handle = NotificationResource.handle;
NotificationMessageResource.title = msg->title;
NotificationMessageResource.contentText = msg->contentText;
NotificationMessageResource.sourceName = msg->sourceName;
+ NotificationMessageResource.topicName = msg->topic;
NotificationMessageResource.mediaContents = msg->mediaContents;
}
else
}
*handle = NotificationMessageResource.handle;
- NS_LOG(DEBUG, "NSPutMessageResource - OUT");
+ NS_LOG(DEBUG, "NSPutMessageResource - OUT");
return NS_OK;
}
projects / platform / upstream / iotivity.git / blobdiff