From 5159c2a518c3c8542f0a7ec00cf6c27032f74fca Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Tue, 2 Aug 2016 13:24:30 +0900 Subject: [PATCH] divide code about related cloud service. while scons builds, cloud service code is not required without WITH_CLOUD option in scons options. It was modified as follows, #ifdef WITH_CLOUD #endif in code. we should modify cpp_wrapper layer. so, this commit makes the related build script of cpp_wrapper being commented out. Change-Id: I9172b32e9242cc8d9ed038f024437dbd3b28da43 Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/9921 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- service/notification/SConscript | 9 ++++--- .../examples/linux/notificationprovider.c | 7 ++++- .../src/provider/NSProviderDiscovery.c | 2 ++ .../src/provider/NSProviderInterface.c | 2 ++ .../src/provider/NSProviderNotification.c | 5 ++++ .../notification/src/provider/NSProviderResource.c | 2 ++ .../src/provider/NSProviderSubscription.c | 30 ++++++++++++++++------ .../notification/src/provider/NSProviderSystem.c | 2 ++ 8 files changed, 47 insertions(+), 12 deletions(-) diff --git a/service/notification/SConscript b/service/notification/SConscript index e9aa079..012a9b2 100644 --- a/service/notification/SConscript +++ b/service/notification/SConscript @@ -85,6 +85,9 @@ if target_os == 'android': if not env.get('RELEASE'): notification_env.PrependUnique(LIBS = ['gcov']) notification_env.AppendUnique(CCFLAGS = ['--coverage']) + +if env.get('WITH_CLOUD') == True: + notification_env.AppendUnique(CPPDEFINES = ['WITH_CLOUD']) ###################################################################### # Source files and Targets @@ -127,8 +130,8 @@ notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\ 'service/notification', 'NSConsumerInterface.h') # Go to build Unit test -# if target_os == 'linux': -#SConscript('unittest/SConscript') +if target_os == 'linux': + SConscript('unittest/SConscript') # Go to build sample apps SConscript('examples/SConscript') @@ -138,4 +141,4 @@ if target_os == 'android': SConscript('android/SConscript') # Go to build c++ wrapper -SConscript('cpp-wrapper/SConscript') \ No newline at end of file +#SConscript('cpp-wrapper/SConscript') \ No newline at end of file diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c index 70d5821..105ef7c 100644 --- a/service/notification/examples/linux/notificationprovider.c +++ b/service/notification/examples/linux/notificationprovider.c @@ -74,6 +74,7 @@ void syncCallback(NSSyncInfo *sync) printf("NS_APP Sync State: %d\n", sync->state); } +#ifdef WITH_CLOUD OCStackApplicationResult CloudLoginoutCallback(void *ctx, OCDoHandle handle, OCClientResponse *clientResponse) { @@ -104,6 +105,7 @@ OCStackApplicationResult CloudLoginoutCallback(void *ctx, return OC_STACK_KEEP_TRANSACTION; } +#endif FILE* server_fopen(const char *path, const char *mode) { @@ -205,13 +207,16 @@ int main() printf("Session Code: "); gets(REMOTE_SERVER_SESSION); +#ifdef WITH_CLOUD NSCloudLogin(REMOTE_SERVER_ADDRESS, REMOTE_SERVER_SESSION, CloudLoginoutCallback); +#endif printf("OCCloudLogin requested"); break; case 12: printf("NSCloudLogout"); - +#ifdef WITH_CLOUD NSCloudLogout(REMOTE_SERVER_ADDRESS, REMOTE_SERVER_SESSION, CloudLoginoutCallback); +#endif printf("OCCloudLogout requested"); break; case 0: diff --git a/service/notification/src/provider/NSProviderDiscovery.c b/service/notification/src/provider/NSProviderDiscovery.c index 37855be..74bd3be 100644 --- a/service/notification/src/provider/NSProviderDiscovery.c +++ b/service/notification/src/provider/NSProviderDiscovery.c @@ -79,10 +79,12 @@ void * NSDiscoverySchedule(void * ptr) NS_LOG(DEBUG, "CASE TASK_REGISTER_RESOURCE : "); NSRegisterResource(); break; +#ifdef WITH_CLOUD case TASK_PUBLISH_RESOURCE: NS_LOG(DEBUG, "CASE TASK_PUBLISH_PESOURCE : "); NSPublishResourceToCloud((char*)node->taskData); break; +#endif default: break; } diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c index 60ee5ac..95c4662 100644 --- a/service/notification/src/provider/NSProviderInterface.c +++ b/service/notification/src/provider/NSProviderInterface.c @@ -124,6 +124,7 @@ NSResult NSStopProvider() return NS_OK; } +#ifdef WITH_CLOUD NSResult NSProviderEnableRemoteService(char *serverAddress) { NS_LOG(DEBUG, "NSProviderEnableRemoteService - IN"); @@ -160,6 +161,7 @@ NSResult NSProviderDisableRemoteService(char *serverAddress) NS_LOG(DEBUG, "NSProviderDisableRemoteService - OUT"); return NS_OK; } +#endif NSResult NSSendMessage(NSMessage *msg) { diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c index a149efd..3b1dced 100644 --- a/service/notification/src/provider/NSProviderNotification.c +++ b/service/notification/src/provider/NSProviderNotification.c @@ -127,10 +127,13 @@ NSResult NSSendNotification(NSMessage *msg) obArray[obCount++] = subData->messageObId; } +#ifdef WITH_CLOUD if(subData->remote_messageObId != 0) { obArray[obCount++] = subData->remote_messageObId; } +#endif + } it = it->next; } @@ -201,10 +204,12 @@ NSResult NSSendSync(NSSyncInfo *sync) obArray[obCount++] = subData->syncObId; } +#ifdef WITH_CLOUD if(subData->remote_syncObId != 0) { obArray[obCount++] = subData->remote_syncObId; } +#endif } it = it->next; } diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c index a0fa445..78e593e 100644 --- a/service/notification/src/provider/NSProviderResource.c +++ b/service/notification/src/provider/NSProviderResource.c @@ -25,6 +25,7 @@ NSNotificationResource NotificationResource; NSMessageResource NotificationMessageResource; NSSyncResource NotificationSyncResource; +#ifdef WITH_CLOUD OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle, OCClientResponse *clientResponse) { @@ -57,6 +58,7 @@ NSResult NSPublishResourceToCloud(char *serverAddress) NS_LOG(DEBUG, "NSPublishResourceToCloud - OUT"); return NS_OK; } +#endif NSResult NSCreateResource(char *uri) { diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index c259251..61aec35 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -128,20 +128,28 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id); NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr); - if(NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr)) + + subData->remote_messageObId = subData->messageObId = 0; + + bool iSRemoteServer = false; + +#ifdef WITH_CLOUD + iSRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr); + if(iSRemoteServer) { NS_LOG(DEBUG, "Requested by remote server"); subData->remote_messageObId = entityHandlerRequest->obsInfo.obsId; - subData->messageObId = 0; NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->remote_messageObId); } - else +#endif + + if(!iSRemoteServer) { NS_LOG(DEBUG, "Requested by local consumer"); subData->messageObId = entityHandlerRequest->obsInfo.obsId; - subData->remote_messageObId = 0; NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->messageObId); } + subData->isWhite = false; subData->remote_syncObId = 0; subData->syncObId = 0; @@ -177,18 +185,24 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id); NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr); - if(NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr)) + + subData->remote_syncObId = subData->syncObId = 0; + bool isRemoteServer = false; + +#ifdef WITH_CLOUD + isRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr); + if(isRemoteServer) { NS_LOG(DEBUG, "Requested by remote server"); subData->remote_syncObId = entityHandlerRequest->obsInfo.obsId; - subData->syncObId = 0; NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->remote_syncObId); } - else +#endif + + if(!isRemoteServer) { NS_LOG(DEBUG, "Requested by local consumer"); subData->syncObId = entityHandlerRequest->obsInfo.obsId; - subData->remote_syncObId = 0; NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->syncObId); } diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c index 778bcce..a8a5367 100644 --- a/service/notification/src/provider/NSProviderSystem.c +++ b/service/notification/src/provider/NSProviderSystem.c @@ -40,6 +40,7 @@ NSConnectionState NSGetProviderConnectionState() return NSProviderConnectionState; } +#ifdef WITH_CLOUD void NSSetRemoteServerAddress(char *serverAddress) { @@ -64,6 +65,7 @@ bool NSIsRemoteServerAddress(char *serverAddress) return false; } +#endif void NSInitProviderInfo() { -- 2.7.4