Change OCCloudPublish API to OCRDRublish

Cloud publish API is changed to OCRDPublish provided by
resource directory. And the cloud login example is removed,
because the API releated to login will be changed.

Change-Id: I13dd27ca5461fb79ef1e2fc0df70d08c9a37515e
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index 2257be0..a86fe42 100755 (executable)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -75,6 +75,9 @@ if target_os == 'android':
 if not env.get('RELEASE'):
     notification_env.PrependUnique(LIBS = ['gcov'])
     notification_env.AppendUnique(CCFLAGS = ['--coverage'])
+
+if 'CLIENT' in notification_env.get('RD_MODE'):
+    notification_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
     
 if env.get('WITH_CLOUD') == True:      
        notification_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD'])    

diff --git a/service/notification/examples/linux/notificationconsumer.c b/service/notification/examples/linux/notificationconsumer.c
index 16aced1..6a64ce3 100644 (file)
--- a/service/notification/examples/linux/notificationconsumer.c
+++ b/service/notification/examples/linux/notificationconsumer.c
@@ -29,7 +29,6 @@
 #ifdef WITH_CLOUD
 #include "NSConstants.h"
 #include "NSConsumerCommon.h"
-#include "cloud_connector.h"
 #include "oic_malloc.h"
 
 #define CLOUD_CONTEXT_VALUE 0x99
@@ -197,7 +196,6 @@ int main(void)
 
 #ifdef WITH_CLOUD
     NS_LOG(DEBUG, "process OCCloudLogin...");
-    OCCloudLogin(CLOUD_HOST_ADDRESS, CLOUD_IOTIVITYNS_SESSION, handleLoginoutCB);
     NS_LOG(DEBUG, "OCCloudLogin return");
 #endif
 

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index fc1da96..edd6937 100644 (file)
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -35,7 +35,6 @@
 \r
 // Input the following values to publish resource to cloud\r
 char REMOTE_SERVER_ADDRESS[50];\r
-char REMOTE_SERVER_SESSION[50];\r
 char mainConsumer[37] = {'\0',};\r
 \r
 extern char *strdup(const char *s);\r
@@ -80,39 +79,6 @@ void syncCallback(NSSyncInfo *sync)
     printf("NS_APP Sync State: %d\n", sync->state);\r
 }\r
 \r
-#ifdef WITH_CLOUD\r
-OCStackApplicationResult CloudLoginoutCallback(void *ctx,\r
-        OCDoHandle handle, OCClientResponse *clientResponse)\r
-{\r
-    int CtxValue = 0x99;\r
-    if (ctx != (void *)CtxValue)\r
-    {\r
-        printf("Invalid Cloud Login/out callback received");\r
-    }\r
-\r
-    printf("Login/out response received");\r
-\r
-    if (clientResponse->payload != NULL &&\r
-            clientResponse->payload->type == PAYLOAD_TYPE_REPRESENTATION)\r
-    {\r
-        printf("PAYLOAD_TYPE_REPRESENTATION received");\r
-\r
-        OCRepPayloadValue *val = ((OCRepPayload *)clientResponse->payload)->values;\r
-\r
-        printf("Get payload values");\r
-        while (val)\r
-        {\r
-            printf("key: %s / Value: %s", val->name, val->str);\r
-            val = val->next;\r
-        }\r
-\r
-        NSProviderEnableRemoteService(REMOTE_SERVER_ADDRESS);\r
-    }\r
-\r
-    return OC_STACK_KEEP_TRANSACTION;\r
-}\r
-#endif\r
-\r
 FILE* server_fopen(const char *path, const char *mode)\r
 {\r
     (void)path;\r
@@ -194,8 +160,7 @@ int main()
         printf("9.  NSProviderGetConsumerTopics(); \n");\r
         printf("10. NSProviderGetTopics(); \n");\r
         printf("11. NSStopProvider() \n");\r
-        printf("12. NSCloudLogin \n");\r
-        printf("13. NSCloudLogout \n");\r
+        printf("12. NSProviderEnableRemoteService \n");\r
         printf("0. Exit() \n");\r
         printf("==============================================\n");\r
 \r
@@ -322,32 +287,17 @@ int main()
                 break;\r
 \r
             case 12:\r
-                printf("NSCloudLogin");\r
-\r
-                printf("Cloud Address: ");\r
+                printf("Remote Server Address: ");\r
                 gets(REMOTE_SERVER_ADDRESS);\r
 \r
-                printf("Session Code: ");\r
-                gets(REMOTE_SERVER_SESSION);\r
-\r
-#ifdef WITH_CLOUD\r
-                NSCloudLogin(REMOTE_SERVER_ADDRESS, REMOTE_SERVER_SESSION, CloudLoginoutCallback);\r
-#endif\r
-                printf("OCCloudLogin requested");\r
-                break;\r
-            case 13:\r
-                printf("NSCloudLogout");\r
-#ifdef WITH_CLOUD\r
-                NSCloudLogout(REMOTE_SERVER_ADDRESS, REMOTE_SERVER_SESSION, CloudLoginoutCallback);\r
-#endif\r
-                printf("OCCloudLogout requested");\r
+                NSProviderEnableRemoteService(REMOTE_SERVER_ADDRESS);\r
                 break;\r
             case 0:\r
                 NSStopProvider();\r
                 isExit = true;\r
                 break;\r
             default:\r
-                printf("Under Construction");\r
+                printf("Under Construction\n");\r
                 break;\r
         }\r
 \r

diff --git a/service/notification/src/provider/NSProviderDiscovery.c b/service/notification/src/provider/NSProviderDiscovery.c
index 74bd3be..5f9d195 100644 (file)
--- a/service/notification/src/provider/NSProviderDiscovery.c
+++ b/service/notification/src/provider/NSProviderDiscovery.c
@@ -79,7 +79,7 @@ void * NSDiscoverySchedule(void * ptr)
                     NS_LOG(DEBUG, "CASE TASK_REGISTER_RESOURCE : ");\r
                     NSRegisterResource();\r
                     break;\r
-#ifdef WITH_CLOUD\r
+#ifdef RD_CLIENT\r
                 case TASK_PUBLISH_RESOURCE:\r
                     NS_LOG(DEBUG, "CASE TASK_PUBLISH_PESOURCE : ");\r
                     NSPublishResourceToCloud((char*)node->taskData);\r

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index cd335d5..6c9331f 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -127,21 +127,23 @@ NSResult NSStopProvider()
     return NS_OK;\r
 }\r
 \r
-#ifdef WITH_CLOUD\r
 NSResult NSProviderEnableRemoteService(char *serverAddress)\r
 {\r
     NS_LOG(DEBUG, "NSProviderEnableRemoteService - IN");\r
     pthread_mutex_lock(&nsInitMutex);\r
- \r
-    if(!initProvider)\r
+\r
+if(!initProvider)\r
     {\r
         NS_LOG(DEBUG, "Provider service has not been started yet");\r
         pthread_mutex_unlock(&nsInitMutex);\r
         return NS_FAIL;\r
     }\r
-\r
+    NS_LOG(DEBUG, "Check the remote server login");\r
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);\r
+#ifdef RD_CLIENT\r
+    NS_LOG(DEBUG, "Request to publish resource");\r
     NSPushQueue(DISCOVERY_SCHEDULER, TASK_PUBLISH_RESOURCE, serverAddress);\r
+#endif\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     NS_LOG(DEBUG, "NSProviderEnableRemoteService - OUT");\r
@@ -159,12 +161,15 @@ NSResult NSProviderDisableRemoteService(char *serverAddress)
         return NS_FAIL;\r
     }\r
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);\r
+#ifdef RD_CLIENT\r
+    NS_LOG(DEBUG, "Delete remote server info");\r
+    NSDeleteRemoteServerAddress(serverAddress);\r
+#endif\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     NS_LOG(DEBUG, "NSProviderDisableRemoteService - OUT");\r
     return NS_OK;\r
 }\r
-#endif\r
 \r
 NSResult NSSendMessage(NSMessage *msg)\r
 {\r

diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c
index ee56bee..571419e 100644 (file)
--- a/service/notification/src/provider/NSProviderNotification.c
+++ b/service/notification/src/provider/NSProviderNotification.c
@@ -140,7 +140,7 @@ NSResult NSSendNotification(NSMessage *msg)
                 }
             }
 
-#ifdef WITH_CLOUD
+#ifdef RD_CLIENT
             if(subData->remote_messageObId != 0)
             {
                 if(NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic))
@@ -224,7 +224,7 @@ NSResult NSSendSync(NSSyncInfo *sync)
                 obArray[obCount++] = subData->syncObId;
             }
 
-#ifdef WITH_CLOUD
+#ifdef RD_CLIENT
             if(subData->remote_syncObId != 0)
             {
                 obArray[obCount++] = subData->remote_syncObId;

diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c
index fae0947..9094528 100644 (file)
--- a/service/notification/src/provider/NSProviderResource.c
+++ b/service/notification/src/provider/NSProviderResource.c
@@ -26,16 +26,12 @@ NSMessageResource NotificationMessageResource;
 NSSyncResource NotificationSyncResource;
 NSTopicResource NotificationTopicResource;
 
-#ifdef WITH_CLOUD
+#ifdef RD_CLIENT
 OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle,
     OCClientResponse *clientResponse)
 {
     (void) handle;
-
-    if (ctx != (void *)DEFAULT_CONTEXT_VALUE)
-    {
-        NS_LOG(DEBUG, "Invalid publish callback received");
-    }
+    (void) ctx;
 
     NS_LOG_V(DEBUG, "Publish resource response received code: %d", clientResponse->result);
 
@@ -46,12 +42,13 @@ NSResult NSPublishResourceToCloud(char *serverAddress)
 {
 
     NS_LOG(DEBUG, "NSPublishResourceToCloud - IN");
-    NS_LOG_V(DEBUG, "Cloud address: %s", serverAddress);
+    NS_LOG_V(DEBUG, "Remote Server Address: %s", serverAddress);
 
-    const char * publishQuery = NS_RD_PUBLISH_QUERY;
+    OCResourceHandle resourceHandles[1] = {NotificationResource.handle};
+    OCStackResult res = OCRDPublish(serverAddress, CT_ADAPTER_TCP, resourceHandles, 1,
+            &NSHandlePublishCb, OC_LOW_QOS);
 
-    if (NSCloudPublish(serverAddress, publishQuery, &NSHandlePublishCb, 1,
-            NotificationResource.handle) != OC_STACK_OK)
+    if (res != OC_STACK_OK)
     {
         NS_LOG(DEBUG, "Unable to publish resources to cloud");
     }

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 50e53ef..db2b8a0 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -134,7 +134,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
 \r
         bool iSRemoteServer = false;\r
 \r
-#ifdef WITH_CLOUD\r
+#ifdef RD_CLIEND\r
         iSRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr);\r
         if(iSRemoteServer)\r
         {\r
@@ -190,7 +190,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         subData->remote_syncObId = subData->syncObId = 0;\r
         bool isRemoteServer = false;\r
 \r
-#ifdef WITH_CLOUD\r
+#ifdef RD_CLIENT\r
         isRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr);\r
         if(isRemoteServer)\r
         {\r

diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c
index f603757..a3eef6f 100644 (file)
--- a/service/notification/src/provider/NSProviderSystem.c
+++ b/service/notification/src/provider/NSProviderSystem.c
@@ -22,7 +22,7 @@
 #define MAX_SERVER_ADDRESS 32\r
 static NSConnectionState NSProviderConnectionState;\r
 \r
-#ifdef WITH_CLOUD\r
+#ifdef RD_CLIENT\r
 static char NSRemoteServerAddress[MAX_SERVER_ADDRESS] = {0,};\r
 #endif\r
 \r
@@ -43,7 +43,7 @@ NSConnectionState NSGetProviderConnectionState()
     return NSProviderConnectionState;\r
 }\r
 \r
-#ifdef WITH_CLOUD\r
+#ifdef RD_CLIENT\r
 void NSSetRemoteServerAddress(char *serverAddress)\r
 {\r
 \r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 9ffca69..30f16b2 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -111,7 +111,7 @@ NSResult NSSendTopicUpdation()
                 obArray[obCount++] = subData->messageObId;\r
             }\r
 \r
-#ifdef WITH_CLOUD\r
+#ifdef RD_CLIENT\r
             if(subData->remote_messageObId != 0)\r
             {\r
                 obArray[obCount++] = subData->remote_messageObId;\r