From 62a2642d01e2c4c238796641aa1d74f4633c84d8 Mon Sep 17 00:00:00 2001 From: KIM JungYong Date: Thu, 29 Sep 2016 14:33:09 +0900 Subject: [PATCH] Modify generating notification consumer id. generating consumer id is replaced with device id generated by base layer. Change-Id: I4e8157b938c0e9ea524c838d7d355443f9bb0c41 Signed-off-by: KIM JungYong Reviewed-on: https://gerrit.iotivity.org/gerrit/12549 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi (cherry picked from commit cbf966cc737b79530cac8cf8920412ec3d36bde9) Reviewed-on: https://gerrit.iotivity.org/gerrit/12555 --- service/notification/src/consumer/NSConsumerScheduler.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/service/notification/src/consumer/NSConsumerScheduler.c b/service/notification/src/consumer/NSConsumerScheduler.c index ff1540b..0b94d1f 100644 --- a/service/notification/src/consumer/NSConsumerScheduler.c +++ b/service/notification/src/consumer/NSConsumerScheduler.c @@ -74,14 +74,10 @@ NSResult NSConsumerMessageHandlerInit() NSConsumerThread * handle = NULL; NSConsumerQueue * queue = NULL; - uint8_t uuid[UUID_SIZE] = {0,}; - char uuidString[UUID_STRING_SIZE] = {0,}; - OCRandomUuidResult randomRet = OCGenerateUuid(uuid); - NS_VERIFY_NOT_NULL(randomRet == RAND_UUID_OK ? (void *) 1 : NULL, NS_ERROR); - randomRet = OCConvertUuidToString(uuid, uuidString); - NS_VERIFY_NOT_NULL(randomRet == RAND_UUID_OK ? (void *) 1 : NULL, NS_ERROR); - - NSSetConsumerId(uuidString); + char * consumerUuid = (char *)OCGetServerInstanceIDString(); + NS_VERIFY_NOT_NULL(consumerUuid, NS_ERROR); + + NSSetConsumerId(consumerUuid); NS_LOG_V(DEBUG, "Consumer ID : %s", *NSGetConsumerId()); NS_LOG(DEBUG, "listener init"); -- 2.7.4