This fixes IOT-372 "Unicast Discovery over Wifi does not work."
Change-Id: Ifbc545f8a04049518410a4d9f54f692388921288
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/452
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
static int UNICAST_DISCOVERY = 0;
static int TEST_CASE = 0;
static int UNICAST_DISCOVERY = 0;
static int TEST_CASE = 0;
-static const char * UNICAST_DISCOVERY_QUERY = "coap://%s:5298/oc/core";
-static const char * UNICAST_DEVICE_DISCOVERY_QUERY = "coap://%s:5298/oc/core/d";
+static const char * UNICAST_DISCOVERY_QUERY = "coap://%s:6298/oc/core";
+static const char * UNICAST_DEVICE_DISCOVERY_QUERY = "coap://%s:6298/oc/core/d";
static const char * MULTICAST_DEVICE_DISCOVERY_QUERY = "/oc/core/d";
static const char * MULTICAST_RESOURCE_DISCOVERY_QUERY = "/oc/core";
//The following variable determines the interface (wifi, ethernet etc.)
static const char * MULTICAST_DEVICE_DISCOVERY_QUERY = "/oc/core/d";
static const char * MULTICAST_RESOURCE_DISCOVERY_QUERY = "/oc/core";
//The following variable determines the interface (wifi, ethernet etc.)
static int UNICAST_DISCOVERY = 0;
static int TEST_CASE = 0;
static int UNICAST_DISCOVERY = 0;
static int TEST_CASE = 0;
-static const char UNICAST_DISCOVERY_QUERY[] = "coap://%s:5298/oc/core";
+static const char UNICAST_DISCOVERY_QUERY[] = "coap://%s:6298/oc/core";
static std::string putPayload = "{\"state\":\"off\",\"power\":10}";
//The following variable determines the interface (wifi, ethernet etc.)
static std::string putPayload = "{\"state\":\"off\",\"power\":10}";
//The following variable determines the interface (wifi, ethernet etc.)
static int UNICAST_DISCOVERY = 0;
static int TEST_CASE = 0;
static int UNICAST_DISCOVERY = 0;
static int TEST_CASE = 0;
-static const char * UNICAST_DISCOVERY_QUERY = "coap://%s:5298/oc/core";
+static const char * UNICAST_DISCOVERY_QUERY = "coap://%s:6298/oc/core";
static std::string putPayload = "{\"state\":\"off\",\"power\":10}";
static std::string coapServerIP = "255.255.255.255";
static std::string coapServerPort = "5683";
static std::string putPayload = "{\"state\":\"off\",\"power\":10}";
static std::string coapServerIP = "255.255.255.255";
static std::string coapServerPort = "5683";
static int TEST_CASE = 0;
static int IPV4_ADDR_SIZE = 16;
static int TEST_CASE = 0;
static int IPV4_ADDR_SIZE = 16;
-static char UNICAST_DISCOVERY_QUERY[] = "coap://%s:5298/oc/core";
+static char UNICAST_DISCOVERY_QUERY[] = "coap://%s:6298/oc/core";
static char MULTICAST_DISCOVERY_QUERY[] = "/oc/core";
static std::string putPayload = "{\"state\":\"off\",\"power\":10}";
static char MULTICAST_DISCOVERY_QUERY[] = "/oc/core";
static std::string putPayload = "{\"state\":\"off\",\"power\":10}";
{
case OC_STACK_OK:
ret = OC::OCPlatform::findResource("",
{
case OC_STACK_OK:
ret = OC::OCPlatform::findResource("",
- "coap://" + hostAddress + ":5298" + "/oc/core?rt=SoftSensorManager.Sensor", OC_ALL,
+ "coap://" + hostAddress + ":6298" + "/oc/core?rt=SoftSensorManager.Sensor", OC_ALL,
std::bind(&CResourceFinder::onResourceFound, this, std::placeholders::_1));
if (ret != OC_STACK_OK)
std::bind(&CResourceFinder::onResourceFound, this, std::placeholders::_1));
if (ret != OC_STACK_OK)
OCStackResult ret = OC_STACK_ERROR;
ret = OC::OCPlatform::findResource("",
OCStackResult ret = OC_STACK_ERROR;
ret = OC::OCPlatform::findResource("",
- "coap://224.0.1.187:5298/oc/core?rt=SoftSensorManager.Sensor", OC_ALL,
+ "coap://224.0.1.187:6298/oc/core?rt=SoftSensorManager.Sensor", OC_ALL,
std::bind(&CResourceFinder::onResourceFound, this, std::placeholders::_1));
if (ret != OC_STACK_OK)
std::bind(&CResourceFinder::onResourceFound, this, std::placeholders::_1));
if (ret != OC_STACK_OK)