Fixed bug for duplicated request to subscribe and invalid storage logic.

This patch is fixed bug for

1. Duplicated request to subscribe to notification providers.
NSProviderConnectionInfo need to have boolean for subscribe status.

2. When NSConsumer is restarted, message/provider storage had invalid informations.
because they has previous address since first allocated.

3. When Provider re-discovered by consumer discovery module,
provider information never change to latest information about acceptance,
even though discovered provider information has difference information with previous.

bug fix for invalid storage logic(e.g. 2, 3) and access to null pointer.
Boolean for subscribe status is added on NSProviderConnectionInfo sturcture
and subscribe trigger point is fixed.
Macro for verify of return type(OCStackResult) is update for return Success.

Change-Id: If460a841b0bcff064eab8c0b884a06cffa7284d6
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/consumer/NSConsumerCommon.c b/service/notification/src/consumer/NSConsumerCommon.c
index d9da4e0..87b3d40 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommon.c
+++ b/service/notification/src/consumer/NSConsumerCommon.c
@@ -131,7 +131,12 @@ void * NSDiscoveredProviderFunc(void * provider)
 
 void NSDiscoveredProvider(NSProvider * provider)
 {
-    NSConsumerThread * thread = NSThreadInit(NSDiscoveredProviderFunc, (void *) provider);
+    NS_VERIFY_NOT_NULL_V(provider);
+
+    NSProvider * retProvider = (NSProvider *)NSCopyProvider((NSProvider_internal *)provider);
+    NS_VERIFY_NOT_NULL_V(retProvider);
+
+    NSConsumerThread * thread = NSThreadInit(NSDiscoveredProviderFunc, (void *) retProvider);
     NS_VERIFY_NOT_NULL_V(thread);
 }
 
@@ -173,7 +178,12 @@ void * NSNotificationSyncFunc(void * obj)
 void NSNotificationSync(NSSyncInfo * sync)
 {
     NS_VERIFY_NOT_NULL_V(sync);
-    NSConsumerThread * thread = NSThreadInit(NSNotificationSyncFunc, (void *) sync);
+
+    NSSyncInfo * retSync = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
+    NS_VERIFY_NOT_NULL_V(retSync);
+    memcpy(retSync, sync, sizeof(NSSyncInfo));
+
+    NSConsumerThread * thread = NSThreadInit(NSNotificationSyncFunc, (void *) retSync);
     NS_VERIFY_NOT_NULL_V(thread);
 }
 
@@ -203,7 +213,11 @@ void * NSMessagePostFunc(void * obj)
 void NSMessagePost(NSMessage * msg)
 {
     NS_VERIFY_NOT_NULL_V(msg);
-    NSConsumerThread * thread = NSThreadInit(NSMessagePostFunc, (void *) msg);
+
+    NSMessage * retMsg = (NSMessage *)NSCopyMessage((NSMessage_consumer *)msg);
+    NS_VERIFY_NOT_NULL_V(retMsg);
+
+    NSConsumerThread * thread = NSThreadInit(NSMessagePostFunc, (void *) retMsg);
     NS_VERIFY_NOT_NULL_V(thread);
 }
 
@@ -228,18 +242,21 @@ NSMessage_consumer * NSCopyMessage(NSMessage_consumer * msg)
 
     OICStrcpy(newMsg->providerId, NS_DEVICE_ID_LENGTH, msg->providerId);
     newMsg->i_addr = (OCDevAddr *)OICMalloc(sizeof(OCDevAddr));
-    NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(newMsg, NULL, OICFree(newMsg));
+    NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(newMsg, NULL, NSOICFree(newMsg));
     memcpy(newMsg->i_addr, msg->i_addr, sizeof(OCDevAddr));
 
     newMsg->messageId = msg->messageId;
     newMsg->title = OICStrdup(msg->title);
     newMsg->contentText = OICStrdup(msg->contentText);
     newMsg->sourceName = OICStrdup(msg->sourceName);
+    newMsg->type = msg->type;
 
     return newMsg;
 }
 void NSRemoveMessage(NSMessage_consumer * msg)
 {
+    NS_VERIFY_NOT_NULL_V(msg);
+
     msg->messageId = 0;
     NSOICFree(msg->title);
     NSOICFree(msg->contentText);
@@ -251,6 +268,8 @@ void NSRemoveMessage(NSMessage_consumer * msg)
 
 void NSRemoveConnections(NSProviderConnectionInfo * connections)
 {
+    NS_VERIFY_NOT_NULL_V(connections);
+
     NSProviderConnectionInfo * tmp = connections;
 
     while(tmp)
@@ -274,6 +293,7 @@ NSProviderConnectionInfo * NSCreateProviderConnections(OCDevAddr * inAddr)
     connections->messageHandle = NULL;
     connections->syncHandle = NULL;
     connections->isCloudConnection = false;
+    connections->isSubscribing = false;
     connections->next = NULL;
 
     if (inAddr)
@@ -303,6 +323,7 @@ NSProviderConnectionInfo * NSCopyProviderConnections(NSProviderConnectionInfo *
         copyInfo->messageHandle = tmp->messageHandle;
         copyInfo->syncHandle = tmp->syncHandle;
         copyInfo->isCloudConnection = tmp->isCloudConnection;
+        copyInfo->isSubscribing = tmp->isSubscribing;
         tmp = tmp->next;
         copyInfo = copyInfo->next;
     }
@@ -330,6 +351,8 @@ NSProvider_internal * NSCopyProvider(NSProvider_internal * prov)
 }
 void NSRemoveProvider(NSProvider_internal * prov)
 {
+    NS_VERIFY_NOT_NULL_V(prov);
+
     NSOICFree(prov->messageUri);
     NSOICFree(prov->syncUri);
     NSRemoveConnections(prov->connection);
@@ -359,3 +382,18 @@ OCStackResult NSInvokeRequest(OCDoHandle * handle,
 
     return ret;
 }
+
+bool NSOCResultToSuccess(OCStackResult ret)
+{
+    switch (ret)
+    {
+        case OC_STACK_OK:
+        case OC_STACK_RESOURCE_CREATED:
+        case OC_STACK_RESOURCE_DELETED:
+        case OC_STACK_CONTINUE:
+        case OC_STACK_RESOURCE_CHANGED:
+            return true;
+        default:
+            return false;
+    }
+}

diff --git a/service/notification/src/consumer/NSConsumerCommon.h b/service/notification/src/consumer/NSConsumerCommon.h
index d84e01b..d2d4f3e 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommon.h
+++ b/service/notification/src/consumer/NSConsumerCommon.h
@@ -32,7 +32,7 @@ extern "C" {
 #include "NSStructs.h"
 #include "ocstack.h"
 
-#define NS_QOS OC_LOW_QOS
+#define NS_QOS OC_HIGH_QOS
 #define NS_RESOURCE_TYPE "oic.r.notification"
 #define NS_RESOURCE_URI "/notification"
 #define NS_INTERFACE_BASELINE "oic.if.baseline"
@@ -82,30 +82,30 @@ extern "C" {
         } \
     }
 
-#define NS_VERIFY_STACK_OK_V(obj) \
+#define NS_VERIFY_STACK_SUCCESS_V(obj) \
     { \
-        OCStackResult _ret = (obj); \
-        if ( _ret != OC_STACK_OK) \
+        bool _ret = (obj); \
+        if ( _ret != true) \
         { \
             NS_LOG_V(ERROR, "%s : %s is not OC_STACK_OK : %d", __func__, #obj, _ret); \
             return; \
         } \
     }
 
-#define NS_VERIFY_STACK_OK(obj, retVal) \
+#define NS_VERIFY_STACK_SUCCESS(obj, retVal) \
     { \
-        OCStackResult _ret = (obj); \
-        if ( _ret != OC_STACK_OK) \
+        bool _ret = (obj); \
+        if ( _ret != true) \
         { \
             NS_LOG_V(ERROR, "%s : %s is not OC_STACK_OK : %d", __func__, #obj, _ret); \
             return (retVal); \
         } \
     }
 
-#define NS_VERIFY_STACK_OK_WITH_POST_CLEANING(obj, retVal, func) \
+#define NS_VERIFY_STACK_SUCCESS_WITH_POST_CLEANING(obj, retVal, func) \
     { \
-        OCStackResult _ret = (obj); \
-        if ( _ret != OC_STACK_OK) \
+        bool _ret = (obj); \
+        if ( _ret != true) \
         { \
             NS_LOG_V(ERROR, "%s : %s is not OC_STACK_OK : %d", __func__, #obj, _ret); \
             (func); \
@@ -139,6 +139,7 @@ typedef struct NSProviderConnectionInfo
     OCDoHandle syncHandle;
 
     bool isCloudConnection;
+    bool isSubscribing;
 
     struct NSProviderConnectionInfo * next;
 
@@ -225,6 +226,8 @@ OCStackResult NSInvokeRequest(OCDoHandle * handle,
         const char * queryUrl, OCPayload * payload,
         void * callbackFunc, void * callbackData, OCConnectivityType type);
 
+bool NSOCResultToSuccess(OCStackResult ret);
+
 #ifdef __cplusplus
 }
 #endif // __cplusplus

diff --git a/service/notification/src/consumer/NSConsumerCommunication.c b/service/notification/src/consumer/NSConsumerCommunication.c
index 68bd69f..274e007 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommunication.c
+++ b/service/notification/src/consumer/NSConsumerCommunication.c
@@ -45,8 +45,9 @@ NSResult NSConsumerSubscribeProvider(NSProvider * provider)
     NSProviderConnectionInfo * connections = provider_internal->connection;
     while(connections)
     {
-        if (connections->messageHandle)
+        if (connections->isSubscribing == true)
         {
+            connections = connections->next;
             continue;
         }
 
@@ -64,6 +65,8 @@ NSResult NSConsumerSubscribeProvider(NSProvider * provider)
             }
         }
 
+        NS_LOG_V(DEBUG, "subscribe to %s:%d", connections->addr->addr, connections->addr->port);
+
         NS_LOG(DEBUG, "get subscribe message query");
         char * query = NULL;
         query = NSMakeRequestUriWithConsumerId(msgUri);
@@ -74,7 +77,8 @@ NSResult NSConsumerSubscribeProvider(NSProvider * provider)
         OCStackResult ret = NSInvokeRequest(&(connections->messageHandle),
                               OC_REST_OBSERVE, connections->addr, query, NULL,
                               NSConsumerMessageListener, NULL, type);
-        NS_VERIFY_STACK_OK_WITH_POST_CLEANING(ret, NS_ERROR, NSOICFree(query));
+        NS_VERIFY_STACK_SUCCESS_WITH_POST_CLEANING(
+                NSOCResultToSuccess(ret), NS_ERROR, NSOICFree(query));
         NSOICFree(query);
         NSOICFree(msgUri);
 
@@ -87,10 +91,13 @@ NSResult NSConsumerSubscribeProvider(NSProvider * provider)
         ret = NSInvokeRequest(&(connections->syncHandle),
                               OC_REST_OBSERVE, connections->addr, query, NULL,
                               NSConsumerSyncInfoListener, NULL, type);
-        NS_VERIFY_STACK_OK_WITH_POST_CLEANING(ret, NS_ERROR, NSOICFree(query));
+        NS_VERIFY_STACK_SUCCESS_WITH_POST_CLEANING(
+                NSOCResultToSuccess(ret), NS_ERROR, NSOICFree(query));
         NSOICFree(query);
         NSOICFree(syncUri);
 
+        connections->isSubscribing = true;
+
         connections = connections->next;
     }
 
@@ -104,7 +111,8 @@ OCStackApplicationResult NSConsumerCheckPostResult(
     (void) handle;
 
     NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
-    NS_VERIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
+    NS_VERIFY_STACK_SUCCESS(
+            NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION);
 
     return OC_STACK_KEEP_TRANSACTION;
 }
@@ -121,7 +129,8 @@ OCStackApplicationResult NSConsumerSyncInfoListener(
     (void) handle;
 
     NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
-    NS_VERIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
+    NS_VERIFY_STACK_SUCCESS(
+            NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION);
 
     NS_LOG(DEBUG, "get NSSyncInfo");
     NSSyncInfo * newSync = NSGetSyncInfoc(clientResponse);
@@ -146,7 +155,7 @@ OCStackApplicationResult NSConsumerMessageListener(
     (void) handle;
 
     NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
-    NS_VERIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
+    NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION);
 
     NS_LOG(DEBUG, "build NSMessage");
     NSMessage_consumer * newNoti = NSGetMessage(clientResponse);
@@ -366,8 +375,20 @@ void NSConsumerCommunicationTaskProcessing(NSTask * task)
         NSProviderConnectionInfo * connections = provider->connection;
         while(connections)
         {
+            if (connections->isSubscribing == false)
+            {
+                NS_LOG_V(DEBUG, "unsubscribed to %s:%d",
+                     connections->addr->addr, connections->addr->port);
+                connections = connections->next;
+                continue;
+            }
+            NS_LOG_V(DEBUG, "cancel subscribe to %s:%d",
+                     connections->addr->addr, connections->addr->port);
             OCCancel(connections->messageHandle, NS_QOS, NULL, 0);
             OCCancel(connections->syncHandle, NS_QOS, NULL, 0);
+            connections->messageHandle = NULL;
+            connections->syncHandle = NULL;
+            connections->isSubscribing = false;
             connections = connections->next;
         }
     }
@@ -375,4 +396,5 @@ void NSConsumerCommunicationTaskProcessing(NSTask * task)
     {
         NS_LOG(ERROR, "Unknown type message");
     }
+    NSOICFree(task);
 }

diff --git a/service/notification/src/consumer/NSConsumerDiscovery.c b/service/notification/src/consumer/NSConsumerDiscovery.c
index 2918b2a..89b894a 100644 (file)
--- a/service/notification/src/consumer/NSConsumerDiscovery.c
+++ b/service/notification/src/consumer/NSConsumerDiscovery.c
@@ -44,7 +44,8 @@ OCStackApplicationResult NSConsumerPresenceListener(
     (void) handle;
 
     NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
-    NS_VERIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
+    NS_VERIFY_STACK_SUCCESS(
+            NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION);
 
     NS_LOG_V(DEBUG, "Presence income : %s:%d",
             clientResponse->devAddr.addr, clientResponse->devAddr.port);
@@ -87,7 +88,7 @@ OCStackApplicationResult NSProviderDiscoverListener(
 
     NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
     NS_VERIFY_NOT_NULL(clientResponse->payload, OC_STACK_KEEP_TRANSACTION);
-    NS_VERIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
+    NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION);
 
     NS_LOG_V(DEBUG, "Discover income : %s:%d",
             clientResponse->devAddr.addr, clientResponse->devAddr.port);
@@ -139,7 +140,7 @@ OCStackApplicationResult NSIntrospectProvider(
     (void) handle;
 
     NS_VERIFY_NOT_NULL(clientResponse, OC_STACK_KEEP_TRANSACTION);
-    NS_VERIFY_STACK_OK(clientResponse->result, OC_STACK_KEEP_TRANSACTION);
+    NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(clientResponse->result), OC_STACK_KEEP_TRANSACTION);
 
     NS_LOG_V(DEBUG, "GET response income : %s:%d",
             clientResponse->devAddr.addr, clientResponse->devAddr.port);

diff --git a/service/notification/src/consumer/NSConsumerInternalTaskController.c b/service/notification/src/consumer/NSConsumerInternalTaskController.c
index 8e91250..8e8f7a0 100644 (file)
--- a/service/notification/src/consumer/NSConsumerInternalTaskController.c
+++ b/service/notification/src/consumer/NSConsumerInternalTaskController.c
@@ -55,6 +55,8 @@ void NSDestroyMessageCacheList()
     {
         NSStorageDestroy(cache);
     }
+
+    NSSetMessageCacheList(NULL);
 }
 
 void NSDestroyProviderCacheList()
@@ -64,6 +66,8 @@ void NSDestroyProviderCacheList()
     {
         NSStorageDestroy(cache);
     }
+
+    NSSetProviderCacheList(NULL);
 }
 
 NSMessage_consumer * NSMessageCacheFind(const char * messageId)
@@ -82,8 +86,9 @@ NSMessage_consumer * NSMessageCacheFind(const char * messageId)
     }
 
     NSCacheElement * cacheElement = NSStorageRead(MessageCache, messageId);
+    NS_VERIFY_NOT_NULL(cacheElement, NULL);
 
-    return (NSMessage_consumer *) cacheElement->data;
+    return NSCopyMessage((NSMessage_consumer *) cacheElement->data);
 }
 
 NSProvider_internal * NSProviderCacheFind(const char * providerId)
@@ -104,7 +109,7 @@ NSProvider_internal * NSProviderCacheFind(const char * providerId)
     NSCacheElement * cacheElement = NSStorageRead(ProviderCache, providerId);
     NS_VERIFY_NOT_NULL(cacheElement, NULL);
 
-    return (NSProvider_internal *) cacheElement->data;
+    return NSCopyProvider((NSProvider_internal *) cacheElement->data);
 }
 
 
@@ -134,9 +139,7 @@ NSResult NSMessageCacheUpdate(NSMessage_consumer * msg, NSSyncType type)
     NS_LOG(DEBUG, "try to write to storage");
     NSResult ret = NSStorageWrite(MessageCache, obj);
     NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(ret == NS_OK ? (void *) 1 : NULL,
-            NS_ERROR, NSRemoveMessage(msg));
-
-    NSOICFree(obj);
+            NS_ERROR, NSOICFree(obj));
 
     return NS_OK;
 }
@@ -165,9 +168,7 @@ NSResult NSProviderCacheUpdate(NSProvider_internal * provider)
     NS_LOG(DEBUG, "try to write to storage");
     NSResult ret = NSStorageWrite(ProviderCache, obj);
     NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(ret == NS_OK ? (void *) 1 : NULL,
-            NS_ERROR, NSRemoveProvider(provider));
-
-    NSOICFree(obj);
+            NS_ERROR, NSOICFree(obj));
 
     return NS_OK;
 }
@@ -177,21 +178,26 @@ void NSConsumerHandleProviderDiscovered(NSProvider_internal * provider)
     NS_VERIFY_NOT_NULL_V(provider);
 
     bool isAdded = true;
+    bool isSubscribing = false;
     NSProvider_internal * providerCacheData = NSProviderCacheFind(provider->providerId);
-    //NS_VERIFY_NOT_NULL_V(providerCacheData == NULL ? (void *)1 : NULL);
+
     if (providerCacheData == NULL)
     {
         isAdded = false;
     }
     else
     {
+        providerCacheData->accessPolicy = provider->accessPolicy;
         NSProviderConnectionInfo * infos = providerCacheData->connection;
         OCTransportAdapter newAdapter = provider->connection->addr->adapter;
-        while(infos)
+        while (infos)
         {
-            if (infos->addr->adapter == newAdapter)
+            isSubscribing |= infos->isSubscribing;
+            if (infos->addr->adapter == newAdapter && infos->isSubscribing == true)
             {
-                NS_LOG(DEBUG, "This provider already discovered.");
+                NS_LOG_V(DEBUG, "This provider already discovered : %s:%d",
+                         infos->addr->addr, infos->addr->port);
+                NS_LOG_V(DEBUG, "Subscription : %d", infos->isSubscribing);
                 return;
             }
             infos = infos->next;
@@ -211,8 +217,7 @@ void NSConsumerHandleProviderDiscovered(NSProvider_internal * provider)
         NS_LOG(DEBUG, "provider's connection is updated.");
     }
 
-
-    if (provider->accessPolicy == NS_ACCESS_DENY && isAdded == false)
+    if (provider->accessPolicy == NS_ACCESS_DENY && isSubscribing == false)
     {
         NS_LOG(DEBUG, "accepter is NS_ACCEPTER_CONSUMER, Callback to user");
         NSDiscoveredProvider((NSProvider *) provider);
@@ -220,17 +225,27 @@ void NSConsumerHandleProviderDiscovered(NSProvider_internal * provider)
     else
     {
         NS_LOG(DEBUG, "accepter is NS_ACCEPTER_PROVIDER, request subscribe");
-        NSTask * task = NSMakeTask(TASK_CONSUMER_REQ_SUBSCRIBE, (void *) provider);
+        NSProvider_internal * subProvider = NSCopyProvider(provider);
+        NSTask * task = NSMakeTask(TASK_CONSUMER_REQ_SUBSCRIBE, (void *) subProvider);
         NS_VERIFY_NOT_NULL_V(task);
 
         NSConsumerPushEvent(task);
     }
+
+    NSRemoveProvider(providerCacheData);
+}
+
+void NSConsumerHandleProviderDeleted(NSProvider_internal * provider)
+{
+    // TODO delete provider infomation on storage list.
+    (void) provider;
 }
 
 void NSConsumerHandleRecvSubscriptionConfirmed(NSMessage_consumer * msg)
 {
     NS_VERIFY_NOT_NULL_V(msg);
 
+    NS_LOG_V(DEBUG, "confirmed by : %s", msg->providerId);
     NSProvider_internal * provider = NSProviderCacheFind(msg->providerId);
     NS_VERIFY_NOT_NULL_V(provider);
 
@@ -254,9 +269,6 @@ void NSConsumerHandleRecvSyncInfo(NSSyncInfo * sync)
 {
     NS_VERIFY_NOT_NULL_V(sync);
 
-    NSProvider_internal * provider = NSProviderCacheFind(sync->providerId);
-    NS_VERIFY_NOT_NULL_V(provider);
-
     char msgId[NS_DEVICE_ID_LENGTH] = { 0, };
     snprintf(msgId, NS_DEVICE_ID_LENGTH, "%lld", sync->messageId);
 
@@ -265,6 +277,7 @@ void NSConsumerHandleRecvSyncInfo(NSSyncInfo * sync)
 
     NSResult ret = NSMessageCacheUpdate(msg, sync->state);
     NS_VERIFY_NOT_NULL_V(ret == NS_OK ? (void *) 1 : NULL);
+    NSRemoveMessage(msg);
 
     NSNotificationSync(sync);
 }
@@ -291,8 +304,6 @@ void NSConsumerHandleMakeSyncInfo(NSSyncInfo * sync)
     NS_VERIFY_NOT_NULL_WITH_POST_CLEANING_V(syncTask, NSOICFree(syncInfo));
 
     NSConsumerPushEvent(syncTask);
-
-    NSOICFree(sync);
 }
 
 void NSConsumerInternalTaskProcessing(NSTask * task)
@@ -306,31 +317,41 @@ void NSConsumerInternalTaskProcessing(NSTask * task)
         {
             NS_LOG(DEBUG, "Receive Subscribe confirm from provider.");
             NSConsumerHandleRecvSubscriptionConfirmed((NSMessage_consumer *)task->taskData);
+            NSRemoveMessage((NSMessage_consumer *)task->taskData);
             break;
         }
         case TASK_CONSUMER_RECV_MESSAGE:
         {
             NS_LOG(DEBUG, "Receive New Notification");
             NSConsumerHandleRecvMessage((NSMessage_consumer *)task->taskData);
-
+            NSRemoveMessage((NSMessage_consumer *)task->taskData);
             break;
         }
         case TASK_CONSUMER_PROVIDER_DISCOVERED:
         {
             NS_LOG(DEBUG, "Receive New Provider is discovered.");
             NSConsumerHandleProviderDiscovered((NSProvider_internal *)task->taskData);
+            NSRemoveProvider((NSProvider_internal *)task->taskData);
             break;
         }
         case TASK_RECV_SYNCINFO:
         {
             NS_LOG(DEBUG, "Receive SyncInfo.");
             NSConsumerHandleRecvSyncInfo((NSSyncInfo *)task->taskData);
+            NSOICFree(task->taskData);
             break;
         }
         case TASK_MAKE_SYNCINFO:
         {
             NS_LOG(DEBUG, "Make SyncInfo, get Provider's Addr");
             NSConsumerHandleMakeSyncInfo((NSSyncInfo *)task->taskData);
+            NSOICFree(task->taskData);
+            break;
+        }
+        case TASK_CONSUMER_REQ_SUBSCRIBE_CANCEL:
+        {
+            NSConsumerHandleProviderDeleted((NSProvider_internal *)task->taskData);
+            NSRemoveProvider((NSProvider_internal *)task->taskData);
             break;
         }
         default :
@@ -339,4 +360,5 @@ void NSConsumerInternalTaskProcessing(NSTask * task)
             return ;
         }
     }
+    NSOICFree(task);
 }

diff --git a/service/notification/src/consumer/NSConsumerNetworkEventListener.c b/service/notification/src/consumer/NSConsumerNetworkEventListener.c
index b43749b..4d420af 100644 (file)
--- a/service/notification/src/consumer/NSConsumerNetworkEventListener.c
+++ b/service/notification/src/consumer/NSConsumerNetworkEventListener.c
@@ -57,13 +57,13 @@ NSResult NSConsumerListenerInit()
     OCStackResult stackResult = NSInvokeRequest(getPresenceHandle(), OC_REST_PRESENCE, NULL,
                         NS_PRESENCE_SUBSCRIBE_QUERY, NULL, NSConsumerPresenceListener,
                         NULL, CT_DEFAULT);
-    NS_VERIFY_STACK_OK(stackResult, NS_ERROR);
+    NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(stackResult), NS_ERROR);
 
     NS_LOG(DEBUG, "Request to discover provider");
     stackResult = NSInvokeRequest(NULL, OC_REST_DISCOVER, NULL,
                       NS_DISCOVER_QUERY, NULL, NSProviderDiscoverListener,
                       NULL, CT_DEFAULT);
-    NS_VERIFY_STACK_OK(stackResult, NS_ERROR);
+    NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(stackResult), NS_ERROR);
 
     return NS_OK;
 }

diff --git a/service/notification/src/consumer/NSConsumerQueue.c b/service/notification/src/consumer/NSConsumerQueue.c
index ae6cd2e..7db9a32 100644 (file)
--- a/service/notification/src/consumer/NSConsumerQueue.c
+++ b/service/notification/src/consumer/NSConsumerQueue.c
@@ -38,15 +38,17 @@ NSConsumerQueue * NSCreateQueue()
 
 void NSDestroyQueue(NSConsumerQueue * queue)
 {
+    NS_VERIFY_NOT_NULL_V(queue);
+
     NSConsumerQueueObject * node = NSPopQueue(queue);
     while(node)
     {
         node = (NSConsumerQueueObject *)node->next;
-        OICFree(node->data);
-        OICFree(node);
+        NSOICFree(node->data);
+        NSOICFree(node);
     }
 
-    OICFree(queue);
+    NSOICFree(queue);
 }
 
 bool NSPushQueue(NSConsumerQueue * queue, NSConsumerQueueObject * object)

diff --git a/service/notification/src/consumer/NSConsumerScheduler.c b/service/notification/src/consumer/NSConsumerScheduler.c
index 64a5196..82a9740 100644 (file)
--- a/service/notification/src/consumer/NSConsumerScheduler.c
+++ b/service/notification/src/consumer/NSConsumerScheduler.c
@@ -117,6 +117,7 @@ void NSConsumerMessageHandlerExit()
     NSConsumerListenerTermiate();
     NSThreadStop(*(NSGetMsgHandleThreadHandle()));
     NSDestroyQueue(*(NSGetMsgHandleQueue()));
+    NSSetMsgHandleQueue(NULL);
 }
 
 void * NSConsumerMsgHandleThreadFunc(void * threadHandle)
@@ -186,8 +187,8 @@ void * NSConsumerMsgPushThreadFunc(void * data)
     if (!queue)
     {
         NS_LOG(ERROR, "NSQueue is null. can not insert to queue");
-        OICFree(data);
-        OICFree(obj);
+        NSOICFree(data);
+        NSOICFree(obj);
     }
     else
     {

diff --git a/service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.c b/service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.c
index ce492ec..81fb11a 100644 (file)
--- a/service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.c
+++ b/service/notification/src/consumer/cache/linux/NSConsumerMemoryCache.c
@@ -218,6 +218,14 @@ NSResult NSConsumerCacheWriteMessage(NSCacheList * list, NSCacheElement * newObj
     if (it)
     {
         NSMessage_consumer * msgObj = (NSMessage_consumer *) it->data;
+        if(msgObj->type == newMsgObj->type)
+        {
+            NS_LOG (DEBUG, "Already receive message");
+            pthread_mutex_unlock(mutex);
+            return NS_ERROR;
+        }
+
+
         it->data = (void *) NSCopyMessage(newMsgObj);
         if (!it->data)
         {
@@ -304,7 +312,6 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb
         }
         infos->next = NSCopyProviderConnections(newProvObj->connection);
 
-        NSRemoveProvider(newProvObj);
         pthread_mutex_unlock(mutex);
 
         return NS_OK;