Revert "[CONPRO-1337] Disabled Presence Feature"

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

diff --git a/service/notification/src/provider/NSProviderDiscovery.c b/service/notification/src/provider/NSProviderDiscovery.c
index 5f245bc..9452103 100644 (file)
--- a/service/notification/src/provider/NSProviderDiscovery.c
+++ b/service/notification/src/provider/NSProviderDiscovery.c
@@ -22,29 +22,29 @@
 \r
 NSResult NSStartPresence()\r
 {\r
-    OIC_LOG(INFO, DISCOVERY_TAG, "NSStartPresence()");\r
+    NS_LOG(DEBUG, "NSStartPresence()");\r
 \r
     if (OCStartPresence(0) != OC_STACK_OK)\r
     {\r
-        OIC_LOG(INFO, DISCOVERY_TAG, "NSStartPresence() NS_ERROR");\r
+        NS_LOG(DEBUG, "NSStartPresence() NS_ERROR");\r
         return NS_ERROR;\r
     }\r
 \r
-    OIC_LOG(INFO, DISCOVERY_TAG, "NSStartPresence() NS_OK");\r
+    NS_LOG(DEBUG, "NSStartPresence() NS_OK");\r
     return NS_OK;\r
 }\r
 \r
 NSResult NSStopPresence()\r
 {\r
-    OIC_LOG(INFO, DISCOVERY_TAG, "NSStopPresence()");\r
+    NS_LOG(DEBUG, "NSStopPresence()");\r
 \r
     if (OCStopPresence() != OC_STACK_OK)\r
     {\r
-        OIC_LOG(INFO, DISCOVERY_TAG, "NSStopPresence() NS_ERROR");\r
+        NS_LOG(DEBUG, "NSStopPresence() NS_ERROR");\r
         return NS_ERROR;\r
     }\r
 \r
-    OIC_LOG(INFO, DISCOVERY_TAG, "NSStopPresence() NS_OK");\r
+    NS_LOG(DEBUG, "NSStopPresence() NS_OK");\r
     return NS_OK;\r
 }\r
 \r
@@ -52,7 +52,7 @@ void * NSDiscoverySchedule(void * ptr)
 {\r
     if (ptr == NULL)\r
     {\r
-        OIC_LOG(INFO, DISCOVERY_TAG, "Create NSDiscoverySchedule");\r
+        NS_LOG(DEBUG, "Create NSDiscoverySchedule");\r
     }\r
 \r
     while (NSIsRunning[DISCOVERY_SCHEDULER])\r
@@ -65,24 +65,36 @@ void * NSDiscoverySchedule(void * ptr)
             NSTask *node = NSHeadMsg[DISCOVERY_SCHEDULER];\r
             NSHeadMsg[DISCOVERY_SCHEDULER] = node->nextTask;\r
 \r
-            switch ((int)node->taskType)\r
+            switch (node->taskType)\r
             {\r
                 case TASK_START_PRESENCE:\r
+                    NS_LOG(DEBUG, "CASE TASK_START_PRESENCE : ");\r
                     NSStartPresence();\r
                     break;\r
                 case TASK_STOP_PRESENCE:\r
+                    NS_LOG(DEBUG, "CASE TASK_STOP_PRESENCE : ");\r
                     NSStopPresence();\r
                     break;\r
                 case TASK_REGISTER_RESOURCE:\r
+                    NS_LOG(DEBUG, "CASE TASK_REGISTER_RESOURCE : ");\r
                     NSRegisterResource();\r
                     break;\r
+#if (defined WITH_CLOUD)\r
+                case TASK_PUBLISH_RESOURCE:\r
+                    NS_LOG(DEBUG, "CASE TASK_PUBLISH_PESOURCE : ");\r
+                    NSPublishResourceToCloud((char*)node->taskData);\r
+                    break;\r
+#endif\r
+                default:\r
+                    break;\r
             }\r
 \r
-            OICFree(node);\r
+            NSOICFree(node);\r
         }\r
 \r
         pthread_mutex_unlock(&NSMutex[DISCOVERY_SCHEDULER]);\r
-\r
     }\r
+\r
+    NS_LOG(DEBUG, "Destroy NSDiscoverySchedule");\r
     return NULL;\r
 }\r