Implemented unsubscribe function. Added callback state to notification callback data.

diff --git a/network-manager/nmlib/IoT/src/iotivity.cpp b/network-manager/nmlib/IoT/src/iotivity.cpp
index 1aac444..3b40e71 100644 (file)
--- a/network-manager/nmlib/IoT/src/iotivity.cpp
+++ b/network-manager/nmlib/IoT/src/iotivity.cpp
@@ -92,6 +92,7 @@ struct Params
     IoTDevicesMap owned;
     PresenceHook presence_hook;
     std::mutex owned_mutex;
+    std::shared_ptr<OCResource> notificationResource;
 };
 
 IoTivity* IoTivity::instance = nullptr;
@@ -176,8 +177,10 @@ inline void guardSignErrorCode(int resultCode, std::string message)
 
 inline void guardErrorCode(OCStackResult resultCode, std::string message)
 {
+    if (resultCode == OC_STACK_NO_RESOURCE)
+        throw IoTInternalError(message + " no resource error. OCStackResult=" + std::to_string(resultCode), EC_IOTIVITY_ERROR);
     if (resultCode != OC_STACK_OK)
-        throw IoTInternalError(message + " error:" + std::to_string(resultCode), EC_IOTIVITY_ERROR);
+        throw IoTInternalError(message + " error. OCStackResult=" + std::to_string(resultCode), EC_IOTIVITY_ERROR);
 }
 
 void IoTivity::guardUnauthorized()
@@ -440,7 +443,7 @@ string IoTivity::getDeviceID()
 
 }
 
-void IoTivity::subscribeNotifications(NM_NotificationCb callback, void* user_data)
+void IoTivity::subscribeNotifications(NM_NotificationCb callback, void* userData)
 {
     guardUnauthorized();
 
@@ -451,13 +454,24 @@ void IoTivity::subscribeNotifications(NM_NotificationCb callback, void* user_dat
 
     bool findResourceTimeout = true;
 
-    std::shared_ptr<OCResource> curResource;
-
-    auto observCb = [callback, user_data](const HeaderOptions,
-                                          const OCRepresentation & rep,
-                                          const int& eCode,
-                                          const int& sequenceNumber)
+    auto observCb = [callback, userData](const HeaderOptions,
+                                         const OCRepresentation & rep,
+                                         const int& eCode,
+                                         const int& sequenceNumber)
     {
+        if (eCode != OC_STACK_OK)
+        {
+            LOG_E(TAG, "Notification observ callback failed");
+            exit(-1);
+        }
+
+
+        CallbackState callbackState = NORMAL_CALLBACK;
+        if (sequenceNumber == 0)
+            callbackState = FIRST_CALLBACK;
+        if (sequenceNumber == MAX_SEQUENCE_NUMBER + 1)
+            callbackState = LAST_CALLBACK;
+
         string messageString = rep.getValueToString("message");
         string messageTitle = rep.getValueToString("title");
         NM_NotificationData data
@@ -465,38 +479,32 @@ void IoTivity::subscribeNotifications(NM_NotificationCb callback, void* user_dat
             rep.getValue<int>("code"),
             messageTitle.c_str(),
             messageString.c_str(),
-            rep.getValue<int>("time")
+            rep.getValue<int>("time"),
+            callbackState
         };
-        callback(data, user_data);
+        callback(data, userData);
     };
 
+    OCStackResult errorCbCode = OC_STACK_ERROR;
+
     auto foundCb = [&](std::shared_ptr<OCResource> resource)
     {
         lock_guard<std::mutex> lock(curResourceLock);
-        findResourceTimeout = false;
-        std::string resourceURI = resource->uri();
-        std::string resourceDuid = resource->sid();
-        std::stringstream searchedUri;
-        searchedUri << "/oic/route/" << resourceDuid << NOTIFICATION_URI;
-
-        //cout << searchedUri.str() << endl << flush;
 
-        if(searchedUri.str() == resourceURI && !curResource)
+        if(!params->notificationResource)
         {
-            std::string resourceHost = resource->host();
-
-            curResource = resource;
-            cout << "\tFound: " << resourceURI << " "
-                 << resourceHost << " " << resourceDuid << endl << flush;
+            findResourceTimeout = false;
+            errorCbCode = OC_STACK_OK;
+            params->notificationResource = resource;
             resource->observe(ObserveType::ObserveAll, QueryParamsMap(), observCb);
             condVar.notify_all();
         }
     };
 
-    auto errorCb = [&](const std::string & resourceUri, const int ecode)
+    auto errorCb = [&](const std::string&, const int eCode)
     {
         findResourceTimeout = false;
-        cout << "Error" << resourceUri << " " << ecode << endl << flush;
+        errorCbCode = (OCStackResult) eCode;
         condVar.notify_all();
     };
 
@@ -504,12 +512,16 @@ void IoTivity::subscribeNotifications(NM_NotificationCb callback, void* user_dat
 
     condVar.wait_for(lock, std::chrono::seconds(DEFAULT_TIMEOUT));
     guardTimeout(findResourceTimeout, NOTIF_FIND);
+    guardErrorCode(errorCbCode, NOTIF_REQUEST);
 }
 
 void IoTivity::unsubscribeNotifications()
 {
-    guardUnauthorized();
-    throw IoTInternalError("unsubscribeNotifications() not implemented", EC_NOT_IMPLEMENTED_YET);
+    if (params->notificationResource)
+    {
+        params->notificationResource->cancelObserve();
+        params->notificationResource = nullptr;
+    }
 }
 
 void IoTivity::setPersistentStoragePath(std::string newPath)

diff --git a/network-manager/nmlib/include/nmlib.h b/network-manager/nmlib/include/nmlib.h
index 0b2242e..46cc378 100644 (file)
--- a/network-manager/nmlib/include/nmlib.h
+++ b/network-manager/nmlib/include/nmlib.h
@@ -51,12 +51,19 @@ typedef struct
     DeviceState state;
 } NM_DeviceInfo;
 
+typedef enum {
+    FIRST_CALLBACK = 0,
+    NORMAL_CALLBACK = 1,
+    LAST_CALLBACK = 2,
+} CallbackState;
+
 typedef struct
 {
     int code;
     const char* title;
     const char* message;
     int time;
+    CallbackState callbackState;
 } NM_NotificationData;
 
 #define NULL_HANDLE (void*)0

diff --git a/network-manager/test/test_iot_notification.cpp b/network-manager/test/test_iot_notification.cpp
index 742b80a..4176b0c 100644 (file)
--- a/network-manager/test/test_iot_notification.cpp
+++ b/network-manager/test/test_iot_notification.cpp
@@ -43,14 +43,18 @@ protected:
 
 struct UserData
 {
-    bool callbackFired;
+    bool firstCallbackFired;
+    bool lastCallbackFired;
     condition_variable notificationCV;
 };
 
 static void notificationCb(NM_NotificationData data, void* inUserData)
 {
     UserData* userData = (UserData*)inUserData;
-    userData->callbackFired = true;
+    if (data.callbackState == FIRST_CALLBACK)
+        userData->firstCallbackFired = true;
+    if (data.callbackState == LAST_CALLBACK)
+        userData->lastCallbackFired = true;
     userData->notificationCV.notify_all();
 }
 
@@ -65,17 +69,25 @@ TEST_F(TestIotNotification, correct)
     std::mutex notificationMtx;
     std::unique_lock<std::mutex> notificationLock(notificationMtx);
 
-    UserData userDataCheck{false};
+    UserData userDataCheck{false, false};
 
     try
     {
         iot->subscribeNotifications(notificationCb, &userDataCheck);
+        userDataCheck.notificationCV.wait_for(notificationLock, std::chrono::seconds(2));
     }
-    catch(std::exception e)
+    catch (NMexception& e)
+    {
+        ADD_FAILURE() << e.what() << " " << e.errorCode();
+    }
+    catch (std::exception& e)
     {
         ADD_FAILURE() << e.what();
     }
-    userDataCheck.notificationCV.wait_for(notificationLock, std::chrono::seconds(3));
 
-    ASSERT_TRUE(userDataCheck.callbackFired);
+    iot->unsubscribeNotifications();
+    userDataCheck.notificationCV.wait_for(notificationLock, std::chrono::seconds(2));
+
+    ASSERT_TRUE(userDataCheck.firstCallbackFired);
+    ASSERT_TRUE(userDataCheck.lastCallbackFired);
 }

diff --git a/network-manager/test/test_nmlibapi.cpp b/network-manager/test/test_nmlibapi.cpp
index b85f185..1db8a21 100644 (file)
--- a/network-manager/test/test_nmlibapi.cpp
+++ b/network-manager/test/test_nmlibapi.cpp
@@ -40,7 +40,8 @@ TEST(test_nmlibapi, signInCorrect)
 }
 
 static std::condition_variable notificationCV;
-static bool callbackFired = false;
+static bool firstCallbackFired = false;
+static bool lastCallbackFired = false;
 static char* callbackUserDataCheck = NULL;
 
 static void notificationCb(NM_NotificationData data, void* user_data)
@@ -49,8 +50,14 @@ static void notificationCb(NM_NotificationData data, void* user_data)
          << data.title << " "
          << data.message << " "
          << data.time << " "
+         << data.callbackState << " "
          << endl << flush;
-    callbackFired = true;
+
+    if (data.callbackState == FIRST_CALLBACK)
+        firstCallbackFired = true;
+    if (data.callbackState == LAST_CALLBACK)
+        lastCallbackFired = true;
+
     callbackUserDataCheck = (char*) user_data;
     notificationCV.notify_all();
 }
@@ -81,10 +88,15 @@ TEST(test_nmlibapi, notificationCorrect)
     /* 2. Call subscribe method and wait no more than 3 sec for notification callback */
     ASSERT_EQ(EC_OK, NM_subscribeNotifications(ctx, notificationCb, userDataCheck));
     notificationCV.wait_for(notificationLock, std::chrono::seconds(3));
+
+    NM_unsubscribeNotifications(ctx);
+    notificationCV.wait_for(notificationLock, std::chrono::seconds(3));
+
     NM_signOut(ctx);
 
     /* 3. Check callback was called */
-    ASSERT_TRUE(callbackFired);
+    ASSERT_TRUE(firstCallbackFired);
+    ASSERT_TRUE(lastCallbackFired);
 
     /* 4. Check user data was transferd */
     ASSERT_EQ(userDataCheck, callbackUserDataCheck);