Update snapshot(2017-12-14)

[platform/upstream/iotivity.git] / service / notification / src / provider / NSProviderResource.c

diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c
index dbac395..494b670 100644 (file)
--- a/service/notification/src/provider/NSProviderResource.c
+++ b/service/notification/src/provider/NSProviderResource.c
@@ -20,23 +20,24 @@
 
 #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);
 
@@ -45,17 +46,16 @@ OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle,
 
 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)
@@ -74,7 +74,7 @@ NSResult NSCreateResource(char *uri)
 
     if (!uri)
     {
-        NS_LOG(NS_ERROR, "Resource URI cannot be NULL");
+        NS_LOG(ERROR, "Resource URI cannot be NULL");
         return NS_ERROR;
     }
 
@@ -90,7 +90,7 @@ NSResult NSCreateResource(char *uri)
         NotificationResource.version = VERSION;
         NotificationResource.handle = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_DISCOVERABLE | OC_SECURE;
@@ -100,18 +100,18 @@ NSResult NSCreateResource(char *uri)
             resourceProperties = OC_DISCOVERABLE;
         }
 
-        if (OCCreateResource(&NotificationResource.handle, NS_ROOT_TYPE, NS_DEFAULT_INTERFACE,
+        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(NS_ERROR, "Fail to bind Notification Resource Type");
+            NS_LOG(ERROR, "Fail to bind Notification Resource Type");
             return NS_ERROR;
         }
     }
@@ -130,7 +130,7 @@ NSResult NSCreateResource(char *uri)
         NotificationMessageResource.topicName = NULL;
         NotificationMessageResource.mediaContents = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_OBSERVABLE | OC_SECURE;
@@ -141,28 +141,28 @@ NSResult NSCreateResource(char *uri)
         }
 
         if (OCCreateResource(&NotificationMessageResource.handle, NS_COLLECTION_MESSAGE_TYPE,
-                NS_DEFAULT_INTERFACE, NS_COLLECTION_MESSAGE_URI, NSEntityHandlerMessageCb, NULL,
+                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(NS_ERROR, "Fail to bind Notification Message Resource Type");
+            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())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_OBSERVABLE | OC_SECURE;
@@ -173,10 +173,10 @@ NSResult NSCreateResource(char *uri)
         }
 
         if (OCCreateResource(&(NotificationSyncResource.handle), NS_COLLECTION_SYNC_TYPE,
-                NS_DEFAULT_INTERFACE, NS_COLLECTION_SYNC_URI, NSEntityHandlerSyncCb, NULL,
+                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;
         }
 
@@ -184,7 +184,7 @@ NSResult NSCreateResource(char *uri)
                 NS_INTERFACE_READWRITE)
             != OC_STACK_OK)
         {
-            NS_LOG(NS_ERROR, "Fail to bind Notification Sync Resource Type");
+            NS_LOG(ERROR, "Fail to bind Notification Sync Resource Type");
             return NS_ERROR;
         }
     }
@@ -195,21 +195,21 @@ NSResult NSCreateResource(char *uri)
         NotificationTopicResource.TopicList = NULL;
         NotificationTopicResource.handle = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
-            resourceProperties = OC_DISCOVERABLE | OC_SECURE;
+            resourceProperties = OC_RES_PROP_NONE | OC_SECURE;
         }
         else
         {
-            resourceProperties = OC_DISCOVERABLE;
+            resourceProperties = OC_RES_PROP_NONE;
         }
 
         if (OCCreateResource(&(NotificationTopicResource.handle), NS_COLLECTION_TOPIC_TYPE,
-                NS_DEFAULT_INTERFACE, NS_COLLECTION_TOPIC_URI, NSEntityHandlerTopicCb, NULL,
+                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;
         }
 
@@ -217,7 +217,7 @@ NSResult NSCreateResource(char *uri)
                 NS_INTERFACE_READWRITE)
             != OC_STACK_OK)
         {
-            NS_LOG(NS_ERROR, "Fail to bind Notification Topic Resource Type");
+            NS_LOG(ERROR, "Fail to bind Notification Topic Resource Type");
             return NS_ERROR;
         }
     }