Patch 1 (Yamin): This is where all work is merged from
authorYamin S Al-mousa <yamin.s.al-mousa@intel.com>
Wed, 3 Sep 2014 02:16:08 +0000 (19:16 -0700)
committerYamin S Al-mousa <yamin.s.al-mousa@intel.com>
Wed, 3 Sep 2014 02:16:08 +0000 (19:16 -0700)
commitc8ef4d0c62760d0ac65311957d2fa5196b7563aa
treef02af8a6e7fa701b1e6d54744ae099895e2022c0
parent810f47fd2176215c8be68eb398edc8019f543c76
Patch 1 (Yamin): This is where all work is merged from
Sashi, Joey and myself

Patch 2 (Sashi): Looks like some debugging printf work. Should
be removed. Sashi?

Patch 3 (Joey): Applying changes as per review by Chanchala in parent
changeset Change-Id: I2625063e4a6bdfa53e3954310a060ea3c0ee5d3c

Patch 4 (Joey & Yamin): Squash all of Active Discovery and rebase
on to master.

Patch 5 (Joey): Cleaned up warnings and refactored merge conflicts
that caused build server to fail.

Patch 6 (Yamin): More debugging and restructuring... more work needed specifically for the TTL logic

Patch 7 and 8 (Yamin): Fixed TTL logic and presence cancelation, more clean up to come...

Patch 9: Added the random TTL logic and cleaned up.

Change-Id: I4bbd72e066ed4b50f4d2be52367844918a29823a
21 files changed:
csdk/libcoap-4.1.1/net.c
csdk/occoap/include/occoap.h
csdk/occoap/include/occoaphelper.h
csdk/occoap/src/occoap.c
csdk/occoap/src/occoaphelper.c
csdk/ocrandom/include/ocrandom.h
csdk/ocrandom/src/ocrandom.c
csdk/stack/include/internal/occlientcb.h
csdk/stack/include/internal/ocobserve.h
csdk/stack/include/internal/ocresource.h
csdk/stack/include/internal/ocstackinternal.h
csdk/stack/include/ocstack.h
csdk/stack/samples/linux/SimpleClientServer/common.cpp
csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
csdk/stack/src/occlientcb.c
csdk/stack/src/occollection.c
csdk/stack/src/ocobserve.c
csdk/stack/src/ocresource.c
csdk/stack/src/ocstack.c