replace : iotivity -> iotivity-sec

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

diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c
index b8181bc..0f50776 100644 (file)
--- a/service/notification/src/provider/NSProviderSystem.c
+++ b/service/notification/src/provider/NSProviderSystem.c
@@ -19,16 +19,20 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 #include "NSProviderSystem.h"\r
 \r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
+#if (defined WITH_CLOUD)\r
 #define MAX_SERVER_ADDRESS 32\r
 static char NSRemoteServerAddress[MAX_SERVER_ADDRESS] = {0,};\r
 #endif\r
 \r
+#ifdef WITH_MQ\r
+static NSMQServerInfo * mqServerInfo = NULL;\r
+#endif\r
+\r
 static NSConnectionState NSProviderConnectionState;\r
 \r
 NSProviderInfo * providerInfo;\r
 bool NSPolicy = true;\r
-bool NSResourceSecurity = true;\r
+bool NSResourceSecurity = false;\r
 \r
 void NSSetProviderConnectionState(NSConnectionState state)\r
 {\r
@@ -44,7 +48,7 @@ NSConnectionState NSGetProviderConnectionState()
     return NSProviderConnectionState;\r
 }\r
 \r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
+#if (defined WITH_CLOUD)\r
 void NSSetRemoteServerAddress(char *serverAddress)\r
 {\r
 \r
@@ -53,16 +57,16 @@ void NSSetRemoteServerAddress(char *serverAddress)
 \r
 void NSDeleteRemoteServerAddress(char *serverAddress)\r
 {\r
-    NS_LOG_V(DEBUG, "Delete cloud address: %s", serverAddress);\r
+    NS_LOG_V(INFO_PRIVATE, "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
+    NS_LOG_V(INFO_PRIVATE, "Check server address: %s", serverAddress);\r
 \r
-    if(serverAddress != NULL)\r
+    if (serverAddress != NULL)\r
     {\r
         return strstr(NSRemoteServerAddress, serverAddress);\r
     }\r
@@ -77,45 +81,47 @@ void NSInitProviderInfo(const char * userInfo)
 \r
     providerInfo = (NSProviderInfo *) OICMalloc(sizeof(NSProviderInfo));\r
     const char * generatedUuid = (char *)OCGetServerInstanceIDString();\r
-    NS_LOG_V(DEBUG, "Generate Provider ID: %s", generatedUuid);\r
+    NS_LOG_V(INFO_PRIVATE, "Generate Provider ID: %s", generatedUuid);\r
     OICStrcpy(providerInfo->providerId, UUID_STRING_SIZE, generatedUuid);\r
 \r
     providerInfo->providerName = NULL;\r
     providerInfo->userInfo = NULL;\r
 \r
-    if(userInfo)\r
+    if (userInfo)\r
+    {\r
         providerInfo->userInfo = OICStrdup(userInfo);\r
+    }\r
 }\r
 \r
 void NSDeinitProviderInfo()\r
 {\r
     NS_LOG(DEBUG, "NSDeinitProviderInfo");\r
 \r
-    if(!providerInfo)\r
+    if (!providerInfo)\r
     {\r
         NS_LOG(DEBUG, "providerInfo is NULL");\r
         return;\r
     }\r
 \r
-    if(providerInfo->providerName)\r
+    if (providerInfo->providerName)\r
     {\r
-        OICFree(providerInfo->providerName);\r
+        NSOICFree(providerInfo->providerName);\r
         providerInfo->providerName = NULL;\r
     }\r
 \r
-    if(providerInfo->userInfo)\r
+    if (providerInfo->userInfo)\r
     {\r
-        OICFree(providerInfo->userInfo);\r
+        NSOICFree(providerInfo->userInfo);\r
         providerInfo->userInfo = NULL;\r
     }\r
 \r
-    OICFree(providerInfo);\r
+    NSOICFree(providerInfo);\r
     providerInfo = NULL;\r
 }\r
 \r
 NSProviderInfo * NSGetProviderInfo()\r
 {\r
-    NS_LOG_V(DEBUG, "ProviderInfo: %s", providerInfo->providerId);\r
+    NS_LOG_V(INFO_PRIVATE, "ProviderInfo: %s", providerInfo->providerId);\r
 \r
     return providerInfo;\r
 }\r
@@ -144,3 +150,22 @@ const char * NSGetUserInfo()
 {\r
     return providerInfo->userInfo;\r
 }\r
+\r
+#ifdef WITH_MQ\r
+void NSSetMQServerInfo(const char * serverUri, OCDevAddr * devAddr)\r
+{\r
+    if (!mqServerInfo)\r
+    {\r
+        NS_LOG(DEBUG, "setMqServer");\r
+        mqServerInfo = (NSMQServerInfo *)OICMalloc(sizeof(NSMQServerInfo));\r
+        mqServerInfo->serverUri = OICStrdup(serverUri);\r
+        mqServerInfo->devAddr = (OCDevAddr *)OICMalloc(sizeof(OCDevAddr));\r
+        memcpy(mqServerInfo->devAddr, devAddr, sizeof(OCDevAddr));\r
+    }\r
+}\r
+\r
+NSMQServerInfo * NSGetMQServerInfo()\r
+{\r
+    return mqServerInfo;\r
+}\r
+#endif\r