IP address plumbing changes to support IPv6

[platform/upstream/iotivity.git] / resource / src / OCResource.cpp

diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp
index 2ad836a..e46ef16 100644 (file)
--- a/resource/src/OCResource.cpp
+++ b/resource/src/OCResource.cpp
@@ -29,16 +29,15 @@ using OC::nil_guard;
 using OC::result_guard;
 using OC::checked_guard;
 
-OCResource::OCResource(std::weak_ptr<IClientWrapper> clientWrapper, const std::string& host,
-                       const std::string& uri, const std::string& serverId,
-                       OCConnectivityType connectivityType, bool observable,
-                       const std::vector<std::string>& resourceTypes,
-                       const std::vector<std::string>& interfaces)
- :  m_clientWrapper(clientWrapper), m_uri(uri), m_resourceId(serverId, m_uri),
-    m_host(host),
-    m_connectivityType(connectivityType),
-    m_isObservable(observable),
-    m_isCollection(false), m_resourceTypes(resourceTypes), m_interfaces(interfaces),
+OCResource::OCResource(std::weak_ptr<IClientWrapper> clientWrapper,
+                        const OCDevAddr& devAddr, const std::string& uri,
+                        const std::string& serverId, bool observable,
+                        const std::vector<std::string>& resourceTypes,
+                        const std::vector<std::string>& interfaces)
+ :  m_clientWrapper(clientWrapper), m_uri(uri),
+    m_resourceId(serverId, m_uri), m_devAddr(devAddr),
+    m_isObservable(observable), m_isCollection(false),
+    m_resourceTypes(resourceTypes), m_interfaces(interfaces),
     m_observeHandle(nullptr)
 {
     m_isCollection = std::find(m_interfaces.begin(), m_interfaces.end(), LINK_INTERFACE)
@@ -54,6 +53,43 @@ OCResource::OCResource(std::weak_ptr<IClientWrapper> clientWrapper, const std::s
     }
 }
 
+OCResource::OCResource(std::weak_ptr<IClientWrapper> clientWrapper,
+                        const std::string& host, const std::string& uri,
+                        const std::string& serverId,
+                        OCConnectivityType connectivityType, bool observable,
+                        const std::vector<std::string>& resourceTypes,
+                        const std::vector<std::string>& interfaces)
+ :  m_clientWrapper(clientWrapper), m_uri(uri),
+    m_resourceId(serverId, m_uri),
+    m_devAddr{ OC_DEFAULT_ADAPTER },
+    m_isObservable(observable), m_isCollection(false),
+    m_resourceTypes(resourceTypes), m_interfaces(interfaces),
+    m_observeHandle(nullptr)
+{
+    m_isCollection = std::find(m_interfaces.begin(), m_interfaces.end(), LINK_INTERFACE)
+                        != m_interfaces.end();
+
+    if (m_uri.empty() ||
+        resourceTypes.empty() ||
+        interfaces.empty()||
+        m_clientWrapper.expired())
+    {
+        throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
+                interfaces.empty(), m_clientWrapper.expired(), false, false);
+    }
+
+    // construct the devAddr from the pieces we have
+    m_devAddr.adapter = static_cast<OCTransportAdapter>(connectivityType >> CT_ADAPTER_SHIFT);
+    m_devAddr.flags = static_cast<OCTransportFlags>(connectivityType & CT_MASK_FLAGS);
+    size_t len = host.length();
+    if (len >= MAX_ADDR_STR_SIZE)
+    {
+        throw std::length_error("host address is too long.");
+    }
+    host.copy(m_devAddr.addr, len);
+    m_devAddr.addr[len] = '\0';
+}
+
 OCResource::~OCResource()
 {
 }
@@ -61,9 +97,11 @@ OCResource::~OCResource()
 OCStackResult OCResource::get(const QueryParamsMap& queryParametersMap,
                               GetCallback attributeHandler, QualityOfService QoS)
 {
-    return checked_guard(m_clientWrapper.lock(), &IClientWrapper::GetResourceRepresentation,
-                         m_host, m_uri, m_connectivityType, queryParametersMap, m_headerOptions,
-                         attributeHandler, QoS);
+    return checked_guard(m_clientWrapper.lock(),
+                            &IClientWrapper::GetResourceRepresentation,
+                            m_devAddr, m_uri,
+                            queryParametersMap, m_headerOptions,
+                            attributeHandler, QoS);
 }
 
 OCStackResult OCResource::get(const QueryParamsMap& queryParametersMap,
@@ -107,7 +145,7 @@ OCStackResult OCResource::put(const OCRepresentation& rep,
                               QualityOfService QoS)
 {
     return checked_guard(m_clientWrapper.lock(), &IClientWrapper::PutResourceRepresentation,
-                         m_host, m_uri, m_connectivityType, rep, queryParametersMap,
+                         m_devAddr, m_uri, rep, queryParametersMap,
                          m_headerOptions, attributeHandler, QoS);
 }
 
@@ -157,7 +195,7 @@ OCStackResult OCResource::post(const OCRepresentation& rep,
                                QualityOfService QoS)
 {
     return checked_guard(m_clientWrapper.lock(), &IClientWrapper::PostResourceRepresentation,
-                         m_host, m_uri, m_connectivityType, rep, queryParametersMap,
+                         m_devAddr, m_uri, rep, queryParametersMap,
                          m_headerOptions, attributeHandler, QoS);
 }
 
@@ -205,7 +243,7 @@ OCStackResult OCResource::post(const std::string& resourceType,
 OCStackResult OCResource::deleteResource(DeleteCallback deleteHandler, QualityOfService QoS)
 {
     return checked_guard(m_clientWrapper.lock(), &IClientWrapper::DeleteResource,
-                         m_host, m_uri, m_connectivityType, m_headerOptions, deleteHandler, QoS);
+                         m_devAddr, m_uri, m_headerOptions, deleteHandler, QoS);
 }
 
 OCStackResult OCResource::deleteResource(DeleteCallback deleteHandler)
@@ -226,8 +264,8 @@ OCStackResult OCResource::observe(ObserveType observeType,
     }
 
     return checked_guard(m_clientWrapper.lock(), &IClientWrapper::ObserveResource,
-                         observeType, &m_observeHandle, m_host,
-                         m_uri, m_connectivityType, queryParametersMap, m_headerOptions,
+                         observeType, &m_observeHandle, m_devAddr,
+                         m_uri, queryParametersMap, m_headerOptions,
                          observeHandler, QoS);
 }
 
@@ -256,7 +294,7 @@ OCStackResult OCResource::cancelObserve(QualityOfService QoS)
 
     OCStackResult result =  checked_guard(m_clientWrapper.lock(),
             &IClientWrapper::CancelObserveResource,
-            m_observeHandle, m_host, m_uri, m_headerOptions, QoS);
+            m_observeHandle, "", m_uri, m_headerOptions, QoS);
 
     if(result == OC_STACK_OK)
     {
@@ -268,7 +306,7 @@ OCStackResult OCResource::cancelObserve(QualityOfService QoS)
 
 std::string OCResource::host() const
 {
-    return m_host;
+    return std::string(m_devAddr.addr);
 }
 
 std::string OCResource::uri() const
@@ -278,7 +316,8 @@ std::string OCResource::uri() const
 
 OCConnectivityType OCResource::connectivityType() const
 {
-    return m_connectivityType;
+    return static_cast<OCConnectivityType>(
+           (m_devAddr.adapter << CT_ADAPTER_SHIFT) | (m_devAddr.flags & CT_MASK_FLAGS));
 }
 
 bool OCResource::isObservable() const
@@ -286,7 +325,6 @@ bool OCResource::isObservable() const
     return m_isObservable;
 }
 
-
 OCResourceIdentifier OCResource::uniqueIdentifier() const
 {
     return m_resourceId;
@@ -335,7 +373,6 @@ OCResourceIdentifier::OCResourceIdentifier(const std::string& wireServerIdentifi
 
 std::ostream& operator <<(std::ostream& os, const OCResourceIdentifier& ri)
 {
-
     os << ri.m_representation<<ri.m_resourceUri;
 
     return os;