[IOT-1820]Commenting C Unit Test to resolve build error

Change-Id: Id2be7a1201d248b39e05acac360064299891e957
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17289
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

Fixed memory leak on CARetransmissionDestroy

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

add OCSetLogLevel API in logger

we can filter log with level through setLogLevel API.
it will be helpped to reduce unnecessary log
without additional build option in some lite device.
and also we can filter private information such as Device ID,
Access Token, etc.

Change-Id: I91bff24737cbc7f09985adc142fc5f3d37e8f577
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17197
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

add new BLE scan through android public API (upper than API level 21)

since previous scan api - startLeScan() was deprecated in API level 21.
we should use startScan(List, ScanSettings, ScanCallback).
https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html

Change-Id: Ife58de26f1b132c260b94a6d0ba5c6aa17d1e7f3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17005
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1814] Add OCRepPayloadSetPropByteStringAsOwner to .def.

Bug: https://jira.iotivity.org/browse/IOT-1814
Change-Id: I5ad17d44d16b9f3940173d59ae23ee2fc50ac838
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17223
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix BLE crash issue when IoTivity Stop is called.

Change-Id: Iee01565d5aab088c597f43f7bad463ab11553e41
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17075
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix svace defects in csr.c

Change-Id: I2c1870a7773ff4d56eec0539d0641c51e510a36f
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16933
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1800] Implement OCF Security CR1291

1. After establishing the secure OTM connection, GET the doxm
   properties again, and verify that they are still the same as those
   obtained during un-owned device discovery.

2. All GET and POST requests for /oic/sec/pstat are now performed
   using the secure OTM connection, after finishing step #1 above.

3. Assert that a secure OTM connection is used for all Onboarding
   related communication, except for:
   - The initial discovery, and
   - Posting the OxmSel property value (PostOwnerTransferModeToResource)

Note that:
- These are just Client-side changes. No Server-side changes were
  required.
- A newer Client is still compatible with a Server based on IoTivity 1.2
- A newer Server is still compatible with a Client based on IoTivity 1.2

Not directly-related to this CR: set-up DTLSHandshakeCB earlier, to
avoid a possible race condition with the initiation of the OTM secure
connection triggered by PostOwnerTransferModeToResource.

Change-Id: I1a94505756205d3b40ed70cb73dc41c8ce6ce0e1
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17135
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1816] Windows: Fix build breaks

1. Most likely the ocrandom compiler error was hiding the RD linker
   errors.

2. Support both RD Client and Server functionality with
   octbstack.dll

3. Avoid building sqlite3.obj with several different compiler options,
   by building it a single time and packaging it in sqlite3.lib

Change-Id: I8b9fe95f97d88a28a8b6bb48fd9932f51a65ecdb
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17253
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Add support for needed functionality to mbedTLS

Support for directoryName-based subject alternative name
Creating certificates containing this extension
Specifying a particular EKU to check for in TLS negotiation instead
of standard client/server authentication EKUs

This work will be offered upstream to the mbedTLS maintainers; if
they accept it, this will later be reverted when IoTivity ingests
a newer version of mbedTLS.

Change-Id: I4f81d75b767683327564e27758d1aa1bc02613de
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15733
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>

IOT-1812: OICStrcpy is not safe with OICMalloc if the string can be empty

OICMalloc does not zero the memory allocated, and OICStrcpy does not
initialize the destination buffer if the source strlen is 0. Indeed
this seems to be by design, as the StringTests.StrcpyZeroSource
explicitly verifies that it does not initialize the destination buffer.

As a result, OICMalloc + OICStrcpy can result in uninitialized memory
(in a 1 byte buffer) that results in subsequently reading past the end
of the buffer, which can cause a crash.

Several security code paths are susceptible to this bug, which is
easy to reproduce with Application Verifier.

Change-Id: I6a3e2840c310d15a52656bf309ac9995de813683
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17177
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1805] Fix SSL session leak on error

The SSL session is always using the secure port - never the unsecured
port.

Change-Id: If4f490a720dc1943404f9364230ba1de1e232133
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17099
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1488] Remove workaround

Remove workaround, now that change 82c4c656ea508d6014419b0f82c6b734e55118e5
is releasing the mutex, from the error code path.

Change-Id: Ibfb5fad559d9351e3279d7af3346b49de8570738
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17083
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Fix mbedtls debug format

Remove carriage return from debug message
added by default in mbedtls

Change-Id: Ie6077a5eb294f1790b87472b4baa69fc283016c0
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16761
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

IOT-1811 Move MOT device info cleanup to fix AV

Change-Id: Ia7ce7aca7224da855776b47a46749c0baed18b39
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17163
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1815] Add missing OCRDDatabase functions to .def.

Note OCRDDatabaseGetStorageFilename was previously an internal API.
However to allow the RD lib to locate it, it is now exported.

Bug: https://jira.iotivity.org/browse/IOT-1815
Change-Id: I40c579c7e14024257b343737833664df858aa8e5
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17227
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Add missing handle parameter in rdtests.cpp.

Handle parameter was introduced in commit
ce5af55ebf421d7d550563da266b76dfd89e3051.

Change-Id: Id9e5f149e65c0a41d3e46cab15a416a59d2ef626
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17225
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

[IOT-1765] Fix for DT_SONAME warning messages in Android

Although the jira issue was against 1.2-rel, this fix is being
applied to master for inclusion in 1.3.

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

[IOT-1540] Connection manager logic add.
Add the function to switch cloud IP to local IP
in connection manager.

Change-Id: I032d2ae38e63ad79694ebc92b900f6621d0130c3
Signed-off-by: Jonggyu Ham <jg.ham@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15909
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Add OCDoHandle parameter on resource-directory function

this parameter is used to refer to the request sent out on behalf
of calling this API.

Change-Id: I7032f9e5afea6ecba44cb09e39c6bd654b59e5a9
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17205
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Fix callback issue which there is no payload in case of error message.

check logic what payload is parsed was modified in
https://gerrit.iotivity.org/gerrit/#/c/15197/.
However that change cause some issue which
there is no payload in case of error message
with general get/put/post/delete message except for oic/res.

payload should be set in common in OCHandleResponse method.

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

Modify confirmable certificate OTM

- In case of user denial, send relevant error message
- Reset in case of confirmation failure
- https://gerrit.iotivity.org/gerrit/#/c/16295/4

Patch #1: initial upload
Patch #2-3: Fix build error
Patch #4: resolve merge conflict

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

Check initialized and Changed logic of IP connect state check.

getNetworkInfo was deprecated in API level 23.
So changed to getActiveNetworkInfo() API.

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

Fix blocking issue when OCStop is called in android BLE.

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

Fix static analysis issue in base layer.

ocresource.c, ocstack.c

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

[IOT-1531]PAL API for get link-local zone id from ifindex

PAL API for get IPv6 link-local zone id from ifindex.
This changes need for mapping zone-id with IPv6 link-local Address
on Endpoint and CAGetNetworkInfo().

Change-Id: Ib5043d3de5747f3e461de775dba2d04e804297dd
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14123
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Updated SSL_CHECK_FAIL macro to ignore bad client hello message.

Change-Id: I317e63d192af372844e672650c261578508e9331
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16367
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7198d2fdd91adec7df769a78ef66d2b87d8d9e47)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17171

delete wifi API and pkg config in tizen.

since IoTivity already use Tizen Connectivity Manager API instead of wifi API.
it should be removed in this and there.

Change-Id: I9a61d7d4d323fe83e988c792284179c099bc2855
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17079
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

IOT-1583: Preparing SConscripts for /W3 and /WX changes.

Initial commit making changes and small clean-up in SConscript
files to enable adding /W3 and /WX compiler options limited
to the resource/csdk/stack/ directory.

Changes made:
1. Building of stack's code moved to resource/csdk/stack/SConscript.
2. Turned extlibs/timer/ into a static lib, so that it doesn't compile
(and generate warnings) along with other modules' code.

Change-Id: I6c64916dbcfd23edb546d43db7b2470100528baa
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16975
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

replace parameter name in setDevAddr

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

IOT-1804 Add option to build without MOT in run.bat

Change-Id: Ie1e1a6d15acfbc02d3b6446b0ca1d700376260a7
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Implement RD update.

Change-Id: I6d115b14ddefb60fbcfc289e40f69228b7878551
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15639
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

[IOT-1810]Fix for Double free of payload in C for Notification Message

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

Fix for missing-field-initializers compiler warning

The OCDevAddr struct has 7 values only 2 were
initilized when the addr struct was created.

Two values the port and addr were set after the
initilization. All values are now intilized when
the OCDevAddr struct is created.

In addition the EXPECT_EQ was changed to EXPECT_STREQ
the macro undertands that a string is expected and
will display more informative errors if the test fails.

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

Add API to allow application to set RD storage filename.

Change-Id: I4afa1607ea9758747c212906a8ecf5b7f0099f72
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Fix static analysis issue in base layer

-cainterfacecontroller.c: fix dereference memory
-oickeepalive.c: add null check logic

Change-Id: Iaa839b5a8c4eba44934931d9e3b3a529a07a762e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16997
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix defect found by static analyzer

- ocpayloadparse : double free
- occollection : need to NULL check
- ocRepresentation : big size of m_devAddr parameter

Change-Id: I5bd4cbc6d5dab1dfe7293a234e90d2c465a0039c
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17007
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Clean up log messages in CA Layer.

- To make sure of analysis, Debug level is replaced with Info level.
- Remove unnecessary Logs of BLE and CA common.

Change-Id: Ifab4d264c7347e8575e008ca1bd7fd7deed03b9d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17023
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Implement RD delete.

Change-Id: I492034351d388b58a349024270d5abd9506da86d
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15075
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Update MOT Enable API and added some ESResult.

 - Security-layer support MOT enabled API. So updated MOT enabled API.
   Please check following changes.

   1. When the mediator finds an owned-secured resource that is MOT disabled,
      it can enable it according to whether it is the owner or the sub-owner.
   2. MOT related functions are separated.
   3. Changes in DB synchronized check logic have occurred as the above changes occur.

 - Added some ESResult(e.g. ES_MOT_NOT_SUPPORTED, ES_MOT_ENABLING_FAILURE)

Change-Id: I5af3bdfcfbdf6b62b50a07e2d6d699c96a7a2667
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17087
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

Fix crash in ssl retransmission thread

It is possible to happen segmentation fault if retransmission thread
lock a mutex during CAdeinitSslAdapter function is called

Patch 1: Initial upload

Change-Id: I446aeb2cc9d6cd07d2683984ba2783ab72020c58
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16575
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17107

Adding Android Interface API saveACL() and doSelfOwnershiptransfer()

Change-Id: Ia19bb669d073868a1ca74b1e98968383256a62aa
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15835
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16873

Change the cred usage according to CR33(MfgCertOTMClarifications)

Change-Id: I042a93cd8acc6c0ec5f6e77f24ecb78b667b9912
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 317078b7708e6542aa84f30da44afc2f1e14e0d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17109

Fix selected ciphersuite info of established session

Fixed selected ciphersuite infomation to get from
the session object when session established.
This patch will be needed in case of multiple (D)TLS session are initiating.

Patch 1:Initial upload

Change-Id: I245443f9e1216da72c742fe7eafaf24445050dfa
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16569
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit f14b783b1828361a41de813f9780ae61ec8a6597)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17105

IOT-1806: Temporarily disabling one of OCDiscover* tests.

One of these tests is failing for Windows only. We're disabling it
temporarily to unblock other developers' changes.

Change-Id: I73bbad157acbd618d50f49bcd1fc7ef07baf2aee
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17103
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1685] Make /oic/res observable.

The application is expected to do the following when it wishes to
enable this behavior:
- handle = OCGetResourceHandleAtUri(OC_RSRVD_WELL_KNOWN_URI)
- OCSetResourceProperties(handle, OC_DISCOVERABLE|OC_OBSERVABLE)
- OCNotifyAllObservers(handle, OC_NA_QOS)

Note that this change enables OCNotifyAllObservers for virtual
resources (such as OC_RSRVD_WELL_KNOWN_URI).

Change-Id: I5c49ab168791e6b5a6e3a97f561c2851614e0f8f
Bug: https://jira.iotivity.org/browse/IOT-1685
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15633
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Resource directory related fixes.

- Use the passed in ID in OCRDPublishWithDeviceId(),
- Set the size of the CBOR array to the length of the discovery
  payload list in OCConvertDiscoveryPayload(),
- Return all local and published resources in response to GET
  /oic/res,
- Set the di and baseURI correctly in discovery payloads,
- Only return resources that match the intersection of 'rt' and 'if'
  queries.
- Add missing calls to ROLLBACK in error paths.

Change-Id: Ib1ad770fec8ec6f9eafff0e5f864ee115f1ba5b5
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14581
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

[IOT-789] [IOT-792] [IOT-794] [IOT-1763 partial fix]
Remove AMS and clean up SRM context and response code.

The AMS code is dead, broken, and needs to be removed.

Also, the SRM uses a tangled and inconsistent set of context objects,
leaving it unclear which request is being processed, what the state
of processing is, and whether or not a response has been sent to the
requester.

This patch fixes this and should be used as the basis
for future improvements to the policy engine (ACL) code,
SVR handling, etc.

There is some additional cleanup I'd like to do, but this needs
to get merged, and is already a large change, so I'll add those
other fixes as smaller patches once this is merged to master.

NOTE TO REVIEWERS: a few places are marked "TODO Samsung" and need
review by Samsung engr because it is a Samsung feature.

patch set 7: deleted commented out code and files

patch set 8: fixed const assignment warning that was causing Arduino
build to fail

patch set 9: rebased and merged 16883

patch set 10: addressed Kevin's comments and automated build issue

patch set 11: automated build issue

patch set 12: automated build issue

Change-Id: I9560c8aeb1ee59925c0b7aa1282f0cf39f3cae9b
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16719
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Fix a wrong usage of return value of getMediatorDevId API

Instead of OCUUIdentity *, a value of std::string should be returned.
Additionally, removed a defect point in returning a value after OICFree

Change-Id: Ibcd204b14ea6f488f689ff0ff61da9b618124a4d
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17085
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[IOT-1794]Adding comments for ProviderStateChanged callback handling

Change-Id: Iec35dfb0a4103898ecb8797658348d4c69f9b890
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17073
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

[IOT-1793]Exclude Internal header from Interface header files

Change-Id: Ia159f481a1a4ddd5e1a7a1134fa2aa4cdd3cc6f3
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17071
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

security: Fix to access dereferenced object memory in OCSecure class

[Joonghwan Lee]

This patch fix below invalid memory access in OCSecure class
- invalid DisplayNumContext object access
- invalid UserConfirmNumContext object access
- minor fix : prevent duplicated call of SetResult()

[Philippe Coval]

Ported from 1.2-rel branch to master

  Conflicts:
resource/csdk/security/provisioning/src/ownershiptransfermanager.c

Change-Id: I623c856f7086cf7fe7333e69f682070434961fbe
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16369
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Author: Joonghwan Lee <jh05.lee@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16949

Adding C++ wrapper and test case to set a seed value for UUID generation

Change-Id: I14d20ce49b87741dfbef34631cb8f728f3c33b41
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16435
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d58a56bc2929f322b0997d2e6d52a8d2356192d2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16713

[IOT-1775] Fix observer response handle logic

Fix observer response handle logic to return OC_STACK_OK,
cases of observer request fail and observer cancel response
will handled with this logic.
[As is]
return OC_STACK_UNAUTHORIZED_REQ
[To be]
return OC_STACK_OK

Change-Id: I7e36775b71d6e4baa3f611b27c2e1cec46779b66
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16999
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fixed a linking error on android for specific Android level

Change-Id: I9242a64e3658f41e0c847c338307c2ce7d539428
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16697
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.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>

build: Clean build folders when using scons -c

Since Android and Java code is built using gradle
the build output is not properly tracked by scons.
Scons' Clean method is used to add the build
output to the clean build.

This commit is limited to the `build` folders
generated when building TARGET_OS=android or
BUILD_JAVA=1.

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

To support BLE server disable flag in BT configure.

we can select disable/enable flag of ble server
even through there are both client and server mode in OCMode of PlatformConfig.
it will help to reduce battery consumption issue in both mode with ALL transports

Change-Id: I2e4179c1c6b673313d751770a1885774280cc428
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16909
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

To support BLE MTU negotiation. (android server implementation)

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

GetDerCrl() fix

Memory leak in GetDerCrl() fixed

Change-Id: Iddf0628c73d69ce8beafa66b09b4b2f2e61e8006
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16439
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e43d061497721cfe8fbfef623c3c4d5ae2556ce7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17059

[IOT-1790]Changes in C++ APIs design to remove raw pointers

1. Callbacks are discovery and subscribtion is updated to smart pointers
2. Message and sync Callbacks are sent as object in place of pointers
3. Create Message and SendMessage are sent and received as objects in place of pointers.

patch 2 : added review comment changes
patch 3 : rebased
patch 4 : added separate files for accepted provider/consumer

Change-Id: I63f2655d51f46851dcc2e2a93fe2adadcff32134
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16961
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

[IOT-1592] Fix unit test of notification service.

Dependency of hippomocks is removed in notification service

Bug: https://jira.iotivity.org/browse/IOT-1562
Change-Id: I4d8b44b1c06c1abcc73a15fa87db94056a642b9d
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16377
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Remove ACE related to /oic/sec/acl on defualt ACE setting

Remove ACE related to /oic/sec/acl on defualt ACE setting
on SVR file of unowned sample apps, because that is not
required to Ownership Transfer.

Patch 1: upload patch.

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

Updated with Valgrind memory leak fixes for Notification Provider and consumer.

Updated NS sample App to allow/deny consumer subscription.

[Philippe Coval]

Ported from 1.2-rel to master, did not change style

  Conflicts:
service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
service/notification/cpp-wrapper/provider/SConscript
service/notification/cpp-wrapper/unittest/NSConsumerServiceSimulator.h
service/notification/cpp-wrapper/unittest/NSConsumerServiceTest.cpp
service/notification/cpp-wrapper/unittest/NSProviderServiceSimulator.h
service/notification/cpp-wrapper/unittest/NSProviderServiceTest.cpp

Change-Id: I6f3609895cbfe2d4d8b18247b7e7dd4c7a438161
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Author: abitha.s <abitha.s@samsung.com>
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16887
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Windows: add support for SECURED=0

Add -noSecurity script parameter, for parity with the other platforms.

Also, use case insensitive comparisons for the script parameters.

Change-Id: I57cd2928638fdd0a95bf7c9ce85568a56a0e2419
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17001
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>

IOT-1789 Eliminate duplicate messages regardless of addr family

There can be duplicate messages coming from multiple ipv6 (or v4)
addresses in the system. The presence of ipv6 link-local for instance
could cause duplicate messages to appear. They can also occur due to
retransmits.

This change extends the existing mechanism of looking at the previous
four unique messages and dropping the new one if the COAP token
matched any of the four messages regardless of the address family.

Change-Id: I88617ad441f51a730cdf75f8a0b01c01ee002eaa
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16973
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>

[IOT-1783] Fix output buffer size

1. Don't allocate securityPayloadSize and use INIT_SIZE as the buffer
   size parameter, when calling OCConvertPayloadHelper.

2. Using Realloc here was wasteful, because Realloc copies the
   current buffer contents in the new, larger buffer. The current
   buffer contents are not needed in the larger buffer.

3. Call OCConvertPayloadHelper in a single place instead of three.

Change-Id: Ib854d91c5938df10597207f4aa88945dd8720cf5
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16859
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

build: Convert EOL to use UNIX convention (csdk)

Remove CRLF

Also align to python coding style (using autopep8)

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

tizen: Use mediator richsdk lib

Change-Id: Ib63db28697925b02349da82c5feabc1334a39ba2
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/Ib63db28697925b02349da82c5feabc1334a39ba2
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16963
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17017

build: Updated boost Framework path for ios

[srijon.sb]
1. Updated boost Framework path for ios
2. Fixed build errors
a. Some void functions return values
b. Added missing Headers

[Philippe Coval]
Ported from 1.2-rel branch to master
  Conflicts:
service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp

Change-Id: I0b6a796fb815a16725e06fa154499d5a8d1605cf
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Author: srijon.sb <srijon.sb@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by:Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16881
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

build: Fix the ios build break

[srijon.sb]
iOS has been built successfully before,
but currently build fail happened due to some update in the IoTivity.
This fix resolves secure and insecure build of IoTivity for iOS

[Philippe Coval]
Rebased on renamed files and adapted,
removed cleanup changes (prefered in isolated patches)
Ported from 1.2-rel to master

Change-Id: I7599d02f1931f38a28eac90163aac5818540c5b9
Author: srijon.sb <srijon.sb@samsung.com>
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14731
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16879
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Remove duplicated deviceID check in PM_Discovery

Patch 1: upload
Patch 2,3: If self reply, discard it.
Patch 4: Retriger jenkins build

Change-Id: Ife6bf2a802aa17da63899ad904a1df085696340e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16297
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16885
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Versioning feature implementation.

1. Introduce in new Content Type application/vnd.ocf+cbor
2. Introduce in option headers Accept Version and Content-Format Version
3. Handle versioning at CA and RI layers
4. Expose the result of version handling to application layer
5. Add test codes at CA, RI and application layers

Bug: https://jira.iotivity.org/browse/IOT-1735
Change-Id: I9924881f6233b4c4f5af9d50098cd48ef258a753
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16505
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>

Add log message for discovered secure resource in easy setup

Once a target secure resource is discovered, some of useful information of
the found resource are provided by log messages.

Change-Id: If41390c884e5520f51fed1601d626c1eda523c01
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17029
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

/oic/res error response for query handling

- Stop the error response on invalid multicast /oic/res request.
- An error message is sent in case of unicast.
- In case of empty query for interface and resource type,, it sends an error message.
- Add unit tests to test the callback returned value.

BUG: https://jira.iotivity.org/browse/IOT-1650
Change-Id: I2f5902f46030d28ebcc8dc28c7e2f4fbcb6a1716
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15197
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

tizen: Enable CLOUD and ship ES lib

Change-Id: I84ce3dd94e1a90f13f0ff875221ca5061828618e
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/I84ce3dd94e1a90f13f0ff875221ca5061828618e
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16965
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17019

Fix defects detected by static analysis

Change-Id: I43d5400da6e7fd2ee6265c04c36ba59e6ab05478
Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16953
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

build: Disable resource-container unittests

This test is unstable on jenkins, let's disable it

This reverts commit 7dda698e3b7569eeb9189c33d5cc4805b825f768.

Change-Id: I513c720faa2ba371d2909b3bc364bdd969642f58
Bug: https://jira.iotivity.org/browse/IOT-1684
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16321
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Replace u_array_list data structure with linked-list in catcpserver

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

Update OTM condition check logic.

 - we need to seperate OTM condition(i.e. Not synchronized with DB, enrollee is already owned by other mediator)

Change-Id: I20696908ff961f3c2ae2f18f9fec01cb6a60fc82
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17013
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Refactoring EnrolleeSecurity class

  - provisionOwnership function is too long, so divide the function.

Change-Id: Ifd80fe5ceae70a5181c5020e014acda13215994c
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16915
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix defects detected by static analysis

1. nativeRemoteEnrollee and jRemoteEnrollee are initialized with NULL.
2. NULL is returned if global lister for event lister fails to create.

Change-Id: I9b77acb439f4f42e5c382370d060d525e5d6e652
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16939
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[IOT-1779] Windows: fix linker errors for SECURED=0

The recently-added octbstack.dll exports from octbstack_product_with_tcp
were actually not available when SECURED=0.

Also, move the larger SConscript if/else paths to the 'else' branch,
for easier reading of these two nested if/else statements.

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

[IOT-1753] After-merge code review comments

Change-Id: Ibebbad962e6c9626f8387e16aabd558f496de667
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16877
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

[IOT-1366] coaps request for secure resource

[Randeep Singh]

[IOT-1366] coaps request for secure resource

handled pending review comments

[Philippe Coval]

Ported from 1.2-rel to master

  Conflicts:
resource/csdk/security/src/secureresourcemanager.c

Change-Id: Iacde7395b7a5da53caff7f175beb3d3e17dd9894
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Author: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16883
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

To support BLE MTU negotiation (android to android)-> clean up LE state

- move common codes related device state calestate for android BLE

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

Harden parsing of CBOR to ensure types are accurate

TinyCBOR requires that the caller ensure that the type of the entry
pointed by CborValue be of the correct type before extracting the
value. Otherwise, bad things happen (failed assertions in debug mode).

This fixes IOT-1722.

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I2bc52f3c7a574209b213fffd1498a48851c9c5d8
Reviewed-on: https://gerrit.iotivity.org/gerrit/16309
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Fix static analysis defect in NSProviderInterface.c
 - Add mutex unlock in exception code.

Change-Id: Ic244e65ee0efb814264e8f1d29ee61f3a42f3e25
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16943
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[IOT-1774]Add BLE, NFC, RA flag for RI endpoint

BLE, NFC, RA is not working due to endpoint.
So add BLE, NFC, RA flag for RI endpoint to make work
BLE, NFC, RA adapter

Change-Id: Iaf7ba69e5b28465876ef3abb986479cacb91e1b7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16691
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

fix Tizen build issue related BLE MTU negotiation.

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

IOT-1583: Removing /W3 warning from resource/csdk/security.

I'm also refactoring some SConscript files in order to enable
/W3 and /WX only for specific directories and I'm adding
_CRT_NONSTDC_NO_WARNINGS to disable warnings about issues we cannot
change anyway, because the code has to build for multiple platforms.

Change-Id: Ifef66b6c59540df2ceb40a54af47865d56a302d7
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16329
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Add API to set a seed value for UUID generation,
to ensure that a device always uses the same UUID.
If the seed value is not set, a UUID is generated randomly.

Patch #1 : Initial upload
Patch #2 : add header file include on srmutility.c.
Patch #3 : Updated according to comments.
Patch #4 : Fix build error
Patch #5 : rebase
Patch #6 : Fix coredump
Patch #7-8 : Retrigger
Patch #9-10 : Updated according to comments.
Patch #11-13 : Retrigger

Change-Id: I6ce668866b5881386a52ef8cb9de5226b8595749
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16921
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Change default settings to allow Ownership Transfer

If a Device did not provide a CBOR file that includes appropriate
ACLs, generate a CBOR file that allows Ownership Transfer, using the
Random PIN method.

The default read-only ACE for /oic/sec/acl has been removed, because
it is not required by provisioningclient.

There are new ACEs allowing read+write by default for /oic/sec/doxm,
/oic/sec/pstat and /oic/sec/cred. Those are required by the current
Onboarding design.

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

provisioning: Fix OIC_LOG args (FTBFS on tizen)

It was observed when building with SECURED=1

Also use local include as it's not part of system

Change-Id: I7c1cf2090df7aeb2dc3084e9e469c8acee0ced2c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16837
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Fix a defect to access a NULL variable

If OICMalloc fails, mediatorDevId gets to be NULL, which causes a crash
in calling getDeviceID API with mediatorDevId.

Change-Id: Ie59211187e6be896f0f4d0387884092812521a84
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16905
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add a log message for better understanding in OT

Change-Id: I8409ae00196bcfd0ead8118cb21e38c51f8d4c07
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16759
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

tizen: Add trace api for using ttrace
android: Add trace api for using ftrace

This patch includes implementation of alternative trace api set for android.
Since Atrace (android trace) api is available at android level 23,
we implement trace api by using ftrace directly.

Change-Id: I5370a190f340816934b77a83159c7c7ba9c8a17e
Signed-off-by: Eunji, Lee <eunjieji.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16467
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

provide setConfigure API related BT including EDR, BLE by cautil.

It can be set Adv Flag that check whether start Adv
in initialize step or not.
and It will resolve battery consumption issue.

Change-Id: I09791c1d8ca71373c36309150dbc97c5031a8bc2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16491
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Enable discovery in Zigbee plugin in IoTivity's Plugin Interface module.

The PISetup() API needed to be called. It was never being called from the
sample application. Therefore no one knew how to perform the discovery.
This should unblock anyone looking to use this plugin.

Change-Id: Idcb269a48958ee3b262356a054c78ca6e0109315
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15165
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

service: [IOT-1562] Fix for unittest with SECURED at RE/RC

[KIM JungYong]
When IoTivity was built with SECURED and TEST,
some of test case at RE and RC occurring crash.
because RE and RC has not set the precondition of security.

In this patch, added the security flow and persistence storage files at RE.
related security test case is disabled at RC.

[Philippe Coval]
Ported from 1.2-rel to master branch

Change-Id: I4094bd01cba84d395c408a56f4c57d4ebcb45b44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1562
Reviewed-on: https://gerrit.iotivity.org/gerrit/14837
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16867
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Add ACLs to java SimpleClientService so example runs when SECURED=1

The ioc_svr_db_server ACL file is a copy of the ACL file from
resource/examples. This currently installs the .dat file from
the simpleserver sample.

Build:
scons BUILD_JAVA=1

Run example:
export LD_LIBRARY_PATH=<iotivity>/out/linux/x86_64/release/

java -cp java/examples-java/simpleclientserver/build/libs/simpleclientserver.jar:\
java/iotivity-linux/build/libs/iotivity-linux.jar \
org.iotivity.base.examples.SimpleClientServer

Change-Id: I02617ad852231a730cdf75f8a0b01c01ee0daeb2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16399
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>