Correct a predefined query string for multicast discovery in Things Manager

Instead of OC_WELL_KNOWN_QUERY, OC_MULTICAST_DISCOVERY_URI should be used
for multicast discovery.

Change-Id: Ia38c578a461b67e4298c3aa0ae978c4bdda245cf
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1047
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/things-manager/sampleapp/linux/groupaction/groupserver.cpp b/service/things-manager/sampleapp/linux/groupaction/groupserver.cpp
index b49b215..93a5bd5 100755 (executable)
--- a/service/things-manager/sampleapp/linux/groupaction/groupserver.cpp
+++ b/service/things-manager/sampleapp/linux/groupaction/groupserver.cpp
@@ -478,7 +478,7 @@ int main()
 
                 if (n == 9)
                 {
-                    std::string query = OC_WELL_KNOWN_QUERY;
+                    std::string query = OC_MULTICAST_DISCOVERY_URI;
                     query.append("?rt=");
                     query.append(resourceTypeName);
 
@@ -494,7 +494,7 @@ int main()
                 }
                 else if (n == 0)
                 {
-                    std::string query = OC_WELL_KNOWN_QUERY;
+                    std::string query = OC_MULTICAST_DISCOVERY_URI;
                     query.append("?rt=");
                     query.append("core.bookmark");
 

diff --git a/service/things-manager/sampleapp/linux/groupsyncaction/group.cpp b/service/things-manager/sampleapp/linux/groupsyncaction/group.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 0a55c0e..cf15423
--- a/service/things-manager/sampleapp/linux/groupsyncaction/group.cpp
+++ b/service/things-manager/sampleapp/linux/groupsyncaction/group.cpp
@@ -113,7 +113,7 @@ int main(int argc, char* argv[])
             else if (selectedMenu == 11)
             {
                 ostringstream query;
-                query << OC_WELL_KNOWN_QUERY << "?rt=core.musicplayer";
+                query << OC_MULTICAST_DISCOVERY_URI << "?rt=core.musicplayer";
 
                 cout << query.str() << endl;
                 result = OCPlatform::findResource("",
@@ -138,7 +138,7 @@ int main(int argc, char* argv[])
             else if (selectedMenu == 12)
             {
                 ostringstream query;
-                query << OC_WELL_KNOWN_QUERY << "?rt=core.speaker";
+                query << OC_MULTICAST_DISCOVERY_URI << "?rt=core.speaker";
                 result = OCPlatform::findResource("",
                             query.str(),
                             OC_ALL,

diff --git a/service/things-manager/sdk/src/GroupManager.cpp b/service/things-manager/sdk/src/GroupManager.cpp
index 90d7e12..9564ea1 100755 (executable)
--- a/service/things-manager/sdk/src/GroupManager.cpp
+++ b/service/things-manager/sdk/src/GroupManager.cpp
@@ -223,7 +223,7 @@ OCStackResult GroupManager::findCandidateResources(
     {
         // std::cout << "resourceTypes : " << resourceTypes.at(i) << std::endl;
 
-        std::string query = OC_WELL_KNOWN_QUERY;
+        std::string query = OC_MULTICAST_DISCOVERY_URI;
         query.append("?rt=");
         query.append(resourceTypes.at(i));
 

diff --git a/service/things-manager/sdk/src/GroupSynchronization.cpp b/service/things-manager/sdk/src/GroupSynchronization.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8b8687f..b60c045
--- a/service/things-manager/sdk/src/GroupSynchronization.cpp
+++ b/service/things-manager/sdk/src/GroupSynchronization.cpp
@@ -73,7 +73,7 @@ namespace OIC
         for (unsigned int i = 0; i < collectionResourceTypes.size(); ++i)
         {
 
-            std::string query = OC_WELL_KNOWN_QUERY;
+            std::string query = OC_MULTICAST_DISCOVERY_URI;
             query.append("?rt=");
             query.append(collectionResourceTypes.at(i));
 
@@ -697,7 +697,7 @@ OCStackResult GroupSynchronization::leaveGroup(
 
                     if (methodType == "joinGroup")
                     {
-                        std::string resourceName = OC_WELL_KNOWN_QUERY;
+                        std::string resourceName = OC_MULTICAST_DISCOVERY_URI;
                         resourceName.append("?rt=");
                         resourceName.append(resourceType);
                         OC_LOG_V(DEBUG, TAG, "\t\t\tresourceName : %s", resourceName.c_str());