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
Sashi Penta [Wed, 8 Oct 2014 15:31:12 +0000 (08:31 -0700)]
Vector of OCRepresentations type in OCRepresentation
Change-Id: If1097afc87010d7d930e125d83b140e85bad11ef
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""
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
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"
Erich Keane [Wed, 8 Oct 2014 20:40:24 +0000 (13:40 -0700)]
Merge "Fix compile error"
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
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
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."
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
Erich Keane [Wed, 8 Oct 2014 17:25:06 +0000 (10:25 -0700)]
Merge "Updated example program."
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
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
Erich Keane [Wed, 8 Oct 2014 16:18:13 +0000 (09:18 -0700)]
Updated example program.
Change-Id: I02d9a652a1b80ec7eebe0dde1039dae7b5dbdbec
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"
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
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
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
Yamin S Al-mousa [Mon, 6 Oct 2014 23:52:15 +0000 (16:52 -0700)]
Fixing returned error codes in OCProcessPresence.
Change-Id: I1976a240bdd440708acfc4e10bfc0bc06437c35a
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
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
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
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"
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
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."
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"
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
William Dieter [Fri, 3 Oct 2014 13:30:43 +0000 (06:30 -0700)]
Merge "Tech writer reviewed edits for programmer's guide"
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
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."
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>
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
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
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"
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
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
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
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
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"
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
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
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
William Dieter [Wed, 1 Oct 2014 03:40:19 +0000 (20:40 -0700)]
Merge "C++ programer's guide"
Yamin S Al-mousa [Wed, 1 Oct 2014 00:48:32 +0000 (17:48 -0700)]
This commit to support exposing vendor specific options to application:
1) Define a structure defining the vendor specific options
2) Pass an array of vendor specific options needed with the call to OCDoResource
3) Vendor specific header options are checked against the range of acceptable vendor specific header options
4) Vendor specific header options are added to the pdu being sent
5) Vendor specific header options are parsed and added to OCEntityHandlerRequest and OCClientResponse structs
6) Rebased on to master
7) Adding a test case to occlient for sending vendor specific option
8) Adding The number of options to be sent and the ones received, also adding this infor to OCEntityHandlerRequest and OCClientResponse structs
9) Rebased on to master
Change-Id: I5d4c56028bf510fba57ad4fc440565fd4b87ca31
Erich Keane [Wed, 1 Oct 2014 00:29:36 +0000 (17:29 -0700)]
Merge "Added URI parameter for Device Entity Handler."
Erich Keane [Tue, 30 Sep 2014 23:38:35 +0000 (16:38 -0700)]
Merge "Modified makefiles so that each makefile could build its own dependencies or build only itself. Fixed .gitignore and makefiles base on review comments. Rebased as requested by Erich. Added fix to building with boost Cleaned up .gitignore"
Thuyen Tran [Wed, 24 Sep 2014 00:00:12 +0000 (17:00 -0700)]
Modified makefiles so that each makefile could build its own dependencies or build only itself.
Fixed .gitignore and makefiles base on review comments.
Rebased as requested by Erich.
Added fix to building with boost
Cleaned up .gitignore
Change-Id: I0829400e74694f2a7f8271ea72f93e7cd7be000c
Sashi Penta [Tue, 30 Sep 2014 07:35:52 +0000 (00:35 -0700)]
Added URI parameter for Device Entity Handler.
Change-Id: If37e64f6578b6a8eccee9b9ea43690123d6ac2aa
Sashi Penta [Tue, 30 Sep 2014 08:44:54 +0000 (01:44 -0700)]
APIs to setNULL and check for NULL in OCRepresenation
Change-Id: I3db71123c1362efaf7e641a845fa737057d56da5
Erich Keane [Mon, 29 Sep 2014 23:10:24 +0000 (16:10 -0700)]
Merge "1. Default device entity handler implementation in Cpp Stack. 2. Addressed review comments."
Erich Keane [Mon, 29 Sep 2014 23:04:13 +0000 (16:04 -0700)]
Merge "IOT-36 (Leak 2) : Fixing memory leaks Patch 2 : Taking care of some review comments. Patch 3 : Update in occoaphelper.c."
Sashi Penta [Thu, 25 Sep 2014 01:48:57 +0000 (18:48 -0700)]
1. Default device entity handler implementation in Cpp Stack.
2. Addressed review comments.
Change-Id: I8745b604d62d9c2e49fce1cedb3af185ae2f5f5b
Erich Keane [Mon, 29 Sep 2014 18:40:44 +0000 (11:40 -0700)]
Merge "Fix cosmetic regression bug reported by Habteab and Mark. https://01.org/jira/browse/IOT-54"
Erich Keane [Mon, 29 Sep 2014 18:01:44 +0000 (11:01 -0700)]
Merge "Logging effort created a regression in InProcClientWrapper that caused get/observe to not work. This fixes said regression"
Jesse Williamson [Mon, 29 Sep 2014 17:54:59 +0000 (10:54 -0700)]
Fix cosmetic regression bug reported by Habteab and Mark.
https://01.org/jira/browse/IOT-54
Change-Id: I6b7a946111800848249fea2258dff3253c7a5048
Erich Keane [Mon, 29 Sep 2014 17:51:27 +0000 (10:51 -0700)]
Merge "Simultaneous ACK and RST message received at Server causes SegFaults"
Erich Keane [Mon, 29 Sep 2014 17:46:55 +0000 (10:46 -0700)]
Merge "New APIs : hasAttribute, numberOfAttributes, erase in OCRepresentation."
Erich Keane [Mon, 29 Sep 2014 17:28:38 +0000 (10:28 -0700)]
Logging effort created a regression in InProcClientWrapper that caused get/observe to not work. This fixes said regression
Change-Id: Id6ac04d3aec3ee1f9f0d93e2cfe06cc65324d1b5
Sachin Agrawal [Mon, 29 Sep 2014 16:08:08 +0000 (09:08 -0700)]
IOT-36 (Leak 2) : Fixing memory leaks
Patch 2 : Taking care of some review comments.
Patch 3 : Update in occoaphelper.c.
Change-Id: I9bba4039e37cc94b0acad061a68d3f1cec427372
Sachin Agrawal [Mon, 29 Sep 2014 04:34:34 +0000 (21:34 -0700)]
Simultaneous ACK and RST message received at Server causes SegFaults
Change-Id: I9f609c926ed80bba940a8ba5533cea755c181be6
Sashi Penta [Fri, 26 Sep 2014 22:04:08 +0000 (15:04 -0700)]
New APIs : hasAttribute, numberOfAttributes, erase in OCRepresentation.
Change-Id: Ia6df616bdd73d7e73a34563896dd3c5d941b9a8b
Erich Keane [Wed, 24 Sep 2014 21:35:05 +0000 (14:35 -0700)]
c_logger implementation
Patch 2: rebase on master
Patch 3: adding license headers to missing files
Patch 4: rebase on master
Change-Id: I8c3d16000432df1de4b08633142ecc01ee423e0d
Doug Hudson [Fri, 26 Sep 2014 15:18:51 +0000 (11:18 -0400)]
1. Modify libcoap to use OCMalloc and OCFree.
2. Modify uri.c to call coap_free instead of free.
Change-Id: If404da557bf3f2191ad1036b9a6ac91e10a96ca9
Erich Keane [Thu, 25 Sep 2014 21:23:49 +0000 (14:23 -0700)]
Merge "Remove hard-coded IP address from the samples. removed duplicate call to OCBuildIPv4Address OCInitCoAP."
Sashi Penta [Wed, 24 Sep 2014 19:06:12 +0000 (12:06 -0700)]
Remove hard-coded IP address from the samples.
removed duplicate call to OCBuildIPv4Address OCInitCoAP.
Change-Id: I51ed3ff71997069e375043e37946180223a60141
Erich Keane [Thu, 25 Sep 2014 16:24:14 +0000 (09:24 -0700)]
Merge "IOT-36 : Fixing memory leaks"
Erich Keane [Thu, 25 Sep 2014 16:23:53 +0000 (09:23 -0700)]
Merge "1. Create csdk/ocmalloc directory 2. Create ocmalloc.c and ocmalloc.h 3. Remove OCMalloc and OCFree functions from ocstack.c and ocstack.h 4. Modify stack source modules to include ocmalloc.h 5. Modify stack makefiles to use ocmalloc.c and ocmalloc.h 6. Add doxygen function comments to ocmalloc.h 7. Remove #include from within #ifdef __cplusplus block 8. Add comment to ocmalloc.h describing the intention of the module."
Erich Keane [Wed, 24 Sep 2014 23:18:07 +0000 (16:18 -0700)]
Merge "Default device entity handler implementation in C Stack."
Doug Hudson [Wed, 24 Sep 2014 21:36:57 +0000 (17:36 -0400)]
1. Create csdk/ocmalloc directory
2. Create ocmalloc.c and ocmalloc.h
3. Remove OCMalloc and OCFree functions from ocstack.c and ocstack.h
4. Modify stack source modules to include ocmalloc.h
5. Modify stack makefiles to use ocmalloc.c and ocmalloc.h
6. Add doxygen function comments to ocmalloc.h
7. Remove #include from within #ifdef __cplusplus block
8. Add comment to ocmalloc.h describing the intention of the module.
Change-Id: I453d4ced530d7539f8b00b22b3f651327ea6a42c
Sachin Agrawal [Wed, 24 Sep 2014 21:22:47 +0000 (14:22 -0700)]
IOT-36 : Fixing memory leaks
Change-Id: I8ed2d398d79c43abf4d0131232c88f9ae8890f8f
Sashi Penta [Wed, 24 Sep 2014 21:07:08 +0000 (14:07 -0700)]
Default device entity handler implementation in C Stack.
Patch 1-3: Implementation.
Patch 4-5: Review comments from Doug and Joey.
Patch 6: Joey -> Resolved 'defaultDeviceHandler' declaration
down to one instance.
Patch 7: Reverted Patch 6.
Patch 8: Removed the declaration from ocresource.c
Change-Id: Ic1a47f65ae6772ecf417fa5f7dcb384db029a4b7
Erich Keane [Thu, 18 Sep 2014 22:56:30 +0000 (15:56 -0700)]
Fridge example which shows a nice set of the std::bind functionality as well as how to use the ResourceObject creation. Note that this will not function correctly without the csdk fix for resource commas.
Patch 2: Resolve Sudarshan's fixes
Patch 3: rebase & remove previous version of code
Change-Id: Ic7c5f3ae5da40cd8e6e82692e0f5e3b878f34489
Erich Keane [Wed, 24 Sep 2014 16:20:14 +0000 (09:20 -0700)]
Merge "Add const modifier"
Caiwen Zhang [Wed, 24 Sep 2014 20:11:26 +0000 (04:11 +0800)]
Add const modifier
const modifier is required for new avr-gcc compiler
Change-Id: I1a7b4b4059632e0c6ea83a65d7514785575416cf
Sashi Penta [Tue, 23 Sep 2014 23:38:36 +0000 (16:38 -0700)]
use of const reference where possible.
Change-Id: I4f47fdc385f58f2e52ce10bffa68ae0910e496c9
Erich Keane [Tue, 23 Sep 2014 22:49:15 +0000 (15:49 -0700)]
Merge "1. arrays in OCRepresentation 2. Fixed review comments from Jesse. 3. Refactored the code to get JSON from vector."
Erich Keane [Tue, 23 Sep 2014 22:49:04 +0000 (15:49 -0700)]
Merge "JSON Object implementation"
Sashi Penta [Tue, 23 Sep 2014 07:06:07 +0000 (00:06 -0700)]
1. arrays in OCRepresentation
2. Fixed review comments from Jesse.
3. Refactored the code to get JSON from vector.
Change-Id: I1f31f8f0c242f53f56cf50f9d9e781d8ed770f8c
Sashi Penta [Fri, 19 Sep 2014 07:06:05 +0000 (00:06 -0700)]
JSON Object implementation
1. Support for JSON object in OCRepresentation.
2. Code refactor for JSON composition in various parts of the stack into one place (OCRepresenation).
3. Similar code refactoring for JSON parsing needs to be done. I will revisit when we look into
JSON parse library alternatives.
4. Implemented correct JSON composition. Earlier we were returning strings for all the json types.
Now strings are only used for string types and JSON objects.
5. garageserver.cpp and garageclient.cpp examples to explain the user of JSON object with in
the representation.
Change-Id: I9461db811c7b5e3b827d5704cde489aa2005e291
shamit patel [Mon, 22 Sep 2014 22:59:50 +0000 (17:59 -0500)]
C++ programer's guide
Change-Id: Iab4d32ae3776cfbbe0f4c9947c71d11aaf605634
Erich Keane [Mon, 22 Sep 2014 18:16:33 +0000 (11:16 -0700)]
Non-discoverable resources cause bad JSON (trailing comma). By putting the comma generation first, we buy ourselves some room
Change-Id: Ie270c22e0f61c657f15ecf45fcbdb96de72d495f
Yamin S Al-mousa [Fri, 19 Sep 2014 17:56:47 +0000 (10:56 -0700)]
A fix for a bug reported by Omkar and Vijay:
The check for required uri lenght should consider that it includes the uri and query.
Change-Id: I1ca3e4709de02cb4f5217aba5133b8aa2bc4ee14
Sashi Penta [Fri, 19 Sep 2014 09:15:50 +0000 (02:15 -0700)]
Makefile in ocicuc is not cleaning up all the object files.
Change-Id: Ia1d198b96b61a82c07c069b4545ad40460cf2f4c
Erich Keane [Thu, 18 Sep 2014 17:32:45 +0000 (10:32 -0700)]
Merge "Revert "Replace to_string and stoi""
Erich Keane [Thu, 18 Sep 2014 17:32:32 +0000 (10:32 -0700)]
Revert "Replace to_string and stoi"
We have decided that sprintf is not stable/future proof enough, so we are going to revert this change (and the other one) and investigate what it would take to make android-only implementations of tostring and stoi
This reverts commit
dcfe2eb3bee0296aee3cc4453f4237c784251671.
Change-Id: I82bb37e42aa5b6809bdf6a6522dac678ba74aac0
Caiwen Zhang [Thu, 18 Sep 2014 17:56:05 +0000 (01:56 +0800)]
Replace to_string and stoi
Part of C++11 features aren't supported by Android NDK, includes
to_string and stoi. Replace them with snprintf and atoi.
Change-Id: I6edda1856ab34c0e1dcc23daef0b105875a09189
Erich Keane [Thu, 18 Sep 2014 16:49:57 +0000 (09:49 -0700)]
Merge "Fixing Arduino compilation error"
Erich Keane [Thu, 18 Sep 2014 16:49:22 +0000 (09:49 -0700)]
Merge "Avoid redefine 'NDEBUG'"
Caiwen Zhang [Thu, 18 Sep 2014 17:18:50 +0000 (01:18 +0800)]
Avoid redefine 'NDEBUG'
Change-Id: I1a8e1c5b0a8b7aa0c1ab19e292485e4e20ab90a5
Erich Keane [Thu, 18 Sep 2014 16:48:45 +0000 (09:48 -0700)]
Merge "Fixed warning (control reaching end of non void function) in OCPlatform.cpp"
Sachin Agrawal [Thu, 18 Sep 2014 15:39:57 +0000 (08:39 -0700)]
Fixing Arduino compilation error
Change-Id: I030f3d66b54ab61bd866f434e3cadfee30ff4ac7
Sudarshan Prasad [Thu, 18 Sep 2014 02:18:38 +0000 (19:18 -0700)]
Fixed warning (control reaching end of non void function) in OCPlatform.cpp
Change-Id: Ibab82216537c0927794bfb57dbe9e97f52b4d028
Erich Keane [Wed, 17 Sep 2014 21:07:36 +0000 (14:07 -0700)]
Merge "Support for notifying specific observers using observation Id"
Erich Keane [Wed, 17 Sep 2014 21:01:16 +0000 (14:01 -0700)]
Added release notes for Sept 17th, 2014 release.
Change-Id: I3bf64deb84e54b2c9306c03688ff5d8be9fe4053
Vijay [Wed, 17 Sep 2014 20:48:56 +0000 (13:48 -0700)]
Support for notifying specific observers using observation Id
1. Initial code changes
2. Combine GET & observe registration calls to entity handler into a single call; support for CON messages in NotifySpecificObservers; updates sample server app
3. Added the support for immediate observe cancelation in OCCancel
4. Fixed the new interface to OCCancel in C++ layer
5. A temp solution for the case when observation sequence number wraps around.
6. Merging with Yamin's changes
7. Changed OCNotifyObservers to OCNotifyAllObservers
8. Build issue
9. Another Merge to support calling the entity handler when deregister an observer
10. Rebase & CPP Changes from Sudarshan and Sashi to support Notify specific observers.
11. Command line argument options for simpleserver (so it can choose between all observers or specific observers)
12. CPP bugfix.
13. Fixed review comments for CPP.
14. Changed COAP_DEFAULT_RESPONSE_TIMEOUT to 2 and all the sample applications to sleep accordingly.
15. Fixed review comment for new line.
16. Fixed review commend for line exceed.
17. Response to comments received on patch 11
18. Header file comments updated
Change-Id: I03aa7ab2a580899441b70bd2a76cca05575b192a
Erich Keane [Tue, 16 Sep 2014 21:31:56 +0000 (14:31 -0700)]
Removed <oic-resource>/csdk/android and <oic-resoruce>/csdk/controller plus <oic-resource>/csdk/libcoap-4.1.1/config.log and config.status
PatchSet 2: Erich Rebased for submission sake
Change-Id: I0d5a355924aca94847aa70f8adcb10c700164cdc
Signed-off-by: Charunethran PG <charunethran.panchalam.govindarajan@intel.com>
Erich Keane [Tue, 16 Sep 2014 20:58:10 +0000 (13:58 -0700)]
Merge "Partial Implementation of US1574:"
Sashi Penta [Wed, 10 Sep 2014 22:19:16 +0000 (15:19 -0700)]
Partial Implementation of US1574:
OCRepresentation is now provides simpler interface to setValue and getValue from the applications.
Applications doesn't have to go through attributeMaps in OCRepresentation.
OCRepresentation now supports serialization/deserialization for primitive attributes (numbers, booleans and strings) so application doesn't have to deal with strings.
Change-Id: I09d323fc624d87c0b2a3c9b510935a6d5907a11b
Erich Keane [Tue, 16 Sep 2014 18:02:38 +0000 (11:02 -0700)]
Merge "Removed extraneous comment. The callback process is triggered from a lower point in the stack than from here. The consideration written in comment here has already been taken care of, as per Yamin."
Erich Keane [Tue, 16 Sep 2014 18:02:15 +0000 (11:02 -0700)]
Merge "IOT-48 : Updated makefiles for compiling OCStack with WiFi libraries for Arduino 1.0.5 Patch 2 : Included suggestions provided in Review comments."