#ifdef HAVE_IN6ADDR_H
#include <in6addr.h>
#endif
+#include "ocstack.h"
namespace OC {
static const char COAP[] = "coap://";
static const char COAPS[] = "coaps://";
static const char COAP_TCP[] = "coap+tcp://";
+static const char COAPS_TCP[] = "coaps+tcp://";
static const char COAP_GATT[] = "coap+gatt://";
static const char COAP_RFCOMM[] = "coap+rfcomm://";
const OCDevAddr& devAddr, const std::string& uri,
const std::string& serverId, uint8_t property,
const std::vector<std::string>& resourceTypes,
- const std::vector<std::string>& interfaces)
+ const std::vector<std::string>& interfaces,
+ const std::string& deviceName)
: m_clientWrapper(clientWrapper), m_uri(uri),
m_resourceId(serverId, m_uri), m_devAddr(devAddr),
m_isCollection(false), m_property(property),
m_resourceTypes(resourceTypes), m_interfaces(interfaces),
- m_observeHandle(nullptr)
+ m_observeHandle(nullptr), m_deviceName(deviceName)
{
m_isCollection = std::find(m_interfaces.begin(), m_interfaces.end(), LINK_INTERFACE)
!= m_interfaces.end();
interfaces.empty()||
m_clientWrapper.expired())
{
- throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
- interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, resourceTypes.empty(),
+ interfaces.empty(), m_clientWrapper.expired(), false, false, false);
}
}
const std::string& serverId,
OCConnectivityType connectivityType, uint8_t property,
const std::vector<std::string>& resourceTypes,
- const std::vector<std::string>& interfaces)
+ const std::vector<std::string>& interfaces,
+ const std::string& deviceName)
: m_clientWrapper(clientWrapper), m_uri(uri),
m_resourceId(serverId, m_uri),
m_isCollection(false), m_property(property),
m_resourceTypes(resourceTypes), m_interfaces(interfaces),
- m_observeHandle(nullptr)
+ m_observeHandle(nullptr), m_deviceName(deviceName)
{
m_devAddr = OCDevAddr{OC_DEFAULT_ADAPTER, OC_DEFAULT_FLAGS, 0, {0}, 0,
#if defined (ROUTING_GATEWAY) || defined (ROUTING_EP)
- {0}
+ {0},
#endif
- };
+ {0}};
m_isCollection = std::find(m_interfaces.begin(), m_interfaces.end(), LINK_INTERFACE)
!= m_interfaces.end();
interfaces.empty()||
m_clientWrapper.expired())
{
- throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
- interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, resourceTypes.empty(),
+ interfaces.empty(), m_clientWrapper.expired(), false, false, false);
}
if (uri.length() == 1 && uri[0] == '/')
{
- throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
- interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), true, resourceTypes.empty(),
+ interfaces.empty(), m_clientWrapper.expired(), false, false, false);
}
if (uri[0] != '/')
{
- throw ResourceInitException(m_uri.empty(), resourceTypes.empty(),
- interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), true, resourceTypes.empty(),
+ interfaces.empty(), m_clientWrapper.expired(), false, false, false);
}
// construct the devAddr from the pieces we have
{
prefix_len = sizeof(COAP_TCP) - 1;
}
+ else if (host.compare(0, sizeof(COAPS_TCP) - 1, COAPS_TCP) == 0)
+ {
+ prefix_len = sizeof(COAPS_TCP) - 1;
+ m_devAddr.flags = static_cast<OCTransportFlags>(m_devAddr.flags | OC_SECURE);
+ }
else if (host.compare(0, sizeof(COAP_GATT) - 1, COAP_GATT) == 0)
{
prefix_len = sizeof(COAP_GATT) - 1;
}
else
{
- throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
- m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false, true);
}
// remove 'coap://' or 'coaps://' or 'coap+tcp://' or 'coap+gatt://' or 'coap+rfcomm://'
if (std::string::npos == bracket || 0 == bracket)
{
- throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
- m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, false);
}
// extract the ipv6 address
std::string ip6Addr = host_token.substr(1, bracket - 1);
const char *cAddr = ip6AddrToValidityCheck.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);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), true, false, false);
}
//skip ']' and ':' characters in host string
if (0 > port || UINT16_MAX < port)
{
- throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
- m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), true, false, false);
+ }
+
+ OCStackResult result = OCDecodeAddressForRFC6874(m_devAddr.addr,
+ sizeof(m_devAddr.addr), ip6Addr.c_str(), nullptr);
+
+ if (OC_STACK_OK != result)
+ {
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, 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);
+ 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);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, false, true);
}
else
{
// 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);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, false);
}
for (size_t blockCnt = 0; blockCnt < MAC_ADDR_BLOCKS; blockCnt++)
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);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, false);
}
if (MAC_ADDR_BLOCKS - 1 > blockCnt)
if (':' != delimiter)
{
- throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
- m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, false);
}
}
}
if (colon == std::string::npos || colon == 0)
{
- throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
- m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, false);
}
// extract the ipv4 address
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);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), true, false, false);
}
//skip ':' characters in host string
if (0 > port || UINT16_MAX < port)
{
- throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(),
- m_interfaces.empty(), m_clientWrapper.expired(), false, false);
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), true, false, false);
}
ip4Addr.copy(m_devAddr.addr, sizeof(m_devAddr.addr));
const QueryParamsMap& queryParametersMap, ObserveCallback observeHandler,
QualityOfService QoS)
{
- if (m_observeHandle != nullptr)
- {
- return result_guard(OC_STACK_INVALID_PARAM);
- }
-
return checked_guard(m_clientWrapper.lock(), &IClientWrapper::ObserveResource,
observeType, &m_observeHandle, m_devAddr,
m_uri, queryParametersMap, m_headerOptions,
if (m_devAddr.adapter & OC_ADAPTER_TCP)
{
- ss << COAP_TCP;
+ if (m_devAddr.flags & OC_SECURE)
+ {
+ ss << COAPS_TCP;
+ }
+ else
+ {
+ ss << COAP_TCP;
+ }
}
else if (m_devAddr.adapter & OC_ADAPTER_GATT_BTLE)
{
if (m_devAddr.flags & OC_IP_USE_V6)
{
- ss << '[' << m_devAddr.addr << ']';
+ char addressEncoded[128] = {0};
+
+ OCStackResult result = OCEncodeAddressForRFC6874(addressEncoded,
+ sizeof(addressEncoded),
+ m_devAddr.addr);
+ if (OC_STACK_OK != result)
+ {
+ throw ResourceInitException(m_uri.empty(), false, m_resourceTypes.empty(),
+ m_interfaces.empty(), m_clientWrapper.expired(), false, true, false);
+ }
+ ss << '[' << addressEncoded << ']';
}
else
{
return this->uniqueIdentifier().m_representation;
}
+std::string OCResource::deviceName() const
+{
+ return m_deviceName;
+}
+
+OCDevAddr OCResource::getDevAddr() const
+{
+ return m_devAddr;
+}
+
#ifdef WITH_MQ
OCStackResult OCResource::discoveryMQTopics(const QueryParamsMap& queryParametersMap,
MQTopicCallback attributeHandler,