From 7b77bb661f38fea1ecb96cfe6eb4b3bbab839b80 Mon Sep 17 00:00:00 2001
From: Sudarshan Prasad <sudarshan.prasad@intel.com>
Date: Wed, 24 Dec 2014 22:51:42 -0800
Subject: [PATCH] [CA-Integration] Added code to get connectivity type from C
 to C++ layer

Change-Id: I5afd5269595c5d45b355e10e6c9400f66dc74ef9
Signed-off-by:Sudarshan Prasad<sudarshan.prasad@intel.com>
---
 resource/include/OCSerialization.h   | 11 ++++++++---
 resource/src/InProcClientWrapper.cpp |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/resource/include/OCSerialization.h b/resource/include/OCSerialization.h
index 2872813..b0bf50a 100644
--- a/resource/include/OCSerialization.h
+++ b/resource/include/OCSerialization.h
@@ -186,9 +186,15 @@ namespace OC
                 ar(resources);
             }
         public:
+#ifdef CA_INT
+            ListenOCContainer(std::weak_ptr<IClientWrapper> cw, const OCDevAddr& address,
+                    uint8_t connectivityType, std::stringstream& json):
+                m_clientWrapper(cw), m_address(address), m_connectivityType(connectivityType)
+#else
             ListenOCContainer(std::weak_ptr<IClientWrapper> cw, const OCDevAddr& address,
                     std::stringstream& json):
                 m_clientWrapper(cw), m_address(address)
+#endif
             {
                 LoadFromJson(json);
             }
@@ -269,12 +275,10 @@ namespace OC
                         if(res.loaded())
                         {
 #ifdef CA_INT
-                            //CA_TODO: To get the connectivity type correctly.
-                            uint8_t connectivityType;
                             m_resources.push_back(std::shared_ptr<OCResource>(
                                 new OCResource(m_clientWrapper,
                                     ConvertOCAddrToString(res.secureType(),res.port()),
-                                    res.m_uri, res.m_serverId, connectivityType, res.observable(),
+                                    res.m_uri, res.m_serverId, m_connectivityType, res.observable(),
                                     res.resourceTypes(), res.interfaces())));
 #else
                             m_resources.push_back(std::shared_ptr<OCResource>(
@@ -296,5 +300,6 @@ namespace OC
             std::vector<std::shared_ptr<OC::OCResource>> m_resources;
             std::weak_ptr<IClientWrapper> m_clientWrapper;
             OCDevAddr m_address;
+            uint8_t m_connectivityType;
     };
 }
diff --git a/resource/src/InProcClientWrapper.cpp b/resource/src/InProcClientWrapper.cpp
index 9fd3153..35ff469 100644
--- a/resource/src/InProcClientWrapper.cpp
+++ b/resource/src/InProcClientWrapper.cpp
@@ -148,9 +148,13 @@ namespace OC
 
         try
         {
+#ifdef CA_INT
+            ListenOCContainer container(clientWrapper, *clientResponse->addr,
+                    clientResponse->connType, requestStream);
+#else
             ListenOCContainer container(clientWrapper, *clientResponse->addr,
                     requestStream);
-
+#endif
             // loop to ensure valid construction of all resources
             for(auto resource : container.Resources())
             {
-- 
2.7.4