From: Sashi Penta Date: Fri, 23 Jan 2015 06:58:17 +0000 (-0800) Subject: Update the multicast port and GenerateToken code in RI accordingly. X-Git-Tag: 0.9.1-alpha1~38^2~217 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ad0b75c22b5e5bd2ac9b19d8e7a20f1eb71a4f8;p=contrib%2Fiotivity.git Update the multicast port and GenerateToken code in RI accordingly. 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/231 Tested-by: jenkins-iotivity Reviewed-by: Sakthivel Samidurai Reviewed-by: Sudarshan Prasad Tested-by: Sudarshan Prasad --- diff --git a/resource/csdk/stack/include/ocstack.h b/resource/csdk/stack/include/ocstack.h index cafb2bc..d17071a 100644 --- a/resource/csdk/stack/include/ocstack.h +++ b/resource/csdk/stack/include/ocstack.h @@ -36,9 +36,9 @@ extern "C" { //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 diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index 6b89605..0a7566e 100644 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -1626,11 +1626,6 @@ OCStackResult OCDoResource(OCDoHandle *handle, OCMethod method, const char *requ // 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")); @@ -2142,7 +2137,7 @@ OCStackResult OCStartPresence(const uint32_t ttl) #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);