projects / platform / upstream / iotivity.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove not required function.
[platform/upstream/iotivity.git] / service / notification / src / provider / NSProviderSubscription.c
diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index bb8d742..17a0f3b 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -31,37 +31,32 @@ NSResult NSInitSubscriptionList()
     return NS_OK;\r
 }\r
 \r
-NSResult NSSetSubscriptionAccessPolicy(NSAccessPolicy access)\r
+NSResult NSSetSubscriptionAccessPolicy(bool policy)\r
 {\r
     NS_LOG(DEBUG, "NSSetSubscriptionAcceptPolicy - IN");\r
 \r
-    if (access == NS_ACCESS_ALLOW)\r
+    if (policy == NS_POLICY_PROVIDER)\r
     {\r
         NS_LOG(DEBUG, "Place Provider as a subscription accepter");\r
     }\r
-    else if (access == NS_ACCESS_DENY)\r
+    else if (policy == NS_POLICY_CONSUMER)\r
     {\r
         NS_LOG(DEBUG, "Place Consumer as a subscription accepter");\r
     }\r
 \r
-    NSSubscriptionAccess = access;\r
+    NSSetPolicy(policy);\r
 \r
     NS_LOG(DEBUG, "NSSetSubscriptionAcceptPolicy - OUT");\r
     return NS_OK;\r
 }\r
 \r
-int NSGetSubscriptionAccepter()\r
-{\r
-    return NSSubscriptionAccess;\r
-}\r
-\r
 NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest)\r
 {\r
     NS_LOG(DEBUG, "NSSendAccessPolicyResponse - IN");\r
 \r
     // put notification resource\r
-    OCResourceHandle notificationResourceHandle;\r
-    if (NSPutNotificationResource(NSGetSubscriptionAccepter(), &notificationResourceHandle)\r
+    OCResourceHandle notificationResourceHandle = NULL;\r
+    if (NSPutNotificationResource(NSGetPolicy(), &notificationResourceHandle)\r
             != NS_OK)\r
     {\r
         NS_LOG(ERROR, "Fail to put notification resource");\r
@@ -86,9 +81,10 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest
 \r
     OCRepPayloadSetUri(payload, NS_ROOT_URI);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
-    OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_POLICY, NSGetSubscriptionAccepter());\r
+    OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_POLICY, NSGetPolicy());\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_MESSAGE, NS_COLLECTION_MESSAGE_URI);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_SYNC, NS_COLLECTION_SYNC_URI);\r
+    OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_TOPIC, NS_COLLECTION_TOPIC_URI);\r
 \r
     response.requestHandle = entityHandlerRequest->requestHandle;\r
     response.resourceHandle = entityHandlerRequest->resource;\r
@@ -133,20 +129,28 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id);\r
 \r
         NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr);\r
-        if(NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr))\r
+\r
+        subData->remote_messageObId = subData->messageObId = 0;\r
+\r
+        bool iSRemoteServer = false;\r
+\r
+#ifdef RD_CLIEND\r
+        iSRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr);\r
+        if(iSRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by remote server");\r
             subData->remote_messageObId = entityHandlerRequest->obsInfo.obsId;\r
-            subData->messageObId = 0;\r
             NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->remote_messageObId);\r
         }\r
-        else\r
+#endif\r
+\r
+        if(!iSRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by local consumer");\r
             subData->messageObId = entityHandlerRequest->obsInfo.obsId;\r
-            subData->remote_messageObId = 0;\r
             NS_LOG_V(DEBUG, "SubList message observation ID = [%d]", subData->messageObId);\r
         }\r
+\r
         subData->isWhite = false;\r
         subData->remote_syncObId = 0;\r
         subData->syncObId = 0;\r
@@ -159,15 +163,17 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
             NS_LOG(DEBUG, "fail to write cache");\r
         }\r
 \r
-        if (NSGetSubscriptionAccepter() == NS_ACCESS_ALLOW)\r
+        bool currPolicy = NSGetPolicy();\r
+\r
+        if (currPolicy == NS_POLICY_PROVIDER)\r
         {\r
             NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_PROVIDER");\r
             NSAskAcceptanceToUser(entityHandlerRequest);\r
         }\r
-        else if (NSGetSubscriptionAccepter() == NS_ACCESS_DENY)\r
+        else if (currPolicy == NS_POLICY_CONSUMER)\r
         {\r
             NS_LOG(DEBUG, "NSGetSubscriptionAccepter == NS_ACCEPTER_CONSUMER");\r
-            NSSendSubscriptionResponse(entityHandlerRequest, true);\r
+            NSSendConsumerSubResponse(entityHandlerRequest);\r
         }\r
     }\r
     else if (resourceType == NS_RESOURCE_SYNC)\r
@@ -180,18 +186,24 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         NS_LOG_V(DEBUG, "SubList ID = [%s]", subData->id);\r
 \r
         NS_LOG_V(DEBUG, "Consumer Address: %s", entityHandlerRequest->devAddr.addr);\r
-        if(NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr))\r
+\r
+        subData->remote_syncObId = subData->syncObId = 0;\r
+        bool isRemoteServer = false;\r
+\r
+#ifdef RD_CLIENT\r
+        isRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr);\r
+        if(isRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by remote server");\r
             subData->remote_syncObId = entityHandlerRequest->obsInfo.obsId;\r
-            subData->syncObId = 0;\r
             NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->remote_syncObId);\r
         }\r
-        else\r
+#endif\r
+\r
+        if(!isRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by local consumer");\r
             subData->syncObId = entityHandlerRequest->obsInfo.obsId;\r
-            subData->remote_syncObId = 0;\r
             NS_LOG_V(DEBUG, "SubList sync observation ID = [%d]", subData->syncObId);\r
         }\r
 \r
@@ -217,7 +229,11 @@ void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest)
 {\r
     NS_LOG(DEBUG, "NSHandleUnsubscription - IN");\r
 \r
-    NSProviderDeleteSubDataFromObId(consumerSubList, entityHandlerRequest->obsInfo.obsId);\r
+    consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER_OBSERVE_ID;\r
+\r
+    while(NSStorageDelete(consumerSubList, (unsigned char *)\r
+            &(entityHandlerRequest->obsInfo.obsId)) != NS_FAIL);\r
+    consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER;\r
 \r
     NSFreeOCEntityHandlerRequest(entityHandlerRequest);\r
 \r
@@ -244,7 +260,7 @@ NSResult NSSendResponse(const char * id, bool accepted)
         return NS_ERROR;\r
     }\r
 \r
-    OCResourceHandle rHandle;\r
+    OCResourceHandle rHandle = NULL;\r
     if (NSPutMessageResource(NULL, &rHandle) != NS_OK)\r
     {\r
         NS_LOG(ERROR, "Fail to put notification resource");\r
@@ -252,8 +268,8 @@ NSResult NSSendResponse(const char * id, bool accepted)
     }\r
 \r
     OCRepPayloadSetUri(payload, NS_COLLECTION_MESSAGE_URI);\r
-    OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, 1);\r
-    OCRepPayloadSetPropBool(payload, NS_ATTRIBUTE_ACCPETANCE, accepted);\r
+    (accepted) ? OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, NS_ALLOW)\r
+        : OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, NS_DENY);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
 \r
     NSCacheElement * element = NSStorageRead(consumerSubList, id);\r
@@ -265,7 +281,7 @@ NSResult NSSendResponse(const char * id, bool accepted)
     }\r
     NSCacheSubData * subData = (NSCacheSubData*) element->data;\r
 \r
-    if (OCNotifyListOfObservers(rHandle, (OCObservationId*)&subData->messageObId, 1, payload, OC_HIGH_QOS)\r
+    if (OCNotifyListOfObservers(rHandle, (OCObservationId*)&subData->messageObId, 1, payload, OC_LOW_QOS)\r
             != OC_STACK_OK)\r
     {\r
         NS_LOG(ERROR, "fail to send Acceptance");\r
@@ -279,7 +295,7 @@ NSResult NSSendResponse(const char * id, bool accepted)
     return NS_OK;\r
 }\r
 \r
-NSResult NSSendSubscriptionResponse(OCEntityHandlerRequest *entityHandlerRequest, bool accepted)\r
+NSResult NSSendConsumerSubResponse(OCEntityHandlerRequest * entityHandlerRequest)\r
 {\r
     NS_LOG(DEBUG, "NSSendSubscriptionResponse - IN");\r
 \r
@@ -298,30 +314,9 @@ NSResult NSSendSubscriptionResponse(OCEntityHandlerRequest *entityHandlerRequest
         return NS_ERROR;\r
     }\r
 \r
-    if (accepted)\r
-    {\r
-        NS_LOG(DEBUG, "accepted is true");\r
-        NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
-        NSCacheSubData * subData = (NSCacheSubData *) OICMalloc(sizeof(NSCacheSubData));\r
-\r
-        OICStrcpy(subData->id, UUID_STRING_SIZE, id);\r
-\r
-        subData->isWhite = true;\r
-        subData->messageObId = entityHandlerRequest->obsInfo.obsId;\r
-\r
-        element->data = (void*) subData;\r
-        element->next = NULL;\r
-\r
-        if (NSStorageWrite(consumerSubList, element) != NS_OK)\r
-        {\r
-            NS_LOG(ERROR, "fail to write consumer white list");\r
-        }\r
-    }\r
-\r
-    NSSendResponse(id, accepted);\r
-\r
+    NSCacheUpdateSubScriptionState(consumerSubList, id, true);\r
+    NSSendResponse(id, true);\r
     NSFreeOCEntityHandlerRequest(entityHandlerRequest);\r
-\r
     NS_LOG(DEBUG, "NSSendSubscriptionResponse - OUT");\r
     return NS_OK;\r
 }\r
Domain: Network & Connectivity / IoT Connectivity;