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
}
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,
if (OC_STACK_OK != result)
{
- 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);
}
m_devAddr.port = static_cast<uint16_t>(port);
}
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));
m_devAddr.addr);
if (OC_STACK_OK != result)
{
- 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);
}
ss << '[' << addressEncoded << ']';
}
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,