Commit d0fecae5 authored by Jihun Ha's avatar Jihun Ha Committed by Uze Choi

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: default avatarJihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1047Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
Tested-by: default avatarUze Choi <uzchoi@samsung.com>
parent 38424d45
......@@ -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");
......
......@@ -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,
......
......@@ -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));
......
......@@ -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());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment