contrib/iotivity.git
10 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."

10 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."

10 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

10 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

10 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

10 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

10 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

10 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

10 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."

10 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."

10 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

10 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

10 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."

10 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

10 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

10 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

10 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."

10 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."

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

10 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."

10 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

10 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

10 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

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

Change-Id: Ib90cc60fdd5c2ee44a697249af448e07116d75e8

10 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

10 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"

10 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."

10 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

10 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

10 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

10 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"

10 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

10 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

10 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."

10 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

10 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

10 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

10 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

10 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."

10 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"

10 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

10 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

10 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

10 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

10 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

10 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

10 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."

10 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

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

10 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"

10 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

10 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

10 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

10 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."

10 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."

10 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!)"

10 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

10 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

10 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

10 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

10 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""

10 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

10 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"

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

10 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

10 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

10 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."

10 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

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

10 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

10 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

10 years agoUpdated example program.
Erich Keane [Wed, 8 Oct 2014 16:18:13 +0000 (09:18 -0700)]
Updated example program.

Change-Id: I02d9a652a1b80ec7eebe0dde1039dae7b5dbdbec

10 years agoMerge "Fix to remove quotes around array of strings as attribute value. Patch 2:...
Erich Keane [Wed, 8 Oct 2014 01:41:36 +0000 (18:41 -0700)]
Merge "Fix to remove quotes around array of strings as attribute value. Patch 2: Fixed same for array of bool Change-Id: Ib732ac8aff643cc579f57aafee27dee39b2f33f7"

10 years agoFix to remove quotes around array of strings as attribute value.
Sudarshan Prasad [Wed, 8 Oct 2014 01:22:35 +0000 (18:22 -0700)]
Fix to remove quotes around array of strings as attribute value.
Patch 2:
Fixed same for array of bool
Change-Id: Ib732ac8aff643cc579f57aafee27dee39b2f33f7

10 years agoChanges in C++ for vendor specific header options to be sent from client to server...
Sudarshan Prasad [Wed, 1 Oct 2014 02:01:06 +0000 (19:01 -0700)]
Changes in C++ for vendor specific header options to be sent from client to server and vice-versa
Patch 2:
Code clean up
Fixes for sending header options from client to server
Patch 3:
Added additional comments;
Addressed review comments, added more comments.
Added implementation for sending header options from server to client.
Updated related sample files.
Added comments
Rebased with master
Completed additional changes for building.
Patch 4:
Removed unnecessary statements in makefile.

Change-Id: Ie984051615632263a0f653dc5a1347f8b50dae10

10 years agoBroke out build script into variability.. Added support to build either in
Joseph Morrow [Tue, 7 Oct 2014 20:42:35 +0000 (16:42 -0400)]
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.

Patch 2: Fixed ocserver sample application.Made change suggested by Sachin.
Also edited README from typo.

Change-Id: Ib4d76f255be37e970899562e6e5f2ebbb246fd06

10 years agoFixing returned error codes in OCProcessPresence.
Yamin S Al-mousa [Mon, 6 Oct 2014 23:52:15 +0000 (16:52 -0700)]
Fixing returned error codes in OCProcessPresence.

Change-Id: I1976a240bdd440708acfc4e10bfc0bc06437c35a

10 years agoChanged std::mutex to std::recursive_mutex in the client/server wrappers. This will...
Erich Keane [Thu, 2 Oct 2014 21:47:17 +0000 (14:47 -0700)]
Changed std::mutex to std::recursive_mutex in the client/server wrappers.  This will allow us to call create/get/put/etc from the entity handler\!

Added the simpleclient/simpleserver changes from Sashi's review.  Should be able to use them to test post.

Change-Id: I3e96e0a1915e4da0e4ce5880db0b00c6dd73f247

10 years agoMake exception and error handling more consistent through the top-level API.
Erich Keane [Mon, 6 Oct 2014 17:50:47 +0000 (10:50 -0700)]
Make exception and error handling more consistent through the top-level API.

Following up on Sudarshan's comments.

Change-Id: I8e19a89952f5235abbab43f1eb266604b5a4f1ac

10 years agoAdd README to ocicuc; add small_example near-minimal demo program;
Jesse Williamson [Fri, 3 Oct 2014 22:15:14 +0000 (15:15 -0700)]
Add README to ocicuc; add small_example near-minimal demo program;
Miscellaneous small fixes.

Change-Id: I8fc65b8eca5c05e231c2820ccdb8ca8237eb084e

10 years agoMerge "1.Optimization to reduce number of strlen() calls. 2. Removed the extra blank...
Erich Keane [Fri, 3 Oct 2014 20:20:28 +0000 (13:20 -0700)]
Merge "1.Optimization to reduce number of strlen() calls. 2. Removed the extra blank line. 3. '?' is no longer considered a part of the query Change-Id: Ieabc1352a4cccc504ae1caac59b154aa7a9c0997"

10 years ago1.Optimization to reduce number of strlen() calls.
Omkar Hegde [Fri, 3 Oct 2014 18:19:52 +0000 (11:19 -0700)]
1.Optimization to reduce number of strlen() calls.
2. Removed the extra blank line.
3. '?' is no longer considered a part of the query
Change-Id: Ieabc1352a4cccc504ae1caac59b154aa7a9c0997

10 years agoMerge "Added file describing artifact locations from all build processes. Right now...
Erich Keane [Fri, 3 Oct 2014 16:18:03 +0000 (09:18 -0700)]
Merge "Added file describing artifact locations from all build processes. Right now, it only describes artifact locations that the buildScript.mk file outputs after being run. However, this will be updated to include all arduino due targets, as well the additional arduino mega wifi target."

10 years agoMerge "Arduino Due needs to use DWORD to read address of strings stored in PROGMEM"
Erich Keane [Fri, 3 Oct 2014 16:16:09 +0000 (09:16 -0700)]
Merge "Arduino Due needs to use DWORD to read address of strings stored in PROGMEM"

10 years agoAdded file describing artifact locations from all build processes. Right
Joseph Morrow [Thu, 2 Oct 2014 22:14:16 +0000 (18:14 -0400)]
Added file describing artifact locations from all build processes. Right
now, it only describes artifact locations that the buildScript.mk file
outputs after being run. However, this will be updated to include
all arduino due targets, as well the additional arduino mega wifi target.

Patch 2: Added note in README to refer to artifact_output_locations.txt
file.

Change-Id: I7a7f5ed639c27457bb495891723ca0fa344e2adb

10 years agoMerge "Tech writer reviewed edits for programmer's guide"
William Dieter [Fri, 3 Oct 2014 13:30:43 +0000 (06:30 -0700)]
Merge "Tech writer reviewed edits for programmer's guide"

10 years agoArduino Due needs to use DWORD to read address of strings stored in PROGMEM
Sachin Agrawal [Thu, 2 Oct 2014 22:57:44 +0000 (15:57 -0700)]
Arduino Due needs to use DWORD to read address of strings stored in PROGMEM

Change-Id: Ie01b61df3fecfa12f64d0acfdfdf6f1bd5f8f581

10 years agoMerge "Added mechanism to set URI in the regular entity handler's request. This allow...
Erich Keane [Thu, 2 Oct 2014 21:50:19 +0000 (14:50 -0700)]
Merge "Added mechanism to set URI in the regular entity handler's request. This allows app's entity handler to retrieve the URI of resource from a request."

10 years agoTech writer reviewed edits for programmer's guide
shamit patel [Wed, 1 Oct 2014 20:07:52 +0000 (15:07 -0500)]
Tech writer reviewed edits for programmer's guide

Change-Id: Ia8703d6017105b819395edfba378521848e56ea1
Signed-off-by: shamit patel <shamit.patel@intel.com>
10 years agoCancel threads before exiting in
Doug Hudson [Thu, 2 Oct 2014 21:10:44 +0000 (17:10 -0400)]
Cancel threads before exiting in
csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp and ocservercoll.cpp.
If threads are not canceled before exiting program, valgrind shows lost bytes.
While not really a stack problem, it could be distracting while trying to
use valgrind to find future memory leaks in the stack.

Change-Id: I653916211d6115381fae33cf95338c83b395d6fe

10 years agoAdded mechanism to set URI in the regular entity handler's request.
Sudarshan Prasad [Thu, 2 Oct 2014 20:10:10 +0000 (13:10 -0700)]
Added mechanism to set URI in the regular entity handler's request.
This allows app's entity handler to retrieve the URI of resource from a request.

Patch 2:
Addressed review comments - Added lock before map operation

Change-Id: Iaa5cad56580046bc05efc974d4a7e65213856bfd

10 years agoMerge "IOT-57 fix. We were mis-assigning a pointer during construction"
Erich Keane [Thu, 2 Oct 2014 18:15:20 +0000 (11:15 -0700)]
Merge "IOT-57 fix.  We were mis-assigning a pointer during construction"

10 years agoIOT-57 fix. We were mis-assigning a pointer during construction
Erich Keane [Thu, 2 Oct 2014 18:07:32 +0000 (11:07 -0700)]
IOT-57 fix.  We were mis-assigning a pointer during construction

Change-Id: Ifc2301b6b7a9146940290c00d1fb13568e8472a9

10 years agoMakefile changes req'd for a global build script. Also, global build
Joseph Morrow [Thu, 2 Oct 2014 17:48:45 +0000 (13:48 -0400)]
Makefile changes req'd for a global build script. Also, global build
script implementation "buildScript.mk." Updated base README to reflect
the options and requirements for running this build script.

Patch 2: Edited makefiles so that developers CAN continue to use the build
processes they're used to. Also added 'all_dev' target that will build as
much of everything the build server can (including OCICUC) to prevet
regression in the build process as much as possible with a full-blown
build script.

Patch 3: Had to edit oc_logger makefile to support the new directory output
structure from the edits of this changeset. Also took care of issues
that Erich pointed out.

Patch 4: Added notes to README to state what is NOT being built by the
current iteration of buildScript.mk. Also edited lines of README that Doug
had mentioned needed updated in Patch 3.

Patch 5: Edited mistype in README and edited csdk/makefile as suggested by
Sachin.

Note: Arduino Due is not a part of the build script process.  This changeset
needs to be verified on the build server and put in place as the sole build
process. Once this is done, Support for building the Arduino Due will go in
place. Also, Ethernet Vs. Wifi build support will go in place at that time.
Right now everything is Ethernet.

Change-Id: Ie9938d9f3069aff1858141565dc66b4e2ece9e98

10 years agoFixed upsets in C Stack that caused breakage in the Arduino Build.
Joseph Morrow [Wed, 1 Oct 2014 21:56:01 +0000 (17:56 -0400)]
Fixed upsets in C Stack that caused breakage in the Arduino Build.

Change-Id: I6462963404db66d9c8af7543269d02d5591c718c

10 years agoRelease notes for Sept 30, 2014 release.
Sudarshan Prasad [Wed, 1 Oct 2014 08:26:37 +0000 (01:26 -0700)]
Release notes for Sept 30, 2014 release.
Patch 2:
Review comments addressed
Change-Id: Ifa00dee2d1e79d285a35fe750a92b9cba3ebe073

10 years agoMerge "1 Bug fix to check for length of uri and query separately. 2 Addressed the...
Erich Keane [Wed, 1 Oct 2014 08:05:28 +0000 (01:05 -0700)]
Merge "1 Bug fix to check for length of uri and query separately. 2 Addressed the code review feedback. No longer using strtok, moved check logic to separate function. 3 Optimized the code to use strlen only once. 4. Fixed Build failure"

10 years ago1 Bug fix to check for length of uri and query separately.
Vijay [Wed, 1 Oct 2014 07:49:17 +0000 (00:49 -0700)]
1 Bug fix to check for length of uri and query separately.
2 Addressed the code review feedback. No longer using strtok,
moved check logic to separate function.
3 Optimized the code to use strlen only once.
4. Fixed Build failure

Change-Id: I1d1c8ad39716a93dc32196e110d5a8f1df2ee959

10 years agoFix in makefile to build fridgeclient and fridgeserver samples
Sudarshan Prasad [Wed, 1 Oct 2014 07:22:31 +0000 (00:22 -0700)]
Fix in makefile to build fridgeclient and fridgeserver samples

Change-Id: I1b42d33c6dc3b77e25579a6370b9bf8327edaa08

10 years ago1. Supporting POST operation in C Stack.
Sashi Penta [Wed, 1 Oct 2014 07:01:06 +0000 (00:01 -0700)]
1. Supporting POST operation in C Stack.
2. Supporting POST operation in CPP Stack.
3. Updates to C sample application
4. Rebase
5. Fixed build issue.

Change-Id: I00b70a5eb8f4c1c911416d703e3c739b2a80ff7b