contrib/iotivity.git
9 years agoMerge "Implement functionality to set PSK credentials for DTLS in OC stack."
sudarshan prasad [Fri, 5 Dec 2014 01:59:58 +0000 (17:59 -0800)]
Merge "Implement functionality to set PSK credentials for DTLS in OC stack."

9 years agoImplement slow response feature.
Doug Hudson [Thu, 4 Dec 2014 21:37:22 +0000 (16:37 -0500)]
Implement slow response feature.

This feature allows a resource entity handler to provide a "slow response"
to a client request.  That is, if a request is received but the server cannot
respond immediately (e.g. response data is not available), the server can
instead respond at a later time.  The same API is used for both immediate
and slow responses.

Updated collection's batch interface to aggregate responses of local resources
contained in the collection.  Note that the aggregate response only applies
to local resources, not remote resources.

This feature introduces a new C API, OCDoResponse and a new C++ API,
OCPlatform::sendResponse.  The C++ modifications also include a change to
the the signature of the applications entity handler.

Change-Id: Ic33ab0c7ff52481bed86e9a77319baa3813dd6cd
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Signed-off-by: Yamin Al-Mousa <yamin.s.al-mousa@intel.com>
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
9 years agoImplement functionality to set PSK credentials for DTLS in OC stack.
Sachin Agrawal [Thu, 4 Dec 2014 17:43:17 +0000 (09:43 -0800)]
Implement functionality to set PSK credentials for DTLS in OC stack.

Uptil now DTLS module in OCStack was using PSK credentials which
were hard-coded. Added API which can be used by application to
provide device identity and PSK credentials.

Change-Id: I4df6db6ab70ee69917d0111f06a6504f3ce56ce2
Signed-off-by: Chris Mitchell <cmitch2@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoMoved location of tinyDTLS from csdk to extlibs directory
Sachin Agrawal [Tue, 2 Dec 2014 17:11:26 +0000 (09:11 -0800)]
Moved location of tinyDTLS from csdk to extlibs directory

External libraries are currently being stored under extlibs
directory and therefore moved tinyDTLS also there.

Change-Id: Ib21bd994115b7cd2fddfe92010b6f5f8d2e0b658
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoMerge "Implemented JSON Serialization using Cereal Library"
sudarshan prasad [Tue, 2 Dec 2014 23:23:46 +0000 (15:23 -0800)]
Merge "Implemented JSON Serialization using Cereal Library"

9 years agoImplemented JSON Serialization using Cereal Library
Erich Keane [Wed, 22 Oct 2014 20:31:13 +0000 (13:31 -0700)]
Implemented JSON Serialization using Cereal Library

Previously we were hand-mangling strings for JSON serialization and using
boost::property_tree for parsing.  Now we are using an open source library (cereal)
to do both sides in the C++ stack

Change-Id: I2db2657552a31cdf37c2f2dbbcfdb34e48549f00
Signed-off-by: Erich Keane <erich.keane@intel.com>
9 years agoMerge "Fix sending 3 notifications when creating a resource"
sudarshan prasad [Thu, 27 Nov 2014 17:25:28 +0000 (09:25 -0800)]
Merge "Fix sending 3 notifications when creating a resource"

9 years agoMerge "Fix the infinite PRESENCE_STOPPED message"
sudarshan prasad [Thu, 27 Nov 2014 17:24:29 +0000 (09:24 -0800)]
Merge "Fix the infinite PRESENCE_STOPPED message"

9 years agoFix sending 3 notifications when creating a resource
Sashi Penta [Tue, 25 Nov 2014 23:37:48 +0000 (15:37 -0800)]
Fix sending 3 notifications when creating a resource

Implemented bind resource interface/type internal functions which
do not send the presence notificiations.

Change-Id: Ibf093d489d24ee729f30d714fca5f9b6d9dfe254
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
9 years agoFix the infinite PRESENCE_STOPPED message
Sashi Penta [Sun, 23 Nov 2014 00:40:24 +0000 (16:40 -0800)]
Fix the infinite PRESENCE_STOPPED message

When a client to subscirbes to a server, and when the server process is
exited, client is getting was getting infinte PRESENCE_STOPPED messages.
This commit fixes this issue. Introduced a new stack result
type : PRESENCE_TIMEOUT to indicate timeout of the server.
PRESENCE_STOPPED is used for graceful stopping of the server.

Change-Id: I4e122176f8f7ea8e04d98dea02d22432b4c4555a
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
9 years agoMerge "Adding PCF() wrappers to OC_LOG() calls that were missing in the stack."
Erich Keane [Mon, 24 Nov 2014 18:33:42 +0000 (10:33 -0800)]
Merge "Adding PCF() wrappers to OC_LOG() calls that were missing in the stack."

9 years agoMerge "Implementation of connectivity abstraction feature-Ubutu v0.1"
Uze Choi [Thu, 20 Nov 2014 10:27:05 +0000 (02:27 -0800)]
Merge "Implementation of connectivity abstraction feature-Ubutu v0.1"

9 years agoImplementation of connectivity abstraction feature-Ubutu v0.1
ashok.channa [Fri, 14 Nov 2014 14:32:40 +0000 (23:32 +0900)]
Implementation of connectivity abstraction feature-Ubutu v0.1

Connectivity Abstraction feature provides unified approach for multiple
Transports

Adding WIFI transport support on Ubuntu platform in the  v0.1 release
We followed Coding guidelines as per current base source.

Please read the Release notes v0.1 for more information.
Non Supported code is just made to print the message.

Change-Id: Id018c10680a5cf0ce046592da46cc3ad69669d77
Signed-off-by: ashok.channa <ashok.channa@samsung.com>
9 years agoMerge "Removed Protocol Plugin developer guide document."
Uze Choi [Thu, 20 Nov 2014 02:33:11 +0000 (18:33 -0800)]
Merge "Removed Protocol Plugin developer guide document."

9 years agoMerge "Fixed: bug where Header Option count would be zero"
sudarshan prasad [Wed, 19 Nov 2014 23:07:53 +0000 (15:07 -0800)]
Merge "Fixed: bug where Header Option count would be zero"

9 years agoRemoved Protocol Plugin developer guide document.
junho13.lee [Wed, 19 Nov 2014 06:03:57 +0000 (15:03 +0900)]
Removed Protocol Plugin developer guide document.

Because uploading the developer guide document to the web page,
we no longer manage the document in the repository.

Change-Id: I5aeed10245ce1d255ce69dfd7a2255c5e9f9cdf9
Signed-off-by: junho13.lee <junho13.lee@samsung.com>
9 years agoFixed bug where InvalidParam exception thrown on re-observe
Erich Keane [Tue, 18 Nov 2014 22:23:14 +0000 (14:23 -0800)]
Fixed bug where InvalidParam exception thrown on re-observe

Observing a resource more than once isn't allowed.  However, we were
not clearing the "Observation Handle" on observation cancel.  This
patch resets the observe handle to nullptr when cancelling observation
so that we can re-observe after cancelling.

Change-Id: I507a427e641ad08c5e48e2dea4c5b7b3d0e3a79b
Signed-off-by: Erich Keane <erich.keane@intel.com>
9 years agoFixed: bug where Header Option count would be zero
Erich Keane [Tue, 18 Nov 2014 22:06:12 +0000 (14:06 -0800)]
Fixed: bug where Header Option count would be zero

01.org IOT-76

Header options had a defect introduced attempting to fix
the 'zero' header option count value.  In the previous defect,
the stack would have an uninitialized header options count
when there were none.  The previous fix has been removed and
initialization has been done in the correct place.

Change-Id: I99e0539f86573cfa7392921e1fdfe25dd80b303a
Signed-off-by: Erich Keane <erich.keane@intel.com>
9 years ago[SSM] Adapt astyle code formatter
jk13 [Tue, 18 Nov 2014 01:44:31 +0000 (10:44 +0900)]
[SSM] Adapt astyle code formatter

Problem: Follow coding guideline

How: Adapt astyle cpp formatter

Change-Id: I58ba77542f5fb3a935e1083a076957357599bc7e
Signed-off-by: Kim Jee Hyeok <jihyeok13.kim@samsung.com>
9 years agoMerge "[SSM] Modify thread util and framework init method"
Uze Choi [Tue, 18 Nov 2014 01:37:37 +0000 (17:37 -0800)]
Merge "[SSM] Modify thread util and framework init method"

9 years agoMerge "Supporting Java Plugin and making plugin manager as a library"
Uze Choi [Tue, 18 Nov 2014 00:40:58 +0000 (16:40 -0800)]
Merge "Supporting Java Plugin and making plugin manager as a library"

9 years ago[SSM] Modify thread util and framework init method
jk13 [Mon, 17 Nov 2014 11:11:03 +0000 (20:11 +0900)]
[SSM] Modify thread util and framework init method

Problem: Thread worker crashes while terminating.
         SoftSensor searching path must given at compile time

How:     Rearchitecture threading model
         Add XML descriptor based framework initialization.
           1. Search SoftSensorDescription.xml
              (previously high-context.xml) where executable located
           2. Or put search path using below init configration.

<SSMCore>
    <Device>
        <UDN>abcde123-31f8-11b4-a222-08002b34c003</UDN>
        <Name>MyPC</Name>
        <Type>PC</Type>
    </Device>
    <Config>
        <SoftSensorRepository>/usr/local/SSRepo/</SoftSensorRepository>
        <SoftSensorDescription>/usr/local/SSRepo/SSDescription.xml</SoftSensorDescription>
    </Config>
</SSMCore>

Change-Id: Id2c0746357d9e850e9e90016547b116412b758d2
Signed-off-by: Kim Jee Hyeok <jihyeok13.kim@samsung.com>
9 years ago[SSM] Fix to call OIC platform destructor
jk13 [Mon, 17 Nov 2014 11:10:30 +0000 (20:10 +0900)]
[SSM] Fix to call OIC platform destructor

Problem: There is no destructor caller

How: Call platform destructor when OIC platform manager destroying

Change-Id: I83b033494f3bb84e5341c21d7ec4051e110a9ff8
Signed-off-by: Kim Jee Hyeok <jihyeok13.kim@samsung.com>
9 years ago[SSM] Fix model unregistration problem
jk13 [Mon, 17 Nov 2014 11:09:58 +0000 (20:09 +0900)]
[SSM] Fix model unregistration problem

Problem: If try to unregister registered model,
         unable to find registered model because of key mismatch.

How: Use proper key token to find registered model

Change-Id: Ib66242a4532e6a5fd8ced8e232fea26672347880
Signed-off-by: Kim Jee Hyeok <jihyeok13.kim@samsung.com>
9 years ago[SSM] Remove global mutex
jk13 [Mon, 17 Nov 2014 11:09:02 +0000 (20:09 +0900)]
[SSM] Remove global mutex

Problem: global mutex is not necessary
          while initializing platform.

How: Remove global mutex class and references.

Change-Id: I8972c6eb7d67dbd91c5c8638bec22fe83f83ef43
Signed-off-by: Kim Jee Hyeok <jihyeok13.kim@samsung.com>
9 years agoSupporting Java Plugin and making plugin manager as a library
junho13.lee [Mon, 17 Nov 2014 10:31:24 +0000 (19:31 +0900)]
Supporting Java Plugin and making plugin manager as a library

1) Cleaned unnecsssary files.

2) Changed plugin manager to support C/C++ and Java Plugin. Java plugin manager is not completed yet.

   This commit only have template code for Java.

3) Created plugin manager as a separate library(libpm.a) to be linked by application directly.

   And separated plugin manager implementation as shared library(libpmimpl.so) to support out-proc mode with same libpm.a in the future.

Change-Id: I5a80faa0546da1832e15a75dacc7f916faedd868
Signed-off-by: Lee Jun Ho <junho13.lee@samsung.com>
9 years agoAdding PCF() wrappers to OC_LOG() calls that were missing in the stack.
Joseph Morrow [Sun, 16 Nov 2014 18:45:25 +0000 (13:45 -0500)]
Adding PCF() wrappers to OC_LOG() calls that were missing in the stack.

By ensuring all calls to OC_LOG() wrap their strings with PCF(), we're
ensuring log statements don't take up program memory on lite platforms.

Change-Id: I1aeba972a539ea89d6862d402ee15cf286fbc860
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
10 years agoAdded release notes for Nov 15 release.
Sudarshan Prasad [Sun, 16 Nov 2014 05:37:24 +0000 (21:37 -0800)]
Added release notes for Nov 15 release.

Signed-off by Sudarshan Prasad <sudarshan.prasad@intel.com>
Change-Id: I2382af916166a1d75e220a84c0b7d0dd45271662

10 years agoModify presenceclient sample
Sashi Penta [Sat, 15 Nov 2014 19:58:18 +0000 (11:58 -0800)]
Modify presenceclient sample

Modify presenceclient application to subcribe to MC address
without the need to discover a resource.

Change-Id: I0aed9941dab56a22f9eb58fa8150000b4a554b42
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
10 years agoMerge "Support resource type for multicast subscription"
sudarshan prasad [Sat, 15 Nov 2014 18:49:21 +0000 (10:49 -0800)]
Merge "Support resource type for multicast subscription"

10 years agoActive Discovey Resource Type Filtering - C++ SDK & App Changes only.
Joseph Morrow [Sat, 15 Nov 2014 00:53:10 +0000 (19:53 -0500)]
Active Discovey Resource Type Filtering - C++ SDK & App Changes only.

This change affects only the C++ API and it's sample app
"presenceclient.cpp".

Change-Id: I92cebe5045dfda5b506ab6c849a1ce13330c4391
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
10 years agoAligning name of resource between C Apps and C++ Apps.
Joseph Morrow [Tue, 11 Nov 2014 19:41:51 +0000 (14:41 -0500)]
Aligning name of resource between C Apps and C++ Apps.

This change to align the "LED" resource to be named "Light"
allows for inter-SDK application verification. This will help
ensure that both SDKs operate similarly, if not identically.

Change-Id: I418f47c664a605bfd56d8d50e35755463dc910fb
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
10 years agoAdd to C SDK sample app to subscribe to presence with or without filter.
Joseph Morrow [Fri, 14 Nov 2014 00:00:52 +0000 (19:00 -0500)]
Add to C SDK sample app to subscribe to presence with or without filter.

This allows for end user to see the difference between a filtered
presence subscription and a non-filtered presence subscription. Also
added some minor logging changes.

Change-Id: Ib068d3917937e6da7752125cbe86a44fcb83a2df
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
10 years agoMerge "Active Discovery Resource Type Filtering - C SDK & App Changes only."
sudarshan prasad [Sat, 15 Nov 2014 18:27:20 +0000 (10:27 -0800)]
Merge "Active Discovery Resource Type Filtering - C SDK & App Changes only."

10 years agoSupport resource type for multicast subscription
Sashi Penta [Sat, 15 Nov 2014 17:32:55 +0000 (09:32 -0800)]
Support resource type for multicast subscription

Change-Id: I001a62601a70dbc7d5e9b3480e1134bdbe3dfde4
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
10 years agoActive Discovery Resource Type Filtering - C SDK & App Changes only.
Joseph Morrow [Sat, 15 Nov 2014 04:34:52 +0000 (23:34 -0500)]
Active Discovery Resource Type Filtering - C SDK & App Changes only.

Applying required API changes and tying up a part of the functionality
required for implementing resource type filtering on presence
notifications.

Similar C++ SDK & App changes to follow this commit.

Change-Id: I9a8cd1a3e6e30c5de5788f593ef3efd2891b2f56
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
10 years agoMake command line option for secure and observer
Sakthivel Samidurai [Sat, 15 Nov 2014 02:04:54 +0000 (18:04 -0800)]
Make command line option for secure and observer

Implement command line option for secure resource and observer

Remove duplicate case to avoid confusion

Update app usage description

Change-Id: I2aa090a7a65448a7fbc54b41fef4b29d212f18f8
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
10 years agoImplemented Secure resource support in C++ layer
Sashi Penta [Fri, 14 Nov 2014 05:32:27 +0000 (21:32 -0800)]
Implemented Secure resource support in C++ layer

Added ability for the C++ stack to properly parse/support the secure protocol URIs.

Change-Id: I800d29598854339a2d30ae5b4ef89c2d0973dfe7
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
10 years agoModified OCInitUDP to support security.
Sashi Penta [Mon, 10 Nov 2014 21:21:25 +0000 (13:21 -0800)]
Modified OCInitUDP to support security.

Added a new flag to OCInitUDP to indicated whether to reuse the address or not.
Modified create_new_context API. It now takes the ipAddr[4] as input. This needs
to be passed further down to dtls_init.

signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Change-Id: I536f215bf2a1ff4c90685e7a19e32fcb76f1e912

10 years agoImplement sending host port number for secure resources
Sachin Agrawal [Fri, 14 Nov 2014 01:17:39 +0000 (17:17 -0800)]
Implement sending host port number for secure resources

Secure resources are hosted on a separate IP port. All the
discovery responses are send from unicast unsecure port from
resource server. Currently, when a client receives discovery response
it 'assumes' that the sending port is the port hosting the resource
too. This 'assumption' is NOT valid for secure resources. Therefore,
there is a need to send 'secure port info' for secure resources in
JSON discovery response.

Change-Id: I54fd828a15913ec8be990d040e1190a88be43353
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
10 years agoMerge "Implemented libcoap's tinyDTLS interface"
Erich Keane [Fri, 14 Nov 2014 00:16:10 +0000 (16:16 -0800)]
Merge "Implemented libcoap's tinyDTLS interface"

10 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>
10 years agoMerge "Added support for multicast presence"
Erich Keane [Thu, 13 Nov 2014 22:56:09 +0000 (14:56 -0800)]
Merge "Added support for multicast presence"

10 years agoAdded C++ Sample application using multiple threads.
Erich Keane [Thu, 13 Nov 2014 18:51:43 +0000 (10:51 -0800)]
Added C++ Sample application using multiple threads.

C++ Sample application demonstrating the idea of running multiple
servers and clients running in multiple threads.

Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Change-Id: Icdb59aaec35bb0c9d16b941fbf0eaa48c43d0a56

10 years agoMerge "fix coding standard problem"
Uze Choi [Thu, 13 Nov 2014 08:57:58 +0000 (00:57 -0800)]
Merge "fix coding standard problem"

10 years agofix notification manager for m2
jyong2.kim [Thu, 13 Nov 2014 07:48:05 +0000 (16:48 +0900)]
fix notification manager for m2

fix all code based on latest resource api.
fix notification folder name, following name convention.

Change-Id: Ic1eba69dd712428b4b0fae542d4acb005ad78a52

10 years agofix coding standard problem
jjack.lee [Thu, 13 Nov 2014 06:58:59 +0000 (15:58 +0900)]
fix coding standard problem

fix all coding standard problem. This commit did NOT include logic changes .

Change-Id: I34f7a33374f137b8b641dff74e113b4941cb1391

10 years agofix things manager sdk for m2
jjack.lee [Wed, 12 Nov 2014 08:12:41 +0000 (17:12 +0900)]
fix things manager sdk for m2

Change-Id: I681378772f6b9dd120fd23abc124e66cef85c07e

10 years agoAdded support for multicast presence
Sashi Penta [Mon, 10 Nov 2014 15:49:55 +0000 (07:49 -0800)]
Added support for multicast presence

Added OCMulticastNode data structure to store the nonce information of the server send
presence notifications. When a new notification comes to the client, client checks if there
is a multicast node, and then checks to see if the nonce is same or not. If same nonce, no call
back to client application is made. If nonce is different a call to client application is made.

Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Change-Id: Ia3fe163e7a304f499272f9ffa8a22a359f123d98

10 years ago(1) add platform overload api : registerResource(resourcehandle, resource), (2) add...
jjack.lee [Mon, 10 Nov 2014 10:18:31 +0000 (19:18 +0900)]
(1) add platform overload api : registerResource(resourcehandle, resource), (2) add host in rsrc_t

Change-Id: I4809566e153eb3f488617adb7e044da869c1d88c

10 years agoRemoved Iotivity logo.
Sudarshan Prasad [Thu, 6 Nov 2014 23:23:26 +0000 (15:23 -0800)]
Removed Iotivity logo.

Until we get clearance with Iotivity logo, we are not going to use any logo.

Signed off by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Change-Id: I366fc53bf453c8c0ec4730b44f7f2418ae21a395

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

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

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

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

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

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

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

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

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

10 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

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

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