Add setting userInfo in Provider struct.

initialize ProviderInfo about userinfo.

second patch included deallocate userinfo.
third patch included Add getUserInfo function.
this function will use compare queryparams
when received observer request.
Next patch included
i will add logic about compared queryparams.

Change-Id: Id69891156abd0f0bd4d0f04f873816f697819a46
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c
index a8a5367..520f91e 100644 (file)
--- a/service/notification/src/provider/NSProviderSystem.c
+++ b/service/notification/src/provider/NSProviderSystem.c
@@ -67,7 +67,7 @@ bool NSIsRemoteServerAddress(char *serverAddress)
 }\r
 #endif\r
 \r
-void NSInitProviderInfo()\r
+void NSInitProviderInfo(const char * userInfo)\r
 {\r
     NS_LOG(DEBUG, "NSInitProviderInfo");\r
 \r
@@ -77,24 +77,34 @@ void NSInitProviderInfo()
     OICStrcpy(providerInfo->providerId, UUID_STRING_SIZE, generatedUuid);\r
 \r
     providerInfo->providerName = NULL;\r
+    providerInfo->userInfo = NULL;\r
+\r
+    if(userInfo)\r
+        providerInfo->userInfo = OICStrdup(userInfo);\r
 }\r
 \r
 void NSDeinitProviderInfo()\r
 {\r
     NS_LOG(DEBUG, "NSDeinitProviderInfo");\r
 \r
-    if(providerInfo == NULL)\r
+    if(!providerInfo)\r
     {\r
         NS_LOG(DEBUG, "providerInfo is NULL");\r
         return;\r
     }\r
 \r
-    if(providerInfo->providerName != NULL)\r
+    if(providerInfo->providerName)\r
     {\r
         OICFree(providerInfo->providerName);\r
         providerInfo->providerName = NULL;\r
     }\r
 \r
+    if(providerInfo->userInfo)\r
+    {\r
+        OICFree(providerInfo->userInfo);\r
+        providerInfo->userInfo = NULL;\r
+    }\r
+\r
     OICFree(providerInfo);\r
     providerInfo = NULL;\r
 }\r
@@ -116,3 +126,10 @@ void NSSetPolicy(bool policy)
     NSPolicy = policy;\r
 }\r
 \r
+const char * NSGetUserInfo()\r
+{\r
+    return providerInfo->providerName;\r
+}\r
+\r
+\r
+\r

diff --git a/service/notification/src/provider/NSProviderSystem.h b/service/notification/src/provider/NSProviderSystem.h
index ab00e8e..4860bb4 100644 (file)
--- a/service/notification/src/provider/NSProviderSystem.h
+++ b/service/notification/src/provider/NSProviderSystem.h
@@ -32,8 +32,9 @@
 void NSSetProviderConnectionState(NSConnectionState state);\r
 NSConnectionState NSGetProviderConnectionState();\r
 \r
-void NSInitProviderInfo();\r
+void NSInitProviderInfo(const char * userInfo);\r
 void NSDeinitProviderInfo();\r
 NSProviderInfo * NSGetProviderInfo();\r
+const char * NSGetUserInfo();\r
 \r
 #endif /* _NS_PROVIDER_SYSTEM__H_ */\r