contrib/iotivity.git
9 years agoImplemented libcoap's tinyDTLS interface
Sachin Agrawal [Fri, 14 Nov 2014 00:03:57 +0000 (16:03 -0800)]
Implemented libcoap's tinyDTLS interface

libcoap needs to encrypt/decrypt packets while sending on
secure port. This changeset implements interface for libcoap
to use tinyDTLS for creating DTLS sessions and performing
crypto operations.
This changeset is dependent on having tinyDTLS installed
under oic-resourc/resource/csdk directory.

Change-Id: I728b147991b94b802f125ad8e457c1830a114fba
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoRepo Merge: Modified makefile for the soft sensor manager
William R. Dieter [Thu, 6 Nov 2014 04:49:45 +0000 (23:49 -0500)]
Repo Merge: Modified makefile for the soft sensor manager

Change-Id: I1f37e387d8c5d85b2ef95123126cc098e9b83735
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoRepo Merge: Modified makefiles for the things graph manager
William R. Dieter [Thu, 6 Nov 2014 04:49:45 +0000 (23:49 -0500)]
Repo Merge: Modified makefiles for the things graph manager

Change-Id: I3c72a7b173c5070fb794ad59e2cb3866c53e9a9a
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoRepo Merge: Adding Arduino WiFi/Ethernet patches
William R. Dieter [Thu, 6 Nov 2014 04:49:45 +0000 (23:49 -0500)]
Repo Merge: Adding Arduino WiFi/Ethernet patches

Change-Id: I976cbec7819b89eaa72f106f5e82184bc3dc888a
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoRepo Merge: Move cJSON from oic-utilities to remove the dependency
William R. Dieter [Thu, 6 Nov 2014 04:49:45 +0000 (23:49 -0500)]
Repo Merge: Move cJSON from oic-utilities to remove the dependency

Modified makefile for the cJSON move.

Change-Id: I48602f6c2bb8888690a1bf4a629df0c8981a8b3a
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoRepo Merge: Moving resource API down a directory
William R. Dieter [Thu, 6 Nov 2014 04:49:45 +0000 (23:49 -0500)]
Repo Merge: Moving resource API down a directory

Change-Id: I92868cd59907eae66db7f18f7e9e1c65e02cc914
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoUpdated Makefiles and CMakeLists.txt to point to resource, not oic-resource
William R. Dieter [Wed, 8 Oct 2014 18:36:11 +0000 (14:36 -0400)]
Updated Makefiles and CMakeLists.txt to point to resource, not oic-resource

Change-Id: I6a9b95042157d2f14ca8670a17198a487fc0fc3e
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoAdded snapshot of oic-service repository
William R. Dieter [Wed, 8 Oct 2014 16:50:26 +0000 (12:50 -0400)]
Added snapshot of oic-service repository

The original commit hash in oic-service is 6e5c509395d8fa54ea4849b7065c0e2d0bad6b0d.
No attempt is made in this commit to update Makefiles to build.  Makefile updates
will happen in a separate commit.

Change-Id: Ie541169ba2d10c10833c08b6ee90885f3cf704d0
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
9 years agoMerge "fix darwin and ios build error"
Erich Keane [Thu, 6 Nov 2014 01:27:53 +0000 (17:27 -0800)]
Merge "fix darwin and ios build error"

9 years agofix darwin and ios build error
Caiwen Zhang [Wed, 5 Nov 2014 18:45:54 +0000 (02:45 +0800)]
fix darwin and ios build error

1) the logger implementation only consider arduino/android/linux
should add more platform in consider, such as darwin/ios ...

2) Without include <string>, there will be build error with xcode
compiler.

Change-Id: I6c98efdf40dc682f519faf90d04ae81ea406507b
Signed-off-by: Caiwen Zhang <caiwen.zhang@intel.com>
9 years agoMerge "Updated libcoap to send messages using secure port"
Erich Keane [Thu, 6 Nov 2014 00:24:52 +0000 (16:24 -0800)]
Merge "Updated libcoap to send messages using secure port"

9 years agoUpdated libcoap to send messages using secure port
Sachin Agrawal [Wed, 5 Nov 2014 02:30:34 +0000 (18:30 -0800)]
Updated libcoap to send messages using secure port

Whenever a REST request is received by OIC Stack on secure
port, it needs to keep track of this fact for two reasons:
1) It allows upper layer to grant/deny access to secure resource
if the request was unauthenticated.
2) It also allows OC Stack to encrypt the response for a secure
request.
Since existing code was using a mechanism of send_flag to keep
track of various send mechanisms, it was modified to a bit mask
flag.

Change-Id: I293d4378a1e90234daf2553b6c6defdb6a3abac5
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoMerge "Removed 'resource implementation' of libcoap library For enabling security...
Erich Keane [Wed, 5 Nov 2014 21:32:34 +0000 (13:32 -0800)]
Merge "Removed 'resource implementation' of libcoap library For enabling security in libcoap, there is a need to modify methods which are being invoked from 'resource interface' of libcoap. Since libcoap's 'resource interface' is unused in OIC stack, it does not make sense to spend dev cycles in keep on maintaining that code."

9 years agoRemoved 'resource implementation' of libcoap library
Sachin Agrawal [Mon, 3 Nov 2014 06:35:22 +0000 (22:35 -0800)]
Removed 'resource implementation' of libcoap library
For enabling security in libcoap, there is a need to modify methods
which are being invoked from 'resource interface' of libcoap. Since
libcoap's 'resource interface' is unused in OIC stack, it does not
make sense to spend dev cycles in keep on maintaining that code.

Change-Id: I4a201b4bdc999fbe32ecfc051b24787741b51942
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoMerge "Fix wrong return value from OCInitUDP API"
Erich Keane [Tue, 4 Nov 2014 22:57:53 +0000 (14:57 -0800)]
Merge "Fix wrong return value from OCInitUDP API"

9 years agoFix wrong return value from OCInitUDP API
Sachin Agrawal [Tue, 4 Nov 2014 22:37:19 +0000 (14:37 -0800)]
Fix wrong return value from OCInitUDP API

Call to setsocketopt method was hiding the return value from bind
method call (in case bind API fails). Modified code to use the
return value from bind call for API return value.

Change-Id: I7ab39b22444ba5db8a0b25524d4e5f9791c5ccf8
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoMerge "Fixed bug where fridgeclient would immediately exit"
sudarshan prasad [Tue, 4 Nov 2014 21:53:33 +0000 (13:53 -0800)]
Merge "Fixed bug where fridgeclient would immediately exit"

9 years agoMerge "Modify C Sample Applications & solve memory leaks."
Erich Keane [Tue, 4 Nov 2014 21:38:58 +0000 (13:38 -0800)]
Merge "Modify C Sample Applications & solve memory leaks."

9 years agoMerge "Fixed Iotivity logo."
Erich Keane [Tue, 4 Nov 2014 17:47:28 +0000 (09:47 -0800)]
Merge "Fixed Iotivity logo."

9 years agoFixed Iotivity logo.
Sudarshan Prasad [Mon, 3 Nov 2014 22:02:55 +0000 (14:02 -0800)]
Fixed Iotivity logo.

Since Iotivity is going public, the logo needs to match the correct logo.

Change-Id: I2e23f65553cf33228ed21fdde6a80bc80b9fa85a
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
9 years agoMerge "Fix crash issue after observation"
sudarshan prasad [Tue, 4 Nov 2014 07:19:39 +0000 (23:19 -0800)]
Merge "Fix crash issue after observation"

9 years agoFixed bug where fridgeclient would immediately exit
Erich Keane [Tue, 4 Nov 2014 01:04:12 +0000 (17:04 -0800)]
Fixed bug where fridgeclient would immediately exit

When removing the parameter from the constructor, I left the
parends in, which causes it to be interpreted as a function rather
than as an object.  This results in the condition_variable never being
hit.  This returns functionality to forever-blocking like it was
before.

Change-Id: I293f3260cc706db7e6cadde8515a1390bf1c283d
Signed-off-by: Erich Keane <erich.keane@intel.com>
9 years agoFix crash issue after observation
Erich Keane [Tue, 4 Nov 2014 00:42:20 +0000 (16:42 -0800)]
Fix crash issue after observation

I discovered a crash in simpleserver C++ that when being debugged,
it would crash on the observation AFTER the client had cancelled.
The cause was that the NumberRecvHeaderOptions sent was an invalid
character rather than 0!  This fix repairs the issue by ensuring that
the values are initialized correctly.

Change-Id: I35a0a0aa45d356208f1cd563f3558997665881db
Signed-off-by: Erich Keane <erich.keane@intel.com>
9 years agoMerge "Release notes for OCT 31, 2014 release"
Erich Keane [Mon, 3 Nov 2014 21:31:57 +0000 (13:31 -0800)]
Merge "Release notes for OCT 31, 2014 release"

9 years agoRelease notes for OCT 31, 2014 release
Sudarshan Prasad [Sat, 1 Nov 2014 19:13:12 +0000 (12:13 -0700)]
Release notes for OCT 31, 2014 release

Updated release notes based on review comments.
Change-Id: I85e9cf672aaa9e2dbda73e27a7aea9ec51b0aa4a

9 years agoAdding example of a Simple Attribute use on a collection resource using
Joseph Morrow [Sun, 2 Nov 2014 23:18:19 +0000 (18:18 -0500)]
Adding example of a Simple Attribute use on a collection resource using
C SDK.

This involved forming proper JSON examples, as well as adding test
cases to the application as the implementation of test cases were not
fullfilled yet.

Change-Id: I0b217a324334367bf3a923d7aadef5150e385821
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
9 years agoOCPlatform Object Removal
Erich Keane [Sat, 25 Oct 2014 00:15:13 +0000 (17:15 -0700)]
OCPlatform Object Removal

Removed dependency on the OCPlatform object.  We turned it into an internal-singleton(renamed to OCPlatform_impl so that we can use OCPlatform for the namespace, making it more consistent with previous code) with the expectation that people are to use OC::OCPlatform::<functionname> to control the API.
Change-Id: I3f0e13a27021f7454da68add93aaf562506e08ec

9 years agoModify C Sample Applications & solve memory leaks.
omkar [Fri, 10 Oct 2014 00:13:06 +0000 (17:13 -0700)]
Modify C Sample Applications & solve memory leaks.

New Sample applications to demosntrate the basic functionality
of the stack. Added calls to free() to solve JSON related memory
leak issues.

Change-Id: I262fd7f1bca3d78fe46730632d46dc7abeb1d945
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
9 years agoResolve name collision
David Warburton [Wed, 29 Oct 2014 16:39:53 +0000 (12:39 -0400)]
Resolve name collision

Since these two files differed in their names only by case
it was not possible to check them both out at the same time
on a case insensitive filesystem.

Change-Id: I0ba508502b39bf47d157727ce7fb6501f58d68fb
Signed-off-by: David Warburton <david.warburton@intel.com>
9 years agoMerge "roomserver/client updated to demonstrate simple attribute support in collectio...
Erich Keane [Sun, 26 Oct 2014 03:49:52 +0000 (20:49 -0700)]
Merge "roomserver/client updated to demonstrate simple attribute support in collections. Addressed review comments."

9 years agoMerge "Adding C++ UB Unit Tests AND C++ UB Samples to buildScript.mk makefile."
Erich Keane [Fri, 24 Oct 2014 20:26:28 +0000 (13:26 -0700)]
Merge "Adding C++ UB Unit Tests AND C++ UB Samples to buildScript.mk makefile."

9 years agoAdding C++ UB Unit Tests AND C++ UB Samples to buildScript.mk makefile.
Joseph Morrow [Fri, 17 Oct 2014 16:54:18 +0000 (12:54 -0400)]
Adding C++ UB Unit Tests AND C++ UB Samples to buildScript.mk makefile.

This change will be reflected by calling make on any 'Linux' "all" target
in the buildScript.mk makefile. This also contains refactor from UB & TB
to Rich & Lite, respectively.

Change-Id: Ie9c04c28c3f85bf5ffda29c6591cbd2eaeaac1e8

9 years agoroomserver/client updated to demonstrate simple attribute support in collections.
Sashi Penta [Wed, 22 Oct 2014 06:19:01 +0000 (23:19 -0700)]
roomserver/client updated to demonstrate simple attribute support in collections.
Addressed review comments.

Change-Id: I4a054f1990954a9fd9dd3e98feddd204fd692676

9 years agoFixed server crash when we had less than MAX header options
Erich Keane [Thu, 23 Oct 2014 19:42:06 +0000 (12:42 -0700)]
Fixed server crash when we had less than MAX header options

Change-Id: I16a7a1c1049869bd2c26dcec903c2b3f82c11bfb

9 years agoAdded some string constants to cover exception cases
Erich Keane [Thu, 23 Oct 2014 17:59:51 +0000 (10:59 -0700)]
Added some string constants to cover exception cases
Note: I apparently messed up checking if this would compile/work :/  Build server is not working apparently.

Change-Id: I1b7eb33e4f9f1d184eb8c8488c0fe3052a1f1359

9 years agoAdded some string constants to cover exception cases
Erich Keane [Thu, 23 Oct 2014 17:40:37 +0000 (10:40 -0700)]
Added some string constants to cover exception cases

Change-Id: I102a7b136b6cc2d5c309e8c7984869aa51594e80

9 years agoWe wish to prevent multiple instances of OCPlatform from being accidentally created...
Erich Keane [Mon, 20 Oct 2014 22:27:52 +0000 (15:27 -0700)]
We wish to prevent multiple instances of OCPlatform from being accidentally created, so we make the copy-mechanisms private!
Patch 2: Fixed wording of comment in OCPlatform
Change-Id: Ic53816972426a29afc4764982a3ad712fa284945

9 years agoMerge "Fixing the client.c in csdk/stack/test/linux to use OC_LOW_QOS instead of...
William Dieter [Mon, 20 Oct 2014 14:28:43 +0000 (07:28 -0700)]
Merge "Fixing the client.c in csdk/stack/test/linux to use OC_LOW_QOS instead of OC_NON_CONFIRMABLE. This is needed when we include unit tests in the build script."

9 years agoMerge "Edited Arduino Makefiles and READMEs to describe how to ARDUINO_PORT."
William Dieter [Fri, 17 Oct 2014 21:11:35 +0000 (14:11 -0700)]
Merge "Edited Arduino Makefiles and READMEs to describe how to ARDUINO_PORT."

9 years agoFixing many more regressions from String constants change.
Sashi Penta [Fri, 17 Oct 2014 14:04:06 +0000 (07:04 -0700)]
Fixing many more regressions from String constants change.

Change-Id: Id1b6c0f5618c28720565e55354a73eade190f4a4

9 years agoEdited Arduino Makefiles and READMEs to describe how to ARDUINO_PORT.
Joseph Morrow [Thu, 16 Oct 2014 22:29:42 +0000 (18:29 -0400)]
Edited Arduino Makefiles and READMEs to describe how to ARDUINO_PORT.

This fixes an issue that was stopping folks from installing to an Arduino
Due, but not Arduino Mega.

Patch 2: Fix mistype. I wasn't using the ARDUINO_PORT variable.

Change-Id: I8249077378a47cdedc721c5f3e8867c13661a183

9 years agoMerge "Fixing a regression from the StringConstants change, we'd replaced the Propert...
Erich Keane [Thu, 16 Oct 2014 21:35:27 +0000 (14:35 -0700)]
Merge "Fixing a regression from the StringConstants change, we'd replaced the Property key with a different inadvertantly."

9 years agoFixing the client.c in csdk/stack/test/linux to use OC_LOW_QOS instead of OC_NON_CONF...
Yamin Al-Mousa [Thu, 16 Oct 2014 21:35:10 +0000 (14:35 -0700)]
Fixing the client.c in csdk/stack/test/linux to use OC_LOW_QOS instead of OC_NON_CONFIRMABLE.
This is needed when we include unit tests in the build script.

Change-Id: Ib6effb0dd54a126f14e4efdef257693c69a767e2

9 years agoFixing a regression from the StringConstants change, we'd replaced the Property key...
Erich Keane [Thu, 16 Oct 2014 21:19:57 +0000 (14:19 -0700)]
Fixing a regression from the StringConstants change, we'd replaced the Property key with a different inadvertantly.

Change-Id: I8196194b860fc75c6f7d8f0bddebde5fdf379e87

9 years agoFix C++ Unittests build issue.
Sashi Penta [Thu, 16 Oct 2014 20:56:33 +0000 (13:56 -0700)]
Fix C++ Unittests build issue.

Change-Id: I82de00e976ebcf12b6f508e6fb6a222b6cd75e1f

9 years agoMerge "Updated buildscript.mk to include build of TB unit tests and samples."
Erich Keane [Thu, 16 Oct 2014 16:52:10 +0000 (09:52 -0700)]
Merge "Updated buildscript.mk to include build of TB unit tests and samples."

9 years agoMerge "Patch 1: Unittests for C++ Stack: 1. Seperate directory for C++ unit tests...
Erich Keane [Thu, 16 Oct 2014 16:33:53 +0000 (09:33 -0700)]
Merge "Patch 1: Unittests for C++ Stack: 1. Seperate directory for C++ unit tests. 2. tests.cpp file contains unit tests. 3. README explaining to create local.properties to indicate the location of gtest. 4. makefile to build unit tests with google testing framework. 5. One good sample unit test demonstrating the use of unit testing. Patch 2: Addressed review comments."

9 years agoMerge "String Constant changes"
Erich Keane [Thu, 16 Oct 2014 16:32:27 +0000 (09:32 -0700)]
Merge "String Constant changes"

9 years agoMerge "Reverted README back to instructions for buildScript.mk. As per Yamin, he...
Erich Keane [Thu, 16 Oct 2014 16:32:16 +0000 (09:32 -0700)]
Merge "Reverted README back to instructions for buildScript.mk. As per Yamin, he simply acciddentally converted to something else.  He did not intend to push any changes to README.  I'm not sure how this change went through code review on Gerrit."

9 years agoUpdated buildscript.mk to include build of TB unit tests and samples.
Joseph Morrow [Thu, 16 Oct 2014 16:00:59 +0000 (12:00 -0400)]
Updated buildscript.mk to include build of TB unit tests and samples.

I oops'd and some how overlooked this with the 'all_dev' target.

Patch 2: Swapping spots with parent. (ie. Switching parent-child dependency
between this and Change-Id: I1d20b09a095b320971765733b4343a7b781da1d9)

Patch 3: Bailing out on unit tests! The unit tests are rubbish. They
are wayyyyy out of date and WILL NOT build. THe unit test target is/was
pointing to some sample app by Jesse (that i presume was an accident
because it was put into the unit tests directory). This means we have NO
unit tests. This is bad.

Patch 4: Rebase onto master.

Change-Id: Ia9ca015a09bc3408c3ced99eb0432e0fb0814a12

9 years agoReverted README back to instructions for buildScript.mk. As per Yamin, he
Joseph Morrow [Thu, 16 Oct 2014 15:41:03 +0000 (11:41 -0400)]
Reverted README back to instructions for buildScript.mk. As per Yamin, he
simply acciddentally converted to something else.  He did not intend to
push any changes to README.  I'm not sure how this change went through
code review on Gerrit.

Change-Id: I3e9de7f5690fc129873f8e73eac1b1b78ba17fde

9 years agoPatch 1:
Sashi Penta [Sun, 12 Oct 2014 20:44:31 +0000 (13:44 -0700)]
Patch 1:
Unittests for C++ Stack:
1. Seperate directory for C++ unit tests.
2. tests.cpp file contains unit tests.
3. README explaining to create local.properties to indicate the location of gtest.
4. makefile to build unit tests with google testing framework.
5. One good sample unit test demonstrating the use of unit testing.
Patch 2: Addressed review comments.

Change-Id: I6c0ec8af4f7fd13ce9bc8a56b7634074ac161b5f

9 years agoString Constant changes
Chris Mitchell [Tue, 14 Oct 2014 23:46:57 +0000 (16:46 -0700)]
String Constant changes

Change-Id: Ib90cc60fdd5c2ee44a697249af448e07116d75e8

9 years agoAdded commentary to the public API referring to new functionality of
Joseph Morrow [Wed, 15 Oct 2014 22:18:44 +0000 (18:18 -0400)]
Added commentary to the public API referring to new functionality of
notifications when a resource is deleted or when a server is shutdown
gracefully.

Patch 2: Edited commentary to OCStop() as per Erich's review.

Change-Id: I0b71bd3245072ac8f7cf9f67dff66b3d8b501355

9 years agoMerge "Fix build issue for simpleserverHQ"
Erich Keane [Wed, 15 Oct 2014 07:47:30 +0000 (00:47 -0700)]
Merge "Fix build issue for simpleserverHQ"

9 years agoMerge "Release notes for Oct 14 release. Patch2: Incorporated review comments."
Erich Keane [Wed, 15 Oct 2014 07:44:19 +0000 (00:44 -0700)]
Merge "Release notes for Oct 14 release. Patch2: Incorporated review comments."

9 years agoFix build issue for simpleserverHQ
Sashi Penta [Wed, 15 Oct 2014 07:41:35 +0000 (00:41 -0700)]
Fix build issue for simpleserverHQ

Change-Id: I54f2b45968559c0caa052bd53b1a900fd3178fe1

9 years agoRelease notes for Oct 14 release.
Sudarshan Prasad [Wed, 15 Oct 2014 07:25:08 +0000 (00:25 -0700)]
Release notes for Oct 14 release.
Patch2: Incorporated review comments.

Change-Id: Ieff471d87a8eeffe0e33768f9f70951d69e0adb7

9 years ago1. C++ POST updates to include new URI and status for CoAP.
Sashi Penta [Wed, 15 Oct 2014 05:22:37 +0000 (22:22 -0700)]
1. C++ POST updates to include new URI and status for CoAP.
2. Now C++ Entity Handler also return OCEntityHandlerResult
3. Fix build issue.

Change-Id: I4c5e4ba7dab4079b3a45dfca62afc61ee11af22c

9 years agoMerge "POST updates to include new URI and response status in CoAP header"
Erich Keane [Wed, 15 Oct 2014 07:02:40 +0000 (00:02 -0700)]
Merge "POST updates to include new URI and response status in CoAP header"

9 years agoPOST updates to include new URI and response status in CoAP header
Vijay [Wed, 15 Oct 2014 06:30:24 +0000 (23:30 -0700)]
POST updates to include new URI and response status in CoAP header

This was previously submitted as review # 330 but ran into issues during rebase. Abandoning 330 and creating this one. Review comments in 330 have been addressed.

Change-Id: I3f39718975421a9e8e22e953623a81b9c7aac623

9 years agoAdded code for C++ implementation on Delete on both server and client ends.
Sudarshan Prasad [Wed, 15 Oct 2014 03:02:27 +0000 (20:02 -0700)]
Added code for C++ implementation on Delete on both server and client ends.
Patch2 : Incorporated review comments
Change-Id: If666017890ec38890934bb01e53c9f89d49fee42

9 years agoMerge "Delete old testapp files. They do not work and are obsolete."
Erich Keane [Tue, 14 Oct 2014 21:50:00 +0000 (14:50 -0700)]
Merge "Delete old testapp files. They do not work and are obsolete."

9 years agoDelete old testapp files. They do not work and are obsolete.
Chris Mitchell [Tue, 14 Oct 2014 21:43:11 +0000 (14:43 -0700)]
Delete old testapp files. They do not work and are obsolete.

Change-Id: I1b4c1148acef98885b25a42ea3281aa126181948

9 years agoMade small change to sample app to ensure that all clients are notified
Joseph Morrow [Tue, 14 Oct 2014 16:04:31 +0000 (12:04 -0400)]
Made small change to sample app to ensure that all clients are notified
when a server's resource is deleted.

Change-Id: I7eae7c365d9b570ac377d18e50c72e0477862d08

9 years agoClient requests to delete a resource.
Thuyen Tran [Sat, 11 Oct 2014 03:28:48 +0000 (20:28 -0700)]
Client requests to delete a resource.
*Patch 1:
  1. Process request at C apps' level.
  2. Move logic into the C stack instead of app level.
  3. C stack responds to request to a 'to be deleted' resource.
*Patch 2: Added fixes per Sachin's code review.
*Patch 3: Added improvements per Jesse's code review.
***Abandoned changeset #293
***Restarted with changeset #304
*Patch 1: Rebased and changed Makefile per Jesse's feedback.
*Patch 2: Removed 'mark to be deleted' logic per design changes
          and added checks for entity handler result code.
*Patch 3: Fixed build error due to missing newly added coap code.
*Patch 4: Added improvements per Joey's feedbacks.
*Patch 5: Removed extra semicolon in enum to avoid build error.
*Patch 6: Rebased from Joey's changeset #313 and applied my changes on top.
*Patch 7: Rebased of master which has Joey's changeset #313, and added my changes on top.
*Patch 8: Added improvements per comments from Joey and Vijay

Change-Id: Iacec6f56c9f7ce7f61bfda8a47e84368edaf822e

9 years agoSupporting QoS in C++ layer:
Sashi Penta [Tue, 14 Oct 2014 17:18:19 +0000 (10:18 -0700)]
Supporting QoS in C++ layer:
1) Modified the QoS enums so they are not transport specific
2) Overleaded member functions in Platform and Resource to allow specifying QoS
3) Modified internal function hierarchy to pass QoS to C layer
4) Added examples for C++: simpleclientHQ and simpleserverHQ to demo the usage of QoS
5) Modified examples to use the new QoS enums
6) Minor mods in the C layer
7) Minfor fix for OCICUC tests
8) Minfor fix for arduino sample
9) Fixes for received reviews
10)Rebase on to master
11)OCICUC : Platform bare pointer to reference

Change-Id: I5789935e16c851e7d47921a9acdfb15a363daa8e

9 years agoMerge "Added logic to notify all observers when a resource has been deleted by OCDele...
Erich Keane [Mon, 13 Oct 2014 22:47:51 +0000 (15:47 -0700)]
Merge "Added logic to notify all observers when a resource has been deleted by OCDeleteResource API or when OCStop() is called. This will effectively tell all observers that "this" resource is no longer available. This information can be used by a client to infer that the server is going down."

9 years agoMerge "Mods while working User Story US1742"
Erich Keane [Mon, 13 Oct 2014 18:59:53 +0000 (11:59 -0700)]
Merge "Mods while working User Story US1742"

9 years agoAdded logic to notify all observers when a resource has been deleted by
Joseph Morrow [Mon, 13 Oct 2014 18:40:52 +0000 (14:40 -0400)]
Added logic to notify all observers when a resource has been deleted by
OCDeleteResource API or when OCStop() is called. This will effectively tell
all observers that "this" resource is no longer available. This information
can be used by a client to infer that the server is going down.

If any more changes are req'q to encompass the new "Client able to delete
a resource" user story, a new changeset will be generated.

To come: A changeset containing a set (server and client) of examples
using this functionality.

Patch 2: Thuyen rebased on top of mine and for some reason needed to change
the author of my changeset, but doesn't appear to have made any changes to
my changeset other than rebasing it onto master.

Patch 3: Rebased on to newest master and made changes req' by Sachin and
Sudarshan in Patch 1 comments.

Change-Id: I343a5589c2988c45da95ba6d15685c21fa4704b6

9 years agoMods while working User Story US1742
Doug Hudson [Mon, 13 Oct 2014 18:16:26 +0000 (14:16 -0400)]
Mods while working User Story US1742

1. Add additional stack and heap debug info to Arduino ocserver.cpp
2. Add optional debug info to ocmalloc.c.  Disabled by default.
3. Minor parameter name change to libcoap/mem.h
4. Mod libcoap/uthash.h to use OCMalloc instead of malloc

Rebased in response to broken build

Change-Id: I17e443f8dd1c0035140a1c0778532354e68900d8

9 years agoFix OCDoHandle comparation error
Caiwen Zhang [Mon, 13 Oct 2014 19:28:48 +0000 (03:28 +0800)]
Fix OCDoHandle comparation error

OCDoHanlde is 'void *', its size is uncertain. Compare the pointer
directly or must know its real size.

Change-Id: I91614fae4cee52637e9e0aeb42bfd150b63f34ee

9 years agoRevert "Replaced listenCallback PTree with cereal"
Erich Keane [Mon, 13 Oct 2014 17:30:11 +0000 (10:30 -0700)]
Revert "Replaced listenCallback PTree with cereal"

This reverts commit 7e5b9d431a6ddf13c537c0e10bde0b7ecd866f19.

Change-Id: I3ccf81e13f0491394de58da7de4f7d64c439bbeb

9 years agoMerge branch 'master' of ssh://oic/oic-resource
Erich Keane [Sat, 11 Oct 2014 20:28:22 +0000 (13:28 -0700)]
Merge branch 'master' of ssh://oic/oic-resource

9 years agoReplaced listenCallback PTree with cereal
Erich Keane [Sat, 11 Oct 2014 20:02:33 +0000 (13:02 -0700)]
Replaced listenCallback PTree with cereal

Change-Id: I3ded4d42c495c73d5f2fb1d564722758ba8e5879

9 years agoMerge "Fix but in OCUtility.cpp, exception information string wasn't being included."
Erich Keane [Fri, 10 Oct 2014 23:37:01 +0000 (16:37 -0700)]
Merge "Fix but in OCUtility.cpp, exception information string wasn't being included."

9 years agoFix but in OCUtility.cpp, exception information string wasn't being included.
Jesse Williamson [Fri, 10 Oct 2014 23:25:08 +0000 (16:25 -0700)]
Fix but in OCUtility.cpp, exception information string wasn't being included.

Change-Id: I89a20e6411220eb3be4604a8b8c12e5a6621c644

9 years agoMerge "Fix type conflict"
Erich Keane [Fri, 10 Oct 2014 22:58:39 +0000 (15:58 -0700)]
Merge "Fix type conflict"

9 years agoMerge "Example to demonstrate the idea of sending json object as string in OCRepresen...
Erich Keane [Thu, 9 Oct 2014 22:02:24 +0000 (15:02 -0700)]
Merge "Example to demonstrate the idea of sending json object as string in OCRepresenation"

9 years agoFix type conflict
Caiwen Zhang [Thu, 9 Oct 2014 21:08:25 +0000 (05:08 +0800)]
Fix type conflict

In address.h, coap_address_t is defined as OCDevAddr, it should be used
as coap_address_t not 'struct coap_address_t'

Change-Id: I110ebc2e7064dad6588d4b3ae7625a2edde58093

9 years agoAdded clean up logic in makefile for ocicuc to remove new app
Joseph Morrow [Thu, 9 Oct 2014 20:53:58 +0000 (16:53 -0400)]
Added clean up logic in makefile for ocicuc to remove new app
"small_example."

Change-Id: I564c7468582f449127ae54e96298cb7733b7ee6e

9 years agoExample to demonstrate the idea of sending json object as string in OCRepresenation
Sashi Penta [Thu, 9 Oct 2014 17:18:49 +0000 (10:18 -0700)]
Example to demonstrate the idea of sending json object as string in OCRepresenation

Change-Id: I73a7c35241a55da856174223e121c3d808ed476f

9 years agoMerge "fix for arduinodue "install" target for ocserver sample application."
Erich Keane [Thu, 9 Oct 2014 16:51:43 +0000 (09:51 -0700)]
Merge "fix for arduinodue "install" target for ocserver sample application."

9 years agoMerge "Made additions to buildSCript and various makefiles to ensure a better "make...
Erich Keane [Thu, 9 Oct 2014 16:51:27 +0000 (09:51 -0700)]
Merge "Made additions to buildSCript and various makefiles to ensure a better "make clean" of all targets in the entire repo."

9 years agoMerge "Tidy up logging call sites; throw in a few places. Remove old code (from my...
Erich Keane [Thu, 9 Oct 2014 16:50:27 +0000 (09:50 -0700)]
Merge "Tidy up logging call sites; throw in a few places. Remove old code (from my change). Clip lines. (ouch!)"

9 years agoMade additions to buildSCript and various makefiles to ensure a better
Joseph Morrow [Thu, 9 Oct 2014 15:22:10 +0000 (11:22 -0400)]
Made additions to buildSCript and various makefiles to ensure a better
"make clean" of all targets in the entire repo.

Patch 2: Cleaned up error that caused loop when "clean" target was called
by buildScipt.mk or makefile at root of repo.

Change-Id: Ib3b93a0a3a8b26c226ffdbf4851fa7176392a9b4

9 years agoVector of OCRepresentations type in OCRepresentation
Sashi Penta [Wed, 8 Oct 2014 15:31:12 +0000 (08:31 -0700)]
Vector of OCRepresentations type in OCRepresentation

Change-Id: If1097afc87010d7d930e125d83b140e85bad11ef

9 years agofix for arduinodue "install" target for ocserver sample application.
Joseph Morrow [Wed, 8 Oct 2014 16:25:56 +0000 (12:25 -0400)]
fix for arduinodue "install" target for ocserver sample application.

Change-Id: If49a841f5a4a65016bf6493cbf734f6a3d1a51dd

9 years agoTidy up logging call sites; throw in a few places.
Erich Keane [Wed, 8 Oct 2014 23:38:10 +0000 (16:38 -0700)]
Tidy up logging call sites; throw in a few places.
Remove old code (from my change).
Clip lines. (ouch!)

Change-Id: If83a68d24b70e8f576d73334eace7366c98a57a4

9 years agoMerge "Revert "Fix to remove quotes around array of strings as attribute value. Patch...
Erich Keane [Wed, 8 Oct 2014 22:59:56 +0000 (15:59 -0700)]
Merge "Revert "Fix to remove quotes around array of strings as attribute value. Patch 2: Fixed same for array of bool Change-Id: Ib732ac8aff643cc579f57aafee27dee39b2f33f7""

9 years agoRevert "Fix to remove quotes around array of strings as attribute value. Patch 2...
Erich Keane [Wed, 8 Oct 2014 22:17:25 +0000 (15:17 -0700)]
Revert "Fix to remove quotes around array of strings as attribute value. Patch 2: Fixed same for array of bool Change-Id: Ib732ac8aff643cc579f57aafee27dee39b2f33f7"

This reverts commit f9f016f533d200725ad39f1af34b67af529a8949.

Change-Id: Idbc9ddb9b93e189f3fb55c1cb0ede0d0a4989303

9 years agoMerge "1. Fix for IOT-58. Set the resourceInterfaceName to be default when it is...
Erich Keane [Wed, 8 Oct 2014 20:40:58 +0000 (13:40 -0700)]
Merge "1. Fix for IOT-58. Set the resourceInterfaceName to be default when it is set to empty string. NULL is still considered to be an error condition. 2. NULL string replaced by default interface using strlen(). 3. Removed extra tab 4. Removed unnecessary paranthesis. Changed !strlen() to strlen()==0 5. Changed default interface name macro. Change-Id: I91c159e880f9e5c905c47415b48577f623ff3311"

9 years agoMerge "Fix compile error"
Erich Keane [Wed, 8 Oct 2014 20:40:24 +0000 (13:40 -0700)]
Merge "Fix compile error"

9 years ago1. Fix for IOT-58. Set the resourceInterfaceName to be default when it is set to...
Omkar Hegde [Tue, 7 Oct 2014 16:40:24 +0000 (09:40 -0700)]
1. Fix for IOT-58. Set the resourceInterfaceName to be default when it is set to empty string.
NULL is still considered to be an error condition.
2. NULL string replaced by default interface using strlen().
3. Removed extra tab
4. Removed unnecessary paranthesis. Changed !strlen() to strlen()==0
5. Changed default interface name macro.
Change-Id: I91c159e880f9e5c905c47415b48577f623ff3311

9 years agoFix compile error
Caiwen Zhang [Wed, 8 Oct 2014 19:22:57 +0000 (03:22 +0800)]
Fix compile error

const modifier is required for new avr-gcc compiler

Change-Id: Ic6edb878e6de720c115ac30f88ad8ce3c2618e53

9 years agoMerge "Broke out build script into variability.. Added support to build either in...
Erich Keane [Wed, 8 Oct 2014 18:33:24 +0000 (11:33 -0700)]
Merge "Broke out build script into variability.. Added support to build either in debug or release. It defaults to release. Added support to build either ethernet or wifi for both Mega and Due. Converged build process of sample app for Arduino Due into the sample app makefile for Arduino Mega."

9 years ago1. Added a check in ocstack.c for the Maximum JSON payload that can be sent.
Omkar Hegde [Mon, 6 Oct 2014 16:40:00 +0000 (09:40 -0700)]
1. Added a check in ocstack.c for the Maximum JSON payload that can be sent.
2. Added specific error message to result. Changes in if() as suggested.
4. Replaced tab with spaces and moved the check before any processing begins.
Change-Id: Id06ce2f7deaf643acd4f3cf4fcdd9ce30e2eddbc

9 years agoMerge "Updated example program."
Erich Keane [Wed, 8 Oct 2014 17:25:06 +0000 (10:25 -0700)]
Merge "Updated example program."

9 years ago1. Changes made to Sample application (ocserver) in csdk. No need to
Omkar Hegde [Sat, 4 Oct 2014 02:49:09 +0000 (19:49 -0700)]
1. Changes made to Sample application (ocserver) in csdk. No need to
hardcode the JSON strings anymore. Added createJSONResponse() function
for this purpose. Edited the makefile to include the cJSON library.
2. Made some changes to the makefile.
3. Jenkins Failure
4. Indentation Changes
5. 6 . 7.  8. 9.  Gerrit issues
11. Rebase
Change-Id: Ice9dd8cd614bc78cb2ea034ec15ea1a61db1770a

9 years agoBuild system base on scons(oic-resource)
Caiwen Zhang [Wed, 8 Oct 2014 21:15:57 +0000 (05:15 +0800)]
Build system base on scons(oic-resource)

Currently support:
 1) build linux binary on ubuntu
 2) build android binary on windows/ubuntu/Mac OSX
 3) build darwin binary on Mac OSX
 4) build IOS on MAC OSX
 5) build arduino on linux

CPU ARCHs support:
 1) linux: host default arch, support cross compile for other arch
 2) android: x86, x86_64, armeabi, armeabi-v7a, armeabi-v7a-hard,
arm64-v8a
 3) darwin: i386, x86_64
 4) IOS: i386/x86_64 (Simulator), armv7, armv7s, arm64
 5) arduino: avr, arm

Last test and synced with commit 55e34d19a791cf01655012d1daef3ebd18e0e9f4

Change-Id: I40df2989cf48e0f32767c0aebdcc734aa0362e15