Active Discovey Resource Type Filtering - C++ SDK & App Changes only.

This change affects only the C++ API and it's sample app
"presenceclient.cpp".

Change-Id: I92cebe5045dfda5b506ab6c849a1ce13330c4391
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>

diff --git a/resource/examples/presenceclient.cpp b/resource/examples/presenceclient.cpp
index 9c6204f..b279087 100644 (file)
--- a/resource/examples/presenceclient.cpp
+++ b/resource/examples/presenceclient.cpp
@@ -30,6 +30,30 @@ using namespace OC;
 
 std::shared_ptr<OCResource> curResource;
 
+static int TEST_CASE = 0;
+
+/**
+ * List of methods that can be inititated from the client
+ */
+typedef enum {
+    TEST_UNICAST_PRESENCE_NORMAL = 1,
+    TEST_UNICAST_PRESENCE_WITH_FILTER,
+    TEST_MULTICAST_PRESENCE_NORMAL,
+    TEST_MULTICAST_PRESENCE_WITH_FILTER,
+    MAX_TESTS
+} CLIENT_TEST;
+
+void printUsage()
+{
+    std::cout << "Usage : presenceclient -t <1|2>" << std::endl;
+    std::cout << "-t 1 : Discover Resources and Initiate Unicast Presence" << std::endl;
+    std::cout << "-t 2 : Discover Resources and Initiate Unicast Presence with Filter"
+              << std::endl;
+    std::cout << "-t 3 : Discover Resources and Initiate Multicast Presence" << std::endl;
+    std::cout << "-t 4 : Discover Resources and Initiate Multicast Presence with Filter"
+              << std::endl;
+}
+
 // Callback to presence
 void presenceHandler(OCStackResult result, const unsigned int nonce)
 {
@@ -92,8 +116,27 @@ void foundResource(std::shared_ptr<OCResource> resource)
             {
                 curResource = resource;
                 OCPlatform::OCPresenceHandle presenceHandle;
-                OCPlatform::subscribePresence(presenceHandle, hostAddress, &presenceHandler);
-                std::cout<< "subscribing for unicast presence... " <<std::endl;
+                switch(TEST_CASE)
+                {
+                    case TEST_UNICAST_PRESENCE_NORMAL:
+                        OCPlatform::subscribePresence(presenceHandle, hostAddress,
+                                &presenceHandler);
+                        break;
+                    case TEST_UNICAST_PRESENCE_WITH_FILTER:
+                        OCPlatform::subscribePresence(presenceHandle, hostAddress, "core.light",
+                                &presenceHandler);
+                        break;
+                    case TEST_MULTICAST_PRESENCE_NORMAL:
+                        OCPlatform::subscribePresence(presenceHandle, OC_MULTICAST_IP, presenceHandler);
+                        break;
+                    case TEST_MULTICAST_PRESENCE_WITH_FILTER:
+                        OCPlatform::subscribePresence(presenceHandle, OC_MULTICAST_IP, "core.light",
+                                &presenceHandler);
+                        break;
+                    default:
+                        printUsage();
+                        break;
+                }
             }
         }
         else
@@ -109,36 +152,24 @@ void foundResource(std::shared_ptr<OCResource> resource)
     }
 }
 
-void PrintUsage()
-{
-    std::cout << std::endl;
-    std::cout << "Usage : presenceclient <isMulticastAddress>\n";
-    std::cout << "   0 - unicast subcribe presence\n";
-    std::cout << "   1 - multicast subscribe presence\n\n";
-}
-
-// 0 - unicast subcribe presence
-// 1 - multicast subscribe presence
-int isMulticastAddress = 0;
+int main(int argc, char* argv[]) {
+    int opt;
 
-int main(int argc, char* argv[1])
-{
-    PrintUsage();
-
-    if (argc == 1)
+    while ((opt = getopt(argc, argv, "t:")) != -1)
     {
-        isMulticastAddress = 0;
-    }
-    else if (argc == 2)
-    {
-        int value = atoi(argv[1]);
-        if (value == 1)
-            isMulticastAddress = 1;
-        else
-            isMulticastAddress = 0;
+        switch(opt)
+        {
+            case 't':
+                TEST_CASE = atoi(optarg);
+                break;
+            default:
+                printUsage();
+                return -1;
+        }
     }
-    else
+    if(TEST_CASE >= MAX_TESTS || TEST_CASE <= 0)
     {
+        printUsage();
         return -1;
     }
 
@@ -151,23 +182,14 @@ int main(int argc, char* argv[1])
         OC::QualityOfService::LowQos
     };
 
+    OCPlatform::Configure(cfg);
+
     try
     {
-        OCPlatform::Configure(cfg);
-
-        if(isMulticastAddress)
-        {
-            OCPlatform::OCPresenceHandle presenceHandle;
-            OCPlatform::subscribePresence(presenceHandle, OC_MULTICAST_IP, presenceHandler);
-            std::cout<< "subscribing for multicast presence... " <<std::endl;
-        }
-        else
-        {
-            // Find all resources
-            OCPlatform::findResource("", "coap://224.0.1.187/oc/core", &foundResource);
-            std::cout<< "Finding Resource... " <<std::endl;
-        }
-
+        std::cout << "Created Platform..."<<std::endl;
+        // Find all resources
+        OCPlatform::findResource("", "coap://224.0.1.187/oc/core", &foundResource);
+        std::cout<< "Finding Resource... " <<std::endl;
         while(true)
         {
             // some operations

diff --git a/resource/include/IClientWrapper.h b/resource/include/IClientWrapper.h
index 164684d..a03ae76 100644 (file)
--- a/resource/include/IClientWrapper.h
+++ b/resource/include/IClientWrapper.h
@@ -74,7 +74,7 @@ namespace OC
             const std::string& uri, const HeaderOptions& headerOptions, QualityOfService QoS)=0;
 
         virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host,
-                        SubscribeCallback& presenceHandler)=0;
+                        const std::string& resourceType, SubscribeCallback& presenceHandler)=0;
 
         virtual OCStackResult UnsubscribePresence(OCDoHandle handle) =0;
 

diff --git a/resource/include/InProcClientWrapper.h b/resource/include/InProcClientWrapper.h
index bc0a9d5..5fecf6d 100644 (file)
--- a/resource/include/InProcClientWrapper.h
+++ b/resource/include/InProcClientWrapper.h
@@ -81,7 +81,7 @@ namespace OC
             const std::string& uri, const HeaderOptions& headerOptions, QualityOfService QoS);
 
         virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host,
-            SubscribeCallback& presenceHandler);
+            const std::string& resourceType, SubscribeCallback& presenceHandler);
 
         virtual OCStackResult UnsubscribePresence(OCDoHandle handle);
         // Note: this should never be called by anyone but the handler for the listen command.

diff --git a/resource/include/OCPlatform.h b/resource/include/OCPlatform.h
index b736799..39d1792 100644 (file)
--- a/resource/include/OCPlatform.h
+++ b/resource/include/OCPlatform.h
@@ -348,6 +348,7 @@ namespace OC
         *               request.  It can be used to unsubscribe from these events in the future.
         *               It will be set upon successful return of this method.
         * @param host - The IP address/addressable name of the server to subscribe to.
+        * @param resourceType - a resource type specified as a filter for subscription callbacks.
         * @param presenceHandler - callback function that will receive notifications/subscription
         *               events
         *
@@ -355,6 +356,8 @@ namespace OC
         */
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
                         SubscribeCallback presenceHandler);
+        OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
+                        const std::string& resourceType, SubscribeCallback presenceHandler);
 
         /**
         * unsubscribes from a previously subscribed server's presence events. Note that

diff --git a/resource/include/OCPlatform_impl.h b/resource/include/OCPlatform_impl.h
index 1a0e05d..47598d2 100644 (file)
--- a/resource/include/OCPlatform_impl.h
+++ b/resource/include/OCPlatform_impl.h
@@ -371,6 +371,7 @@ namespace OC
         *               request.  It can be used to unsubscribe from these events in the future.
         *               It will be set upon successful return of this method.
         * @param host - The IP address/addressable name of the server to subscribe to.
+        * @param resourceType - a resource type specified as a filter for subscription callbacks.
         * @param presenceHandler - callback function that will receive notifications/subscription
         *                           events
         *
@@ -378,6 +379,8 @@ namespace OC
         */
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
                         SubscribeCallback presenceHandler);
+        OCStackResult subscribePresence(OCPresenceHandle& presenceHandle, const std::string& host,
+                        const std::string& resourceType, SubscribeCallback presenceHandler);
 
         /**
         * unsubscribes from a previously subscribed server's presence events. Note that

diff --git a/resource/include/OutOfProcClientWrapper.h b/resource/include/OutOfProcClientWrapper.h
index 69b4e78..07f5c6a 100644 (file)
--- a/resource/include/OutOfProcClientWrapper.h
+++ b/resource/include/OutOfProcClientWrapper.h
@@ -76,7 +76,8 @@ namespace OC
         }
 
         virtual OCStackResult SubscribePresence(OCDoHandle* handle, const std::string& host,
-            SubscribeCallback& presenceHandler){return OC_STACK_NOTIMPL;}
+            const std::string& resourceType, SubscribeCallback& presenceHandler)
+        {return OC_STACK_NOTIMPL;}
 
         virtual OCStackResult UnsubscribePresence(OCDoHandle handle){return OC_STACK_NOTIMPL;}
 

diff --git a/resource/src/InProcClientWrapper.cpp b/resource/src/InProcClientWrapper.cpp
index e9af394..6225119 100644 (file)
--- a/resource/src/InProcClientWrapper.cpp
+++ b/resource/src/InProcClientWrapper.cpp
@@ -794,7 +794,8 @@ namespace OC
     }
 
     OCStackResult InProcClientWrapper::SubscribePresence(OCDoHandle* handle,
-        const std::string& host, SubscribeCallback& presenceHandler)
+        const std::string& host, const std::string& resourceType,
+        SubscribeCallback& presenceHandler)
     {
         OCCallbackData cbdata = {0};
 
@@ -806,9 +807,13 @@ namespace OC
         auto cLock = m_csdkLock.lock();
 
         std::ostringstream os;
-
         os << host << "/oc/presence";
 
+        if(!resourceType.empty())
+        {
+            os << "?rt=" << resourceType;
+        }
+
         if(!cLock)
             return OC_STACK_ERROR;
 

diff --git a/resource/src/OCPlatform.cpp b/resource/src/OCPlatform.cpp
index 73488d6..4390a4f 100644 (file)
--- a/resource/src/OCPlatform.cpp
+++ b/resource/src/OCPlatform.cpp
@@ -176,6 +176,15 @@ namespace OC
                                                 presenceHandler);
         }
 
+        OCStackResult subscribePresence(OCPresenceHandle& presenceHandle,
+                                                const std::string& host,
+                                                const std::string& resourceType,
+                                                SubscribeCallback presenceHandler)
+        {
+            return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host,
+                                                resourceType, presenceHandler);
+        }
+
         OCStackResult unsubscribePresence(OCPresenceHandle presenceHandle)
         {
             return OCPlatform_impl::Instance().unsubscribePresence(presenceHandle);

diff --git a/resource/src/OCPlatform_impl.cpp b/resource/src/OCPlatform_impl.cpp
index 34fc47b..4671c2b 100644 (file)
--- a/resource/src/OCPlatform_impl.cpp
+++ b/resource/src/OCPlatform_impl.cpp
@@ -275,8 +275,16 @@ namespace OC
                                             const std::string& host,
                                             SubscribeCallback presenceHandler)
     {
+        return subscribePresence(presenceHandle, host, "", presenceHandler);
+    }
+
+    OCStackResult OCPlatform_impl::subscribePresence(OCPresenceHandle& presenceHandle,
+                                            const std::string& host,
+                                            const std::string& resourceType,
+                                            SubscribeCallback presenceHandler)
+    {
         return checked_guard(m_client, &IClientWrapper::SubscribePresence,
-                             &presenceHandle, host, presenceHandler);
+                             &presenceHandle, host, resourceType, presenceHandler);
     }
 
     OCStackResult OCPlatform_impl::unsubscribePresence(OCPresenceHandle presenceHandle)