review.tizen.org Git - platform/upstream/iotivity.git/log

[IS] Sync simulator with changes in cJSON.

Some changes in cJSON external library affected the Simulator's
JSON Schema Parser. Due to this, resource creation was failed.
This code check-in handles those cJSON changes in simulator.

Change-Id: I11173b39c61651c1459cb45b5e5cf886dafbabdd
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15369
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit c29d63038da023bce2de1b95c073fe9b181f6c9d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15453

Add an additional callback in security provisioning of easy setup
after secure resource is discovered.

Right after a target secure resource is discovered, Mediator may need to
confirm which ownership tranfer method is used or set a pre-configured pin
number for MOT use case.
For that, it adds an additional ESResult, ES_SECURE_RESOURCE_IS_DISCOVERED,
which indicates the event. And if some user inputs are needed, user can
pass its inputs as a form of ESOwnershipTransferData object which can store
an ownership transfer method to be used and pre-configured pin to be used
for a MOT case.

Note that, related APIs for MOT was merged
: https://gerrit.iotivity.org/gerrit/#/c/14221/

Change-Id: Ic17f50693a6c4073eb5208da861506230f817f0e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15161
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 80884027f52113cdeb2673877d2a3d338630e371)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15467

[IOT-1652] Fix Doxm Handler to check ehRet during ownership transfer

Kevin noted that ehRet value set at lines 1120 or 1125 of doxmresource.c
will be overwritten and never checked if __WITH_DTLS__ or __WITH_TLS__ is defined
due to the patch https://gerrit.iotivity.org/gerrit/#/c/14739
This patch fixes the issue.
https://jira.iotivity.org/browse/IOT-1652

Patch #1: Initial upload

Change-Id: Ieda643f10d3116d785f293604393e8709c94fe80
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15463
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 8e088ff2f9e41f339b0cef663b9d8cb688840e14)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15539

[IOT-1652] Modify confirmed certificate OTM to use vendor namespace

Confirmed Certificate OTM is vendor-specific OTM
and hence oic.sec.namespace is replaced by x.org.iotivity.
https://jira.iotivity.org/browse/IOT-1652

Patch #1: Initial upload

Change-Id: Ifa3c4f9119307064e27c90f2581cdb6d4765be13
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15461
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7d1493d3288a5b121c70b429d26218ec91ff664c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15537

Platform ID must be UUID
Change sleep() to wait()/notify()

Platform ID change was due to this commit https://gerrit.iotivity.org/gerrit/#/c/14991/
wait()/notify() improves performance

Change-Id: I5c1bca6939243eec9cbb52893c7e376ac422cb7c
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15573
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

IOT-1656: Removing -fPIC compiler option for unsupported builds.

One extlibs/mbedtls/SConscript was passing -fPIC for all compilers,
even the ones, which didn't support it.

Change-Id: Ib946da6f73d3e811e05b8b92bc5315e95a5a3d67
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15295
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1089] Fixed paths in gradle build files

Change-Id: I15261d813de636c1ed9dec6bed7a5e0392897924
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15571
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

[IOT-1313, IOT-1300] Improve random number generation

Update ocrandom.c to use platform specific, secure random number
generators instead of rand(). Update the API in ocrandom.h, and make
corresponding updates to callers. Avoid using FP arithmetic in
OCGetRandomRange.

Change-Id: Ic0476dc69f1c649c4a07a46b99643cf7206f83af
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15243
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Remove unused function to resolve build warnings in catcpserver

Remove unused function after merging below patchset
link: https://gerrit.iotivity.org/gerrit/#/c/14827/
commit message:
[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP

Change-Id: I79ddc0167e62e5601c81bb432bd3c1af750b69a1
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15341
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Extend unit_tests to all (including service)

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I89426d04e0b05c49470c059ffe60cf90fcb95582
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14971
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15291/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15291
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Indicate intentional fall through in switch statments

Add comments to clearly indicate that these cases that lack
a `break` statement is intentional

The lack of `break` statment shows up in many analysis tools.
Adding the comments helps when evaluating reports from analysis
tools.

Change-Id: I24f0e4ee7b8d651bed6a8a0f8179d0ec789521a4
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15239
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

build: Bypass and/or fix suspicious service tests (workaround)

- Run tests using tools.scons.RunTest
- Add a file parameter to enable valgrind check
- Disable failed test, to make verifier sane again

To be tracked at:
http://wiki.iotivity.org/1.2-rel

Droped Conflicts:
resource/csdk/connectivity/test/SConscript
resource/csdk/security/provisioning/unittest/SConscript
resource/provisioning/unittests/SConscript
service/easy-setup/mediator/richsdk/unittests/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f00000001
Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15377
Reviewed-on: https://gerrit.iotivity.org/gerrit/15377
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Fix deadcode execution in ocserverrequest.c

There was a deadcode.

It has goto statement which is only called when memory allocation fails.

In the goto statement, it was trying to free the variable that failed in memory allocation.

BUG: https://jira.iotivity.org/browse/IOT-1664
Change-Id: I36ea779ee5bae131a10f55dafcb45728c1e7dc9b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

NULL pointer check in cbor_test

cbor_test directly uses value returned by OCRepPayloadGetPropeString in memcmp .

The value is not checked before calling memcmp.

BUG: https://jira.iotivity.org/browse/IOT-1662
Change-Id: Ia998ab4154d0b2efb69dff232532d2b8b7f4f5de
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15365
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Buffer overrun in ocstack.c

UUID length is 37, but CA was setting it as 32.
Since UUID length was set in octack, the correct
size has to berelatively in CA layer too.

BUG: https://jira.iotivity.org/browse/IOT-1638
Change-Id: I4c8713acf9329fe8ace64d1da56093c1126d9c19
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15353
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

build: Enable unit testing in SECURED=1 mode for resource

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I38e593d49401f7e14bfa26dd980938d36e66ac68
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 7be23fe785dffb5bf4ce022c882bdd235434ebb8)
Origin: https://gerrit.iotivity.org/gerrit/#/c/14691/
Reviewed-on: https://gerrit.iotivity.org/gerrit/14691
Reviewed-by: George Nash <george.nash@intel.com>

build: Bypass and/or fix suspicious resource tests (workaround)

- Run tests using tools.scons.RunTest
- Add a file parameter to enable valgrind check
- Disable failed test, to make verifier sane again

To be tracked at:
http://wiki.iotivity.org/1.2-rel

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f27487f4e
Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Origin: https://gerrit.iotivity.org/gerrit/#/c/12075/
Reviewed-on: https://gerrit.iotivity.org/gerrit/12075
Reviewed-by: George Nash <george.nash@intel.com>

[IOT-1670]Removing Unreachable code from Provider sample app

Change-Id: I4a21cfb86bf474f1e8609f0288560509d6538e14
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[IOT-1089] Merge remote-tracking branch 'origin/generic-java'

Change-Id: Icad0fdf58b85b23fa1d47a900bfd81b278592749
Signed-off-by: George Nash <george.nash@intel.com>

disable enum value of OCResourceProperty related Local(D2D) MQ Broker

since local mq broker is not supproted yet.
it is better to disable some value of OCResourceProperty
related MQ local broker until define it on OCF spec.

this issue from CTT vertification.

Change-Id: I37715a8e763084cb33f9b7fea794346152c29704
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix for crash in InProcClientWrapper destructor.

InProcClientWrapper::stop() throws an exception when stack
is already stopped. Not catching this exception would terminate
application.

Change-Id: I50bb6befb716049da275c16a4fdbf96437c2ad03
Signed-off-by: Harry <h.marappa@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15169
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1628] fixed TC failure in the resource discovery in the cloud RD

- According to the latest RD implementation, the resource discovery TC is fixed where the device presence information is stored in the DB in advance

Change-Id: I85c2c848cf3b0a60fa22014faa09e00985fe6688
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit fbedeaf326cfd49446ba3a28d599a4cb54824d10)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15259
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Removed href from device and platform payload

- Created a separate function to handle Device and Platform payload.
- rt, if and attribute information are the only included in the payload.
- BuildResponseRepresentation updated to avoid information about device and platform payload.
- Updated dmv value from res.1.1.0,sh.1.2.0 to res.1.1.0,sh.1.1.0.

Change-Id: I59059997f170d177663e87eddea9df32275ca882
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15265
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

[IOT-1614] Test for NULL a single time.

Change-Id: Id3b07eb93ebc0d888c27f3629acc93ec7c4925dc
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15071
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-1626] Added BSD 3-Clause License in SCons.

Because SCons has dual license.

From https://github.com/flashpixx/Storage/tree/master/Scons

Change-Id: If45a359bb41efb3bdd93d33d20e6d26ec28847c5
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Support unicast discovery of secure resource for BLE transport in easy setup

In a patch, https://gerrit.iotivity.org/gerrit/#/c/15183/, an api to discover
a secure resource in unicast is being developed. So if an OCResource object
given for easy setup is BLE transport, this patch will make a secure resource
discovery happen in unicast due to its better efficiency.

Change-Id: I65bacf090b6ef5cebdb101a705a58ebdb6d8b645
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 1b17f573c2ae4accb5888d69b6038cc252e43554)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15319

[IOT-1593] TLS ports and CA_SECURE flag added for secure socket accept

- TLS port and secure flag added in tcp server
- TLS port information added in discovery payload

Change-Id: Ib409e069869c52e10f1bd99d35cd6f94ab90fff2
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14667
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15345
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IoT-1603] Restrict unittest with SECURED mode

Fixed segmentation fault from notification-service unit test
when building option with SECURED=1.
The unit test is not allowed with SECURED mode,
becuase provisioning steps are required to detect providers and consumers
for running the test cases.

Change-Id: I02ebfbc8f3afdd2b06d66b87976773fcdc37b030
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14783
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15343

[IOT-1659] Fix JNI static analysis issue for Notification Service

It is required to fix static analysis issue and improve code quality

Change-Id: Ic5afa823196ef83fb2ee62bb799dda093c13485b
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Modified the usage of the u_arraylist_remove()

-Modified the usage of the u_arraylist_remove()
-Add log message for catcpserver.
It will help to resolve the future problems.

Change-Id: If5ee7157cbf1536b3cafdd9885a8533c91aef505
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15333
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-1575] Update to manage connection state of tcp session

If network interface is down, the socket of the connecting/connected
state will be closed.

Change-Id: I9f9cda2e3ab5672c336ed165ec4f189ab846f054
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14067
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

modified searchUser() API on OCAccountManager

Since the account server spec has been changed, it needs some modifications.
- modified uri "/oic/account/user" to "/oic/account/search"
- modified query form to search more than one user.
- removed searchUser() API for searching a specific user.

Change-Id: I431d6a4750d7a0772831da1865de2e8c5498ed09
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14545
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15347
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Fix static analysis issue in keepalive

- add return value checking logic after memory allocation

Change-Id: I1c28e13e01c2dd7bf4b78585adf0ffdc0e6ecdfd
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 64b44c48ab8944c7cae1cabf64aa0e1e98ada932)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15339
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>

Patch for discovery unowned device by BLE MAC address

Patch for discovery unowned device by BLE MAC and
Device ID.
This is a patch for CONPRO-245.
There is a patch at the iotivity with commit
https://gerrit.iotivity.org/gerrit/#/c/14629/

Change-Id: Iddbf32bfb93fbeb5ffa8654358e538952bd3ae02
Signed-off-by: junghun kim <jhun1105.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15183
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15317

linux: Use system sqlite3

Problem was discovered on yocto

Change-Id: I5274bed9e4b7ddcdc1b17a265a1886cd78cb631f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 08b403572985a70fe5d652378e1cfa2b72ac6a3d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15359
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Modify the SRMRequestHandler to use the CAEndpoint_t's infomation
for identify a secure channel connection.

Change-Id: I91caf27ba7b08ee69623a960bb8df4da0acfefd9
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit b321d908218d5c2fdf1807b47c9da0c85bdbefa5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14823
Reviewed-by: Kevin Kane <kkane@microsoft.com>

fix crash issue related transmission for large data

Change-Id: I88dbef87f5e02a0d4e0c0903a3d1734088d82401
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Prevent out-of-bounds memory access

prevent the snprintf function from accessing outside the
queryParam char array.

If the resulting uri exceeds the max uri length indicate the
failure by returning OC_STACK_INVALID_URI from the function.

Found using static analysis tool.

Change-Id: I81ee4cc932c70942ff65dcf8390529279e36dc4a
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15173
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Add new connectGatt API for Level 23 for android.

Change-Id: I5bb170c92b1df48d767f96dddecdb9b86fc85945
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Ic21559c8bb95f93ab82d8b2d8f443e14ae470654
Signed-off-by: George Nash <george.nash@intel.com>

Add links and rep in the response for the collection

- Use common ExtractParamFromQuery in ocresource and occollection to extract query parameters.
- Added links tag to the oic.if.ll and oic.if.baseline.
- Added rts tag in the payload for the baseline. - Added rep tag for oic.if.b response.
- occollection was using extra structure to differentiate ll, baseline, batch and group. Simplified the code to use
a simpler code and removed unwanted structure.
- oic.wk.col added in the types.
- OCStackIfTypes is removed as it was used only internally. This is not needed due to usage of ExtractParamFromQuery.
- BuildResponseRepresentation is updated as it is used in collection. For inner payload, these
values were not being used by ocpayloadconvert.
- oic.if.ll has been updated to give response in form of {links:[{href:"", rt:[""], if:[""]}]}
- oic.if.baseline has been updated to give response in form of {rt:[], if:[], rts:[], links:[{href:"", rt:[""], if:[""]}]}
- oic.if.b has been to response in form of [{"href": "", "rep": {""}}]
- in case of wrong query it will respond with error message.

Change-Id: I98489ac9923ab3c63012ddfe6b55c2b3064c3f28
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13999
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

[IOT-1625] Fix a logic to terminate CA in case of failure of init

- If CAInitializeMessageHandler() fails, we should call
CATerminateMessageHandler() to terminate the main thread successfully.
- Calling u_arraylist_reserve before creating the thread

Bug: https://jira.iotivity.org/browse/IOT-1625
Change-Id: If291d90bbe69abbf967a7f0014c6e5d44644131d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14941
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15327
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>

[IOT-1605][tizen]Fix obs ocserver.cpp deregistration coredump issue

Fix ocserver.cpp obs deregistration coredump issue in tizen.

Change-Id: Iba3f1288482cd20aac585eec599b45764499b09d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14825
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit bf3a3f25f8bfcdb2508cf0e44d165c8ef6e5d6fe)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15261

[IOT-1608] Support PUT,POST,DELETE method type for /oic/ping

If PUT,DELETE methoed type is received for /oic/ping,
HandleKeepAliveRequest() function will respond to remote device
with error code.
bug: https://jira.iotivity.org/browse/IOT-1608

Change-Id: I47d81222cebced3505cafec8eabfe0604c94d8a3
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15321
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Update the keepalive response payload for the ping request

- add resource type/interface name to response payload
- add interval value to response payload
- POST method is used to send ping message

Change-Id: I6c74122bdb4a726a5c77f8a8e742d202f639972b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 4444b92de6df210c62a2b7d463f74eb0793238f7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13849
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

disable scan interval logic in initialize step for android BLE

Change-Id: I662aef453b109f13556e2eb79accfde17f61188b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

modified uri for searching user on account server

modified uri since the account server specification has been changed.

Change-Id: I25771bca72803fe88a09631611194baf73a28181
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14455
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit ef8dbb0fb89274b24159d0258e1daa3fe198b313)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14507
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>

modified OCAccountManager APIs

modified some APIs on OCAccountManager since the OCF cloud specification
has been changed.
(C++/Android API, sampleApp and unittest are modified)

- added a string parameter for accessToken on signOut() and deleteDevice().
- removed AclGroupType for createGroup() and added new overloaded one
  that has a map parameter for optional property values.
- changed getGroupList() to getGroupInfoAll() because it does not get a
  list anymore but information of all my group from account server.
- removed joinGroup(), deleteInvitation() and added replyToInvitation().
- removed addDeviceToGroup(), deleteDeviceFromGroup(), leaveGroup() and
  added addPropertyValueToGroup(), deletePropertyValueFromGroup(),
  updatePropertyValueOnGroup().

Change-Id: Ibf462a6667990c1786d8b4111263d96e5c618166
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14335
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15211

Add C++ API for UnsetInputPinCB.

Change-Id: I0a3285d906d250a932a6cb98daff0b34ba6bff79
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 194d25ca4d7dccbe2201d0db563a785b4f838d9c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15313

Fix Doxm Handler for Manufacturer Cert OTM

Fix error due to confirmable cert OTM

Change-Id: Id191ae12e3842e910a44b9d025794caf6aaaf16b
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 50a09e72b62edc9179fdc8b824a0cc6bfbeee88f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15311

Update provisioning client dat file for mfg otm

Update dat file for provisioningclient to include key
used for manufacturer cert ownership transfer

Patch #1: Initial upload
Patch #2: Update to latest dat file

Change-Id: I9897266306e398ea683deaa07f480f2b6ce48e17
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15019
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 37ca18297c3ed65275eb033a55190eec423da200)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15309

Added API to reset SVR DB

OCResetSVRDB() added to reset the SVR DB of the device

Patch #1: Initial upload
Patch #2: Fix based on Chul's comments

Change-Id: I2b55eaad5dd4c81f45373ca1dbde113c01d0a93d
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14791
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 2de9ab10e67d24111202aa8e255b5bfb2634cee2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15307

tizen: Remove things-manager installation

Change-Id: I6b8c4ef6322072b9340ab9dc637e6d4751846b90
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 44f330b2077b6dde540182480876d0349ad3e0db)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14801
Reviewed-by: Uze Choi <uzchoi@samsung.com>

provisioning: Rename some C++ headers to avoid collision with CSDK ones

The name clash only happens
on case insensitive filesystems (ie HPFS on MacOS),
there is ambiguity with C header ie:
  ./resource/csdk/security/provisioning/include/ocprovisioningmanager.h
  ./resource/include/OCProvisioningManager.h

Renaming to .hpp suffix prevent the problem.

Note, one other approach would be to use namespaces

Like:
   #include <iotivity/csdk/ocprovisioningmanager.h> vs
   #include <iotivity/oc/ocprovisioningmanager.h> or similar

Change-Id: Ie311344a98fd056e5b54f329819090a36a901589
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/14747/3
Reviewed-on: https://gerrit.iotivity.org/gerrit/15099
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1575] Initialize socket fd after closing session

- add socket fd initialization after closing TCP session in tcpserver

Change-Id: Icb40f0c37ccc17ee9972974cfeae752e3a60048d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14499
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14777
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fixed mismatched printf argument

Change-Id: I16278adc2a1864ec1e95886014a6c6746d94e661
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15203
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix wrong size argument

The second argument for OICStrcpy is the destination size
not the sizeof the char* for the string being copied.

The code should have been copying the string '/oic/res'
over to the szQueryUri but it was only copying '/oic/re'

Found using static analysis tool

Change-Id: I3b6c2f7b6c67db4d84010e9e90fe7dd54f14fcee
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15201
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Added the "OIC" in TAG for debug.

Change-Id: If87d2455e14a2b553cce62d69deb3cbe661fd02c
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1602] Remove observer when the tcp connection is disconnected

If the client observes one or more resources over a reliable
connection, then the CoAP server (or intermediary in the role of the
CoAP server) MUST remove all entries associated with the client
endpoint from the lists of observers when the connection is either
closed or times out.
Bug: https://jira.iotivity.org/browse/IOT-1602

Change-Id: I31dcf26a3dc731b4479c9d7a7a4755c7afd07ff8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 76ac4cfd9ffb58a17c93d74c3f6a21b11b07cf50)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15147
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Fix to also support SECURED=0

Note, for later it would be nice to test booleans instead of strings.

Change-Id: I069d865c6e2cc6a80a812e60ab278af15b7eaa85
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit f50bc6c417731a023d5bb1774ee2ecf84a7b5dca)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15225

doc: Fix API generation script (javadoc)

Change-Id: I99b0925f91658372cd4d736ad1d79e0e92d76392
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15065
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f989db039c8d0b21286f8c6c46f51eb72ef1a9f2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15223
Reviewed-by: Habib Virji <habib.virji@samsung.com>

tizen: Ship resource_directory dynamic library

Note, it's also built with TARGET_OS=linux

For the record previous undefined OCRDDelete OCRDPublish problem
is now fixed by this change:
https://gerrit.iotivity.org/gerrit/#/c/14285/

Bug: https://jira.iotivity.org/browse/IOT-1510
Change-Id: I24e1621788a9154af70cf2db307383b329a8e526
Origin: https://gerrit.iotivity.org/gerrit/#/c/13967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 76aa788dee92e6a94abfe5ac004ecf12523a3ef3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14799

doc: Fix API comments to support javadoc

Many parse error roughtly fixed,
it might worth to verify this by CI too

Change-Id: I61adabf0d454104826b4adaf8cb60297beb91a42
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 022f12861aacf5d40b5ab037602eab3b957b5bf0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15221
Reviewed-by: Habib Virji <habib.virji@samsung.com>

[IOT-1651] Remove lax ACE for /oic/sec/acl

ACEs can be created using owner credential authentication, so there
is no need to grant access to others too.

Change-Id: I9648f34e59d8a7fb06bd7dc9c4d1d55bcace15dd
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-1645] Resovle the MOT's side effect
from https://gerrit.iotivity.org/gerrit/#/c/14221/

Change-Id: Ie2ccfbeaae597a89e1e46d9d7e774b631aa686f4
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 04a8fe396014002d030e10958293e5389875c016)
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15159

Add OCGetDeviceOwnedState API

Change-Id: Ia9996e794f9cc0eb4b62a4b00b8f6fa79e773fc1
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15247
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 9a3b00071047071d218fee88a9d4824bdfd185c7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15255

Fixed bug on MOT.

Previously, If owner(PT) tried DTLS handshake while MOT,
owner's uuid added as subowner.
This patch will fix it.

Change-Id: I6a062d89a630b5582330ac0461e72e62c1e08376
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15209
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 3f2a61fc379de75678628258e8a4473712d7a30b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15249

Adding Android Api for Mutual Verified Just-Works

patch #4 Add support for Mutual verified JW OTM in android PT.
patch #5 Fix names as per C++

Change-Id: I6be03b4af14645808171d25e92b78ef0382c2e7a
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15235

Adding C++ Api for Mutual Verified Just-Works

patch# 5: Change C++ API's name and other fixes.

Change-Id: Id18546ea50bd7308f1871173ca54d199b8b7d3df
Signed-off-by: amar <amar.sri@samsung.com>
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14779
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15233

disable default scan interval time in android BLE

since there is some issue related power consumption in scanning.
it is better to disable it basically

Change-Id: Ic0da8da453b9c0596e521fd5078ec97cad514788
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

build: Fix easy-setup unittests

Need to add a parameter to enable valgrind check

Without this change, a race condition may occur and complain like:
service/easy-setup/enrollee/unittests/easysetup_enrollee_test: not found

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: If927c9a2f6e00b18ab92664f014f4f85f34209aa
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 47f52b3977fd9c78f549abc0683e8fadc840cac0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15219
Reviewed-by: George Nash <george.nash@intel.com>

[IOT-1615] Correct return type of callback in SubOwnerClient

Sample only built when MULTIPLE_OWNER=1 has callback that differs in
return type from what's required. Change return type to the required
OCStackApplicationResult and have the callback return OC_STACK_OK.

Bug: https://jira.iotivity.org/browse/IOT-1615
Change-Id: I5f787f64a16f308c182067d20009decd29760730
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>

[IOT-1525] Keep credential resource encrypted on-disk on Windows

The Windows platform provides a way to encrypt and decrypt data
with system-managed keys. Since the cred resource contains
sensitive symmetric and private keys, keep this resource encrypted
on disk.

Change-Id: I88f3cab76f2e782ce778bc64830491822b7d9842
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15033
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>

added filter to handle an IP loopback message in CA directly

If IoTivity stack sends a message to itself, which means the loopback,
it is unnecessary to let them go through the socket layer.
Especially it is a waste when the large payload will be sent by block-wise transfer.
So I made CA layer to handle the loopback message directly.

Change-Id: I2b8e5217575df391dd4ab66d924a3a24c2584915
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12887
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix static analysis issue in ocresource

- add initial value and null checking

Change-Id: I50731d23865c72d2c03cb3b149b19bf4236bf587
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 2bf1598fa14d918f3c254feaedd61716cba8d0f1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15101
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IoT-1562] Handle unit test segfaults at notification service

Fix unittest segfault caused by discovery failure.
It is because external consumers or providers on the same network
interupt discovery or subscription precedure.
The test will be terminated once this situation happens,
even though precondition of the unittest is guided
to prevent this issue.

Change-Id: I0f763db760d8d2af0a185b9e7c3c6e71dfc5e5bf
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit eb8ec52d48bb8def2a8862118d2fb97aed4c3c2f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14987
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

[IOT-1591] Add warning code as notification type

It is required to notification message with warning type.

Change-Id: I8ea23690382a0f32d084ce3ed9903971f2a4c390
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit d2671aafa1c61b98b2e20fbef0d9c57957526d17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14989
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Remove Thing-manager service which is deprecated.

Functionalities of the current things manager are deprecated because
OCF specification describes oic/con and oic/mnt resources with ambiguousness.
When it comes to be more specific, then a new service for managing those
resource will be developed.

Conflicts:
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java
service/things-manager/sampleapp/linux/configuration/SConscript
service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp
service/things-manager/sampleapp/linux/configuration/con-server.cpp
service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp
service/things-manager/sampleapp/tizen/TMSampleApp/src/group.cpp
service/things-manager/unittests/SConscript
service/things-manager/unittests/ThingsManagerTest.cpp

Change-Id: I00671da74f467461ae6c5ba76d697641dfacdf06
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix defects detected by static analysis

Change-Id: I9f2fd3a24df5f1394174e71ee561ed02ac8d0769
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15133
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
(cherry picked from commit 94ad6508f77f5904de76e85ee30de43b44d738fc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15135
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>

build: Bypass non finishing security test (workaround)

Occured when SECURED=1

This change is temporary to make QA verifier sane again,
with this change:
https://gerrit.iotivity.org/gerrit/#/c/14903/

If merged I will raise bugs for each bypassed testcase related to
https://gerrit.iotivity.org/gerrit/#/q/topic:IOT-1486

Bug: https://jira.iotivity.org/browse/IOT-1486
Origin: https://gerrit.iotivity.org/gerrit/#/c/14925/
Change-Id: I574f92375703bf8a82cad7be6948d46c10776360
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit dd3fd8bf61ebe380ce638a32da08e6d6a8977735)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14969
Reviewed-by: George Nash <george.nash@intel.com>

added fail case for coap_add_option2

If coap_add_option2 fails, it has to return fail while sending data.
Otherwise, it causes a crash error when it tries to use a pdu wrong.

The below is the comment for coap_add_option2 on libcoap-4.1.1
/**
* Adds option of given type to pdu that is passed as first
* parameter. coap_add_option2() destroys the PDU's data, so
* coap_add_data() must be called after all options have been added.
* As coap_add_token2() destroys the options following the token,
* the token must be added before coap_add_option2() is called.
* This function returns the number of bytes written or @c 0 on error.
*/
size_t coap_add_option2(coap_pdu_t *pdu, unsigned short type, unsigned int len,
const unsigned char *data, coap_transport_t transport);

Change-Id: I405c77a63902d9c48b50cb9b94448a9f0e1990f0
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Add client side logic when obs request failed.

Add client side logic and fix example.

Change-Id: Iffedfddde5906a5d27fd7cbad0176197730d89e3
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Update publish request payload for RD

1. add device name (mandatory)
2. add platform model number

Change-Id: If26e6a2b75a68a1e67b20b19e10524c31fb918f8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13321
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

disable BLE send logic related multicast

since BLE has limited policy which can't be connected with 8 times device,
there are many issue related pending thread in multicast scenario.
and there is no spec related multicast in BLE spec.
Thru, multicast will be not supported until get specific comment
from BLE spec.

ps. tizen ble will be disabled when tizen 3.0 ble is updated

Change-Id: Id278f17299fa9b128bb73718257cf2b0e5e90ea9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14937
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

tizen: Remove the build macro for RELEASE flag

(tizen_build_binary_release_type_eng)

- always enable RELEASE to TRUE

Change-Id: Iac9caa72d6747e65f73040eeea7046bd462d251f
Bug: https://jira.iotivity.org/browse/IOT-1320
Author: Jooseok Park <jooseok.park@samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/86784/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
(cherry picked from commit d57f55d22a8d655e596a945a490e3351f06c46c9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13707
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Use RTM_NEWADDR, RTM_DELADDR to receive info about an IP address.

We use RTM_NEWLINK multicast group mask to receive information about
a created or removed network interface. and If a specific network
interface is added, we call getifaddrs() to get an IP address
associated with an interface. but it is more correct to use
RTM_NEWADDR, RTM_DELADDR to detect IP address changes.

Change-Id: I9389cac95473583a015dd4d40489943dc856e0fd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-1575] Fixed session delete function to resolve double free issue

- fix double free issue in tcpserver
when disconnecting TCP session

Change-Id: Ica0b9f0976426d66309ef7304149eb54489b6b66
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14495
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14775
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1517] Update scons scripts to pull gtest from github

Stop downloading gtest-1.7.0 from the fedora project mirror.
Download it from github googletest project page.

The major changes as a result are:
    - The name of the zip file has changed from
      gtest-1.7.0.zip to release-1.7.0.zip
    - The name of the extracted folder has changed from
      gtest-1.7.0 to googletest-release-1.7.0
    - Google test no longer contains a configure file to
      run auto make files. The autoreconfig tool is used
      to produce a new configure file from the
      configure.ac file.

Change-Id: I3316af1f3a875137a872577a22f0e4db74f0b0f3
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14381
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Platform ID must be a UUID to be valid

Change-Id: Ifbbeb18fa2f2bf73c857ad3bfc25b3706d972d61
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

tizen: Port spec file to fedora for ARTIK

Change-Id: I9c00704cd10cd86787d928753058735f995efaa7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
(cherry picked from commit b0a73daf9c58e8ad1d09539567670396c028ff0b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14803

Vendor-specific OTM: Mutual Verified Just-Works & Confirmed MFG Cert

This patch adds vendor-specific Ownership Transfer Methods,
Mutual Verified Just-Works, which works the same as
https://gerrit.iotivity.org/gerrit/#/c/14359/7
and Confirmed Manufacturer Certificate
Due to difference between this method and Verified Just-Works (CR29)
this method has been implemented as a separate vendor-specific OTM.
Also confirmation on server side has been added to manufacturer certificate
to make a new vendor-specific OTM: confirmed manufacturer certificate
Cherry-picked from https://gerrit.iotivity.org/gerrit/#/c/14739/

Change-Id: I80d77b6e36cc857916f3e89f36d2c1f4dfbc5215
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

build: use tools.scons.RunTest for provisioning tests

To avoid race conditions

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I8f1e4823a7c4642b4b03fb4dca924447079d7e39
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
(cherry picked from commit 6b309e20370eafe2780007ae13cbbdba2612fe6e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14917

build: use tools.scons.RunTest for csdk security tests

To avoid race conditions.

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I1c525d58b7c220dd8043b65bf873e0d1d294a020
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
(cherry picked from commit 162ce85af58df04c539b33e63a33d672eeb5317e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15103

[IOT-1612] Fix OCRDPublishWithDeviceId() to publish with a specific id

Fixed OCRDPublishWithDeviceId() to publish resource with a specific id
bug: https://jira.iotivity.org/browse/IOT-1612

Change-Id: Id0242a1c4a7040c928db179a840abf1c7f85400e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14893
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 6dbd734ef4ca54d49ae474f8e7291a54e70cbcbf)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15149

Update a payload format to be compatible to OIC spec in easysetup

1. In a response for get/post request with batch interface,
   "rep" keyword should be included for containing child resource's properties
   for each child resource.
2. Provisioning resource is a collection resource so it should have
   a "oic.wk.col" resource type.
3. "links" property for baseline and linklist interfaces should include a
   "p"(i.e. policy) property.

e.g. response for baseline:
{
  "rt":[
    "oic.wk.prov",
    "oic.wk.col"
  ],
  "if":[
    "oic.if.baseline",
    "oic.if.ll",
    "oic.if.b"
  ],
  "ps":0,
  "lec":0,
  "links":[
    {
      "href":"/WiFiProvisioningResURI",
      "rt":[
        "oic.wk.wifi"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/DevConfProvisioningResURI",
      "rt":[
        "oic.wk.devconf"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/CloudServerProvisioningResURI",
      "rt":[
        "oic.wk.cloudserver"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    }
  ]
}

e.g. response for linklist:
{
  "links":[
    {
      "href":"/WiFiProvisioningResURI",
      "rt":[
        "oic.wk.wifi"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/DevConfProvisioningResURI",
      "rt":[
        "oic.wk.devconf"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/CloudServerProvisioningResURI",
      "rt":[
        "oic.wk.cloudserver"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    }
  ]
}

e.g. response for batch:
[
  {
    "href":"/ProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline",
        "oic.if.ll",
        "oic.if.b"
      ],
      "rt":[
        "oic.wk.prov",
        "oic.wk.col"
      ],
      "ps":0,
      "lec":0
    }
  },
  {
    "href":"/WiFiProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.wifi"
      ],
      "swmt":[
        2,
        3,
        4
      ],
      "swf":1,
      "tnn":"",
      "cd":"",
      "wat":0,
      "wet":0
    }
  },
  {
    "href":"/CloudServerProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.cloudserver"
      ],
      "ac":"",
      "apn":"",
      "cis":""
    }
  },
  {
    "href":"/DevConfProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.devconf"
      ],
      "dn":"Test Device",
      "mnmo":"Test Model Number",
      "loc":"",
      "lang":"",
      "ctry":""
    }
  }

]

Change-Id: I13ccda6fedb7c628dc77cc13e84c1c10c0e1b487
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit e1409c4bb075b7be18d911b07df07568a694c971)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15139

Fix Android SetPropertyValue function call

setPropertyValue call in the Android was swapped, compared to function call how it was in the JNI layer.
setPropertyValue0 is for passing string array and setPropertyValue1 is passing string.

Change-Id: I91c480f162cc53712a68bef078371559fd2eff21
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit c54aaa1f7de9227236cb8f023df99209c6dddb64)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15067
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>