Easysetup - Change OC_LOG to OIC_LOG & warning fixes

- OC_LOG is being depricated, so moved to OIC_LOG
- Fixed some warnings in mediator and enrollee for linux platform

Change-Id: Ie856dc343569e553e0d680a8ccbcdc30cc2d7210
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5071
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Merge "Merge branch 'master' into easysetup" into easysetup

Refactored structures and APIs for medaitor & Enrollee
 - Review Comment fixes

Change-Id: I232243863131ecd89c0a84f0a5dd16f05f650008
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5023
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

[Arduino Enrollee Application] Additional parameter for security in InitEasySetup.

Arduino warning fix for softap.cpp

Change-Id: I87f9341afbbed78eaf240bd5163349a4f5be517c
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge branch 'master' into easysetup

Conflicts:
service/easy-setup/enrollee/src/resourcehandler.cpp
service/easy-setup/mediator/csdk/src/provisioning.cpp
service/easy-setup/mediator/richsdk/android/EasySetupCore/build.gradle
service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
service/easy-setup/sdk/enrollee/src/easysetup.cpp

Change-Id: Ia4fc8d02ebdadc1f71c2b0e40d39d7ad66ba682c
Signed-off-by: lankamadan <lanka.madan@samsung.com>

Merge branch 'nfc-transport'

Change-Id: I9e850b4347ef0027a28dc646f2deb119f1b3f116
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Easysetup - Enable Justworks security option in Linux Enrollee

- Enabled Justworks security option in Linux Enrollee

Change-Id: I8ed43278e27aad19b68dc9dc65bddf671df8fe9f
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5041
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Fix for defects detected by static analysis in ca android

modify ca android ble client/server to fix defects detected
by static code analysis

Change-Id: I5b48824b03a00b373e07ccc311b7b77f32dd5b77
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5035
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

clean up android ble implement code

Change-Id: I0123497c72b28d78e208da013267b6f0e949396c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

CoAP over TCP transmission over BT

currently, CoAP/UDP message format is used over BT-RFCOMM.
but BT-RFCOMM data transmission requires dedicated session
between devices and guarantees reliable data transmission
by its MAC & PHY layer. So, CoAP/TCP message format might
be more efficient for Bluetooth

Change-Id: I0b7752a1146efd1abbe74eb613c72346b99039e9
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

keepalive for coap over tcp

In order to ensure that the connection between an OIC Devices,
OIC Device should send application layer keepalive messages.

Change-Id: I630b186db58317f28cdfbd99a66e6bf75970ae3e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[ENROLLEE] SoftAp host based on build command

Change-Id: Id3386264522b3015075c3333e14b38b1af9b3180
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

[IOT-946] To support Resource Discovery on unicast for Android BLE.

I have updated resource discovery on unicast for BLE.
it will waiting for connected callback
before send message like multicast.

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

CoAP over TCP transmission over BLE

there is another header for fragmentation is added in CoAP PDU.
since CoAP over TCP has message length field,
it is better to apply to BLE

Change-Id: I35f174f85a114abc5521c42cd6b25eda02cd9f6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

BLE Client support for Tizen 2.4

Change-Id: I687d57eae2b89e414b39a45aaebf9a8b5333c3b4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fixed a bug regarding the batch interface in RCSResourceObject.

There was a problem that RCSResourceObject didn't handle the batch interface.
The response format also was wrong.

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

[Tizen] Tizen build support after folder restructure

and additional build flag is provided to support different enrollee options

Change-Id: I56fd63eb41c898a62af97df2a6ad175caff001a3
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Restructuring of the easy-setup service.

    - Separated the mediator and enrollee SDKs.
- Created seperate sconscript for the Enrollee and mediator.
- created seperate sconscript for c and c++ sdk [Mediator].
- Created seperate scocscript for Sample apps [mediator & enrollee].

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

Added SeparateResponse class for the RCSResourceObject in RE.

The class is to support the SLOW response concept of the base.
For it, the RCSRequest now holds its owner resource object.

- how to use

RCSSeparateResponse separateResponse;

...

server->setSetRequestHandler([](const RCSRequest& r, RCSResourceAttributes& attrs){
    // make separate response to set result later
    separateResponse = RCSSeparateResponse(r);

    return RCSSetResponse::separate();
});

...

// the set method will throw an exception when the operation is failed.
separateResponse.set();

Change-Id: I054ee3948d7742b5c45f821f3fec48216915f273
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[ENROLLEE] Tizen enrollee sample application build using scons command
[CODING STANDARD] Enrollee files rename as per iotivity coding standard

Change-Id: Ib873ede13d6b1539e812e535676c2c33d34b9481
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sooho Chang <sooho.chang@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

[Mediator]Java SDK for the new C++ APIs

- Added Java SDK
- Added JNI layer
- Updated Sample Application for new APIS

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

[TIZEN] Tizen console application support for enrollee

and SoftAp stubs API added for Tizen enrollee.

Change-Id: I7b524017e62cd82c8aa9db94279c0f2f7175272d
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4887
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Modify DiscoveryManager and DiscoveryManagerTest

- Discovery Test using multiple resource types
- Check the size of vector that contains resource types

Change-Id: Ia5c8db2413d787ead4490cc2b128fcc2c2a5bbe6
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Fixed EDR problem related to BT on/off for Android.

When BT turn off, call Stop EDR Server,
and when BT turn on, call Start EDR Server.

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

[IOT-931] Added send logic to check write/notify in BLE

according to android BLE guide,
I have modified transmission logic for BLE.
when there is a big message to sent,
next segmentation data has to wait for
callback write/notify Characteristic for previous sent data.

Change-Id: Idf543504d634ab4dfbc2fbd4bb90aa7e2ad1831e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

To separate receive data in caleadapter as per adapter type

since there is SERVER_CLIENT type in base API.
BLE address will be same to each other for BOTH type.
so it is need to access each data as per adapter type.

Change-Id: I7f446166765bfa2391e49a80b62f4878cc6d8b7f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[Arduino BLE]Property of Read characteristic is changed to Write

Read characteristic property is changed from WriteWithoutResponse to Write.
The changes required in RBL library for enabling Write property will be applied as patch.

Change-Id: I686eabee6ac956e44446b17b520d75a18bd00d40
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Added get/set apis with query params in RCSRemoteResourceObject.

These apis work with callbacks taking the RCSRepresentation.
An operation retrieving the interface of a request added in the RCSRequest.
An operation to create the RCSRemoteResourceObject from the OCResource added.

Change-Id: I630727e61068326c262dc0fe4ae6c19f324adcc5
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add cloning of identity to CACloneInfo

In block-transfer mode, the identity was not set
in the resulting CARequestInfo. Therefore, ACLs did not
work properly.

Change-Id: Ie47ee8f18bc3c914c0a662656b42cbf03cadc0fc
Signed-off-by: Tobias Rauter <tobias.rauter@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

replaced OC_LOG with OIC_LOG in stack

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

[Android] Mediator changes to support softAP at enrolllee side

 - Updated mediator sample application.
 - Updated the mediator SDK.

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

Specified the missing inclusion of standard library file.

Included algorithm standard library file in RAML source file to avoid build failure.

Change-Id: Idf858145d3eede3b8bbaa2f39e6c5d7e910ed210
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

replaced current TAG with 'OIC_xxx' commonly in CA

To make easy debugging,
i have modified TAG in CA once.
it is better to add common string 'OIC_' + current TAG name.

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

Reverting back to Android-21 as the move to Android-23 causes Android
to crash on M devices. The current build scripts will need to be updated
to generate shared libs with soname.
Till the scripts are updated, Android-21 will be used as it works even
on M devices.

Change-Id: I33e0ccc19fb406b3508d888f7b04617c7d6e0868
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

replaced current TAG with 'OIC_xxx' commonly in RI Layer

The current TAG doesn't have a rule.
i have modified TAG in RI Layer to make easy debugging.
it is better to add common string 'OIC_' + current TAG name.

Change-Id: I722c1944e9ba89d901d93d6ba208e931c9094028
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

replaced OC_LOG with OIC_LOG in security

Change-Id: I38ba90586d9ea5fb978c2a1cc8a925dbf1e59f9c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Added bind apis to RCSResourceObject

Bind apis are required for some specific use-cases.
An auto-interface handler for BATCH, which builds the response conforming with the OIC-spec, is added.

Change-Id: I9dd7c822bfb1ec06ed9176b20d3dcd06c8cb1f44
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add discovery by multiple resource types.

Change-Id: I9e95a0488880b10fce744a2dd4eed464297bedc6
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4805
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Android JNI compilation issue fix & added build option for specifying type of Enrollee

- JNI compilation issue is happening due to a change in file location and a structure name change.
- Seperated Arduino specific implementation using #ifdef
- Changed file persmission for some of the files from 777 to 644

Change-Id: Id73eac55bb678c9e6bddb288db55e5d8cd4680d1
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Partially Revert OC_LOG -> OIC_LOG for service layer

There is currently no OIC_LOG_PAYLOAD function

Change-Id: Ie6e349f85a96fd9267fcd563385a0f9e1a3b93cd
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

modified target transport type related blockwise transfer.

since EDR is not support BWT anymore,
I removed the build script related that.

Change-Id: I105bf0d9d4d921ca760808b2aff8776a3973ebf1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Modify RCSRequest to wrap OCResourceRequest

RCSRequest just wraps OCResourceRequest and it exposes OCResourceRequest for users who want to get information from oc request.

Change-Id: I12d2210e672c6d1a49d4766e07a0d648a7982773
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Updated documentation for BundleActivator::destroyResource

The documentation said that the destroyResource destroys and registers
the the resource.

It should unregister the resource then destroy.

Change-Id: Ib9f628097a89f87bbb8e20f4ba562dc687d4cebe
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Wait for Linux BLE event loop to start before stopping.

This addresses a corner case where the LE transport is stopped before
it has fully started.  In that case, the thread running the GLib event
loop never exited since the event loop itself was still running.  That
ultimately caused the CA layer termination to block indefinitely on a
pthread_join().

Change-Id: I521c7a66c6541cb14df7d4ba098899f303e50999
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Added RCSRepresentation class and get function with params in PrimitiveResource.

The class is to represesnt resource information in a form of hierarchy.
It replaces ResponseStatement which was a class used internally.
Addtionially broken tests in PrimitiveResource related with Set operation are fixed.

Change-Id: I0b1bcc97b0b210a5a2c3da6e6219de1ff3fc727c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Replaced current TAG with 'OIC_xxx' in c_common and routing

To make easy debugging,
I have modified TAG in c_common and routing.
It is better to add common string 'OIC_' + current TAG name.

Change-Id: I1965db71f58f0ab4dfe3e0bacdd243098d2baf77
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4845
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

modified the initialize/deinitialize logic in CA

I changed the initialize/deinitialize logic in CA adapter
and removed the unnecessary code.

Change-Id: Ia9d3dd503f25a393a4053c95c508d1166c574b73
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Simulator Build

Adds a build for the IoTivity Simulator Eclipse plugin to auto_build.sh

Change-Id: Ia98c34c004fff542c98b5f1d683cb98889926fe5
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Radha Bhavani <radha.p@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

replaced OC_LOG with OIC_LOG in service layer

Change-Id: I892b23e6087368addb63a418fac7f95794aae04d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

things-manager: remove reference to groupsyncaction

This SConscript tried to include service/things-manager/sampleapp/linux
/groupsyncaction/SConscript which does not exists, remove the reference.

Change-Id: Ic5265db3757539113121d1e68df542ca744b54e8
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Clean up documentation warnings reported by doxygen

Most of the documentation cleanup is due to overloaded member functions.

The @overload tag was used to remove the warnings. All of the parameteres
are documented for both functions with the @see tag added for each
overloaded function. This is a balance between not repeating documentation
yet still keeping the output clean. To have clean output some repetition
is required.

The @override tag was removed from the move constructors since @override is
not a keyword understood by doxygen.  The best I could tell the documentation
should have been the same for the move constructors as it was for the the
copy constructors.

note: @overload automatically adds "This is an overloaded member function,
provided for convenience. It differs from the above function only in what
argument(s) it accepts." to the output documentation.

Change-Id: Id167dc8d38bcca65d91a8bd3d6e43f9ca291aa79
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix CA Layer build warnings

This patch fixes compiler warnings related to CA Layer.

Change-Id: I2c92a201492cf2e9b8eff2d58ce187bf397a8239
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

tcp_adapter: use CASecureEndpoint_t

The callback function for g_networkPacketCallback gets
CASecureEndpoint_t as first parameter and not CAEndpoint_t. The TCP
adapter always provided it with the wrong type CAEndpoint_t. This patch
makes the tcp adapter use CASecureEndpoint_t instead and fix this
problem.

Change-Id: Ic3b1ca0aadf7a95c846a31424932a7e90a86a55b
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

connectivity: fix warning about missing method declarations

The WITH_TCP define is not set here, but the libcoap header checks for
it and only adds the tcp functions if it is set. Add it here to fix the
warnings.

Change-Id: I28f1831341583597f5bf06406724e236911b0b81
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3393
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

To Integrate logger files

There are two logger files in iotivity.
These are 'resource/csdk/logger' and
'resource/csdk/connectivity/common/logger'.

since 'resource/csdk/connectivity/common/logger' is using in only CA.
it is better to integrate with 'resource/csdk/logger'
so only 'resource/csdk/logger' will be used after that.

ps. oc_* logger name will be replaced with oic_* name
    through other Change

Change-Id: I195b6d9e8066bcc87c0a9ea50a3bf335e3b7340a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Disable compilation of IoTivity Services for iOS

As this is already disabled for Darwin, it should be disabled for iOS as
well.

Change-Id: Id1c984bfb3bb32896227721ad620904b92d7f2dd
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add Install build tools and a missed library to the Readme.scons.txt

Add the apt-get command to add the build tools used by the IoTivity
build. This includes valgrind that is only needed in some build
configurations.

libglib2 is required for the  build but seems to be missed in the
readme file as well.

Change-Id: I8fc514a584c7b2134edd55052e4dfe229f2fbf51
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4813
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Corrected incompatible pointer and format specifier warnings.

Change-Id: Id2d0dfaafbb7bb9c6c0f4863e2c3822c8cd23018
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4803
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Tizen support for enrollee

-Tizen wifi handler
-tizen sample app
-changed sconscript for tizen

Change-Id: Iff545def768cdbfc2138a6e89bf1016959788386
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add OICFree() to release the memory already allocate for the uri

Change-Id: I14590e2f5427c5aef80eefce0b264eb6b4344328
Signed-off-by: Jay <junghyun.oh@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[IOT-771] Reintroduce missing Linux BLE adapter code.

The IoTivity BLE Linux transport doesn't send data due to missing
code, e.g. stub implementations for several functions required by the
CA LE interface. A incorrect revision was merged during the code
review, likely because the gerrit draft revision with the correct
implementation was not published, and ultimately lost. This patch
reintroduces implementations for those functions.

Change-Id: If9e9f7ebaeebb9072cd7762e94a82ef45809f95b
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3011
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

process return type for some method related CAConnectivityhandler_t

Change-Id: I02ab53c144275b96e16288e41c1f8648273190eb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Revert "Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples) according to spec B."

Roll back the JSON changes for waiting until the Security Spec JSON definitions are released.

This reverts commit b578b61090303a71ae07126107c40c18238a02cd.

Change-Id: I8c520b0a99ca2dbae6c3e44ff93f5221288a4188
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>

Removed unneccessary code for stack

I have removed unneccessary code for stack
and some code format has been changed more clearly

Change-Id: Ia9d970a2a8b6e3637f472d6384993d512b791514
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[IOT-844] Modify Tizen spec forprovisioning

Signed-off-by: Hugues Ekra <hekra@cisco.com>
Change-Id: I6ef65066d68a45767b0a825bf309454d289bfb61
Reviewed-on: https://gerrit.iotivity.org/gerrit/4309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: koushik girijala <g.koushik@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

[IOT-919] Only run send queues if GATT adapter is running.

Don't run the client and server side sending queue threads unless the
client and server, respectively, have actually started.  This addresses an
issue where an attempt to send data from a GATT client to a server
fails due to no connection being established beforehand, as well as
accessing uninitialized resources that are only fully initialized
after server start.

Change-Id: I7b6e9728c2edc6a2a283836f7ee31b68555fc34d
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4665
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevron Rees <tripzero.kev@gmail.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

build: avoid to use ARMv5 machine flags by default

To use this flags it is encouraged to set TARGET_ARCH to "*v5*" from.
If unset, generic (buildsystem)'s flags will be used as expected.

I noticed this while building with Tizen:2.4:Mobile toolchain (gbs)
but it could also affect other ports or build infrastructures.

Bug: https://jira.iotivity.org/browse/IOT-694
Change-Id: I4bc279e809474bf664b4825f201df471c66a191c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4541
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Corrected signed/unsigned integer comparison warnings.

The return value of the ftell() function was assigned to an unsigned
integer typed variable and then compared to -1.  Since ftell() actually
returns a 'long' assign to a 'long' instead.  This addresses
signed/unsigned integer comparison warnings.

Change-Id: I990e891ee2ad1f81cd0721ad82646fcf2e79d2b0
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

code refactoring on camessagehandler

Some codes need a refactoring
like memory free missing when a initialize fails.

Change-Id: Ifdb8c790b666c9d2203a0d3b8f4976382ff1f074
Signed-off-by: jw0213.jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Updated the android version to API 23 and build tools version to 23.0.1.
The user will be prompted to download these versions if they do not have
Android SDK installed. Both are the latest supported versions.

Change-Id: I6c988b9dcde12b47406a8490840d07c135c5dd0e
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Allow empty token usage.

RFC7252: An empty token value is appropriate e.g., when
no other tokens are in use to a destination, or when requests are
made serially per destination and receive piggybacked responses.

Empty tokens are often used by clients in order to have more compact
messages.

Change-Id: I2b409159a225f06ba80130547ffc9d5cabfee298
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

android: c_compat: add __cmsg_nxthd() for Android KitKat 4.4

The function __cmsg_nxthd() is missing in Android 4.4, but the Android NDK
header files in the version we are using are referencing it and we use it in
our code, this functions was added in version 5.0. To make IoTivity
dynamically loadable on Android KitKat 4.4 add this functions
as a weak symbol, so it will be used if the c lib does not provide it, like
on Android < 5.0 This code was taken from these two resources:
https://raw.githubusercontent.com/android/platform_bionic/master/libc/bionic/__cmsg_nxthdr.cpp
https://github.com/android/platform_bionic/commit/ff64831b0965c16c95c9f81a148f30a6ef3a6c64

Change-Id: I02ef763cf3f82c73b1e0169230dd8c7e9d6d379b
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

updated the code related ipadapter more clearly

Change-Id: Iff3bf220017bc447ef0e73c8f25f92bb50aa9539
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

merge the duplicated function in camessagehandler

There were two functions separately for sending request/response message
although they had almost same codes. So I merged it.

Change-Id: Iecaf407d765f04bbffea8b98fbe22b06fa540434
Signed-off-by: jw0213.jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Moved common method to check null parameter.

preprocessor to check Null parameter is in adapter util.
however it checker is using here and there.
so it is better to move common header.

Change-Id: If54032ada0926da0f8917d1d32f36498a9054a12
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

removed unnecessary BLE interface method

and both initialize and terminate method are called
here and there irregularly.
to make sure correct usage, I modified BLE codes related interface

Change-Id: I26a89ae3079a834200533678e2ae8aba0d683122
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

changes the tcp adapter logic for exception case.

if the sending side pauses or goes offline after sending
a partial message, the receive thread will spin.
because receiver is waiting for the remained data.
so I modified the receive logic to processing the partial message.

Change-Id: I54d54238728ca1945874e09ed70ea310072dda51
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix security unittest regarding iotvticalendartest on 32 bit OS

-issue : IsRequestWithinValidTimeTest.IsRequestWithinValidTimeValidPeriod1 is failed on 32 bit OS
-reason : On 32 bit OS, integer overflow occur in return of mktime due to Year 2038 problem,
        when Checking whether endDateTime is after startDateTime in iotvticalendar.c
-solution : Checking the period using tm structure members instead of mktime and difftime function.

-Patch#5 : Split long lines

Change-Id: I5bb14336573ee8b7d42dbbe4f3c45af44f937c3e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4765
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

Added missing AUTHENTICATION_FAILED OCException reason.

Fixed warning about missing OC_STACK_AUTHENTICATION_FAILED case in
OCException::reason() switch statement, and added appropriate
corresponding string constant.

Change-Id: Ibdc2d68f9cfb76f8165a62bce65dc183b19d7622
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4709
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

ip_adapter: fix setting setsockopt() IP_MULTICAST_IF on Linux kernel < 3.5

The struct ip_mreq is only support since Linux 3.5 and not on older Linux
versions for IP_MULTICAST_IF. On older and also on recent Linux kernel
versions using struct ip_mreqn (version with n at the end) is still supported.
See the man page for details: http://man7.org/linux/man-pages/man7/ip.7.html

Without this patch I was getting this error message when trying to send a
multicast message from a USB tethered Android phone:
E/IP_SERVER: send IP_MULTICAST_IF failed: Cannot assign requested address (using defualt)
after applying this patch this operation works and it looks like IoTivity
with IP works on the Android phone.

In parameter imr_ifindex the interface index should be provided, but if
it is set to 0 it gets ignored and should behave like the old code.

Change-Id: I6e8ad376357eee49b2cd29dc792092fe3f7af0b6
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4651
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

fixed CoAP/TCP header type check logic from the size.

The first nibble of coap over tcp message format is used
to indicate the length of the options/payload.
if the first nibble is 13, An 8-bit unsigned integer follows
the initial byte and indicates the length of options/payload minus 13.
(14: 16-bit unsigned integer,
     indicates the length of options/payload minus 269.
 15: 32-bit unsigned interger,
     indicates the length of options/payload minus 65805)

Change-Id: I2a88eb161584fb0104d2b533e3456c19a4b99304
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Refactored 'RCSDiscoveryManager'

The class is refactored for readability and better structure.

Change-Id: Iefb4b71fb074358e833d779139fbb646c759f022
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix get platform info issue when ROUTING_GATEWAY

Change-Id: I6356ee398b5c435f8c0a6d08e3032e78d83420a1
Signed-off-by: youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix provisioning unittest SConscript path

When built with TEST option enabled, the wrong path in provisioning SConscript caused an error.
The path in the SConscript has been corrected to reflect its location.

Change-Id: Iedecd4867255ea68e936c2bc20d9e97ae41ce909
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4753
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples)
according to spec B.

* NOTE : https://gerrit.iotivity.org/gerrit/#/c/4733/ required,
         in order to provisioning tool works in debug mode.

1. Change the security resource name according to spec B.

2. Remove unnecessary security resource according to spec B.

3. Remove the entity of resource name from coap/coaps payload as follows :
  [Before]
  {
    "doxm":
    {
      "oxm":[0],
      "oxmsel":0,
      "sct":1,
      "owned":true,
      "deviceid":"anVzdHdvcmtzRGV2VVVJRA==",
      "devowner":"YWRtaW5EZXZpY2VVVUlEMA==",
      "rowner":"YWRtaW5EZXZpY2VVVUlEMA=="
    }
  }

  [After]
  {
    "oxm":[0],
    "oxmsel":0,
    "sct":1,
    "owned":true,
    "deviceid":"anVzdHdvcmtzRGV2VVVJRA==",
    "devowner":"YWRtaW5EZXZpY2VVVUlEMA==",
    "rowner":"YWRtaW5EZXZpY2VVVUlEMA=="
  }

4. Modify the sample SVR DB(.json) according to above modifications.

5. Modify the unittest according to above modifications.

[Patch #1] Initial upload
[Patch #2] Update commit message
[Patch #3] Retrigger
[Patch #4] Upload missing file.
[Patch #5,#6] Modify according to comments.
[Patch #7,#8] Update commit message.

Change-Id: Ic6842af77c7098f30e7823597f807bb8a55d4541
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: sangsu choi <sangsu.choi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

Fix CKM's unit test issue

Details:
1. Fix SetNumberOfRevoked() API to use value instead of pointer
2. Fix SetCRLSerialNumber() API to use value instead of pointer
3. Fix SetNextSerialNumber() API to use value instead of pointer
4. Fix all places where those functions were called

Change-Id: I35000d84391399c1fd915678bc3bbed31761bcc5
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4731
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: sangsu choi <sangsu.choi@samsung.com>
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>

OICSensorBoard: rename resource type to comply RFC-6690

Change-Id: I72bacb30803b8947eb5cf37ced83b0a088d64ae2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Modify OCParseSecurityPayload() to prevent core-dump in debug mode.

   1. Add cbor value verification code
   2. Remove the cbor_value_leave_container() invoking.

Change-Id: Iaa0b784c1688eddff8d1a1eec6406f396e508db7
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4733
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Modify the remove device related API to use client UUID of OCClientResponse

If we failed remove deivce, PM API will set device status as stale.
We need to add mechanism to clean up the stale status of device.
It will be uploaded to the next.

[Patch #1] : Intial upload
[Patch #2] : Update commit message
[Patch #3] : Modify according to comment.
[Patch #4,#5] : Modify according to Sachin's comments.
[Patch #6] : Modify typo

Change-Id: I0268b0820e2e0dbddeeba247bbc14d679d6fd7bb
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

DTLS handshake retransmission

DTLS retransmission initiated after dtls context successfully created.
After that it starts each 2 seconds (using Timer) and call dtls_check_retransmission()
It stops when global dtls session was destroyed

Change-Id: Idc2216a4773feea44a306fcee78b8c779b595abe
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: sangsu choi <sangsu.choi@samsung.com>
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

[easysetup] Easysetup Justworks bug fix and sample application bug fix when security is enabled

- Bug when security is enabled is fixed

Change-Id: Ifb96ee5a57622fab7216a46946d904e237317641
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4723
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

[easysetup] Sample application bug fix when security is enabled

- Bug when security is enabled is fixed

Change-Id: Icf22ee6a71c5665419cc358d8b4d0388d9f81e62
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4715
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Correct some defects detected by Static Code Analysis Tool in things manager

After running Static Code Analysis Tool(Svace) for things manager codes, some defects have been
detected. Most of the defects are about null pointer handling and variable
initialization. This patchset is for covering these defects.

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

[easysetup] Static code analysis fix in provisioning

- Static code analysis bug is fixed

Change-Id: I7b7c5b3dd284de20a48aaf90a3b5bcbb72565714
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix for defects detected by static analysis for resource-container

modify resource container sample and unittest to fix defects detected

Change-Id: I7c6520d3ca5d4576f4bf1525e42a9f4e983cca87
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4633
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Merge branch 'simulator'

Change-Id: Iee9352bd3bf67c5db6aa07f0ea10639b180bfedc
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>

Merge branch 'master' into simulator.

Change-Id: Ib0054018e0b27b9eb84ac8bb4dd7955c98ec731a
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>

Add wrong PIN defence codes in case of PIN based OxM

 * Add CAErrorCallback in OTM to handle result of DTLS handshake.
 * Our implementation as follows :
    1. Implemente CAErrorCallback(DTLSHandshakeCB) in OTM to handle result of DTLS handshake.
    2. Try dtls handshake.
    3. Wait for handshake result.
    4. Invoke CAErrorCallback(DTLSHandshakeCB) at CAHandleSecureEvent() when handshake is finished.
    5. Handle handshake result in DTLSHandshakeCB.
        - in case of success, we can send next coaps request.
        - in case of failure, return the error value or restart ownership transfer.

Related jira : https://jira.iotivity.org/browse/IOT-831

[Patch #1] Intial upload
[Patch #2] Remove white-space
[Patch #3] Update comment
[Patch #4] Update according to comments
[Patch #5] Revert extlibs/tinydtls/crypto.c to seprate changeset
[Patch #6] Rebase
[Patch #7] Modify the stCADtlsContext_t to save the OTMContext.
[Patch #8] Remove white-space.
[Patch #9] Modify according to sachin's comment.
[Patch #10] Modify according to comments.
[Patch #11] Remove whitespace
[Patch #12] Rebase by sachin
[Patch #13] Update commit message

Change-Id: I034b0e9ad267cb6998ce3df3ce50629583740608
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

/oic/res response for the RD

Earlier collection payload was added in discovery payload to handle RD response in
a separate way in form of tags and links. But with recent changes and discussion
baseURI is mvoed to discovery payload.

With this change there is one response for /oic/res with an additional field for RD.

Change-Id: Ia29cc64ffb48062d72ee4b9a9b59013480f13ff1
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4611
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Removed collection resource and device support from simulator plug-in.

1. Collection resource and device related UI has been removed
   from service provider eclipse plug-in.
2. This check-in also includes refactoring and fixing of minor UI bugs.

Change-Id: I1b12620202d3a861c251afb8ae4e14c5a96b7b44
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4635
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>