Add 'model number' and 'location' properties from mediator side

 - 'setDevConfProp' function is added parameter which is information of location
 - add 'getModelNumber' function.

Change-Id: I48a028dd77310d690035f348cb721fa52adfc462
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10497
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add 'model number' and 'location' properties in DevConf resource

'Model number' property is set by Enrollee. Contrarily, 'Location' property
is given by Mediator, which is GPS information in JSON format.

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

modified setHost() in OCResource for ipv6 with scope ID

Since scope ID info has been appended to address info of resource object,
checking address validity logic should be modified
to check only address part of full string but not scope ID.

and added unit tests to check validation of host for constructResourceObject.

Change-Id: I6d1771a5573bf6324c8565adb3ff2abb53c2ac76
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10129
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>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Implemented MQ API for Android JNI

connected from Android JNI to C++ API of OcResource.

Change-Id: I377d786dfa2bf7f06fb43a82b6bb1955f19dbcb1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

added MQ callback listener for android JNI.

- subscribe callback listener.
- discoveryTopic/createTopic callback listener

Change-Id: I50959c54423c6bed0e9622c6c64ce1a1e91dc16c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Update unittest for remote opertion in scene manager

In some cases, unittest would produces unexpected results especially when
creation and deletion of scene objects are repeated in continuous unittests.
This patch fixes this issue.

Change-Id: I0294215e5f2578145b4398808146bee1c8199a73
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Implementation of JNI for deleting resource from RD

Added JNI code for deleteResourceFromRD() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: I7fb825817db4fbfc4734087222162e3b022e1f51
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Implementation of JNI for publishing resource to RD

Added JNI code for publishResourceToRD() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: Ieb941ab2ce37c1aa39f44c8e51bbf49e3025a273
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Merge "Merge branch 'cloud-interface'"

update simpleclient sample app to support test TCP.

Change-Id: I23feba350fb80fb625161ae28077010767a172ba
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10217
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Merge branch 'cloud-interface'

Change-Id: If7c53ffecdbc4c9c4386ce996e7e746edb673b7c
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Fix keep-alive to filter correctly.

1. Fix keep-alive to filter correctly.
2. Cleanup netty pipeline.

Change-Id: Id99916f22c62f43ace4ae1a605e4b8adf7a65c92
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10189
Reviewed-by: Minji Park <minjii.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Update Mediator code for more readable using const.

Change-Id: I87f6222908c30e14f5c7963859a0310dd06ac03f
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10323
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

AS unit test included

Change-Id: I0a0e56f12817843d14f82f361ad0e52c5496045f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

CI unit test included

Change-Id: I68b655f2a07db01ea4fca4c580702eb4a10ae66f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Implement acl/invite resource in cloud account server.

Add invite feature to invite user

Change-Id: I7a4c1922de4b312afda92423338092423fa573c7
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Update Common data model's Constructor & change security '.dat' files.

Change-Id: I30a6aa0abe2b52b637fd86045bd0a81ababcb921
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Remove '/.well-known' from URI

According to a OCF spec

Change-Id: I54167589ba4fc03282944ecf4ba06e24d83b1de7
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Added Android java API for Cloud MQ Client.

- added Native Caller for MQ API

Change-Id: I7a15877cd041b8321088c9f8ec530fe77b390b2f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Clean up encodeAddressForRFC6874 routine

Change-Id: Ie4b816186dc7bb808f6fdb3a2836552bfdf32772
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Merge "Merge branch 'notification-service'"

Modified Scene UnitTest

Scene container is changed to unordered_map in SceneCollection.
Apply the change to 'getAllSceneInstance' logic.

Change-Id: I48916883b115c7eb57cfe63d1ae55d6d2ee1c430
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f162cb2234428750943373d939415fb09fd103d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/10267
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge branch 'notification-service'

Notification service feature is added newly.

Change-Id: I3ec6e84ea7ad9c247f0f444889bf7e326b6c8e11
Signed-off-by: ch79.cho <ch79.cho@samsung.com>

Move the removeDeviceWithUuid method to OCSecure class as static method.

Change-Id: Ic8a9904990b3bbd27c82e43f1b1105aa60b00087
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Merge "Merge remote-tracking branch 'origin/extended-easysetup'"

[IOT-1204] Add zero terminator before logging

Change-Id: I8a8b94aad4b00e22a59a728a2f6802a3d18bff24
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Merge remote-tracking branch 'origin/extended-easysetup'

Change-Id: I9d846ee6afcfa18a53081c606401ffe4b8d4d18c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Implement x509 certeficate resource in cloud account server.
 - Certeficate builder modify.
 - Added Certeficate resource to account server.
 - Added Certrficate configuration.
 - TODO: Implement Certeficate storage.

Patch #7: Rebase with the latest branch

Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Change-Id: I4a350ff96bc4d4c3f086d0790715576026192ee3
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Update Mediator sample App.

 - Add Cloud feature (using Iotivity Cloud)

Change-Id: I651121b8cd83e83178d3cfce6ff49e9f1dee0ec5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

update mediator unittest and implement validation check logic.

Change-Id: Ieb53eb1a659d7ddf2152ac2d3b8494a80943c62a
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10197
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Resolved tizen build issue regarding ip network

Resolved tizen build issue regarding ip network.

Change-Id: I8f18efd4fdeff40fdb5e6a3c13522be461ba8bd8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

[Enrollee] DeleteEasySetupResourcess() is fixed in resource handler.
   . Unbind logic is added
   . Check whether handle is NULL or not

Change-Id: I0b69d29735af06b75b4e775484cf835ca12007f0
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10207
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Implement acl/group resource in cloud account server.

1. Account server restructured. (API design, naming)
2. Modify to use the tokens issued by OAuth2 providers.
3. Add group feature to share devices.

Change-Id: I1b15aadcb0b7715a41bce7a96363b8ab7f612d0a
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9665
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

added APIs related to account in OCAccountManager

added 2 APIs related to account
: searchUser, deleteDevice

and modified signOut API due to the change of the specification
that signOut message has no more any payload but only login property.

Change-Id: Ida9abb953d1bed0dae0fb4f0cb2bed522bc8a3dd
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

DARWIN BUGFIX: [-Wreturn-type] error void fn returns 0

Two void functions have "return 0;", chg to "return;"

Change-Id: Icdbb91891f01e8d56427d952722da776d4a34f78
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Cleanup Maven build script

1. Cleanup Maven build script

Change-Id: Ibf455e52f064b7b0cc5e4cd00beda51d25c8950d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>

Fix error response and error code

1. Fix packet forawrding to client correctly
   when resource find receives error from account server,

2. Change response code to use CHANGED when POST method succeed.

Change-Id: Ibf7b1ba6996c2bcef086f3c4361f38036f4a8c71
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>

updated Readme.scons files for Message Queue(MQ)

Change-Id: I2143d908e7323acd8505a4024faf4f60ac009f43
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Add setLocation API for PUT response

1. Add setLocation for resource creator
2. Apply setLocation to MQ server

Change-Id: I143dd14471bb9b8055f7d3a60e9e58c22697d481
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>

Add RD C++ API to supporting QoS in OCPlatform

- add publishResourceToRD() overload function
- add deleteResourceFromRD() overload function
- remove unnecessary code
- add null check logic for input parameter

Change-Id: Ib3ad9d196af4a1b1662a4fca0dce40e963dc78f5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9907
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Enable gradle build for Easy setup app for Android with scons

Along with the patch 10093, this is for build easy setup
Android app with gradle build in scons.

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

Enabled IP CAGetNetworkInformation() API

currently CAGetNetworkInformation is not working on linux platform.
because stack doesn't set the device address.

Change-Id: Ia80c9e61d4c9180f3abbe7234e512fa475132da5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Enable gradle build of easy setup SDK for Android with scons

For building SDK of easy setup for Android, this patch utilizes gradle
executed in scons build.

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

Fix OTM Unittest

Fix OTM Unittest error

Patch #1-3: PT SVR DB modified to use x.org.iotivity.dpc
Patch #4-6: sample server's SVR DB modified to use x.org.iotivity.dpc.
           Also otmunittest.cpp updated to ignore the unknown server.
Patch #7: Updated to exit the unittest
          in case of two more devices are running on the subnet.

Change-Id: Ifd0c8c6043a6967f0e936da0086ee0fb7ed7e0b3
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

fixed library loading issue at Android(API23)

Change-Id: I055c3f3a2537346bc285ec8825350317156fe4e7
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge branch 'master' into cloud-interface

Change-Id: I9baa52a9dcff36aec179677400cb5a8ee985d410
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Add specified response type into RM

As 'dataType' has added in CAResponseInfo_t,
RM also applied it in its code

refer change : https://gerrit.iotivity.org/gerrit/#/c/9255/.

Change-Id: I1484c9967e5f902b20967c5a94c1e04ca14bfada
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge branch 'master' into extended-easysetup

Change-Id: I300f1038ef9795499f328bf844939757702dcdeb
Signed-off-by: Heewon Park <h_w.park@samsung.com>

Fix a logic in linking child representation payload in batch interface

If provisioning resource receives a GET request with BATCH interface and
cloud resource is not created by user's decision, device configuration
resource's representation will not delivered even if device configuration
resource exists. This patch fixes this issue.

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

Add specified response type
according to https://gerrit.iotivity.org/gerrit/#/c/9255/.

Change-Id: I4b5a23f8c42084de369dbb5af7a64b7a8d0679c8
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add exception handling in MQ

exception handling added to give proper error responses in MQ

Change-Id: Idb6ba4c90707b490b854788a5f06120a46652d6f
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9977
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

RD unit test included

Change-Id: If8c2354aa3c32b628b6ec5dc5fbead1faca1e9aa
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9719
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Fix defects detected by SVACE system in easy setup

SVACE which is one of static code analysis tools detects several defects
in easy setup. This patch fixes them.

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

Update common data class.

 - implement move & copy constructor.

Change-Id: I8b27beb016e463db30142b80fe6e06aa282e76f5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

added Testcase for MQ Client API

Change-Id: Iee8e98a922288f90a79e3fd006b797e5c745d107
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9539
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

To Enable MQ Cloud Client API for Android

Change-Id: Ic785552ec5737849e9c7a18035de7d81e74303c9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Replace handling RM routeData

Change-Id: Iae81e35edb4988edb9701014ef2813751ff03a41
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9853
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Merge branch 'master' into extended-easysetup

Change-Id: Ica3dc6b70f2021c7f26d002ae9a0f50ea1fd82b2
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

Change APIs for Subscribe device presence.

Application developers have to pass devices id instead of the list of queries.
It will make them more convenient.

As-Is
const QueryParamsList& queryParams

To-Be
const std::vector<std::string>& di

Change-Id: I2c8231a58425227333c2a9c672c086409e2e51be
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

tizen: set verbose mode for building

Change-Id: If87868e716291445df754b7e567f87e49c444cce
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit cc96473a6b3cb03748549fce47d851cefc3177ef)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9477
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Separated transmission logic for data on Both Mode.

Since BLE transport has gatt server and client.
there are two sender and receiver
such as notifyCharacteristic / writeCharacteristic in BLE transport.
(while other transport has only one sender and receiver.)

thur, message has to be sent by message type which whether
it is a request or response message.

Change-Id: I7f77d86c13115138082b72a6371ce5bd49f1f0c6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Include a new tinycbor file to iotivity build

In tinycbor a function was moved from cborparser.c to
cborparser_dup_string.c file. As we need this function in IoTivity we
need to include cborparser_dup_string.c in tinycbor SConscript.

Change-Id: Ic0b7598b525c61005bc07b3efcef0270f20bfc28
Signed-off-by: Otavio Pontes <otavio.pontes@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9285
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

added OCAccountManager class

As there is need for API about Cloud server on client side, I added it
on OCPlatform.
(https://gerrit.iotivity.org/gerrit/#/c/9121/)
However there are plenty of APIs to be added more and just adding them
all on OCPlatform is not fine for usability.
So I make them a class like OCResource.

Below APIs will be added after this patchset.
: searchUser, createGroup, searchGroup, deleteGroup, addGroupMember,
  searchGroupMember, deleteGroupMember

Change-Id: I45e1f08b13d821346b364d38bf212b8040205a46
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

modified network interface monitoring logic in tizen

To detect network interface changes in tizen,
CAFindInterfaceChange() function was modified.

Change-Id: I325c59205b090f9715d72f533faf27831e114792
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit c5ec8565783a5be30d8089bafa2ede7466641837)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9599
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Added CRL issuer (move from x.509 to x509 folder and restructure)

Change-Id: I8c2daa4c5d7a0a9bebaaed9765bc3622871b1dd0
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9899
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

removed c++ warning for initialize

Change-Id: I9381c79f661f5e517badfb42682525985faa7cd1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

removed potential invalid return value in BWT

Change-Id: I33b552f79d18322d60e188420e57c13976218531
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Added API to obtain OCResourceObject from RCSRemoteResourceObject.

Resource Encapsulation layer's RCSRemoteResourceObject class does not provide
all the operations (e.g. PUT, DELETE) that IoTivity base layer provides.

If application wants to invoke base layer API's directly, it needs to obtain
OCResoureObject. Obtaining this object is not possible without calling base
layer discovery. However, if application wants to use both RE layer and Base
layer there will be redundant discovery going on.

To avoid this problem, we added an API that returns OCResoureObject maintained
in RE layer. Using this object, application can call base layer APIs without
additional discovery.

Change-Id: I87757d70bd5df3463c3573831d7392e7b45c670a
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Added API for setting representation in RCS Client of Resource Encapsulation.

RCSRemoteResourceObject of RE layer provides an API to get remote resource
representation using RCSRepresentation Object, but it is missing the API to
set RCSRepresentation.

Setting of RCSRepresentation is required for collection resources.

In this patch I have added the set API which accepts RCSRepresentation as input
parameter so it can be used to send POST request on collection resources where
payload contains attributes to be set on multiple child resources.

Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Change-Id: Ic8957296b3cfe3e6abe1218ef060614d9cdc5618
Reviewed-on: https://gerrit.iotivity.org/gerrit/9545
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

fixed bug.

 - when the security provisioning failed, devUUID which is using for callback is set nullptr.
   so ouccured some bug.

Change-Id: I9ddd7617c349ebbca5750125e5c94f382881b193
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9941
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Fix a logic to copy userdata in ESReadUserdataCb

userdata parameter should be passed as double pointer type variable in
ESReadUserdataCb function so that user can assign a memory to the
variable and copy an user data to it inside the function.

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

Update garageclient status checking

OC_STACK_OK is the eCode that should really be matched.  STATUS_SUCCESS
was only coincidentially set to the same value.

Also added whitespace after 'if' keyword.

Change-Id: I2f9ccb19d2da0911acbef0a420fecd8ed6199177
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9799
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

IOT-1091: Add auto_build.py

This will replace auto_build.sh as a cross platform solution.

Change-Id: I36afaba8e8935da8322322e2e8c70efde6e22e52
Signed-off-by: Ajay Saini <ajay.saini@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8287
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Improve run.bat

* For SECURED=1, the samples are sensitive to the directory from which
  they are executed.
* Combined the build arguments into a single spot.
* Add new binary runners.
   * provisioningclient (provclient) and
   * sampleserver_justworks (justworks)

Change-Id: Id744569f282a5adb892958be9dcdc46e3b153773
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9399
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup

Move macro from consumer common to NSConstant.h

Move the location of "Macro function" from
NCConsumerCommon.h to NSConstants.h.
Because, provider will use the macros also.

Change-Id: I00b6fcba65ae491eb2a5457ddcf80f6c42df6cde
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9883
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

csdk: fix minimal linux tests

Update to current API, and make them build by default.

Those samples files are good candidates
 to illustrate C API in plain C and not C++,
 specially for systems without recent g++ (ie: Tizen:2.2-)

Change-Id: I22e18903037a249e1dce4d29c2580ffe865caf50
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9515
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

divide code about related cloud service.

while scons builds, cloud service code is
not required without WITH_CLOUD option in scons options.
It was modified as follows, #ifdef WITH_CLOUD #endif in code.
we should modify cpp_wrapper layer.
so, this commit makes the related build script of cpp_wrapper being commented out.

Change-Id: I9172b32e9242cc8d9ed038f024437dbd3b28da43
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Delete unused Mediator sample application for csdk

Mediator does not support csdk anymore, so its sample application is removed.

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

Add unittest code for Enrollee

Using Hippomock, unittest codes for enrollee have been implemented.

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

Merge branch 'master' into extended-easysetup

Change-Id: Ief0ccc439fc50853b38606fb2c172d2db86ebf19
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

MQ unit test included

Change-Id: I128d1d87416292db0bd51608ee84b7af6cbe5ce5
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9727
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

fixed segmentation fault issue when parsing query with rt including period

fixed segmentation fault issue when parsing query with rt including period

Change-Id: Ibff0067acc8ac4df0b608c691dadedd50d320d3b
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9919
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Fix memory corruption when reading integers from cbor

When the cbor_value_get_*() function is called with a pointer to some int, it
should have the correct size. When we cast it to something else it is treated
as a pointer to an uint64_t in the function for example and them 64 bits gets
written to memory even with the real type is only 32 bit long. When the real
type is only 32 bit long some other memory gets overwritten. On Big endian
systems the least significant bits are cut of so in most cases 0 is read.

With this patch a value cast is used and the value is converted to the other size.

This is the same as in commit 0d64c7c95a5c11a9fb5201e729fd8c75da210c80
"security: fix reading of permission attribute from configuration"

Change-Id: If5965491241e25ebf60a22dc45d37d74a33cb02f
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Delete mediator c-sdk.

 - current easy-setup don't support C-layer SDK.

Change-Id: I56dd13b0efd5267614e59540c6f2ea2f05795661
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

do code optimization of EntityHandler.

our service has three entityHandler.
almost, which of operation same is response.

second patch included one more optimization.
our service not using the response value in EntityHandler.
so, i remove related response value.

third patch included remove set ehResultValue.
because of, our service is ehResult value always return OC_EH_OK.

fifth patch included remove comments and not required value.
remove unnecessary comments and not required value in NSProviderListener.c
payload value is not used.

Change-Id: I719a65e70f3ad51da0ed0488be48b973e8a61ab7
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9825
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Remove unused function and Related MessageList.

Remove NSStorageDelete Function.
Remove Related MessageList in NSProviderMemoryCache.
MessagList is not required at current scenario.

Change-Id: I751bd66a5b6b255c3fb1317ff5350cd008ae7496
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9881
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add getStatus API in RemoteEnrollee class for Android platform

Along with a getStatus API for Linux platform, I've implemented the API
for Android platform.
Additionally, DeviceConfig and WiFiConfig classes are removed because they
are not used anymore.

Conflicts:

service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/RemoteEnrollee.java

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

Merge duplicated variables used by both of Mediator and Enrollee

Duplicated string definition and enum variable are merged into escommon.h.
And Enrollee and Mediator has own common header file.

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

Implement cloud acl-provisioning feature & update discovery logic.

Change-Id: Id26b1a68106d8f8b8a0f3880fd02699f66ead81a
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Remote unused scons options for easy setup

ES_ROLE, ES_TARGET_ENROLLEE, and ES_SOFTAP_MODE options are removed
because they are not used anymore.

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

Add an API for handling user-specific properties in Enrollee side

User can register two function pointers to easy setup stack for handling
user-specific properties for incomming and outgoing payload if needed.
This API helps the easy setup code not changed even user wants to deliver
more properties in addition to easy setup properties in OCF spec.

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

Added CRL issuer

1. Test code present (to test Generate Crl).
2. Generated Crl can be verified using http://lapo.it/asn1js/
3. TODO: need to implement storage, possible using Java Key Store
4. GetCrl just returns binary data instead of CoAP response

Change-Id: Iff0d7f8cb0690c2dffe0749ef0703d45dd5db634
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9865
Reviewed-by: Andrii Androsov <a.androsov@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Add deviceid, uid checking logic to session and refresh

1. when sign-in to cloud, uid is required.
2. when do refresh token, uid is required

Change-Id: Ic69afa2165accc1621e94a418ec99554d93c7ebb
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>

Added certificate builder.

Change-Id: I5c6930c4ab4f4aec2379108ed2f7efbe2a817a48
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9861
Reviewed-by: Andrii Androsov <a.androsov@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Merge branch 'master' into notification-service

Merged changes
1. https://gerrit.iotivity.org/gerrit/#/c/9801/
2. https://gerrit.iotivity.org/gerrit/#/c/9289/
3. https://gerrit.iotivity.org/gerrit/#/c/9839/
4. https://gerrit.iotivity.org/gerrit/#/c/9609/
5. https://gerrit.iotivity.org/gerrit/#/c/9601/

Change-Id: Ib56507b1830041fec457b1f8c718584166093c85
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Merge branch 'master' into extended-easysetup

Conflicts:
android/android_api/base/jni/JniSecureUtils.cpp

Change-Id: I250bd8500c33626e81e5395f8c14f3935cd425f9
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

RAML spec gap updation for ACL (Android)

Update Java/JNI and provisioningClient App following
 https://gerrit.iotivity.org/gerrit/#/c/8241 change.

patch #2: Memory Cleanup code and License inclusion.

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

Add sample provisioning servers in package

Added sample provisioning servers into the test package built
Corresponding .dat files are also added to same location as binary file
,i.e. /usr/bin/provision-sample
Server opens the dat file from the current location of the binary file.
This needs to be updated for tizen, to be in a place out of bin, where Read-Write
is possible.

Change-Id: I0d13386976d2d4910934064d6092e1b360dcf919
Credit-to: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9609
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Sync master with 1.1-rel

Merged changes of:

https://gerrit.iotivity.org/gerrit/#/c/9305/
https://gerrit.iotivity.org/gerrit/#/c/9317/
https://gerrit.iotivity.org/gerrit/#/c/9325/
https://gerrit.iotivity.org/gerrit/#/c/9327/
https://gerrit.iotivity.org/gerrit/#/c/9307/
https://gerrit.iotivity.org/gerrit/#/c/9385/
https://gerrit.iotivity.org/gerrit/#/c/9249/
https://gerrit.iotivity.org/gerrit/#/c/9417/
https://gerrit.iotivity.org/gerrit/#/c/9553/
https://gerrit.iotivity.org/gerrit/#/c/9457/
https://gerrit.iotivity.org/gerrit/#/c/9425/

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