add subscriber list for remote server

The changes are modified to send messages to the subscribers from local and cloud concurrently.
The service stores subscriber list from remote server seperately as well as local subscribers.

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

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index f4313e1..94c06ce 100644 (file)
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -1,22 +1,22 @@
-/******************************************************************\r
- *\r
- * Copyright 2015 Samsung Electronics All Rights Reserved.\r
- *\r
- *\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- ******************************************************************/\r
+//******************************************************************\r
+//\r
+// Copyright 2016 Samsung Electronics All Rights Reserved.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//      http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 \r
 #include <stdio.h>\r
 #include <stdbool.h>\r
@@ -32,6 +32,10 @@
 \r
 #define TAG "NSProviderExample"\r
 \r
+// Input the following values to publish resource to cloud\r
+char REMOTE_SERVER_ADDRESS[50];\r
+char REMOTE_SERVER_SESSION[50];\r
+\r
 extern char *strdup(const char *s);\r
 \r
 bool isExit = false;\r
@@ -45,7 +49,7 @@ void* OCProcessThread(void * ptr)
     {\r
         if (OCProcess() != OC_STACK_OK)\r
         {\r
-            OIC_LOG(ERROR, TAG, "OCStack process error");\r
+            printf("OCStack process error");\r
             return NULL;\r
         }\r
     }\r
@@ -55,7 +59,7 @@ void* OCProcessThread(void * ptr)
 \r
 void subscribeRequestCallback(NSConsumer *consumer)\r
 {\r
-    OIC_LOG(INFO, TAG, "consumer requested to subscribe");\r
+    printf("consumer requested to subscribe");\r
 \r
     printf("NS_APP Consumer Device ID: %s\n", consumer->consumerId);\r
 \r
@@ -64,7 +68,7 @@ void subscribeRequestCallback(NSConsumer *consumer)
 \r
 void syncCallback(NSSyncInfo *sync)\r
 {\r
-    OIC_LOG(INFO, TAG, "sync requested");\r
+    printf("sync requested");\r
 \r
     printf("NS_APP Sync State: %d\n", sync->state);\r
 }\r
@@ -75,27 +79,26 @@ OCStackApplicationResult CloudLoginoutCallback(void *ctx,
     int CtxValue = 0x99;\r
     if (ctx != (void *)CtxValue)\r
     {\r
-        OIC_LOG(INFO, TAG, "Invalid Cloud Login/out callback received");\r
+        printf("Invalid Cloud Login/out callback received");\r
     }\r
 \r
-    OIC_LOG(INFO, TAG, "Login/out response received");\r
+    printf("Login/out response received");\r
 \r
     if (clientResponse->payload != NULL &&\r
             clientResponse->payload->type == PAYLOAD_TYPE_REPRESENTATION)\r
     {\r
-        OIC_LOG(INFO, TAG, "PAYLOAD_TYPE_REPRESENTATION received");\r
+        printf("PAYLOAD_TYPE_REPRESENTATION received");\r
 \r
         OCRepPayloadValue *val = ((OCRepPayload *)clientResponse->payload)->values;\r
 \r
-        OIC_LOG(INFO, TAG, "Get payload values");\r
+        printf("Get payload values");\r
         while (val)\r
         {\r
-            OIC_LOG_V(INFO, TAG, "key: %s / Value: %s", val->name, val->str);\r
+            printf("key: %s / Value: %s", val->name, val->str);\r
             val = val->next;\r
         }\r
 \r
-        char *serverAddress = "coap+tcp://52.69.149.85:5683";\r
-        NSProviderEnableRemoteService(serverAddress);\r
+        NSProviderEnableRemoteService(REMOTE_SERVER_ADDRESS);\r
     }\r
 \r
     return OC_STACK_KEEP_TRANSACTION;\r
@@ -112,13 +115,7 @@ int main()
     int num;\r
     pthread_t processThread;\r
 \r
-    // cloud host address\r
-    const char *host = "coap+tcp://52.69.149.85:5683";\r
-    // cloud auth session\r
-    const char *auth_session = "gZDRuDyYapZXIcrs";\r
-\r
-\r
-    OIC_LOG(INFO, TAG, "NSStartProvider()");\r
+    printf("NSStartProvider()");\r
 \r
     // open oic_db\r
     static OCPersistentStorage ps = {server_fopen, fread, fwrite, fclose, unlink};\r
@@ -126,7 +123,7 @@ int main()
 \r
     if (OCInit(NULL, 0, OC_CLIENT_SERVER) != OC_STACK_OK)\r
     {\r
-        OIC_LOG(INFO, TAG, "OCStack init error");\r
+        printf("OCStack init error");\r
         return 0;\r
     }\r
 \r
@@ -141,7 +138,7 @@ int main()
         printf("3. NSSendNotification() \n");\r
         printf("4. NSRead \n");\r
         printf("5. NSStopProvider() \n");\r
-        printf("6. NSGetConsumerList \n");\r
+\r
         printf("11. NSCloudLogin \n");\r
         printf("12. NSCloudLogout \n");\r
         printf("0. Exit() \n");\r
@@ -156,15 +153,15 @@ int main()
         switch (num)\r
         {\r
             case 1:\r
-                OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Provider)");\r
+                printf("NSStartProvider(Accepter: Provider)");\r
                 NSStartProvider(NS_ACCESS_ALLOW, subscribeRequestCallback, syncCallback);\r
                 break;\r
             case 2:\r
-                OIC_LOG(INFO, TAG, "NSStartProvider(Accepter: Consumer)");\r
+                printf("NSStartProvider(Accepter: Consumer)");\r
                 NSStartProvider(NS_ACCESS_DENY, subscribeRequestCallback, syncCallback);\r
                 break;\r
             case 3:\r
-                OIC_LOG(INFO, TAG, "NSSendNotification()");\r
+                printf("NSSendNotification()");\r
 \r
                 char title[100];\r
                 char body[100];\r
@@ -191,7 +188,7 @@ int main()
                 break;\r
 \r
             case 4:\r
-                OIC_LOG(INFO, TAG, "NSRead");\r
+                printf("NSRead");\r
                 NSSyncInfo * sync = (NSSyncInfo*) OICMalloc(sizeof(NSSyncInfo));\r
 \r
                 sync->messageId = OICStrdup("dev_001");\r
@@ -202,27 +199,32 @@ int main()
             case 5:\r
                 NSStopProvider();\r
                 break;\r
-            case 6:\r
-                OIC_LOG(INFO, TAG, "NSGetConsumerList");\r
-                break;\r
+\r
             case 11:\r
-                OIC_LOG(INFO, TAG, "NSCloudLogin");\r
+                printf("NSCloudLogin");\r
+\r
+                printf("Cloud Address: ");\r
+                gets(REMOTE_SERVER_ADDRESS);\r
+\r
+                printf("Session Code: ");\r
+                gets(REMOTE_SERVER_SESSION);\r
+\r
 \r
-                NSCloudLogin(host, auth_session, CloudLoginoutCallback);\r
-                OIC_LOG(INFO, TAG, "OCCloudLogin requested");\r
+                NSCloudLogin(REMOTE_SERVER_ADDRESS, REMOTE_SERVER_SESSION, CloudLoginoutCallback);\r
+                printf("OCCloudLogin requested");\r
                 break;\r
             case 12:\r
-                OIC_LOG(INFO, TAG, "NSCloudLogout");\r
+                printf("NSCloudLogout");\r
 \r
-                NSCloudLogout(host, auth_session, CloudLoginoutCallback);\r
-                OIC_LOG(INFO, TAG, "OCCloudLogout requested");\r
+                NSCloudLogout(REMOTE_SERVER_ADDRESS, REMOTE_SERVER_SESSION, CloudLoginoutCallback);\r
+                printf("OCCloudLogout requested");\r
                 break;\r
             case 0:\r
                 NSStopProvider();\r
                 isExit = true;\r
                 break;\r
             default:\r
-                OIC_LOG(INFO, TAG, "Under Construction");\r
+                printf("Under Construction");\r
                 break;\r
         }\r
 \r

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index 1a28092..e5c64bb 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -27,8 +27,6 @@
 #ifndef _NS_COMMON_H_
 #define _NS_COMMON_H_
 
-#include <ocstack.h>
-
 #define NS_ATTRIBUTE_POLICY "ACCEPTER"
 #define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
 #define NS_ATTRIBUTE_SYNC "SYNC_URI"

diff --git a/service/notification/src/common/NSStructs.h b/service/notification/src/common/NSStructs.h
index e51f4ff..4ade4b1 100644 (file)
--- a/service/notification/src/common/NSStructs.h
+++ b/service/notification/src/common/NSStructs.h
@@ -52,15 +52,17 @@ typedef struct
 \r
 typedef struct\r
 {\r
-    char id[37]; // ip\r
-    int syncObId;\r
-    int messageObId;\r
-    bool isWhite;\r
+    char id[37];\r
+    int syncObId; // sync resource observer ID for local consumer\r
+    int messageObId; // message resource observer ID for local consumer\r
+    int remote_syncObId; //sync observer ID subscribed through remote server\r
+    int remote_messageObId; //message observer ID subscribed through remote server\r
+    bool isWhite; // access state -> True: allowed / False: blocked\r
 } NSCacheSubData;\r
 \r
 typedef struct\r
 {\r
-    char * id; // ip ? ? ?\r
+    char * id;\r
     int messageType; // noti = 1, read = 2, dismiss = 3\r
     NSMessage * nsMessage;\r
 } NSCacheMsgData;\r

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 6fa5967..53baa56 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -152,6 +152,8 @@ NSResult NSProviderEnableRemoteService(char *serverAddress)
     }\r
 \r
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);\r
+    NSSetRemoteServerAddress(serverAddress);\r
+\r
     NSPushQueue(DISCOVERY_SCHEDULER, TASK_PUBLISH_RESOURCE, serverAddress);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
@@ -170,6 +172,7 @@ NSResult NSProviderDisableRemoteService(char *serverAddress)
         return NS_FAIL;\r
     }\r
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);\r
+    NSDeleteRemoteServerAddress(serverAddress);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     NS_LOG(DEBUG, "NSProviderDisableRemoteService - OUT");\r
@@ -312,4 +315,3 @@ void * NSInterfaceSchedule(void * ptr)
     NS_LOG(DEBUG, "Destroy NSResponseSchedule");\r
     return NULL;\r
 }\r
-\r

diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c
index b3fd1f8..a2a60f1 100644 (file)
--- a/service/notification/src/provider/NSProviderNotification.c
+++ b/service/notification/src/provider/NSProviderNotification.c
@@ -113,14 +113,20 @@ NSResult NSSendNotification(NSMessage *msg)
     while (it)
     {
         NSCacheSubData * subData = (NSCacheSubData *) it->data;
-        NS_LOG_V(DEBUG, "subData->id = %s", subData->id);
+        NS_LOG_V(DEBUG, "message subData->id = %s", subData->id);
         NS_LOG_V(DEBUG, "subData->messageId = %d", subData->messageObId);
-        NS_LOG_V(DEBUG, "subData->obID = %d", subData->syncObId);
+        NS_LOG_V(DEBUG, "subData->cloud_messageId = %d", subData->remote_messageObId);
+        NS_LOG_V(DEBUG, "subData->syncId = %d", subData->syncObId);
+        NS_LOG_V(DEBUG, "subData->cloud_syncId = %d", subData->remote_syncObId);
         NS_LOG_V(DEBUG, "subData->isWhite = %d", subData->isWhite);
 
         if (subData->isWhite)
         {
-            obArray[obCount++] = subData->messageObId;
+            if(subData->messageObId != 0)
+                obArray[obCount++] = subData->messageObId;
+
+            if(subData->remote_messageObId != 0)
+                obArray[obCount++] = subData->remote_messageObId;
         }
         it = it->next;
     }
@@ -177,9 +183,20 @@ NSResult NSSendSync(NSSyncInfo *sync)
     while (it)
     {
         NSCacheSubData * subData = (NSCacheSubData *) it->data;
+        NS_LOG_V(DEBUG, "sync subData->id = %s", subData->id);
+        NS_LOG_V(DEBUG, "subData->messageId = %d", subData->messageObId);
+        NS_LOG_V(DEBUG, "subData->cloud_messageId = %d", subData->remote_messageObId);
+        NS_LOG_V(DEBUG, "subData->syncId = %d", subData->syncObId);
+        NS_LOG_V(DEBUG, "subData->cloud_syncId = %d", subData->remote_syncObId);
+        NS_LOG_V(DEBUG, "subData->isWhite = %d", subData->isWhite);
+
         if (subData->isWhite)
         {
-            obArray[obCount++] = subData->syncObId;
+            if(subData->syncObId != 0)
+                obArray[obCount++] = subData->syncObId;
+
+            if(subData->remote_syncObId != 0)
+                obArray[obCount++] = subData->remote_syncObId;
         }
         it = it->next;
     }

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index c770bca..361a2e8 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -82,6 +82,8 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest
         return NS_ERROR;\r
     }\r
 \r
+    NS_LOG_V(DEBUG, "NS Provider ID: %s", NSGetProviderInfo()->providerId);\r
+\r
     OCRepPayloadSetUri(payload, NS_ROOT_URI);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
     OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_POLICY, NSGetSubscriptionAccepter());\r
@@ -128,17 +130,26 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
 \r
         OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
+        NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id);\r
 \r
+        NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr);\r
+        if(NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr))\r
+        {\r
+            NS_LOG(DEBUG, "Requested by remote server");\r
+            subData->remote_messageObId = entityHandlerRequest->obsInfo.obsId;\r
+            NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->remote_messageObId);\r
+        }\r
+        else\r
+        {\r
+            NS_LOG(DEBUG, "Requested by local consumer");\r
+            subData->messageObId = entityHandlerRequest->obsInfo.obsId;\r
+            NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->messageObId);\r
+        }\r
         subData->isWhite = false;\r
-        subData->messageObId = entityHandlerRequest->obsInfo.obsId;\r
-        subData->syncObId = 0;\r
 \r
         element->data = (void*) subData;\r
         element->next = NULL;\r
 \r
-        NS_LOG_V(DEBUG, "SubList IP[ID] = [%s]", subData->id);\r
-        NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->messageObId);\r
-\r
         if (NSStorageWrite(consumerSubList, element) != NS_OK)\r
         {\r
             NS_LOG(DEBUG, "fail to write cache");\r
@@ -160,19 +171,29 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         NS_LOG(DEBUG, "resourceType == NS_RESOURCE_SYNC");\r
         NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
         NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
+\r
         OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
+        NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id);\r
 \r
+        NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr);\r
+        if(NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr))\r
+        {\r
+            NS_LOG(DEBUG, "Requested by remote server");\r
+            subData->remote_syncObId = entityHandlerRequest->obsInfo.obsId;\r
+            NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->remote_syncObId);\r
+        }\r
+        else\r
+        {\r
+            NS_LOG(DEBUG, "Requested by local consumer");\r
+            subData->syncObId = entityHandlerRequest->obsInfo.obsId;\r
+            NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->syncObId);\r
+        }\r
 \r
         subData->isWhite = false;\r
-        subData->syncObId = entityHandlerRequest->obsInfo.obsId;\r
-        subData->messageObId = 0;\r
 \r
         element->data = (void*) subData;\r
         element->next = NULL;\r
 \r
-        NS_LOG_V(DEBUG, "SubList IP[ID] = [%s]", subData->id);\r
-        NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->syncObId);\r
-\r
         if (NSStorageWrite(consumerSubList, element) != NS_OK)\r
         {\r
             NS_LOG(ERROR, "Fail to write cache");\r

diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c
index a9a69aa..2a6c6ee 100644 (file)
--- a/service/notification/src/provider/NSProviderSystem.c
+++ b/service/notification/src/provider/NSProviderSystem.c
@@ -19,7 +19,10 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 #include "NSProviderSystem.h"\r
 \r
+#define MAX_SERVER_ADDRESS 32\r
 static NSConnectionState NSProviderConnectionState;\r
+static char NSRemoteServerAddress[MAX_SERVER_ADDRESS] = {0,};\r
+\r
 NSProviderInfo * providerInfo;\r
 \r
 void NSSetProviderConnectionState(NSConnectionState state)\r
@@ -36,6 +39,31 @@ NSConnectionState NSGetProviderConnectionState()
     return NSProviderConnectionState;\r
 }\r
 \r
+void NSSetRemoteServerAddress(char *serverAddress)\r
+{\r
+\r
+    OICStrcpy(NSRemoteServerAddress, MAX_SERVER_ADDRESS, serverAddress);\r
+}\r
+\r
+void NSDeleteRemoteServerAddress(char *serverAddress)\r
+{\r
+    NS_LOG_V(DEBUG, "Delete cloud address: %s", serverAddress);\r
+\r
+    memset(NSRemoteServerAddress, 0, MAX_SERVER_ADDRESS);\r
+}\r
+\r
+bool NSIsRemoteServerAddress(char *serverAddress)\r
+{\r
+    NS_LOG_V(DEBUG, "Check server address: %s", serverAddress);\r
+\r
+    if(serverAddress != NULL)\r
+    {\r
+        return strstr(NSRemoteServerAddress, serverAddress);\r
+    }\r
+\r
+    return false;\r
+}\r
+\r
 void NSInitProviderInfo()\r
 {\r
     NS_LOG(DEBUG, "NSInitProviderInfo");\r

diff --git a/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c b/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c
index 8ce8f97..fdf978b 100755 (executable)
--- a/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/cache/linux/NSProviderMemoryCache.c
@@ -99,6 +99,8 @@ NSResult NSCacheUpdateSubScriptionState(NSCacheList * list, char * id, bool stat
             NS_LOG_V(DEBUG, "currData_ID = %s", itData->id);\r
             NS_LOG_V(DEBUG, "currData_MsgObID = %d", itData->messageObId);\r
             NS_LOG_V(DEBUG, "currData_SyncObID = %d", itData->syncObId);\r
+            NS_LOG_V(DEBUG, "currData_Cloud_MsgObID = %d", itData->remote_messageObId);\r
+            NS_LOG_V(DEBUG, "currData_Cloud_SyncObID = %d", itData->remote_syncObId);\r
             NS_LOG_V(DEBUG, "currData_IsWhite = %d", itData->isWhite);\r
 \r
             NS_LOG_V(DEBUG, "update state = %d", state);\r
@@ -156,23 +158,38 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
                 NS_LOG_V(DEBUG, "currData_ID = %s", itData->id);\r
                 NS_LOG_V(DEBUG, "currData_MsgObID = %d", itData->messageObId);\r
                 NS_LOG_V(DEBUG, "currData_SyncObID = %d", itData->syncObId);\r
+                NS_LOG_V(DEBUG, "currData_Cloud_MsgObID = %d", itData->remote_messageObId);\r
+                NS_LOG_V(DEBUG, "currData_Cloud_SyncObID = %d", itData->remote_syncObId);\r
                 NS_LOG_V(DEBUG, "currData_IsWhite = %d", itData->isWhite);\r
 \r
                 NS_LOG_V(DEBUG, "subData_ID = %s", subData->id);\r
                 NS_LOG_V(DEBUG, "subData_MsgObID = %d", subData->messageObId);\r
                 NS_LOG_V(DEBUG, "subData_SyncObID = %d", subData->syncObId);\r
+                NS_LOG_V(DEBUG, "subData_Cloud_MsgObID = %d", subData->remote_messageObId);\r
+                NS_LOG_V(DEBUG, "subData_Cloud_SyncObID = %d", subData->remote_syncObId);\r
                 NS_LOG_V(DEBUG, "subData_IsWhite = %d", subData->isWhite);\r
 \r
-                if (itData->messageObId == 0)\r
+                if (subData->messageObId != 0)\r
                 {\r
                     itData->messageObId = subData->messageObId;\r
                 }\r
 \r
-                if (itData->syncObId == 0)\r
+                if (subData->syncObId != 0)\r
                 {\r
                     itData->syncObId = subData->syncObId;\r
                 }\r
 \r
+                if (subData->remote_messageObId != 0)\r
+                {\r
+                    itData->remote_messageObId = subData->remote_messageObId;\r
+                }\r
+\r
+                if (subData->remote_syncObId != 0)\r
+                {\r
+                    itData->remote_syncObId = subData->remote_syncObId;\r
+                    NS_LOG_V(DEBUG, "sync id cached: %d", itData->remote_syncObId);\r
+                }\r
+\r
                 NS_LOG(DEBUG, "Update Data - OUT");\r
 \r
                 pthread_mutex_unlock(&NSCacheMutex);\r