fixed the jira IOT-712 issue in blockwise-transfer

if request data is bulk data with block option1 and
response data is not bulk data, response data will
be sent with only block option1. this case we have to
add the received data to receive queue.
This patch addresses the first part of IOT-712.

Change-Id: I62645ae9592f59ed16758e4ff4a2b635cb834e04
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
(cherry picked from commit b56fb32a396a0553a3334b54eebbcaf505207483)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3133
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Android: fix for IOT-755

1. Moved a number of function implementations from OCResource.h into OCResource.cpp to make Android happy
2. Updated android smoke tests

Change-Id: I0bf0edfae7490204d2f4ca44052066fc2dd9af12
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nagabharan Nagendran <nagabharan.nagendran@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 24cda274e3050433677518b94dfb15d0bae59db5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3131

[JIRA IOT-737] fixed to prevent send coap pdu for no uri

if some case is need it to check. the case have to check it.
pdu have to be passed even though there is no uri.

Change-Id: I95ba9b2bb64f7733fcfb3d06b896032c0e3feeef
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3041
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit a993c18612ba08e00df46926a177f23017d5c614)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3129

Fix crash when discovering devices & platforms.

This fixes IOT-714

Iotivity does not currently enforce the mandatory fields of device and
platform be set by applications.
As a result, servers that do NOT set device and platform info segfault
when encoding device and platform info into CBOR as CBOR expects the
fields to be present.

Modified cbor payload to work with NULL fields in device and platform
payloads.

This changed also needs to go into 1.0.0-dev.

Change-Id: Ia626422bd441069febd47a5f44dd12aa42b1d46e
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit bf098fcea98bcc7a8ccd490a512f8aee320bcce7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3127

things-manager: change file permission of .h files

Removed the execute permission for the .h files from things-manager.

Change-Id: I4ebedbcc84114edcacc67dcaf373d6563f465bc1
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3209
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b725411d17dd973e8d0e91c2ac8a35b03b217535)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3215

Added support for proactive link checking

In current implementation whenever user tries to add link between two devices
which already exists apis logs error and doesn't return callback.
In this change, link api first checks that link between two intended devices
exists or not, if it exists then api return error and doesn't move ahead.

Change-Id: Iac02a44542235b962de2fe965f45548d96f9c625
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2899
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 6aa9d7eb1a93cdac934be8a4ff834de5f27ede3d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3181

[Things-Manager]Fixed junit testcases issues and jira IOT-745

- Updated Java SDK
- Updated sample Application

Change-Id: Ife6e1d3a00ff76d4c68f96949787fab1724092dc
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3115
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit e896af014916446b5098094af994885a76526337)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3211

Align resource container Java bundle APIs with new naming scheme

Updating Java bundle resource to follow the new naming scheme (handleSetAttributeRequest,
handleGetAttributeRequest). Latest changes in the resource container APIs
are now also updated in the Java related code.

Change-Id: I7b28c830c2dc6f2dd1c7ad31405851b6d94def54
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ba2c9a84f7700c4778645bfd07e59d9bd8f40395)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3201

Modify directory location and code refactoring "RCSDiscoveryManager"

- change directory location for "RCSDiscoveryManager.h" into resource-encapsulation/src/resourceClient
- code refactoring about RCSDiscoveryManager and RCSDiscoveryManagerImpl

Change-Id: I6790e5aec8cb80a1b62c8767e71256fb582c58bf
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit db190254d8421cdbcea1c5c9292bb07d7fe29800)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3199

Fix a possible segmentation fault of ExpiryTimer.

The thread for ExpiryTimer might be started before members are initialized.

Change-Id: I2d83a60bb84422e033f6165aef3cb0136edbeae7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 735bf9c001146666d86f5e744e3a0cce6a5aa860)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3197

Remove delete request of notification sampleconsumer.

notification manager(resource hosting) is not service for delete request.

notification manager use to resource-encapsulation APIs.
but resource encapsulation APIs is not service for delete request to remote resource.
so, unsupported function about delete request is removed in sample application.

Change-Id: I1280b1fa647b57eadc80ff064d121593fdc88526
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3079
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit af23adaed8225157cac63389e81dbe4a2885f837)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3183

Fix the size calculation bugs while calling memset in secureresourceprovider.c

 1. Fix the 'sizeof(sizeof(...))' whiling calling memset().
 2. Change the 'OICMalloc + memset' to 'OICCalloc'.

Change-Id: Idbb14de5a3d4517bc55324f7a8a58d2079bf12e8
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit b4a723f299b3ccf44f7bc047eff06bb29abbed93)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3179

Add CRL resource URI to SRM checking

Enables CRL resource URI to be secure while SRM checking

Change-Id: Ie0e5bfc0a08e16730ff9a1f9ff1b52525545ca86
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit fcd6ddcf05f9a77c2b364afe1b13a9d22a6cb0a0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3177

In resource-encapsulation android api, ResourceContainer related files are removed.

It is not part of service api any more.
And manifest is modified to eliminate lint issues.

Change-Id: I80adb6784bd3a1667aa1b71f6f6b978c1148988c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 2d396d6ea3aa15c0a98cbded7c11d5eee7776346)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3111

Code formatting for unit tests for resource-encapsulation android api.

It is to conform with java code style for iotivity.

Change-Id: I70c824606b76025d2b7ddb517c426ebef2faf740
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b5215661fe93472908ee8b7b55378bcee75e055c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3109

Remove a wrong memory free in oicgroup

Schedule information for scheduled group action should be not freed until
it is canceled.

Change-Id: I9c92908b4425795603a98d649f6be2d48d96645e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3035
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 9144f5288fe01dd82dd09df22b8dc5769d2e257a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3099

Convert android examples of resource-encapsulation into android-studio project.

Additionally source is modified to align with new version of apis.
Project names are changed as well to align with tizen samples.

ResourceContainer examples are removed because it will be excluded from service api.

JIRA issue : https://jira.iotivity.org/i#browse/IOT-744

Change-Id: Ie26dcef2ba373cde796099c4f6e5c32fbcf8aa03
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1697ec12d449b7e583ade370ff05d3d6adb5b564)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3095

Modify discoveryMap's cancel logic in order to keep data intergrity.

- lock guard mutex before erasing data in discoveryMap.

Change-Id: I71f2a63797e417148a670a1d9e880d0c2a6515d4
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 404a997993bfba1289279683f7b6c6534f3a651d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3093

modify BundleResource template api for handling attributes update

- remove set,get request handle apis for handling single attribute in bundle resource template to make template simple
- reorder the apis
- modify samples due to the change of resource template apis
- modify bundle resource to make container and bundle use shared pointer

Change-Id: I7b87ffc2e405aedd290a13b3b392063d785f8814
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3027
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1d699397819badb51dfa4ca3adac1fae58be0af4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3089

Add API explained comments for RCSDiscoveryManager and RCSDiscoveryManagerImpl

- Modify return type (void -> unique_ptr<DiscoveryTask>) in RCSDiscoveryManager
- Add new API in RCSDiscoveryManagerImpl

Need to be cherry picked master branch into 1.0.0-dev branch

Change-Id: I69c90a7448efa325941c2aef53ea4a252e2ab6c8
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 40309df462cfde1717a467bbda6cb77fa6de6adb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3087
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

resource: check for valid pointers

This is patch is in continuation of the patchset
As mentioned by Madhan, this patch checks for the validity of
the pointers before their dereferences.

Change-Id: I9c1cd15bbcbd0a77bb34898ce3bc55c7d87b05f4
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2971
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c9f56d7146b8c9e9fb69b9b0e4fa59cd3fbbb85d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3085

Update comments for documents of resource-encapsulation

Add missing file descriptions.
Update comments that were incorrect or unclear.

Change-Id: If2b2ff50d35e52a07e2ff66055801fd0658865b7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3025
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>
(cherry picked from commit 61274389a127dd467b0ee5c70c7b2115e70c52f4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3083

Add class description of container bundle API

- add class and file description of container bundle API
- remove '-' for parameter description in comments for APIs

Change-Id: Iaca3db8d948657381fdf80350e45b7d783a5672a
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2983
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit d5cea0ae54fbf0980b59bbc60e15392773f39466)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2991
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Fixed Tizen build error with SECURED=1

[Patch-1] Initial
[Patch-2,3] Fixed build error in case of CA partially.
Note : The purpose of this patch is to fix build error
when building full tizen with security.
The change required in jenkins configuration is out of this patch.

Change-Id: I2ec95c13d6c7d7978662e7ef69f7a02cd8188df0
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2997
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 8a42b6a387e634c1138a82ada0df1fc43d93ad36)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3171

Add validation of parameters at JNI level.
Updated client json db file for 'sct'.
Few fixes in provisioning client sample.

Patch #1 Fix Review comments and device status enum fix.

Change-Id: Ib4d63619d730d2d350214d8fed6d3817b14eaa2c
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit f2be22f641e435b228af5916de901e90cfc09156)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3169

Fix for bug IOT-759

Fixed the seg fault when no recurrence rule corresponding to period
rule was present.

Change-Id: I69989819d17ef7edf644a0efa512b051b18b7307
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 3382a044ea795e2335b96fb36139c6f217616c27)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3167

Removed the filter to add 'identity' info on selective connections

Ir-respective of the end-point being a SERVER or CLIENT, it may be
useful for RI and upper layers to know the true identity of the sender
of the message. Therefore, removed the filter which was checking for
'SERVER' only mode.

Change-Id: I21cda0a645d79df6df3a3a4113cccbac4a7ae8d6
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2949
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit e3cb235a806f9da339f4bb9ae07f5ac5cd8b25f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3145

Updated log level of log messages in SRM module

Many of the log messages had in-correct level of INFO, whereas they
were actually DEBUG messages.

Change-Id: I0e47e1b19b20a15f7d4b539e55995137270c75fa
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 2a98b1703dd7e3f558a5ecab7063047eb674931b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3139

Destroy Secure resources during system shut-down

Secure resources which were recently added were not being
destroyed during system shutdown. Added API calls to enable
proper de-allocation.

Change-Id: I1fcaf2218d8957138a87e1ffab14d07c78bebe5c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
(cherry picked from commit 8f1b886445997c34a68851d280d2b7ef319312fc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3137

Android: Refactored SimpleClient

The app was refactored with the emphasis to readability
and cleanness. The theme has been modified to include IoTivity
logo and small android icons.
It also exercises the newly created features form the stack
such as OcResourceIdentifier.
Implemented hashCode() in OcResourceIdentifier to allow it to be
used as a key in the dictionary objects

PS 2: Removed unnecessary module reference

Change-Id: Ib1c9a56d97fa52ffe7d17c156ed228cf6e8946ef
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2719
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 7abfb5c94a9a18fbad632972f99ae4a8fb60c334)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3125

Android: Refactored SimpleServer

The app was refactored with the emphasis to readability
and cleanness. The theme has been modified to include IoTivity
logo and small android icons.

Change-Id: Ife421a83b5f23a8b903a76b4a89edcb0c558f8ef
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 9e26620ba9d3a8bba6f7c1b353d6f9db1f55e2f6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3123

[JIRA IOT-738] fixed to calculate message length for option

message length in Header is wrong
for long option number and value for CoAP over TCP

Change-Id: I72452c07e2b5ffe43749cae5c3a4bae6d7c2f3f2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c77eae61f8232159e9d1e0e23b46f6cfb2ea4b5e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3049

fixed the jira IOT-742 Temperature Resource Creation Fail

- modify temperature resourceType
 (core.TemperatrueSensor -> oic.r.temperaturesensor)

Change-Id: Icbb9402055ae09e2e732a85a31ef1e1a81c46b44
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 06d09a4f3980c7131eb25bf7e52278875710df43)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3097
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Android: Adding GroupServer/Client examples

Change-Id: I2604a8dfccf6f55b37949e8ff0eda6b1b49d7713
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit e685fddfe38624da5495400df2a1b76f95db6886)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3121

android: add misssing error codes to stackResultToStr()

The OC_STACK_UNAUTHORIZED_REQ error code and some others were missing in
the method for translating them into strings.
Without this patch it resulted in this exception:
org.iotivity.base.OcException: stack error in onObserveCallback JNI_INVALID_VALUE

Change-Id: I739dfecafff55c035702a27a9b5d8dcb925993f4
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2643
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c8487deda0f5ee888267c53322c6197a463c1b88)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2989
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

ca: fix android KitKat 4.4 support

pthread_condattr_setclock() was added in Android 5.0 and IoTivity used
it unconditionally which cause linkage errors on older android versions.
With this patch pthread_condattr_setclock() is only accessed when it is
available with a weak reference. In addition android < 5.0 provides a
private function __pthread_cond_timedwait_relative() which is similar
to pthread_cond_timedwait() use that when available instead.

This should make IoTivity compatible with KitKat devices.

This was tested backported to IoTivity 0.9.2 on an Intel based Android
4.4 Phone and an Arm based Android 5.0 Phone.

Change-Id: Ibae6613a4ae52e230b7850ef1a2bad0b5fd530df
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit a3a8bfd5a5cb887f10a2a2b55a8bf86b7fa0edad)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3007

Renaming of BundleResource APIs

Renamed the BundleResource APIs from simple setAttribute and getAttribute to
handleSetAttributeRequest and handleGetAttributeRequest. The maintainer
of the primitive services prefers these names in order to avoid
confusion with other resource encapsulation APIs.
The plain setters and getters are just for basic data structure manipulation and
do not handle any bundle resource specific logic any more.

Change-Id: Ie8f486269694ca7ee2a44f2e2390cdb2b27ba45b
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 956102b147d12016537dce17ea4500715fc41564)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2979

Add brief descriptions to several classes in things manager feature

GroupManager, ThingsConfiguration, and ThingsMaintenance has been added with
brief descriptions.

Change-Id: Ic2f884affa1754ff2b897eda171715624641b58b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 82a52fd3586e09fd5828c23b54a2e0bfdbe77a61)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2977

resource: Fix cppcheck issues in resource/csdk/security/ dir

This patch fixes the "(error) Possible null pointer dereference:" issues
reported by cppcheck tool in resource/csdk/security/ directory.

Change-Id: I36c41312fe3d78edd43c6c505b875ecbb6ba0dfa
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit d9121babfc07a9ecc54dd46ef02d6f6b0e8775a3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2967

Fix invoking attribute updated listener of RCSResourceObject.

There was a possible deadlock issue when the callback is invoked.
The mutex should be unlocked when the control is passed by invoking a callback to the users so that an object of the class can be used for the users without any concern regarding deadlock.

Change-Id: Iea35ab16858c7a8be67b87726b0e25ea6e94d73c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2959
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 2e89bcf2c559ff013cbc6c9d9c0f414371ef0b16)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2963

Updated java doc comments for services : TM and RE layer

- updated comments for bundle-java-api of Resurce Container module
- updated comments of Things Manager.

Change-Id: I39970e0cce8920488ac034d3b110421dce2fc0de
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2923
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ee0ccf1a7f9210b40030bb6a5ed26d73dbe8d8d3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2937

Fix a build failure issue of resource-encapsulation for android-debug mode.

Change-Id: I8bc556913b9582814144ef05fd5a9484b857a241
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 5fb1533ea069446cf65ef45c6e729da25f086dc1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2927

Update unittest of notification-manager.

Adding unittest for HostingObject Class,
and fixing release of smart pointer.

Change-Id: Ia27070b5908c5b42348a430dc602e136b70a9217
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit fb5bd9d3850692564af58daa92721c93720528e6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2919

Fix broken tests of resource-encapsulation.

DiscoveryManagerTest is moved.
ResourceClientTest is modified to conform to the modified discovery manager.

Change-Id: I55b1fcfa00e4a606796f44ee4c84351dfaebc4c7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ebea15b1767e1d545a2e7ac7745216b1f0fba666)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2913

correct the comment about mis-definition of class "RCSResourceContainer" for doxygen

The mismatch between the real name of a class RCSResourceContainer and it's comment resulted in the wrong doxygen description .
It means that Doxygen had two seperate definitions like RCSResourceContainer and ResourceContainer.

Change-Id: I3a3647ace72b641862cd05b7d4ee2c8d98aeaf75
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2885
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 5f06380535700dc28cf33690e0e9209363dcc3d1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2901

Update SConscript in service

Cleans SConscript in service folder by removing soft-sensor and
protocol plugin SConscript

Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Change-Id: Iccc880151f6b77a43f6f956eb6a7a40da25547ee
Reviewed-on: https://gerrit.iotivity.org/gerrit/2869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b940439ce35a3f3a8cbf2ef2d86cfe5b056b509a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2893

change resource type names of resource container samples

- modify container sample bundles, unittest and bundle configfiles
- change resource types of sample input sensors

Change-Id: I2738a8c2ad1f5e28ea5a3dd2d6c48739b7be9a5b
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ba685fbcac922991fef921bcd8ba06cd8a247fb3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2891

Fixed bug in SRMIsSecurityResourceURI()

SRMIsSecurityResourceURI() API was returning "TRUE" for all resources with
URI starting with "/oic".  sizeof() char * is always 4.  Changed to strlen().

Change-Id: I2287ee29c677bf7229a80779fa150c73abb7db19
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2863
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 99cddf54412d34f7bb683041d7ef7a319011436f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2889

Rename resource-encapsulation exception classes.

It is to make class names consistent.
All exposed classes in resource-encapsultion layer as the API must start with RCS.

Change-Id: I64280bc959a60d368cfabab731196e35a7383a94
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 9378122394680009804a5181275b16a6b71819dc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2879

Update Sconscript of notification-manager.

Samples exclude from the install target,
and library header include to the install target.

Change-Id: I06c7a2b8302c8d43d00cf2884098af97eb75bddf
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit d06d8bfc5bbb9ce319de7cb98a2478f6cf831187)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2875

Add missing copyright

Patch #2 : Trigger builds on 1.0.0-dev branch.

Change-Id: Ib376f468e060920ce0315ab36d582c365f7aea1e
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2845
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>
(cherry picked from commit 7f3327fbdcddc691cd9b7921233d25f2af97446a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2861

Fix bugs in things manager reported as defects

CIDs: 65815, 65820, 65838, 65877, 77411, 77412, 81301, 81305, 81306, 81584

Additionally, modify resource type to be compatible to RFC 6690 guideline
for factory set resource.

Change-Id: Ia598cc00f8b3810a14a6341e941f20b11e3c4bfd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 962a14806e62788d08eea26cd0797f3bafe16f16)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2859

Remove wrapping '(' and ')' in OC_LOG arguments to resolve Tizen Build error.

Change-Id: I5ca0849bcde655c6eb8962c28bc5c4320f4bf925
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2827
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 5a4eb3109ea6aa759c17a59214552681c41879ad)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2849

Modify NotificationManager code to change resource type

- change the capital of resource type into the small letter

Change-Id: I85d34e25c903a826f2b4a16781991ee61b75b16b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 279fd705afde671ba1cff6d414a18124fbc7e2f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2839

Making simulator build optional through scons command line argument "SIMULATOR".

simulator module will be built only if scons command passed with SIMULATOR
argument having one of the case insensitive value from "True", "Yes", "Y" and "1".

Example: scons SIMULATOR=1

Change-Id: Ie5dcd839d8770d219de1d623d60c23be0133bb1c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2823
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 42471c31531a3dc46d3bbf861b767f11b48ac580)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2837

Fix the build failures on Ubuntu 12.04 32-bit machine.

Changes incorporate inclusion of "condition_variable" header file
in notification-manager dir.

Change-Id: I8dcf2a54579d8c5a1ce9f60a6498007eb7fe2c37
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit dad04311238a4c221a9cec662d9fe79fcd5e287a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2833

[Resource-Encapsulation] Tizen build fixes. Removal of SSM and PPM library references.

Change-Id: I038be50d750333696fcc1ee111fb7fc53bf7729e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 8bdfa8e04052840296d79c98e8f49554ab12d054)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2831

Merge branch 'plugin-interface' into master

Change-Id: Idb58ff366694797d8bc433e974faf2c6124091aa
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>

Added Telegesis & Zigbee Wrappers, mapping logic, and plugin interface.

These additions encompass the first pre-release of the plugin
interface.

A unit test, server, client application are also included.

Change-Id: Ia61a01223f611ffc1e38e79b8e3a8317fb3f34cd
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Changed zigbee sample to use signal-atomic

The signal atomic type is more reliable than bool, since it is
guaranteed to enforce thread safety. Also fixed the logic in the 'while'
loop so that this will function properly when the calls work.

Change-Id: I1ef4713f9e894592b1b25c874327bce810c83352
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2769
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Adding an IoTivity/Zigbee sample server

Added functionality for the IoTivity/Zigbee server.  Added file
for addition of the client.  Changed the PluginStart to have the correct
parameters.  Corrected SConscript to properly include the IoTivity
logger and CSDK.

Change-Id: I20aca3403c6a0a1e198fdb337a6affe13c389417
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2122
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Do not build the Plugin Interface for unsupported platforms (ie. !linux).

This will ensure the Plugin Interface is only run on the Linux platform
as this is the only validated platform for the Plugin Interface thus far.

Change-Id: I14507336d54a47cc32102c76cd1d4f1891cb3687
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2785
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Fix broken observe requests and GETs being treated as OBSERVEs

args to some functions were validated for NULL to return error codes even though
NULLs were legal for the args.
For eg. it is legal for options to be NULL.

These incorrect validations caused early returns and observation actions
were not set to OC_OBSERVE_NO_OPTION which is 2. The field in the struct
instead defaulted to OC_OBSERVE_REGISTER = 0 due to default inits.

Fixed both by removing or replacing the incorrect validations with more
appropriate ones.

Change-Id: Ia7453227a668bb26971b2b7d84381f64151b88f9
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Merge branch 'security-summit' into 'master'

* security-summit:
  Added AMS functionality to support on-demand ACL provisioning.
  Added Android support for Provisioning APIs
  Quick fix on getting secure port information

Conflicts:
android/android_api/base/jni/JniOcStack.cpp
android/examples/settings.gradle
resource/csdk/security/include/internal/secureresourcemanager.h
resource/csdk/security/src/secureresourcemanager.c

Change-Id: I57d1157e4c1e74425fe27757e7dfa8a4ef8d427a
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>

Added AMS functionality to support on-demand ACL provisioning.

This change includes the new "AMS Manager" (amsmgr.c) module, as well
as modifications to the SRM proper, policy engine, and doxmresource,
which are required to enable Access Management Service functionality in
the SRM.

Change-Id: Ibf10e00bebeeafd238ac083c7d45c1bbf7a46dd3
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2486
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Initial commit of "Plugin Interface" & supporting directory structure.

This commit will allow follow-up contributions between contributors to
this new feature to IoTivity.

Change-Id: I41b812c048e44dded31a7fefa75f1e3830fc8daf
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2091
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2765
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tested-by: Patrick Lankswert <patrick.lankswert@intel.com>

Changed if/rt to be space-delimited strings in CBOR encoding

The Spec says that if/rt should be space-delimited values rather than
just an array of strings, so this changes all encodings of if and rt to
be space-delimited.

Also adds some unit tests to validate the defensive nature of this
reading.

Change-Id: Iebd1d5a215a06abb023bb1b33112dac1df3511a1
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2645
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Android: Added Device/Platform discovery client/server examples.

In addition it also modifies the respective functions in the base
Note: this commit depends on gerrit.iotivity.org/gerrit/#/c/2433/

Set 3: Changed the tests to be in accordance with the modified API

Change-Id: I1a91166a54ef7f277d95c4d62961888c782383c5
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Merge "Merge branch 'security-CKM' into 'master'"

Merge branch 'security-CKM' into 'master'

* security-CKM:
  Add PKIX build
  implement certificate key manager
  CA retrieve PKIX resource from SRM using callbacks
  Add PKIX provisioning
  Add PKIX resources
  Add PKIX API for CA
  add support of X.509 into tinyDTLS external library
  Add certificate verification
  Add ASN.1 for PKIX

Conflicts:
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/include/ocprovisioningmanager.h
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c

Change-Id: I7ec588eeec8e04e0bf9de84ebf520023a3f97dfe
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>

clean up RoutingManager codes in here and there.

Change-Id: Ib4ac2c34033f594c8d2821898d4831e18869a3d3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Add validation to resource type/interface addition

The functions that add resource type/interfaces to the resources were
not correctly validating them to the RFC.  This commit adds validation
to these such that RFC6690 is enforced, and gives the developer
immediate/early warning of invalid values.

Change-Id: If04f72c1aa69ec2f9fbc83d849a503c2ee86f502
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Android: Adding PresenceClient\PresenceServer examples

PS2: adding modified settings.gradle

Change-Id: Iedba236264ab2b58bb55e11e8f4ea7f8b3871603
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Merge branch 'simulator'

OC::ObservationInfo is modified only as per the requirement of simulator module.
Please refer this change set for more information https://gerrit.iotivity.org/gerrit/#/c/2323/.

Change-Id: Ib4d762348f250697642d417798780e37cf62bdb0
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>

Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation

Change-Id: I56e84e31987766e5fc97cf3dafa7882f55ae1ef4
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>

OSLV fixes for RE layer.

- Updated Android sample apps.

Change-Id: I6df99717227d1515e40a08560550b3cb2c82d54c
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2723
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Fix for prevent tool reported defects.

Change details:
1. Prevent issues fix.
2. Removal of white spaces from Java files.
3. Simulator tool UI changes.
4. Fix for issues observed during regression testing.

Change-Id: I4141541587421bc3de7ee321e8124a0444f37dd5
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge branch 'master' into resource-encapsulation

Change-Id: Ib07cb15d2b953ac870166383fe51fc7a26aaf73b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>

Modify Notification Manager for updating resource encapsulation

- Modify Notification Manager files
- Add UnitTest codes

Change-Id: I7b3ac0931a77935fc26a9c060a96200f13de27ca
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Eliminate result code from RCSGetResponse and RCSSetResponse.

It turned out there is no reason for users to set the result code.
The only scenario that RCSResponses have not OK for the result is that there is an error occurred
and in that case it should be an exception on resource-encapsulation layer.

Change-Id: Icef409ea5e224f9f02e12e174231baa4e11c5a33
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Modify resourceContainer code files for active discovery manager

- add variable for RCSDiscoveryTask.

Change-Id: Ic26daafcb70c8c59242debcddcbd1307e84aae01
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Code formatting for RCSDiscovery implementation.

Change-Id: I2734731b8c467204e9382a08b185f6f9b9a7797e
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Refactoring the android api for resorce-encapsulation.

SConscript is added to conform to scons build.
JNI files are renamed to conform to the style.
JNI files are restructureed to make folder hierarchy simple.
android apis are refined to follow java convention.
Comments for apis are updated.

Change-Id: I1bef70c9468d767b1694f29165704a70370bbe90
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add PKIX build

To build with X.509 support:
scons SECURED=1 DTLS_WITH_X509=1

Change-Id: I63f0b9e4b1efa6f5871ee23d30ed5975424366ef
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2491

implement certificate key manager

Change-Id: Ie77bc7f7cffe9536a0ca7a24625af17d01bf63ed
Signed-off-by: Oleksii Udod <o.udod@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2447
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Merge "Merge branch 'master' into simulator" into simulator

[ANDROID] Remove GroupSynchronization in things manager.

Change-Id: I3d3324636ee7642cdba7657cba3c92105831159b
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2713
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Modify initialization for non-static class member.

- Non-static class member m_timerHandle is initialized in this constructor.

Change-Id: I6fa35c75f529b13f9c312e298b6536bca5dbd64b
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Remove SSM and PPM service foler

The SSM and PPM service in IoTivity is supported by Resource Container
as Protocol Bridge and Soft Sensor Template. Therefore, the exsisting
SSM and PPM folder is not required anymore.
This commit deletes both service folders and update service/SConscript.

Change-Id: I0864db18a6141b345fc883ae4740c152dbe868ab
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2695
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

[TIZEN] Resource Encapsulation Tizen build fixes.

Change-Id: I0ada98200f182992326c2fd448730f47b30da2be
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

CA retrieve PKIX resource from SRM using callbacks

Change-Id: I179c485a4b71003115d579b4d9c80ed0bc59f4f6
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2601
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>

resource: Add test for ConstructResourceObject without coap scheme

Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with no "coap" scheme in the the host value

Change-Id: Iaec6f6f0038a049b969d08685cc057e6bae80455
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2517
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Add iotivity.pc.in file and generate iotivity.pc file

This patch addresses the second part of IOT-524. The current
changes include adding a new iotivity.pc.in file and generating
the iotivity.pc file using .pc.in file.

Making the relevant changes in gbsbuild.sh files to include iotivity.pc.in
file during tizen builds.

Change-Id: Ie3ed7ccdf6e29d427362d0bb2b85439508997b6b
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2378
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Add PKIX provisioning

Implementation for certificate, crl resources generation and provisioning

Change-Id: Ib8bd72186da5a0d8314b00f28dbe05cb60d9b344
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Fixed android local reference overflow

Delete JNI local reference

Change-Id: I1b0b54ec775be075a3fe9e127d57fe0bc882c9a8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

optimization to use the existing buffer in blockwise-transfer.

if we have to update payload data, we always allocate new memory.
so we modified the code to use the existing memory if one exists.
This patch addresses the first part of IOT-690.

Change-Id: I04ca551273caf02f783c62a76f11f7e07409d8dd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Remove unnecessary include.

syscall(3) is not used, so <sys/syscall.h> is not required. It's a
Linux-specific header anyway, so it should never have been on this file.

Change-Id: I42e7ef1a481840699a8dffff1404e8e982839caf
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2651
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

fixed the prevent issues for CA android platform.

-remove the logically dead code
-memory leak
-dereferencing null pointer

Change-Id: Ided9d1fc0a909f10309df47e23b04d7f1ca8db22
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/2591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Upload command update for Arduino DUE

With the previous implementation, CA and RI binaries were trying to get uploaded
on DUE board during SConscript parsing.

Change-Id: I12955a09e5695192b6cb756f2252b12bc62c0726
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2515
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Merge branch 'master' into simulator

Change-Id: I76a7d8c501e2122a3c4eddd73ede9f7195fe1055
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>