platform/upstream/iotivity.git
8 years agoMerge branch 'master' into resource-container
Markus Jung [Wed, 18 Nov 2015 20:02:00 +0000 (05:02 +0900)]
Merge branch 'master' into resource-container

Change-Id: I897c55a73b18288a0686a6d6770cf8fd8dcf1f2c
Signed-off-by: Markus Jung <markus.jung85@gmail.com>
8 years agoExtended RcsReousrceAttributes to support update of multiple attributes at once
Markus Jung [Thu, 12 Nov 2015 00:14:23 +0000 (09:14 +0900)]
Extended RcsReousrceAttributes to support update of multiple attributes at once

Change-Id: Ibfe08f0d0228a126754e03c091681fcdd3be6d59
Signed-off-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[IOT-825] Explicit discovery to get secure port during provisioning
js126.lee [Wed, 11 Nov 2015 06:11:05 +0000 (15:11 +0900)]
[IOT-825] Explicit discovery to get secure port during provisioning

Issue : If provisiong candidate device doedn't have any secure resource,
        Provisioning Tool can't get secure port.
Solution : In order to get secure port, try explicit discovery
           with /oic/res?rt=oic.sec.doxm. instead of /oic/res
Related jira : https://jira.iotivity.org/browse/IOT-825

[Patch-2] : apply Sachin's comment

Change-Id: I6d6986f64af7ef24dd28ebada477613f30ee1e04
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4131
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoInitial extension to support Android resource bundles
Markus Jung [Wed, 4 Nov 2015 10:58:14 +0000 (19:58 +0900)]
Initial extension to support Android resource bundles

Change-Id: I83faf40e7219f08b9737c1d5625b838728c0dc99
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4081
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoremove a preprocessor for TCP_ADAPTER in RI.
hyuna0213.jo [Thu, 1 Oct 2015 10:01:50 +0000 (19:01 +0900)]
remove a preprocessor for TCP_ADAPTER in RI.

since there is a preprocessor for TCP_ADAPTER in RI.
when user is using a interface file(octype.h)
user application have to add -DTCP_ADAPTER flag in their App.

since CA already check TCP_ADAPTER flag,
it is better to remove this preprocessor in RI.

Change-Id: I8dd2998831d9744e25e68c024b2b3e3fbbbc1633
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded to call unregister for Android IP
jihwan.seo [Mon, 9 Nov 2015 11:55:17 +0000 (20:55 +0900)]
Added to call unregister for Android IP

Change-Id: I7e6ae3220955ae0314ce03807530f5cdbb912166
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4095
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for IOT-813
Tim Kourt [Fri, 16 Oct 2015 17:25:50 +0000 (10:25 -0700)]
Fix for IOT-813

Change-Id: Ifd4692074430e45b935e0b9c6b6fa4b41a9951f0
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3901
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdd unittests for ConstructResourceTest for invalid port number
Ravi Nanjundappa [Tue, 10 Nov 2015 09:44:52 +0000 (15:14 +0530)]
Add unittests for ConstructResourceTest for invalid port number

Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with missing port number.

Change-Id: I0e159df4c1441271bd2c414ed6b94605fc6ab3ac
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4105
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoEnabled callback message for retransmission timeout.
jihwan.seo [Tue, 10 Nov 2015 10:49:30 +0000 (19:49 +0900)]
Enabled callback message for retransmission timeout.

if retransmission time is over,
ACK/EMPTY message should be sent into routing manager without token.

Change-Id: I1cffb4d3d9064c7b8b6772fcf515b922576951d2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4109
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoChanged operator T enable_if to be more closely linked to the variant
Erich Keane [Tue, 3 Nov 2015 17:53:42 +0000 (09:53 -0800)]
Changed operator T enable_if to be more closely linked to the variant

The link between the variant and the enable_if needs to be strong!
Previously, there was no direct link, just one by 'coincidence'.  This
patch introduces a pair of type traits that bind the enable_if directly
to the variant.  Note that the type traits also work with ANY variadic
type!

Change-Id: Ie5f8fbc92b4f6800625c58fd73c08bedf147f122
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoCorrect a wrong memory free in construction of aggregate response
Jihun Ha [Thu, 29 Oct 2015 09:16:40 +0000 (18:16 +0900)]
Correct a wrong memory free in construction of aggregate response

When an aggregate response is freed after sending it, only head response which
has a pointer of next response of the aggregate response is freed, not all
the linked responses, which might lead a wrong memory access after it.
For this reason, OCPayloadDestroy function is better to be used than
OICFree function in DeleteServerResponse function.
Additionally, I've often observed that ehResponse->payload is freed somewhere
, which the pointer becomes NULL. To overcome this exceptional situation, I
copies ehResponse->payload to a new payload data with OCRepPayloadClone
function and safely frees it when it has to be freed.

Change-Id: Ide42346b6ce4858b2587795db29b36027793a077
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoAdd OCProvisioningManager.h into Doxyfile to generate C++ API doc.
Woochul Shim [Thu, 8 Oct 2015 05:03:54 +0000 (14:03 +0900)]
Add OCProvisioningManager.h into Doxyfile to generate C++ API doc.

Change-Id: Ide9bc08bb194b8909dfd2ff7407e6e09c3867b94
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoChange occlient to cancel observe on every registration.
Mandeep Shetty [Tue, 6 Oct 2015 00:02:47 +0000 (17:02 -0700)]
Change occlient to cancel observe on every registration.

In the case when there are multiple servers, occlient sends out observer
requests to all of them. On reaching 15 notifications, only one of the
observation registrations were cancelled.
As the handle for cancellation was maintained in a global variable, none
of the others were cancelled and the client continued to get
notifications and this led to some failed tests.
Changed client behavior to cancel observe wit the handle present in the
response.

This can be cherry-picked to 1.0.0-dev

Change-Id: I51d28620b140dbb4f28baef7aa3be93276f6de5f
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3535
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agotinydtls: use types from inittype.h, fix musl libc
Hauke Mehrtens [Mon, 26 Oct 2015 13:39:55 +0000 (14:39 +0100)]
tinydtls: use types from inittype.h, fix musl libc

The SHA2 code currently uses u_int32_t and similar types without
defining them. This type is not defined by the POSIX standard, but many
libc implementations have it as a non standard extension. In the musl
libc it is not implemented and I am getting a compile error when using
u_int32_t, I should use uint32_t, which is done when
SHA2_USE_INTTYPES_H is set.

This fixes build with musl libs used in OpenWrt.

Change-Id: I485435ddb8b1a2359caedd335ab54f91ca5e3f3e
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoAdd ByteString support in CBOR wrapper in OIC stack
Sachin Agrawal [Thu, 8 Oct 2015 16:20:54 +0000 (09:20 -0700)]
Add ByteString support in CBOR wrapper in OIC stack

Currently byte strings in CBOR wrapper are achieved by using
int arrays. Drawbacks with this approach is in-efficient memory
consumption and 3rd Party tools cannot properly decode the CBOR
generated in this fashion.

Updated code in CBOR wrapper and also added unit tests.

Change-Id: I4ed1adc891be84e800c833df404914a335150ded
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2337
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoRemoving unwanted files
Ravi Nanjundappa [Tue, 13 Oct 2015 05:52:07 +0000 (11:22 +0530)]
Removing unwanted files

Removing unwanted files related to logging from resource dir

Change-Id: Ia550d754347f1dc45d00e43b9f95f2aa9f8cff1f
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFixed MAC key issue in AES-CBC cipher suite in tinyDTLS
Sachin Agrawal [Fri, 16 Oct 2015 16:39:11 +0000 (09:39 -0700)]
Fixed MAC key issue in AES-CBC cipher suite in tinyDTLS

There are couple of issues in current AES-CBC cipher-suite implementation.
1) Using the wrong data encryption/decryption key.
2) Using the wrong MAC Key for MAC calculation.
The reason for this is that the macros which point to the key location
in the key block were designed for AES-CCM cipher suites.

Change-Id: I410175302a2f23d1fa64f2b15b774c48d4ec19b3
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3441
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix format used in OIC_LOG_V
Habib Virji [Mon, 12 Oct 2015 16:14:55 +0000 (17:14 +0100)]
Fix format used in OIC_LOG_V

There was wrong format used for int64_t variable.

Change-Id: I52a1887600d0f004fcea2081058872f684572431
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoAdd logs in android sample of resource encapsulation
coderhyme [Thu, 22 Oct 2015 11:46:02 +0000 (04:46 -0700)]
Add logs in android sample of resource encapsulation

Change-Id: I684601e36f6e55101e3385c4acfd0d1404a1fefa
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3933
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFix issues of RCSResourceObject
coderhyme [Thu, 22 Oct 2015 04:24:25 +0000 (21:24 -0700)]
Fix issues of RCSResourceObject

Fix data race for handlers with shared_ptr which has guaranteed atomic operations for setting and loading.
LockGuard's destructor is now noexcept(false) and it will emit an exception if and only if the destruction is not caused by stack unwinding.
Some minor issues of the test are fixed.

Change-Id: I12ccb6adb4849642d266f7af5b1e28a2f6d35f83
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFix warning and format
Habib Virji [Mon, 12 Oct 2015 16:30:38 +0000 (17:30 +0100)]
Fix warning and format

There is wrong format used for types in OIC_LOG_V. Also fixes for the unsed parameters

Change-Id: Ib99c196721877b30b7bc28b673e4734b7378c7b9
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3833
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoImplemented OICGetCurrentTime.
Shilpa Sodani [Mon, 28 Sep 2015 23:58:52 +0000 (16:58 -0700)]
Implemented OICGetCurrentTime.

Consolidated the functionality for getting current time in
milli or micro seconds as multiple implementation of the
functionality currently exist in the stack.

Change-Id: I79b786ace762012305e487f820bb25f3e1599706
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3239
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoRefactoring resource-encapsulation linux examples
coderhyme [Mon, 19 Oct 2015 01:45:01 +0000 (18:45 -0700)]
Refactoring resource-encapsulation linux examples

Duplicated settings in sconscript for each sample are removed.
And NestedAttributes samples are renamed.

Change-Id: Id0d675155cc85e737bd534c7922b80227a8ff6d6
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed bug IOT-798
Shilpa Sodani [Wed, 14 Oct 2015 20:37:21 +0000 (13:37 -0700)]
Fixed bug IOT-798

IsRequestWithinValidTime in iotvticalendar.c was only checking for the
valid date when recurrence was NULL. Update the IsRequestWithinValidTime
function to check for both valid date and time.

Change-Id: Ifec7520f07958fd7ded36c017c0b08acd3053ff0
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3881
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agofix many format errors
Hauke Mehrtens [Thu, 1 Oct 2015 18:40:19 +0000 (20:40 +0200)]
fix many format errors

This fixes lots of format errors.
1. sometimes there were more arguments given when placeholders in the
   format string, sometimes it was the other way around
2. often size_t was not correctly printed
3. uint64_t and similar variables where often printed wrong

The #define __STDC_FORMAT_MACROS is needed to get the placeholders for
uint64_t and similar variables also in C++.

Change-Id: Ibf3724100fa9d62f7b0cb17201c79a44a30a7f72
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3383
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoRefine toString method of RCSResourceAttributes
coderhyme [Mon, 19 Oct 2015 01:55:48 +0000 (18:55 -0700)]
Refine toString method of RCSResourceAttributes

Nested values were not corretly encoded, they were just described with their type names.
Now it encodes every attribute value including nested olnes.

Change-Id: Ia228a34e6df05ac05c509012afd7f026c0f253e0
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed bug IOT-791
Shilpa Sodani [Mon, 5 Oct 2015 20:09:13 +0000 (13:09 -0700)]
Fixed bug IOT-791

Fixed seg fault caused by error handling conditions in function
AmsMgrAclReqCallback while trying to access uninitialized
amsMgrContext field in PEContext.

Change-Id: I65d3d76fc476f848a82e606f5f7f2a2bb3540935
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years ago[IOT-803] Fix RD response
Habib Virji [Thu, 15 Oct 2015 12:05:52 +0000 (13:05 +0100)]
[IOT-803] Fix RD response

The RD response was not being generated due to missing changes in SConscript. Setting the flag, leads to compiling of relevant RD code.

Change-Id: Ic79f5dd316863a261bf6c2452c7fc14bf317a8e7
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for IOT-808
arya.k [Fri, 16 Oct 2015 05:00:01 +0000 (10:30 +0530)]
Fix for IOT-808
-Also updated things manager sample application for tizen.

Change-Id: I3d13e253831f480b2bab3831733469beae369a09
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3893
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed issues in resource encapsulation
Habib Virji [Mon, 12 Oct 2015 15:47:42 +0000 (16:47 +0100)]
Fixed issues in resource encapsulation

Minor updates that results in compilation due to wrong type used in OIC_LOG_V.
Includes changing type in DataCache which compares unsigned int to int.

Change-Id: I20bb821c02510881251fefd6829fa71b233b863c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoResource Client tizen sample applications UI updated.
arya.k [Wed, 14 Oct 2015 05:09:00 +0000 (10:39 +0530)]
Resource Client tizen sample applications UI updated.

Change-Id: I122d11e4f055432ff59f8c42f2689afeaa6ac8e5
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix compilation issue in security module
Habib Virji [Mon, 12 Oct 2015 15:43:13 +0000 (16:43 +0100)]
Fix compilation issue in security module

Fixed types used for OIC_LOG_V were not correct.
Fixed tmp variables used under the flag to be declared under the flag.

Change-Id: I78a38d7fa89d56b7c350b2144c9916e55dff9c10
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoRemoved unused static function for fixing compilation warning
Habib Virji [Mon, 12 Oct 2015 16:27:35 +0000 (17:27 +0100)]
Removed unused static function for fixing compilation warning

Change-Id: I43d482790534b6b4903715cf93f902816355be1c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3831
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix compilation issues in bt utils
Habib Virji [Mon, 12 Oct 2015 16:12:33 +0000 (17:12 +0100)]
Fix compilation issues in bt utils

There were parameters missing in OIC_LOG_V.

Change-Id: I175515eedaf54a097fce3a0277f082c542520915
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3823
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
8 years agoFix coverity and compilation warning
Habib Virji [Mon, 12 Oct 2015 16:25:32 +0000 (17:25 +0100)]
Fix coverity and compilation warning

Few variable unused and fix issues raised in coverity.

Change-Id: I345549de0132c8e3fe350365b2edce128fe3e18a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoAdd exception handling logic in things configuration
Jihun Ha [Wed, 14 Oct 2015 01:59:45 +0000 (10:59 +0900)]
Add exception handling logic in things configuration

When calling constructResourceObject, it probably throws an exception.
To avoid a sudden crash for it, we add exception handling to it.

Additionaly, in oicgroup file, there is a condition statement which
may lead wrong way from what we expect. Thus we remove it.

Change-Id: Ibc12cd261ca875738446ad3b10b199ae15497654
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for Update Frequency for both RECURRENT and NORMAL type of an resource is not...
spurthi.segu [Tue, 13 Oct 2015 15:20:27 +0000 (20:50 +0530)]
Fix for Update Frequency for both RECURRENT and NORMAL type of an resource is not working properly (IOT-801)

Change-Id: If802f56c76e24469d5ddfa0fe588d18f2d0d5c7d
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoResource Container - Global variable name changes to avoid crash in TIZEN.
arya.k [Tue, 13 Oct 2015 10:22:35 +0000 (15:52 +0530)]
Resource Container - Global variable name changes to avoid crash in TIZEN.

Change-Id: I19075bd3a1dbea9cfbd81193cc26b6830e8ba669
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3851
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix warning due to mismatch in format
Habib Virji [Mon, 12 Oct 2015 16:23:23 +0000 (17:23 +0100)]
Fix warning due to mismatch in format

Arguments passed in OIC_LOG_V were not  matching the format used for printing.

Change-Id: I8dd5ffc35f0f0ad1e23d0a03ff118cc865005384
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3827
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoCode cleanup, Junit fixes and updated Junit test cases for Simulator.
spurthi.segu [Tue, 13 Oct 2015 08:18:28 +0000 (13:48 +0530)]
Code cleanup, Junit fixes and updated Junit test cases for Simulator.

Change-Id: I08587ff08fdc58dbe245f13298c514562722bef5
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3789
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[RE] [TIZEN] Fix for application crash when Back Button is pressed.
arya.k [Mon, 12 Oct 2015 13:21:38 +0000 (18:51 +0530)]
[RE] [TIZEN] Fix for application crash when Back Button is pressed.

Change-Id: Ice60767d55099602df2bb9072a5a446f520fd8ca
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3813
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agomodify resource type name used in server builder unittests
Minji Park [Thu, 8 Oct 2015 05:09:22 +0000 (14:09 +0900)]
modify resource type name used in server builder unittests

- modify resource type name used in server builder unittests into lower cases.

Change-Id: I812b1e67b649f133c861643748f4084c16bad9ec
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Resource-Container] Updated README file of Android Sample App.
Jay Sharma [Thu, 8 Oct 2015 12:59:14 +0000 (18:29 +0530)]
[Resource-Container] Updated README file of Android Sample App.

- Updated README file of RCSampleServerApp.

Change-Id: I48d1115e2348bbeed14d4145157d474ba6b99ca4
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoRemove unnecessary files and codes from resource-container android.
coderhyme [Thu, 8 Oct 2015 13:13:35 +0000 (06:13 -0700)]
Remove unnecessary files and codes from resource-container android.

RcsBundleInfo not needs native peer any more.
The dependency on rcs_common.so for building jni is removed.

Change-Id: I8e8af13a95f418eb9a3d2683eefd7f320ed6668d
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[TIZEN] Updated Resource Encapsulation Sample applicaitons.
arya.k [Mon, 12 Oct 2015 05:27:01 +0000 (10:57 +0530)]
[TIZEN] Updated Resource Encapsulation Sample applicaitons.
- Added Light resource creation and discovery in the samples along with temperature resource.

Change-Id: Ic087000cd030ce2e7f9260adb0a2daf89c052e7e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3787
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agofixed Resource-encapsulation sampleApplication bug.
Heewon Park [Mon, 12 Oct 2015 10:47:02 +0000 (19:47 +0900)]
fixed Resource-encapsulation sampleApplication bug.

- when called 'getCachedAttribute' function, client can't get cached attribute because of mismatching key of 'attribute'.

Change-Id: I6248d2ff34d422fae4b8daf4df8b50804f4745b7
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3803
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoExperimental disclaimer for resource container android support
Markus Jung [Thu, 8 Oct 2015 02:22:52 +0000 (11:22 +0900)]
Experimental disclaimer for resource container android support

The android platform support for the resource container is experimental

Change-Id: Ic9438e5b60dbf55f460e490518b14b75241facac
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[IOT-728] Remove Linux BLE build dir from include path.
Ossama Othman [Wed, 23 Sep 2015 18:04:15 +0000 (11:04 -0700)]
[IOT-728] Remove Linux BLE build dir from include path.

The Linux BLE adapter build directory was originally added to the
preprocessor include path so that the generated GDBus "glue" headers
could be found by the preprocessor.  However, that caused conflicts in
cases where another directory contained a header with the same name as
one found on the Linux BLE adapter directory (e.g. utils.h).  Avoid
this conflict by removing the Linux BLE adapter build directory from
the preprocessor include path, and instead make the generated "glue"
header available to the preprocessor by copying it to the source
directory.  This change addresses the problem reported in bug
IOT-728.

This change can be cherry-picked for the 1.0.0-dev branch.

Change-Id: Ic7dbb570148458a30e05d4e6ac3cef78d606d4a4
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoFix ECDSA signature verification
Dmitrii Zhuravlev [Tue, 6 Oct 2015 18:59:02 +0000 (21:59 +0300)]
Fix ECDSA signature verification

[Patch #1] Fix signature verification.
[Patch #2] Fix compatibility.

Change-Id: Ib1b3769fc42143878d84f58830af1d3976409524
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3647
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit b5d9281374cd35e36e4bd348b4884d2f56d20ba8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3755

8 years agoeasy-setup : mediator compilation warning and prevent fixes. Log TAG update
lankamadan [Thu, 8 Oct 2015 01:47:36 +0000 (10:47 +0900)]
easy-setup : mediator compilation warning and prevent fixes. Log TAG update

- Fixed some compilation warning fixes
- New prevent issue fixes
- Log TAG update

Change-Id: I8215d929af3a10791bd93a828e1a8ebad895a710
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix defect issues in things manager
Jihun Ha [Thu, 8 Oct 2015 01:54:28 +0000 (10:54 +0900)]
Fix defect issues in things manager

Fixed issue CID: 82945, 82946, 82947, 82948, 82949

Change-Id: I7b4e8ac60751a5bb5c62aa1be05452aea16047ee
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3739
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoAndroid: Enhancement for the IOT-764
Tim Kourt [Tue, 6 Oct 2015 21:08:27 +0000 (14:08 -0700)]
Android: Enhancement for the IOT-764

It is OK now to do the following:

OcRepresentation rep = new OcRepresentation();
OcRepresentation repNull = null;
rep.setValue("key", repNull);

Change-Id: I10d554490190561e40cc97c8a1973f6ace0478cd
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3649
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoFindResource and CreateResource issue fix in Simulator.
spurthi.segu [Wed, 7 Oct 2015 14:03:00 +0000 (19:33 +0530)]
FindResource and CreateResource issue fix in Simulator.

Change-Id: I79b060680e52be77fb8779a12ca701e0d3eadbdf
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3729
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Resource-Container] Java SDK and Sample applications
Jay Sharma [Wed, 7 Oct 2015 13:04:54 +0000 (18:34 +0530)]
[Resource-Container] Java SDK and Sample applications

- Java SDK for Resource Container.
- Android Sample Applications for Resource Container.

Change-Id: I1138ea7c82a155b18b8951d2bcdd94b24f1bd579
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agointial creation for making JAVA API documetation
Rami Jung [Wed, 7 Oct 2015 07:23:13 +0000 (16:23 +0900)]
intial creation for making JAVA API documetation
Running this shell results in  the "Java_API" folder
and "Java_API/index.html" explains Java APIs

Change-Id: I2302386d64d6f5df26286ecc931b65e2ab27d818
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3691
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[easy-setup] Modified JNI class name based on Android package change
lankamadan [Wed, 7 Oct 2015 08:37:49 +0000 (17:37 +0900)]
[easy-setup] Modified JNI class name based on Android package change

- JNI class name has to be changed as Android easysetup package is modified

Change-Id: Ibfe4491788ecc3691d62d354f06a72b28cac0a0a
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3697
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[easy-setup] Fix for IOT-785
lankamadan [Tue, 6 Oct 2015 08:16:23 +0000 (17:16 +0900)]
[easy-setup] Fix for IOT-785

- Fix in Arduino build instructions

Change-Id: Iba558c43f118f6a449202f0d354a8fee0bf19174
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3603
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit d37d85cb0f850ed1d9169e62d43e38926de7a3ec)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3689

8 years ago[easy-setup] Android package name changed for sdk
lankamadan [Wed, 7 Oct 2015 06:49:21 +0000 (15:49 +0900)]
[easy-setup] Android package name changed for sdk

- Changed package name for Easysetup setup Android sdk

Change-Id: Id80f23dc49bd5fdc8f1e04cc09d4292c43552d15
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[easy-setup] Updated Arduino Enrollee sample app for taking user input
lankamadan [Mon, 5 Oct 2015 13:13:47 +0000 (22:13 +0900)]
[easy-setup] Updated Arduino Enrollee sample app for taking user input

- Modified Arduino sample and the corresponding code to accept input from sample user
- Added a new enum to provide the status of the enrollee along with the result
- Modified the callback handler to accept enrollee status

Change-Id: Ie0e8720c17315c0e022155727cc472f854308ead
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoJunit fixes and review comment fixes for Simulator.
spurthi.segu [Wed, 7 Oct 2015 12:37:34 +0000 (18:07 +0530)]
Junit fixes and review comment fixes for Simulator.

Change-Id: I215a83ef94b8b503018cf983bf36fc14bbe66c77
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoCorrect a typo in comments in Group Manager class
Jihun Ha [Wed, 7 Oct 2015 08:51:16 +0000 (17:51 +0900)]
Correct a typo in comments in Group Manager class

I modify Extrracting --> Extracting in getActionSetfromString function's comment

Change-Id: Ia6bd50c1abace62529c543acc8806739ab02c7f6
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoUpdate the things manager code not to produce warning messages in compilation
Jihun Ha [Wed, 7 Oct 2015 06:10:58 +0000 (15:10 +0900)]
Update the things manager code not to produce warning messages in compilation

It is shown that most of warning messages are produced by an existance
of unused parameters in a function. Not to produce the warning message, I
make the unused parameters being commented.
Additionally, fix potential defects in things manager with
CID 65806, 81664, 81560, 82257.

Change-Id: Ie460630d0dc3306087b87b2dd5bb314b1844bc1b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3679
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agomodified build option for CoAP/TCP
jihwan.seo [Wed, 7 Oct 2015 05:30:56 +0000 (14:30 +0900)]
modified build option for CoAP/TCP

- There is no way to select ALL option without TCP
  in previous build option.
- CoAP/TCP should be also used WITH_TCP option like WITH_RA.
- and CoAP/TCP can be supported optionally more easy
  for Non-IP Transfer.

Change-Id: I39473e0c05c8f3950e9df78d118b9986dda42362
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3677
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoFix segmentation fault problem after discovery.
Woochul Shim [Tue, 6 Oct 2015 00:41:44 +0000 (09:41 +0900)]
Fix segmentation fault problem after discovery.

- PMDeviceDiscovery() add discovered devices in the list
  whenever callback is hit. If timeout happens the pointer to a list
  could be freed by the app but still there is a registered discovery callback.
  If the callback is hit after defined timeout period, callback try to
  add a discovered device to the invalid pointer (to freed memory).
  It will cause segmentation fault.

Fix: After defined timeout, PMDeviceDiscovery() explicitly
     remove registered callback using OCCancel.

Change-Id: Ic713cefb75c3495cfc9ad6688df44eb124d88f82
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3543
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoAndroid: Removing old build instructions
Tim Kourt [Tue, 6 Oct 2015 23:57:41 +0000 (16:57 -0700)]
Android: Removing old build instructions

Change-Id: Ib7ad6ea2a7ae5c29408054336f87655ee731ac2e
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoupdate comments for javadoc
Rami Jung [Tue, 6 Oct 2015 18:19:11 +0000 (03:19 +0900)]
update comments for javadoc
changing comments to avoid errors while generating javadoc
such as </br>

Change-Id: I10c57894dcdc4642d600a11dc9fe224679c2aac9
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3645
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoJunit testing fixes for Simulator APIs.
spurthi.segu [Tue, 6 Oct 2015 15:04:31 +0000 (20:34 +0530)]
Junit testing fixes for Simulator APIs.

Change-Id: Id55390d0476be0349b2d2bbaa84adbbd36e4a8dd
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3629
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[easy-setup] Added limit for Arduino Enrollee network reconnection attempts
lankamadan [Tue, 6 Oct 2015 11:34:04 +0000 (20:34 +0900)]
[easy-setup] Added limit for Arduino Enrollee network reconnection attempts

- Added max 5 retry count for connecting to SoftAP nework
- Removed unused code in WiFiSoftAPManager

Change-Id: I9de157e9c69abb8301adf43a2404ac307681f286
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3619
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[TIZEN] Update container samples for listBundle APIs to use unique_ptr.
arya.k [Tue, 6 Oct 2015 10:53:16 +0000 (16:23 +0530)]
[TIZEN] Update container samples for listBundle APIs to use unique_ptr.

Change-Id: Id1833d0e5cb3d89438ecd1d2a881ff9015af14ad
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix oversized lib size of rcs_client of resource-encapsulation.
coderhyme [Tue, 6 Oct 2015 11:24:35 +0000 (04:24 -0700)]
Fix oversized lib size of rcs_client of resource-encapsulation.

Caused by a wrong compile flag.
-g is an option for debug mode, it should be excluded for release.

Change-Id: I62d0910b27ac243f4d9b7f560164f0553968120c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3617
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix for setAllowedValuesInteger API of SimulatorResourceServer is throwing InvalidArg...
spurthi.segu [Tue, 6 Oct 2015 11:16:21 +0000 (16:46 +0530)]
Fix for setAllowedValuesInteger API of SimulatorResourceServer is throwing InvalidArgsException (IOT-779)

Change-Id: Id74ebb5af1f68a459acf247d49de08593c8060b5
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoEasySetup:Enrollee implementation optimization
Vinil Jain [Tue, 6 Oct 2015 06:03:16 +0000 (11:33 +0530)]
EasySetup:Enrollee implementation optimization

- for handling error cases like SoftAP disconnect

Change-Id: I64abbb147c9d223d92e007f11a80c98ef36dea35
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3587
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[TZIEN] Resource-Hosting Sample Application file name changes.
arya.k [Tue, 6 Oct 2015 05:02:45 +0000 (10:32 +0530)]
[TZIEN] Resource-Hosting Sample Application file name changes.

Change-Id: I0a2f197683ede0b49ca5db47bab8cbfe253be9d3
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3571
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoRemoving message logger from android examples as each app
Rahul Rahul [Mon, 5 Oct 2015 23:01:00 +0000 (16:01 -0700)]
Removing message logger from android examples as each app
is self contained.

Change-Id: I3c1bec113444fc8138bb237ad254430839bcf5dd
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3523
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoReview comment changes for Simulator Junit.
spurthi.segu [Tue, 6 Oct 2015 06:05:55 +0000 (11:35 +0530)]
Review comment changes for Simulator Junit.

Change-Id: Ia20ffbfefef7c6715ebf277c7c0093c410b0e755
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoCorrect the ENUM value of OTM according to spec.
js126.lee [Mon, 5 Oct 2015 07:16:12 +0000 (16:16 +0900)]
Correct the ENUM value of OTM according to spec.

- Issue : Compliance issue on OTM type
- Solution : Samsung suggest to revive enum type of OTM, and make URN type to optional and ENUM type to mandatory/
            THis patch is for this solution.
     oic:justwork = 0, oic:randompin = 1, oic:mfgcert = 2

Note : Need to apply this patch, once ENUM type of OTM is revived on Spec.

Change-Id: Id0ae1fcf4175576ff2afd7fde7e473942c391f66
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoModified to check Payload for TCP
jihwan.seo [Tue, 6 Oct 2015 04:47:13 +0000 (13:47 +0900)]
Modified to check Payload for TCP

to check payload have to contain option data.

Change-Id: Ib8d1cb9946cd1e4723531de986129e8e30f32c09
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years ago[IOT-762] Something wrong with handling unicast presence response - client always...
daeken.kwon [Tue, 6 Oct 2015 05:32:32 +0000 (14:32 +0900)]
[IOT-762] Something wrong with handling unicast presence response - client always get "PRESENCE_TIMEOUT"

< Cause >
ocstack don't do ResetPresenceTTL() after getting presence response from server because there was no change in sequnceNumber

< Solution >
To resolve this case, it is just needed to put ResetPresenceTTL() before exit in this caseTo resolve this case, it seems that we just put ResetPresenceTTL() before exit in this case

Change-Id: If1e32692d3b859cea84382bded0cceecf42874d5
Signed-off-by: daeken.kwon <daeken.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3581
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoUse unique_ptr for listBundles API return
Markus Jung [Tue, 6 Oct 2015 01:31:02 +0000 (10:31 +0900)]
Use unique_ptr for listBundles API return

listBundles now returns a list with unique_ptr references to RCSBundleInfo objects.
The change clarifies the responsibilty for memory management.

Change-Id: I79f4d70cd6f219f8024b4f2dae548b5ecac606ac
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoCorrected doxygen issues for RD
Habib Virji [Mon, 5 Oct 2015 14:36:04 +0000 (15:36 +0100)]
Corrected doxygen issues for RD

Minor updates with correct param names.

Change-Id: If57f5f998758b9c716ac409735e7610db04dd839
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[JIRA IOT-780,782,783] fixed an error logic in sampleApp of Resource-Encapsulation.
Heewon Park [Mon, 5 Oct 2015 14:24:21 +0000 (23:24 +0900)]
[JIRA IOT-780,782,783] fixed an error logic in sampleApp of Resource-Encapsulation.

-When server is created for Light-Sensor,the server can't response for Get-Request.
-When user inserts invalid input, sample app was not work normally.
-Fixed sampleApp input logics.

Change-Id: I94d1ba4b1293f730ba185af847976b0e9d13d816
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded Junit test cases for Simulator Java APIs.
spurthi.segu [Mon, 5 Oct 2015 14:19:17 +0000 (19:49 +0530)]
Added Junit test cases for Simulator Java APIs.

Change-Id: Iddfea7d5bfa43e86fa71697b6bd2a011774d9979
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoClarify resource container API
Markus Jung [Mon, 5 Oct 2015 13:22:33 +0000 (22:22 +0900)]
Clarify resource container API

Clarify the API for listing bundle information.

Change-Id: I959ac95bb7992105ea308a24480b1ebdaa0f8f77
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agomodify description of resource container apis to correct doxygen warnings
Minji Park [Mon, 5 Oct 2015 11:21:10 +0000 (20:21 +0900)]
modify description of resource container apis to correct doxygen warnings

- fix doxygen comments of container apis to remove warnings

Change-Id: I917d3b48dd44943c803581145fa82af9ab9fb775
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3479
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix wrong comments in groupmanager.h for doxygen
Jihun Ha [Mon, 5 Oct 2015 12:55:30 +0000 (21:55 +0900)]
Fix wrong comments in groupmanager.h for doxygen

A name of parameter in a function prototype should be matched with
a name following *@param* keyword for doxygen.

Change-Id: I892de77f163bbf5781735fce897ee11f850718b5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[easy-setup]Fixed doxygen warnings and renamed a file
lankamadan [Mon, 5 Oct 2015 11:58:44 +0000 (20:58 +0900)]
[easy-setup]Fixed doxygen warnings and renamed a file

- Fixed doxygen warnings and included a file in Doxyfile
- Renamed common.h to escommon.h

Change-Id: Ia499ee77059fa9034ee71ecbd61d972060103800
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago/oic/res response as per Spec1.0
Habib Virji [Tue, 29 Sep 2015 14:24:31 +0000 (15:24 +0100)]
/oic/res response as per Spec1.0

Corrects the format as per the specification.

Issue: IOT-717
Change-Id: Ic03d67541ef5afdfd6acc3820dc224b61484bd83
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3283
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agomodified some code to make tcp header.
jihwan.seo [Fri, 2 Oct 2015 04:42:15 +0000 (13:42 +0900)]
modified some code to make tcp header.

I have modified for tcp header which
has 0 ~ 12 length or 8bit message length.
since previous code has potential issue for byte ordering.

Change-Id: Id2f63608442ccf85558c61dbfd631a01f59ad8b9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoMerge "Merge branch 'plugin-interface' into master"
Patrick Lankswert [Mon, 5 Oct 2015 22:11:34 +0000 (22:11 +0000)]
Merge "Merge branch 'plugin-interface' into master"

8 years agoAdd Android interface set Display pin callback server API to
Sandeep Sharma [Mon, 28 Sep 2015 09:09:32 +0000 (14:39 +0530)]
Add Android interface set Display pin callback server API to
display for RANDOM_PIN provisioning.

[Patch #4] Added malloc failed check and Renaming of variable
           to be more consistent.
[Patch #5] Addressed Randeep's review comments and upated
           provisioning sample's build.gradle
[Patch #8] Addressed review comment.

Note: This change depends upon patch set #3047
      This can be cherry picked for 1.0.0-dev

Change-Id: If704a01a760ec0880ea6e1a89f7e856d2f1ba3e5
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoMerge branch 'plugin-interface' into master
Joseph Morrow [Mon, 5 Oct 2015 17:34:32 +0000 (10:34 -0700)]
Merge branch 'plugin-interface' into master

* plugin-interface:
  Enable ZigBee eventing in Plugin Interface through to IoTivity.
  Add event feature.
  Initial prototype for optimized Telegesis read/write layer.
  Fix logic in zigbee wrapper to correctly evaluate boolean values.

Conflicts:
plugins/zigbee_wrapper/src/zigbee_wrapper.c

Change-Id: I23ea73432656197a8d79a169257ae5a57ac99718
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
8 years agoExclude private types from doxygen
coderhyme [Mon, 5 Oct 2015 11:20:03 +0000 (04:20 -0700)]
Exclude private types from doxygen

Older doxygens document private types if definitions for them are outside of the outer class.
cond command is one way to prevent them from being documented.

Change-Id: I151180a0724eca6ecf8f5682cbcbab4ca5ee42e6
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3477
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agofix function signature in catcpadapter.c
Hauke Mehrtens [Sat, 3 Oct 2015 14:08:00 +0000 (16:08 +0200)]
fix function signature in catcpadapter.c

The uint32_t and size_t type were mixed up in this file, this could
make the compiler generate code which would prepare the stack in a
different way the function expects it to be prepared and this will
cause some strange runtime problems.

Change-Id: I7665ce9e1bacc25bc367f2d64ff1775253db0454
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years ago[JIRA IOT-778] fixed the jira issue related to CASendNotification API.
hyuna0213.jo [Mon, 5 Oct 2015 03:54:16 +0000 (12:54 +0900)]
[JIRA IOT-778] fixed the jira issue related to CASendNotification API.

CASendNotification API is not used by RI layer.
RI layer is using CASendRequest API to send notification.
so we removed the CASendNotification API and modified the CA sample.

Change-Id: I90d490814dcd5e250564ca4f221911fb1c365128
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoIOT-787 issue fix.
arya.k [Mon, 5 Oct 2015 05:22:43 +0000 (10:52 +0530)]
IOT-787 issue fix.

Change-Id: Ic1e9105a2529c6864f6eae6159f31a6d86642146
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3461
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[JIRA IOT-768] fixed to parsing message length for TCP
jihwan.seo [Fri, 2 Oct 2015 05:39:16 +0000 (14:39 +0900)]
[JIRA IOT-768] fixed to parsing message length for TCP

when message length of TCP has short size (0~12 size)
Parser of Receiver is working as wrong size.

Change-Id: Ib8075913389ef28315623edfe8ae053238bb3663
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3403
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoUpdated android fridgeclient and fridgeserver example.
Rahul Rahul [Fri, 2 Oct 2015 23:40:16 +0000 (16:40 -0700)]
Updated android fridgeclient and fridgeserver example.

Added a new fridgegroupserver and fridgegroupclient example.
This creates proxy child resources from the fridgeResource.

Change-Id: I235ea32a2a9dd2d596cfd1a3407f2a012d6fe3cd
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3439
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoFix logic in zigbee wrapper to correctly evaluate boolean values.
Mandeep Shetty [Tue, 22 Sep 2015 22:24:53 +0000 (15:24 -0700)]
Fix logic in zigbee wrapper to correctly evaluate boolean values.

Boolean values could be read as either "0" or "00" and thus a simple
strcmp with "0" would not suffice.
Additionally, sometimes, bitmasks are read and so we need the entire
numeric value of the string.

Changed strcmp operations to convert to numeric operations.
Also extracted duplicate code into it's own function

Change-Id: I9a8918d9824dcb452b64fdbe9f344cfa020f9e7c
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agofixed the dependency issue between RM and BWT (IOT-731/IOT-712)
jihwanseo [Thu, 1 Oct 2015 05:11:59 +0000 (14:11 +0900)]
fixed the dependency issue between RM and BWT (IOT-731/IOT-712)

currently,there are the dependency issues
between routing manager option and blockwise-transfer option.
so I modifid the code to order the option list.
Both JIRA issues are related.

Change-Id: Iab7bc25e6dd7c35353d8cb382d1c896facbcdd40
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3347
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoadd API set information in iotivity/service
Rami Jung [Fri, 2 Oct 2015 06:18:39 +0000 (15:18 +0900)]
add API set information in iotivity/service

resource-encapsulation
resource-hosting
resource-container
resource-container's bundle-api
things-manager
easy-setup
resource-directory

Change-Id: I618a7babbd65825d7fa464f77e188a54f3b8dc19
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>