projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.0.1
[platform/upstream/iotivity.git]
/
resource
/
include
/
OCSerialization.h
diff --git
a/resource/include/OCSerialization.h
b/resource/include/OCSerialization.h
index
b112af1
..
b681eee
100644
(file)
--- a/
resource/include/OCSerialization.h
+++ b/
resource/include/OCSerialization.h
@@
-21,6
+21,7
@@
#include <StringConstants.h>
#include "ocpayload.h"
#include "ocrandom.h"
#include <StringConstants.h>
#include "ocpayload.h"
#include "ocrandom.h"
+#include "oic_string.h"
namespace OC
{
namespace OC
{
@@
-50,7
+51,7
@@
namespace OC
while(res)
{
char uuidString[UUID_STRING_SIZE];
while(res)
{
char uuidString[UUID_STRING_SIZE];
- if(OCConvertUuidToString(
res
->sid, uuidString) != RAND_UUID_OK)
+ if(OCConvertUuidToString(
payload
->sid, uuidString) != RAND_UUID_OK)
{
uuidString[0]= '\0';
}
{
uuidString[0]= '\0';
}
@@
-81,19
+82,29
@@
namespace OC
{
while(colRes)
{
{
while(colRes)
{
+ // currently support for ipv4 is provided.
+ OCDevAddr colAddr;
+ colAddr.adapter = OC_ADAPTER_IP;
+ colAddr.flags = OC_IP_USE_V4;
+ char *ptr = strtok(colRes->tags->baseURI, ":");
+ OICStrcpy(colAddr.addr, sizeof(colAddr.addr), ptr);
+
if (colRes->tags->bitmap & OC_SECURE)
{
if (colRes->tags->bitmap & OC_SECURE)
{
-
m_dev
Addr.flags =
+
col
Addr.flags =
(OCTransportFlags)(OC_FLAG_SECURE | m_devAddr.flags);
}
(OCTransportFlags)(OC_FLAG_SECURE | m_devAddr.flags);
}
-
if (colRes->tags->port != 0)
{
if (colRes->tags->port != 0)
{
- m_devAddr.port = colRes->tags->port;
+ colAddr.port = colRes->tags->port;
+ }
+ else
+ {
+ colAddr.port = atoi(ptr+1);
}
m_resources.push_back(std::shared_ptr<OC::OCResource>(
}
m_resources.push_back(std::shared_ptr<OC::OCResource>(
- new OC::OCResource(m_clientWrapper,
m_dev
Addr,
+ new OC::OCResource(m_clientWrapper,
col
Addr,
std::string(colRes->setLinks->href),
std::string((char*)colRes->tags->di.id),
(colRes->tags->bitmap & OC_OBSERVABLE) == OC_OBSERVABLE,
std::string(colRes->setLinks->href),
std::string((char*)colRes->tags->di.id),
(colRes->tags->bitmap & OC_OBSERVABLE) == OC_OBSERVABLE,