#include "OCUtilities.h"
#include <boost/lexical_cast.hpp>
+#include <sstream>
+#if !defined(_WIN32)
+#include <arpa/inet.h>
+#else
+#include <ws2tcpip.h>
+#include <in6addr.h>
+#endif
namespace OC {
+static const char COAP[] = "coap://";
+static const char COAPS[] = "coaps://";
+static const char COAP_TCP[] = "coap+tcp://";
+
using OC::nil_guard;
using OC::result_guard;
using OC::checked_guard;
-#ifdef CA_INT
-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)
interfaces.empty(), m_clientWrapper.expired(), false, false);
}
}
-#else
-OCResource::OCResource(std::weak_ptr<IClientWrapper> clientWrapper, const std::string& host,
- 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_host(host),
- m_isObservable(observable), m_isCollection(false), m_resourceTypes(resourceTypes),
- m_interfaces(interfaces), m_observeHandle(nullptr)
+
+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, OC_DEFAULT_FLAGS, 0, {0}, 0
+#if defined (ROUTING_GATEWAY) || defined (ROUTING_EP)
+ , {0}
+#endif
+ },
+ 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();
throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
interfaces.empty(), m_clientWrapper.expired(), false, false);
}
+
+ if (uri.length() == 1 && uri[0] == '/')
+ {
+ throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
+ interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ if (uri[0] != '/')
+ {
+ 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);
+
+ this->setHost(host);
}
-#endif
OCResource::~OCResource()
{
}
+void OCResource::setHost(const std::string& host)
+{
+ size_t prefix_len;
+
+ if(host.compare(0, sizeof(COAP) - 1, COAP) == 0)
+ {
+ prefix_len = sizeof(COAP) - 1;
+ }
+ else if(host.compare(0, sizeof(COAPS) - 1, COAPS) == 0)
+ {
+ prefix_len = sizeof(COAPS) - 1;
+ m_devAddr.flags = static_cast<OCTransportFlags>(m_devAddr.flags & OC_SECURE);
+ }
+ else if (host.compare(0, sizeof(COAP_TCP) - 1, COAP_TCP) == 0)
+ {
+ prefix_len = sizeof(COAP_TCP) - 1;
+ }
+ else
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ // remove 'coap://' or 'coaps://' or 'coap+tcp://'
+ std::string host_token = host.substr(prefix_len);
+
+ if(host_token[0] == '[') // IPv6
+ {
+ size_t bracket = host_token.find(']');
+
+ if(bracket == std::string::npos || bracket == 0)
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+ // extract the ipv6 address
+ std::string ip6Addr = host_token.substr(1, bracket - 1);
+
+ // address validity check
+ struct in6_addr buf;
+ const char *cAddr = ip6Addr.c_str();
+ if(0 == inet_pton(AF_INET6, cAddr, &buf))
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ //skip ']' and ':' characters in host string
+ host_token = host_token.substr(bracket + 2);
+ int port = std::stoi(host_token);
+
+ if (0 > port || UINT16_MAX < port)
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ ip6Addr.copy(m_devAddr.addr, sizeof(m_devAddr.addr));
+ m_devAddr.addr[ip6Addr.length()] = '\0';
+ m_devAddr.port = static_cast<uint16_t>(port);
+ m_devAddr.flags = static_cast<OCTransportFlags>(m_devAddr.flags & OC_IP_USE_V6);
+ }
+ else if (host_token[0] == ':')
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+ else
+ {
+ size_t dot = host_token.find('.');
+ if (std::string::npos == dot) // MAC
+ {
+ std::string macAddr = host_token;
+
+ // address validity check
+ if (MAC_ADDR_STR_SIZE != macAddr.length())
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ for (size_t blockCnt = 0; blockCnt < MAC_ADDR_BLOCKS; blockCnt++)
+ {
+ std::string block = macAddr.substr(blockCnt * 3, 2);
+
+ if (std::string::npos != block.find_first_not_of("0123456789ABCDEFabcdef"))
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ if (MAC_ADDR_BLOCKS - 1 > blockCnt)
+ {
+ char delimiter = macAddr[blockCnt * 3 + 2];
+
+ if (':' != delimiter)
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+ }
+ }
+
+ macAddr.copy(m_devAddr.addr, sizeof(m_devAddr.addr));
+ m_devAddr.addr[MAC_ADDR_STR_SIZE] = '\0';
+ }
+ else // IPv4
+ {
+ size_t colon = host_token.find(':');
+
+ if (colon == std::string::npos || colon == 0)
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ // extract the ipv4 address
+ std::string ip4Addr = host_token.substr(0, colon);
+
+ // address validity check
+ struct in_addr buf;
+ const char *cAddr = ip4Addr.c_str();
+ if(0 == inet_pton(AF_INET, cAddr, &buf))
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ //skip ':' characters in host string
+ host_token = host_token.substr(colon + 1);
+ int port = std::stoi(host_token);
+
+ if (0 > port || UINT16_MAX < port)
+ {
+ throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ }
+
+ ip4Addr.copy(m_devAddr.addr, sizeof(m_devAddr.addr));
+ m_devAddr.addr[ip4Addr.length()] = '\0';
+ m_devAddr.port = static_cast<uint16_t>(port);
+ }
+ }
+}
+
OCStackResult OCResource::get(const QueryParamsMap& queryParametersMap,
GetCallback attributeHandler, QualityOfService QoS)
{
-#ifdef CA_INT
- return checked_guard(m_clientWrapper.lock(), &IClientWrapper::GetResourceRepresentation,
- m_host, m_uri, m_connectivityType, queryParametersMap, m_headerOptions,
- attributeHandler, QoS);
-#else
- return checked_guard(m_clientWrapper.lock(), &IClientWrapper::GetResourceRepresentation,
- m_host, m_uri, queryParametersMap, m_headerOptions, attributeHandler, QoS);
-#endif
+ return checked_guard(m_clientWrapper.lock(),
+ &IClientWrapper::GetResourceRepresentation,
+ m_devAddr, m_uri,
+ queryParametersMap, m_headerOptions,
+ attributeHandler, QoS);
}
OCStackResult OCResource::get(const QueryParamsMap& queryParametersMap,
const QueryParamsMap& queryParametersMap, PutCallback attributeHandler,
QualityOfService QoS)
{
-#ifdef CA_INT
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);
-#else
- return checked_guard(m_clientWrapper.lock(), &IClientWrapper::PutResourceRepresentation,
- m_host, m_uri, rep, queryParametersMap, m_headerOptions, attributeHandler, QoS);
-#endif
}
OCStackResult OCResource::put(const OCRepresentation& rep,
const QueryParamsMap& queryParametersMap, PostCallback attributeHandler,
QualityOfService QoS)
{
-#ifdef CA_INT
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);
-#else
- return checked_guard(m_clientWrapper.lock(), &IClientWrapper::PostResourceRepresentation,
- m_host, m_uri, rep, queryParametersMap, m_headerOptions, attributeHandler, QoS);
-#endif
}
OCStackResult OCResource::post(const OCRepresentation& rep,
OCStackResult OCResource::deleteResource(DeleteCallback deleteHandler, QualityOfService QoS)
{
-#ifdef CA_INT
return checked_guard(m_clientWrapper.lock(), &IClientWrapper::DeleteResource,
- m_host, m_uri, m_connectivityType, m_headerOptions, deleteHandler, QoS);
-#else
- return checked_guard(m_clientWrapper.lock(), &IClientWrapper::DeleteResource,
- m_host, m_uri, m_headerOptions, deleteHandler, QoS);
-#endif
+ m_devAddr, m_uri, m_headerOptions, deleteHandler, QoS);
}
OCStackResult OCResource::deleteResource(DeleteCallback deleteHandler)
return result_guard(OC_STACK_INVALID_PARAM);
}
-#ifdef CA_INT
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);
-#else
- return checked_guard(m_clientWrapper.lock(), &IClientWrapper::ObserveResource,
- observeType, &m_observeHandle, m_host,
- m_uri, queryParametersMap, m_headerOptions, observeHandler, QoS);
-#endif
}
OCStackResult OCResource::observe(ObserveType observeType,
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)
{
return result;
}
+void OCResource::setHeaderOptions(const HeaderOptions& headerOptions)
+{
+ m_headerOptions = headerOptions;
+}
+
+void OCResource::unsetHeaderOptions()
+{
+ m_headerOptions.clear();
+}
+
std::string OCResource::host() const
{
- return m_host;
+ std::ostringstream ss;
+ if (m_devAddr.flags & OC_SECURE)
+ {
+ ss << COAPS;
+ }
+ else if ((m_devAddr.adapter & OC_ADAPTER_TCP)
+ || (m_devAddr.adapter & OC_ADAPTER_GATT_BTLE)
+ || (m_devAddr.adapter & OC_ADAPTER_RFCOMM_BTEDR))
+ {
+ ss << COAP_TCP;
+ }
+ else
+ {
+ ss << COAP;
+ }
+ if (m_devAddr.flags & OC_IP_USE_V6)
+ {
+ ss << '[' << m_devAddr.addr << ']';
+ }
+ else
+ {
+ ss << m_devAddr.addr;
+ }
+ if (m_devAddr.port)
+ {
+ ss << ':' << m_devAddr.port;
+ }
+ return ss.str();
}
std::string OCResource::uri() const
return m_uri;
}
-#ifdef CA_INT
OCConnectivityType OCResource::connectivityType() const
{
- return m_connectivityType;
+ return static_cast<OCConnectivityType>(
+ (m_devAddr.adapter << CT_ADAPTER_SHIFT) | (m_devAddr.flags & CT_MASK_FLAGS));
}
-#endif
bool OCResource::isObservable() const
{
return m_isObservable;
}
+std::vector<std::string> OCResource::getResourceTypes() const
+{
+ return m_resourceTypes;
+}
+
+std::vector<std::string> OCResource::getResourceInterfaces(void) const
+{
+ return m_interfaces;
+}
OCResourceIdentifier OCResource::uniqueIdentifier() const
{
std::string OCResource::sid() const
{
- std::ostringstream os;
- os << this->uniqueIdentifier().m_representation;
- return os.str();
+ return this->uniqueIdentifier().m_representation;
}
bool OCResource::operator==(const OCResource &other) const
OCResourceIdentifier::OCResourceIdentifier(const std::string& wireServerIdentifier,
const std::string& resourceUri)
- :m_representation(0), m_resourceUri(resourceUri)
+ :m_representation(wireServerIdentifier), m_resourceUri(resourceUri)
{
- // test required so we can create Resources without a server. Will leave as default.
- if(!wireServerIdentifier.empty())
- {
- m_representation = boost::lexical_cast<unsigned int>(wireServerIdentifier);
- }
}
-ostream& operator <<(ostream& os, const OCResourceIdentifier& ri)
+std::ostream& operator <<(std::ostream& os, const OCResourceIdentifier& ri)
{
-
os << ri.m_representation<<ri.m_resourceUri;
return os;
projects / platform / upstream / iotivity.git / blobdiff