summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
William Dieter [Wed, 20 Aug 2014 01:11:10 +0000 (18:11 -0700)]
Merge "Modified stack unit test makefile (root/csdk/stack/test/makefile) that was broken when root/csdk/makefile mod that created debug and release subdirectories was pushed."
William Dieter [Tue, 19 Aug 2014 16:28:48 +0000 (09:28 -0700)]
Merge "Check-in for container tests for C APIs. They were supposed to be in the previous commit, somehow they got missed during rebase."
clairiky [Tue, 19 Aug 2014 16:07:30 +0000 (09:07 -0700)]
Check-in for container tests for C APIs. They were supposed to be in the previous commit, somehow they got missed during rebase.
Removed tabs
Change-Id: Id5c6f6d64d42cf3ac25ad866ef926c209f7812ec
Sashi Penta [Tue, 19 Aug 2014 03:59:39 +0000 (20:59 -0700)]
Fix build error. Now the entityHandler has its own return type
Change-Id: I1151d88db2c1cb3fada268504948d34723b25e09
clairiky [Tue, 19 Aug 2014 02:19:48 +0000 (19:19 -0700)]
Default entity handler outline for collection resources
Added GET for LL and def for default entity handler.
This commit has Sachin's and Chanchala'a changes.
This is GET (LL and B) and PUT (B) working from C apps. New JSON format is
also implemented.
Jesse's review incorporated and tabs removed.
Change-Id: I9d27612d545fdeda1798a5b8c01953a260cfdbef
William Dieter [Tue, 19 Aug 2014 01:04:14 +0000 (18:04 -0700)]
Merge "integrated coapuriparser fixed the crash occuring when freeing memory in OCUtilities.cpp added a temporary patch in OCUtilities.cpp after discussion with Sudarshan made changes to makefile and OCUtilities.h as per Bill and Joey's comments."
Aniket Pingley [Fri, 15 Aug 2014 21:29:33 +0000 (14:29 -0700)]
integrated coapuriparser
fixed the crash occuring when freeing memory in OCUtilities.cpp
added a temporary patch in OCUtilities.cpp after discussion with Sudarshan
made changes to makefile and OCUtilities.h as per Bill and Joey's comments.
Change-Id: I53f838bf6cd2e78d5a9c9eadfeb982d29bde54cb
William Dieter [Sun, 17 Aug 2014 22:59:26 +0000 (15:59 -0700)]
Merge "we don't need linux/if_link.h. Removing this allows building in other platforms"
sashi [Sat, 16 Aug 2014 17:52:27 +0000 (10:52 -0700)]
we don't need linux/if_link.h. Removing this allows building in other platforms
Change-Id: Idef28aeb8f1aa8341439bdac8bfeb17326dd3344
Joseph Morrow [Fri, 15 Aug 2014 20:49:36 +0000 (16:49 -0400)]
Porting TBStack Functionality to Arduino. The following changes were made
for this:
Added PCF() wrappers around const char* strings to store pre-defined debug
statements in flash, rather than RAM. This only 'affects' Arduino. It has
no affect on linux.
Removed erroneous/un-wanted #include headers from the public TB Stack API
Removed #include ocrandom.h as it was/is unneeded by ISVs.
Updated makefiles to be more friendly between Linux Vs.
Arduino builds (i.e. made both build without a hitch).
Cleaned up warnings that AVR-GCC marked as warnings that regular 'ol GCC
did not. Most notably line 328 or 329 "OCStopCoAP()" is being called
with a parameter. OCStopCoAP does not take ANY parameters.
Fixed bug with Arduino devices not retrieving correct IP address structs
from Linux devices (i.e. OCDevAddr needed to be #pragma packed).
Change-Id: Ided8d61ba647889d7a52fa7a4477ca67944b0fa0
Doug Hudson [Fri, 15 Aug 2014 18:59:35 +0000 (14:59 -0400)]
Modified stack unit test makefile (root/csdk/stack/test/makefile) that was
broken when root/csdk/makefile mod that created debug and release
subdirectories was pushed.
Note that this unit test MAY be used to verify the build on the build server.
Change-Id: If6075d0d06f233ff4902e480a66dda2cc7248366
Sachin Agrawal [Fri, 15 Aug 2014 15:33:48 +0000 (08:33 -0700)]
Fixing the segfault reported by Doug. It is caused because we are attempting to double free pointer. Carrying this from previous repo.
Change-Id: Iac6ccdbc87a2761103487d0aadf25133be50c9c2
Joseph Morrow [Fri, 15 Aug 2014 14:26:45 +0000 (10:26 -0400)]
Merge Teamforge ccf-resource repo onto OIC oic-resource repo.
Merge remote-tracking branch 'oic/master' into oic-merge
Conflicts:
csdk/stack/test/linux/Makefile
Keane, Erich [Thu, 14 Aug 2014 21:42:13 +0000 (14:42 -0700)]
Merge "* initial creation of API documentation Change-Id: I396fa690ce65a4ff88bcfe8c574759a425ec9a53"
shamit [Thu, 14 Aug 2014 20:15:36 +0000 (15:15 -0500)]
* initial creation of API documentation
Change-Id: I396fa690ce65a4ff88bcfe8c574759a425ec9a53
Adam Westhusing [Thu, 14 Aug 2014 20:20:03 +0000 (16:20 -0400)]
Updating all of the makefiles to support separate directories for debug and release artifacts.
Change-Id: I61df1142255bc7abb4d0547c5edcc5e4567a9517
Erich Keane [Thu, 14 Aug 2014 20:41:04 +0000 (13:41 -0700)]
Merge "First implementation for Client and Server in same process. Additionally changed OCResource's IClientWrapper reference to a weak_ptr so that it doesn't cause a deadlock on destruction."
Sachin Agrawal [Thu, 14 Aug 2014 02:46:02 +0000 (19:46 -0700)]
Increasing the size of max server payload(MAX_REQUEST_LENGTH) allowed
Patch 2 : Missed fixing the 'real' culprit.
Change-Id: I4eff9363fa589d3b15b0f9f85c830d59c9f0f979
Sachin Agrawal [Tue, 12 Aug 2014 16:04:21 +0000 (09:04 -0700)]
1. Get/Put callbacks now returning OC_STACK_DELETE_TRAN. This allows us to do memory profiling on stack using sample app. 2. Moved error translation to a common file which can be used by client/server app. 3. some other error cleaning identified in previous reviews
Change-Id: I6b54f127cf3297b9c0b1f6d6f453c2cc68211c01
Erich Keane [Tue, 12 Aug 2014 20:42:47 +0000 (13:42 -0700)]
First implementation for Client and Server in same process. Additionally changed OCResource's IClientWrapper reference to a weak_ptr
so that it doesn't cause a deadlock on destruction.
SimpleClientServer Example that shows off a client and a server operating on the same process. The client only does a discovery and a get
Change-Id: I5221a658e58c9c4f7d0c58cbbc657b6880d860bf
Doug Hudson [Wed, 13 Aug 2014 18:34:12 +0000 (14:34 -0400)]
1. Modified OCCreateResource to allow NULL to be passed as entity handler parameter. If NULL
is passed, the stack's default entity handler is assigned to the resource
2. Modified OCCreateResource so that resource and other dynamic elements it references are
freed upon creation error.
3. Modified OCStop so that all resources and other dynamically created elements they
reference are freed.
4. Modified unit test makefile to build unit test with octbstack.a.
5. Moved unit test makefile from root/csdk/stack to root/csdk/stack/test
6. Fixed all broken API calls in root/csdk/stack/test/stacktests.cpp
Keane, Erich [Wed, 13 Aug 2014 21:29:53 +0000 (14:29 -0700)]
Merge "Updated functions description to match with params listed in function signature"
Thuyen Tran [Tue, 12 Aug 2014 20:33:00 +0000 (13:33 -0700)]
Updated functions description to match with params listed in function signature
Sashi Penta [Tue, 12 Aug 2014 18:16:48 +0000 (11:16 -0700)]
Patch1:
1. Renamed all container stuff to collection stuff both in C/C++.
2. Simplified function names in C stack.
3. Implemented OCUnbindResource in C stack.
4. Implemented unbindResource(s) in C++ stack.
Patch2: Incorporated Doug and Erich's review comments.
Change-Id: I32d8f7248b65e2fee9a05ca52d22f7d247748984
Erich Keane [Tue, 12 Aug 2014 20:25:03 +0000 (13:25 -0700)]
Makefile to build with c++0x, so we can support compilers old enough to attend 1st grade
Change-Id: Iff0367bf67df7e7fd701e42222fbc068797f3916
Erich Keane [Tue, 12 Aug 2014 17:53:04 +0000 (10:53 -0700)]
US1313, abillity to create an OCResource object without discovering it
Change-Id: Ie283435901a6438c4695496c79cca15e248273a2
Thuyen Tran [Tue, 12 Aug 2014 02:04:13 +0000 (19:04 -0700)]
Add ObserveAll case in SimpleClient C++
Change-Id: I8769f8bec28ddfa607819926384f2aee9143618f
Sudarshan Prasad [Mon, 11 Aug 2014 19:58:18 +0000 (12:58 -0700)]
Added Get and Put for collection. TODO: implementation
Sashi Penta [Fri, 8 Aug 2014 17:33:32 +0000 (10:33 -0700)]
bindResource and bindResources implementation
Change-Id: I26747c1360ebc4f385474ee09e403af10b245253
Erich Keane [Mon, 11 Aug 2014 16:09:08 +0000 (09:09 -0700)]
1) Minor change in ocsocket and libcoap to identify if a packet was received on unicast or multicast address/socket
Patch 2 : Fixed identified review comments.
Modified ocserver to listen on '5683' so that occlient
can send unicast discovery requests to it.
Patch 3 : 'Really' taking care of tabs this time.
Change-Id: I50c0d47133a469d20ba17e26f2df540e97d099bc
Joseph Morrow [Mon, 11 Aug 2014 15:53:42 +0000 (11:53 -0400)]
Accidentally pushed and set makefile for TB Stack to build for ARDUINO. I reverted this to LINUX. To build for ARDUINO issue this in terminal:
make PLATFORM=arduino
Sudarshan Prasad [Mon, 11 Aug 2014 13:46:41 +0000 (06:46 -0700)]
Fix for building OIC code. Makefile was pointing to ccf-utilities which was incorrect. Fix is to point to oic-utilities.
Change-Id: Ic2944a890d9856bb32f940946d6fd5e3c42d3300
Keane, Erich [Fri, 8 Aug 2014 23:49:26 +0000 (16:49 -0700)]
Merge "Changing TBStack makefiles to allow for DEBUG & RELEASE modes through & through."
Keane, Erich [Fri, 8 Aug 2014 23:48:27 +0000 (16:48 -0700)]
Merge "- US1321 - Now, C++ API users will be able to register multiple types and interfaces to a resource. The API names may change after review. - Removed unwanted trailing whitespaces at the end of lines. - Updated according to review comments."
Joseph Morrow [Fri, 8 Aug 2014 22:15:46 +0000 (18:15 -0400)]
Changing TBStack makefiles to allow for DEBUG & RELEASE modes through & through.
Renaming all instances of "Makefile" to "makefile". Justification:
From what I can read "makefile" is ran over "Makefile" when "make" is ran.
Also, more of our makefiles have a lower-case "m" as of now.
Also, this move/rename doesn't affect anyone..I used the git-mv command because I know using "mv" would be detrimental to anyone using Windows.
clairiky [Fri, 8 Aug 2014 21:23:49 +0000 (14:23 -0700)]
- US1321 - Now, C++ API users will be able to register multiple types and interfaces
to a resource. The API names may change after review.
- Removed unwanted trailing whitespaces at the end of lines.
- Updated according to review comments.
Change-Id: I13f7fcd07386d4a13d42f00254f870cfbd8ca4b4
Joseph Morrow [Fri, 8 Aug 2014 20:43:33 +0000 (16:43 -0400)]
Updated C++ stack makefiles to build in DEBUG or RELEASE modes.
Westhusing, Adam [Fri, 8 Aug 2014 17:32:16 +0000 (10:32 -0700)]
Merge "Updated TB Stack Unittest source code and makefile to be up to date with current state of TB Stack."
Joseph Morrow [Fri, 8 Aug 2014 17:29:36 +0000 (13:29 -0400)]
Updated TB Stack Unittest source code and makefile to be up to date with current state of TB Stack.
Adam Westhusing [Fri, 8 Aug 2014 15:24:19 +0000 (11:24 -0400)]
Fixing the unit test Makefile so it can find cJSON in ccf-utilities
Adam Westhusing [Fri, 8 Aug 2014 15:16:17 +0000 (11:16 -0400)]
Fixing the unit tests so that they build in Jenkins.
Sudarshan Prasad [Fri, 8 Aug 2014 09:34:56 +0000 (02:34 -0700)]
Added the possible APIs for binding a resource to another resource. This is for resource collection feature. TODO implementation for the functions.
Erich Keane [Thu, 7 Aug 2014 22:16:12 +0000 (15:16 -0700)]
Fixed a TODO that got reported by Chris
Change-Id: I185ea9161f40a920d9183a33482c7d410d1d0caa
Keane, Erich [Thu, 7 Aug 2014 22:09:29 +0000 (15:09 -0700)]
Merge "Removing resourceAttributeRepresentation and allowedMethods parameters through the C Stack. These parameters are not required, and confusing C++ stack developers."
Erich Keane [Thu, 7 Aug 2014 21:31:51 +0000 (14:31 -0700)]
Merge "US1310: C++ Client will now do callbacks when an error callback is received and it is required to by the spec"
Erich Keane [Wed, 6 Aug 2014 03:15:59 +0000 (20:15 -0700)]
US1310: C++ Client will now do callbacks when an error callback is received and it is required to by the spec
Patch 2 & 3: responded to code-review feedback
Change-Id: I726cca729164ae5eb13ac154a0bec9819e2f441f
William R. Dieter [Thu, 7 Aug 2014 01:00:36 +0000 (21:00 -0400)]
Added Release Notes from Sudarshan.
Change-Id: Ibff971b9b9ba6b42f08b427503cc44d5b40b4f59
Sashi Penta [Wed, 6 Aug 2014 21:41:19 +0000 (14:41 -0700)]
Removing resourceAttributeRepresentation and allowedMethods parameters through the C Stack. These parameters are not required, and confusing C++ stack developers.
Erich Keane [Tue, 5 Aug 2014 21:58:16 +0000 (14:58 -0700)]
Fixed the makefile to properly use CJSON
Erich Keane [Tue, 5 Aug 2014 21:51:56 +0000 (14:51 -0700)]
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/ccf-resource
Sashi Penta [Tue, 5 Aug 2014 21:21:47 +0000 (14:21 -0700)]
All changes in the C++ stack to get the Get/put/StartObserve functionality working. Combination/squash of Sashi & Erich's effort.
Patch3: OCStackResult return added to registerResource
Patch4: Simplified simpleserver.cpp
Patch5: Cleaned InProcServerWrapper.cpp
Patch6: Responded to a number of issues that came up as a part of the code review (thanks Jesse!)
Patch7: Review comments from Sudarshan/Sam
Patch8: Rebased on PS21 from Joey, enabled cancel, pushing so we can debug it.
Patch9: Got cancel working correctly, removed the Cancel callback, since we aren't provided with it from the lower layer
Patch10: Cleaned some tabs space. Changed the resource to core.light. Removed examples from examples. and other cleanups.
Patch11: Header file changes from Sudarshan. Fixed tabs.
Patch12: Rebase
Patch13: improved examples. Added myLightResource.setRepresentation()
Patch14: Simple one line change (adding a new line)
Change-Id: Ic6fb03372bf9ff2bca94ff9605fd5f30ce5fac1f
Vijay Kesavan [Tue, 5 Aug 2014 21:19:25 +0000 (14:19 -0700)]
To come on this changeset: All convergences between and server and client observation functionality.
Added changes for implementing SequenceNum on Client Side.
Fixed token nuances. Now server and client utilize the same token.
Added Delete functionality to observer implementation.
Sequence Iterator work...It works!! :D
Patch #7 : Modified OCClientResponseHandler callback signature. Updated occlient sample app to reflect that.
Updated code in OCDoResource API for proper error handling.
Updated OCClientCb.h to store DoHandle instead of address of DoHandle.
Took care of some other small tid-bits regarding code formatiing.
Patch #8 : Made one little change Sachin forgot. Check for ptr == NULL not needed when calling free().
Patch #9 : Put in logic for OBSERVE_ALL notification Vs. OBSERVE on client-side. Now client will not accept notifications out of order if OC_REST_OBSERVE is used.
Patch #10 & 11: Added more complete logic for OBSERVE Vs. OBSERVE_ALL logic. Also verified that out of order notifications are handled correctly in each case.
Patch #12: Added functionality to convert coap errors to OC stack errors for server respsonses.
Updated OCClient application to weild specific usage scenarios.
Patch #13: Added fix for some of code review comments by Jesse.
Updated occlient.cpp to OC_REST_OBSERVE in InitObserveRequest method.
Patch #14: (Joey) Added RST to Remove Observations logic.
Patch #15: Rebase on master
Patch #16: (Vijay) Observe delete on server
Patch #17: (Vijay) Fixed issues with cancel (cancel observe still not working)
Patch #18: (Joey) Reverted and Fixed issues with cancel observe.
Patch #19: (Vijay) Observer list delete
Patch #20: (Joey) Fully implemented Cancel Observe. Needs Vijay's approval. (I.e. if Vijay +1's we're done make changes except for code review changes)
Patch #21: (Joey) Cleaned up ALL warnings (minus TODO pragma messages someone has put in.).
Patch #22: (Vijay) Clean up of observe delete and removed printfs
Patch #23: (Vijay) Addressed some of the review comments
Change-Id: Iad7a4263ece57f1545606a5cf05ddfcacb48d363
EC TF Bind account [Tue, 5 Aug 2014 13:11:06 +0000 (06:11 -0700)]
Initial empty repository
Joseph Morrow [Sun, 3 Aug 2014 23:23:37 +0000 (19:23 -0400)]
Server-side changes to support observe functionality.
Moved/Added occoaptoken.h. There were some weird cyclical dependency patterns in the compiler.
CoAP token storage for observe sends.
Sending sequence numbers with observations.
Change-Id: Ib101a093c6c37066e4b6d51218fc689f2c5423e5
Joseph Morrow [Sun, 3 Aug 2014 00:05:05 +0000 (20:05 -0400)]
Added API enum for removing observation of servers' resource.
Turned out to be a very minimal change to the public API.
Added more changes to fulfill callback management requirements. (i.e. Token in/out on OCDoResource())
Reverted Token implementation. Defined "OCDoHandle"
Turned off many over-zealous ignore-warning flags. Fixed few errors that arose with that.
Made fixes to all modules (minus libcoap, which didnt need it) to get the stack to build with new infrastructure (i.e. baggage of maintaining ODDoHandle) in place.
Rebased on top of Sachin's changeset. Made changes so that the stack and apps build and compile.
Sachin made changes to a makefile. I rebased onto his patch set #6.
Changed "eth3" to "eth0" in sample apps. Turned tabs into spaces.
Somehow 'OCDoHandle' was commented out in my changeset? Well, I uncommented it out and it builds again. Logging ONLY works with "make BUILD=debug" now. I assume this is in alignment with Sachin's changes. -- So no worries on logging?
Implementation of send observe request in place now.
Change-Id: I93140cafc1dd51ba35fb47b1fb455fef7a95499a
Keane, Erich [Mon, 4 Aug 2014 18:52:31 +0000 (11:52 -0700)]
Merge "Initial check-in of GET code. This is Work In Progress and is NOT Tested. This check-in is to facilitate co-development. Patch 3: Added code to add payload in pdu for PUT request. Added 'PUT' method in supported list. Patch 4: Added some changes to ocstack.c to bind the Entityhandler to the resource and also modified the client and server c++ app, which uses the c apis to use GET. Patch 5: Merged Yamin's changes and Vijay's Arduino changesets. Patch 6: Updated ocserver/occlient sample apps to use OCLogger mechanism. Some related changes in oclogger module. Patch 7: PUT API now function from C++ app using C APIs. Patch 8: Modified patch 7's commit blunder :( Patch 9: Fixed some of the review comments by Yamin. Modified logic in occlient and ocserver test app to pass NULL when OCGetInterfaceAddress api is unable to retrieve local IP address. Fixed some method names to Upper Camel case."
Sachin Agrawal [Sat, 2 Aug 2014 01:17:56 +0000 (18:17 -0700)]
Initial check-in of GET code. This is Work In Progress and is NOT Tested. This check-in is to facilitate co-development.
Patch 3: Added code to add payload in pdu for PUT request.
Added 'PUT' method in supported list.
Patch 4: Added some changes to ocstack.c to bind the Entityhandler to the resource and also modified the client and
server c++ app, which uses the c apis to use GET.
Patch 5: Merged Yamin's changes and Vijay's Arduino changesets.
Patch 6: Updated ocserver/occlient sample apps to use OCLogger mechanism.
Some related changes in oclogger module.
Patch 7: PUT API now function from C++ app using C APIs.
Patch 8: Modified patch 7's commit blunder :(
Patch 9: Fixed some of the review comments by Yamin.
Modified logic in occlient and ocserver test app to pass NULL when OCGetInterfaceAddress
api is unable to retrieve local IP address.
Fixed some method names to Upper Camel case.
Change-Id: Ic3469e01add2b44b6925dd0a91c32e6cf7b1e186
Sudarshan Prasad [Wed, 30 Jul 2014 13:00:56 +0000 (06:00 -0700)]
Added modified header files and samples for aug 5 deliverable. Lots of TODOs to complete. But this will get the team going
Fixed the author issue
Change-Id: Ie2260641248a48ec4100882124223f462af9e19d
Dieter, William R [Fri, 25 Jul 2014 17:05:19 +0000 (10:05 -0700)]
Merge "Fix some build issues"
Dieter, William R [Fri, 25 Jul 2014 16:59:59 +0000 (09:59 -0700)]
Merge "Removing cJSON.c & cJSON.h source files from repo. I have no idea why they were added after I removed them. This was overlooked at some point."
Joseph Morrow [Fri, 25 Jul 2014 16:24:28 +0000 (12:24 -0400)]
Removing cJSON.c & cJSON.h source files from repo. I have no idea why they were added after I removed them. This was overlooked at some point.
Change-Id: I94902ab94f70b7d2fd79a98a604eef70354885fd
Sachin Agrawal [Fri, 25 Jul 2014 15:38:18 +0000 (08:38 -0700)]
Updating makefiles to build in release mode by default. Restrict debug logs in debug builds only.
Patch 3 : Adding the Fix for seg fault in ocserverrequest.c(Fix provided by Erich).
Change-Id: I056c9fd293e51b0c5f08dc28cbd4f0cff9ad269b
Sashi Penta [Thu, 24 Jul 2014 23:21:22 +0000 (16:21 -0700)]
Fix some build issues
Jesse Williamson [Thu, 24 Jul 2014 03:42:30 +0000 (20:42 -0700)]
Missed a few name conversions.
Erich Keane [Thu, 24 Jul 2014 16:14:27 +0000 (09:14 -0700)]
Symmetric property serialization; progress toward method binding; simplified some names.
Change-Id: Ic278672587dbbe939bdf41a2bee701f8dea1dda6
William R. Dieter [Wed, 23 Jul 2014 04:26:21 +0000 (00:26 -0400)]
Updated license header to reference Apache 2.0 License
Change-Id: I57416603084e7c2019d93ba1ce2c79b86092fb46
Sashi Penta [Wed, 23 Jul 2014 00:22:05 +0000 (17:22 -0700)]
Some cleanup.
Jesse Williamson [Tue, 22 Jul 2014 21:30:21 +0000 (14:30 -0700)]
Initial merge-commit of the OIC code. Should successfully do discovery for single-level resources
Fixed the host address on the resource object
Removed echo messages form makefiles.
Moved cJSON to ccf-utilities repo. Update makefiles accordingly.
Change-Id: I6c0798a1f9602db8a2800baec5561c8f1281f76f
Added copyright notice.
Change-Id: I6c0798a1f9602db8a2800baec5561c8f1281f76f