Update the Multicast port to 5683 accordingly in RI as per connectivity code.
Connectivity code fixed generate token code. Remove the temporary fix that
was added in RI code.
Change-Id: Iec9b07b98d65309a4cc2998252fcc8c445975f55
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Tested-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
//Don't want to expose to application layer that lower level stack is using CoAP.
#ifdef CA_INT
-#define OC_WELL_KNOWN_QUERY "224.0.1.187:5298/oc/core"
-#define OC_EXPLICIT_DEVICE_DISCOVERY_URI "224.0.1.187:5298/oc/core/d?rt=core.led"
-#define OC_MULTICAST_PREFIX "224.0.1.187:5298"
+#define OC_WELL_KNOWN_QUERY "224.0.1.187:5683/oc/core"
+#define OC_EXPLICIT_DEVICE_DISCOVERY_URI "224.0.1.187:5683/oc/core/d?rt=core.led"
+#define OC_MULTICAST_PREFIX "224.0.1.187:5683"
#define OC_MULTICAST_IP "224.0.1.187"
#else
// create token
caResult = CAGenerateToken(&caToken);
- //TODO-CA Remove this temporary fix (for some reason same token is being generated)
- static int count = 0;
- count++;
- caToken[0] += count;
-
if (caResult != CA_STATUS_OK)
{
OC_LOG(ERROR, TAG, PCF("CAGenerateToken error"));
#ifdef CA_INT
CAAddress_t addressInfo;
strncpy(addressInfo.IP.ipAddress, "224.0.1.187", CA_IPADDR_SIZE);
- addressInfo.IP.port = 5298;
+ addressInfo.IP.port = 5683;
CAToken_t caToken = NULL;
CAGenerateToken(&caToken);