Merge notification service from master branch

[platform/upstream/iotivity.git] / service / notification / src / consumer / NSConsumerDiscovery.c

diff --git a/service/notification/src/consumer/NSConsumerDiscovery.c b/service/notification/src/consumer/NSConsumerDiscovery.c
index a812d34..d0d3f3f 100644 (file)
--- a/service/notification/src/consumer/NSConsumerDiscovery.c
+++ b/service/notification/src/consumer/NSConsumerDiscovery.c
@@ -28,9 +28,8 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 
-#define NS_DISCOVER_QUERY "/oic/res?rt=oic.r.notification"
-#define NS_PRESENCE_SUBSCRIBE_QUERY_TCP "/oic/ad?rt=oic.r.notification"
-#define NS_GET_INFORMATION_QUERY "/notification?if=oic.if.notification"
+#define NS_DISCOVER_QUERY "/oic/res?rt=oic.wk.notification"
+#define NS_PRESENCE_SUBSCRIBE_QUERY_TCP "/oic/ad?rt=oic.wk.notification"
 
 NSProvider_internal * NSGetProvider(OCClientResponse * clientResponse);
 
@@ -200,19 +199,18 @@ NSProvider_internal * NSGetProvider(OCClientResponse * clientResponse)
     OCRepPayloadPropType accepterType = OCREP_PROP_BOOL;
 
     OCRepPayload * payload = (OCRepPayload *)clientResponse->payload;
-    while (payload)
+    OCRepPayloadValue * value = payload->values;
+    while (value)
     {
-        NS_LOG_V(DEBUG, "Payload Key : %s", payload->values->name);
-        NS_LOG_V(DEBUG, "Payload Type : %d", (int) payload->values->type);
-        if (!strcmp(payload->values->name, NS_ATTRIBUTE_POLICY))
+        NS_LOG_V(DEBUG, "Payload Key : %s", value->name);
+        NS_LOG_V(DEBUG, "Payload Type : %d", (int) value->type);
+        if (!strcmp(value->name, NS_ATTRIBUTE_POLICY))
         {
-            accepterType = payload->values->type;
+            accepterType = value->type;
         }
-        payload = payload->next;
+        value = value->next;
     }
 
-    payload = (OCRepPayload *)clientResponse->payload;
-
     char * providerId = NULL;
     char * messageUri = NULL;
     char * syncUri = NULL;