From d6e96d35954fb4d4a73cb4f995870b5f75ddac41 Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Fri, 2 Sep 2016 12:50:56 +0900 Subject: [PATCH] Replace conditional compilation marcro WITH_CLOUD and bug fixed. Macro RD_CLIENT is replaced with WITH_CLOUD. The codes related to cloud service is not compiled according to the conditional compilation with the marcro. modify topic notification filter for remote message This patch is bug-fix which adds topic notification filter for remote msg. Change-Id: Ib61957dac3a193706386be5e121e5efdb2bbada8 Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/11311 Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/notification/src/provider/NSProviderDiscovery.c | 2 +- service/notification/src/provider/NSProviderInterface.c | 16 ++++++++++------ .../notification/src/provider/NSProviderNotification.c | 12 ++++++++---- service/notification/src/provider/NSProviderResource.c | 2 +- .../notification/src/provider/NSProviderSubscription.c | 4 ++-- service/notification/src/provider/NSProviderSystem.c | 8 ++++---- service/notification/src/provider/NSProviderTopic.c | 3 +-- 7 files changed, 27 insertions(+), 20 deletions(-) diff --git a/service/notification/src/provider/NSProviderDiscovery.c b/service/notification/src/provider/NSProviderDiscovery.c index 5f9d195..81b5903 100644 --- 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 : "); NSRegisterResource(); break; -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined RD_CLIENT) case TASK_PUBLISH_RESOURCE: NS_LOG(DEBUG, "CASE TASK_PUBLISH_PESOURCE : "); NSPublishResourceToCloud((char*)node->taskData); diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c index 7c60796..0fbd5ed 100644 --- a/service/notification/src/provider/NSProviderInterface.c +++ b/service/notification/src/provider/NSProviderInterface.c @@ -125,8 +125,9 @@ NSResult NSStopProvider() return NS_OK; } -NSResult NSProviderEnableRemoteService(char * serverAddress) +NSResult NSProviderEnableRemoteService(char *serverAddress) { +#if(defined WITH_CLOUD && defined RD_CLIENT) NS_LOG(DEBUG, "NSProviderEnableRemoteService - IN"); pthread_mutex_lock(&nsInitMutex); @@ -136,20 +137,21 @@ NSResult NSProviderEnableRemoteService(char * serverAddress) pthread_mutex_unlock(&nsInitMutex); return NS_FAIL; } - NS_LOG(DEBUG, "Check the remote server login"); NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress); -#ifdef RD_CLIENT NS_LOG(DEBUG, "Request to publish resource"); NSPushQueue(DISCOVERY_SCHEDULER, TASK_PUBLISH_RESOURCE, serverAddress); -#endif pthread_mutex_unlock(&nsInitMutex); NS_LOG(DEBUG, "NSProviderEnableRemoteService - OUT"); return NS_OK; +#endif + NS_LOG_V(DEBUG, "Not logged in remote server: %s", serverAddress); + return NS_FAIL; } NSResult NSProviderDisableRemoteService(char *serverAddress) { +#if(defined WITH_CLOUD && defined RD_CLIENT) NS_LOG(DEBUG, "NSProviderDisableRemoteService - IN"); pthread_mutex_lock(&nsInitMutex); @@ -159,14 +161,16 @@ NSResult NSProviderDisableRemoteService(char *serverAddress) return NS_FAIL; } NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress); -#ifdef RD_CLIENT + NS_LOG(DEBUG, "Delete remote server info"); NSDeleteRemoteServerAddress(serverAddress); -#endif pthread_mutex_unlock(&nsInitMutex); NS_LOG(DEBUG, "NSProviderDisableRemoteService - OUT"); return NS_OK; +#endif + NS_LOG_V(DEBUG, "Not logged in remote server : %s", serverAddress); + return NS_FAIL; } NSResult NSSendMessage(NSMessage * msg) diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c index 1b5f893..13ebdfd 100644 --- a/service/notification/src/provider/NSProviderNotification.c +++ b/service/notification/src/provider/NSProviderNotification.c @@ -129,12 +129,16 @@ NSResult NSSendNotification(NSMessage *msg) } } -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined RD_CLIENT) if(subData->remote_messageObId != 0) { - if(NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic)) + if(msg->topic) { - obArray[obCount++] = subData->remote_messageObId; + NS_LOG_V(DEBUG, "this is topic message via remote server: %s", msg->topic); + if(NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic)) + { + obArray[obCount++] = subData->remote_messageObId; + } } else { @@ -213,7 +217,7 @@ NSResult NSSendSync(NSSyncInfo *sync) obArray[obCount++] = subData->syncObId; } -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined 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 fa26e0f..a3fa316 100644 --- a/service/notification/src/provider/NSProviderResource.c +++ b/service/notification/src/provider/NSProviderResource.c @@ -26,7 +26,7 @@ NSMessageResource NotificationMessageResource; NSSyncResource NotificationSyncResource; NSTopicResource NotificationTopicResource; -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined RD_CLIENT) #define DEFAULT_CONTEXT_VALUE 0x99 OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle, diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index 4a07a00..090e78d 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -134,7 +134,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour bool iSRemoteServer = false; -#ifdef RD_CLIEND +#if(defined WITH_CLOUD && defined RD_CLIENT) iSRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr); if(iSRemoteServer) { @@ -190,7 +190,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour subData->remote_syncObId = subData->syncObId = 0; bool isRemoteServer = false; -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined RD_CLIENT) isRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr); if(isRemoteServer) { diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c index a3eef6f..deeb4c5 100644 --- a/service/notification/src/provider/NSProviderSystem.c +++ b/service/notification/src/provider/NSProviderSystem.c @@ -19,13 +19,13 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include "NSProviderSystem.h" +#if(defined WITH_CLOUD && defined RD_CLIENT) #define MAX_SERVER_ADDRESS 32 -static NSConnectionState NSProviderConnectionState; - -#ifdef RD_CLIENT static char NSRemoteServerAddress[MAX_SERVER_ADDRESS] = {0,}; #endif +static NSConnectionState NSProviderConnectionState; + NSProviderInfo * providerInfo; bool NSPolicy = true; @@ -43,7 +43,7 @@ NSConnectionState NSGetProviderConnectionState() return NSProviderConnectionState; } -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined RD_CLIENT) void NSSetRemoteServerAddress(char *serverAddress) { diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c index 5474671..112c2ef 100644 --- a/service/notification/src/provider/NSProviderTopic.c +++ b/service/notification/src/provider/NSProviderTopic.c @@ -133,13 +133,12 @@ NSResult NSSendTopicUpdation() obArray[obCount++] = subData->messageObId; } -#ifdef RD_CLIENT +#if(defined WITH_CLOUD && defined RD_CLIENT) if(subData->remote_messageObId != 0) { obArray[obCount++] = subData->remote_messageObId; } #endif - } it = it->next; } -- 2.7.4