projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
src
/
ocobserve.c
diff --git
a/resource/csdk/stack/src/ocobserve.c
b/resource/csdk/stack/src/ocobserve.c
index
f7b2d3c
..
9cc6557
100644
(file)
--- a/
resource/csdk/stack/src/ocobserve.c
+++ b/
resource/csdk/stack/src/ocobserve.c
@@
-370,7
+370,10
@@
OCStackResult GenerateObserverId (OCObservationId *observationId)
do
{
do
{
- *observationId = OCGetRandomByte();
+ do
+ {
+ *observationId = OCGetRandomByte();
+ } while (0 == *observationId); //Make sure *observationId is not 0
// Check if observation Id already exists
resObs = GetObserverUsingId (*observationId);
} while (NULL != resObs);
// Check if observation Id already exists
resObs = GetObserverUsingId (*observationId);
} while (NULL != resObs);
@@
-435,11
+438,13
@@
OCStackResult AddObserver (const char *resUri,
obsNode->devAddr = *devAddr;
obsNode->resource = resHandle;
obsNode->devAddr = *devAddr;
obsNode->resource = resHandle;
+#ifdef WITH_PRESENCE
if ((strcmp(resUri, OC_RSRVD_PRESENCE_URI) == 0))
{
obsNode->TTL = 0;
}
else
if ((strcmp(resUri, OC_RSRVD_PRESENCE_URI) == 0))
{
obsNode->TTL = 0;
}
else
+#endif
{
obsNode->TTL = GetTicks(MAX_OBSERVER_TTL_SECONDS * MILLISECONDS_PER_SECOND);
}
{
obsNode->TTL = GetTicks(MAX_OBSERVER_TTL_SECONDS * MILLISECONDS_PER_SECOND);
}