[CONPRO-1471]Adding logic for caching MTU in tizen LE Server (remaining files)

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/573/commits/6e689edd472e098a873b64549006d026e597c667
(cherry-picked from 6e689edd472e098a873b64549006d026e597c667)

Change-Id: Ib246a361c804b499d4269e38532033b7904a5abb
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Adding logic for caching MTU in tizen LE Server

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/573/commits/6e689edd472e098a873b64549006d026e597c667
(cherry-picked from 6e689edd472e098a873b64549006d026e597c667)

Change-Id: I8a7f8a5eee882894ac27cd98f501fe49345931ca
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Merge "Updated snapshot_history.txt" into tizen_5.0

Merge "[CONPRO-1483] Implementation of API for setting scanfilter UUIDs" into tizen_5.0

Merge "Enabling build of simpleclientblescan application" into tizen_5.0

Merge "SimpleClient Android Application change for BLE" into tizen_5.0

Merge "Adding Retry logic for LUX disconnection issue" into tizen_5.0

Updated snapshot_history.txt

Change-Id: I74821c7fb5c5b33d0a08752d5f7b4ca1593dd0b9
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

[CONPRO-1483] Implementation of API for setting scanfilter UUIDs

- Currently, IoTivity sets the custom UUIDs to set scanfilters for Android BLE client by hard coding UUIDs
- This patch implements CASetLEScanUuid API to set the UUIDs to add more scanfilters

Change-Id: I167bb7b7b24589e88d4b7c8120cea9b72a5918b1
Signed-off-by: samanway-dey <samanway.dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Enabling build of simpleclientblescan application

A new android application "simpleclientblescan" was added recently
in commit 6d7c44e1c073d74ff117a456007156214b310f1c - The new app is
for android BLE client side, which enables BLE scan in app, and it will
show other devices around - User can select one from the list of devices
shown by app, app will connect to it - In this commit enabling the build
of the application

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/576/commits/7aa9c33abad299afed842f192dad6ef1e5d8dbac
(cherry-picked from 7aa9c33abad299afed842f192dad6ef1e5d8dbac)

Change-Id: Iad103f1397efb0c59693cad19fa597c0a725f65b
Signed-off-by: samanway-dey <samanway.dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

SimpleClient Android Application change for BLE

This patch is to provide BLE scanning functionality in Android BLE client side.

- First application will start BLE scan for nearby devices.
- Then app will provide list of BLE devices which are advertising.
- Then user will select a device and app will internally connect to it.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/563/commits/6d7c44e1c073d74ff117a456007156214b310f1c
(cherry-picked from 6d7c44e1c073d74ff117a456007156214b310f1c)

Change-Id: I6efd7762ddb33c1e3dee2f2c225c8231d4381b93
Signed-off-by: samanway-dey <samanway.dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Adding Retry logic for LUX disconnection issue

 -Added retry logic for LUX disconnection issue
 -There is a mutex unlock placed under wrong nested block,
which will be corrected in a separate commit

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/530/commits/25ef240cc9978fa5945a26e72a8e763c436960db
(cherry-picked from 25ef240cc9978fa5945a26e72a8e763c436960db)

Change-Id: If2ff7023db999d4bf160501014af5ec559f5bd8d
Signed-off-by: Samanway Dey <samanway.dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Memory leak fixes

Memory leak fixes in sec. res. provider

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/e7985fedfadaa0fc1371c8a0fc376c9d85fafaac
(cherry-picked from e7985fedfadaa0fc1371c8a0fc376c9d85fafaac)

Change-Id: Iabb45f6c26ed1559314922e31871c0077522fb85
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

mbedTLS CVE fix

Added mitigations for CVE-2018-0497,
CVE-2018-0498, CVE-2018-0488, CVE-2018-0487

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/518
(cherry-picked from ac312d7f123f8a0c0992577efd3a2d55c73e93cd)

Change-Id: I8b0bd22bc5c5888e0cded89d6445d4c6e6ca1850
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Update snapshot_history.txt

Change-Id: Ifd8bfc18448df8eb7348a41fdc92b3cd88bf1edc
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Svace memory leak fixes

Fix memory leaks

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/12fafe1b6a94b3a7032bae5745143c246f79129f
(cherry-picked from 12fafe1b6a94b3a7032bae5745143c246f79129f)

Change-Id: I2015af65b4c865377db746e232842b4d52df1545
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Memleak fix

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/9ea7c80e82baee3f896d31f31397e8d6b92afa25
(cherry-picked from 9ea7c80e82baee3f896d31f31397e8d6b92afa25)

Change-Id: Id194ae5ee25c1fb48c4a177836dec2a138d0869f
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Delete client callback for error response.

After invoking application's callback from HandleCAErrorResponse(),
client callback is not removed from client callback list ('cbList').
This patch removes it.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/2aed3ca47526d7cb49e779ce3d4bab925738ed40
(cherry-picked from 2aed3ca47526d7cb49e779ce3d4bab925738ed40)

Change-Id: I4e1732a3b47ba2879e02ad91577bb21264c764ae
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Fix for android build failure.

Background:
Recently, an API was added to retrieve the some internal values in TCP socket.
This requirement was from VD and hence it was verified on Tizen platform.
PR(merged): https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/537

There is a build issue on android because <ifaddrs.h> which is used in the above patch
is not available in android-21.

Solution:
Made the corresponding API to be available only for Tizen platform.

Change-Id: Idd64911aee0f817353c3376127f53a5ac8efe650
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

svace fixes

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/dfdaf037df98fbd0c8b659fccdfe0384bb466547
(cherry-picked from dfdaf037df98fbd0c8b659fccdfe0384bb466547)

Change-Id: Ic0361d29c7bc8f0aa4708ec103728e968b430a42
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Svace issues fixed

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/8a9bc2e8d74f6dffab3719120c45f0f7725c1b85
(cherry-picked from 8a9bc2e8d74f6dffab3719120c45f0f7725c1b85)

Change-Id: Ib535052b5b934db1e16064b0e923994c7b3f7b68
Signed-off-by: Iurii Metelytsia <i.metelytsia@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Some svace issues fixed

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/215d4911bf4858bba1c8a5719cbe8516df6e7158
(cherry-picked from 215d4911bf4858bba1c8a5719cbe8516df6e7158)

Change-Id: I2e32b5b381de1c063dff9ef924a690e1113b2478
Signed-off-by: Iurii Metelytsia <i.metelytsia@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Changes in spec file for WITH_PROCESS_EVENT flag

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/3a2766a06675f675761f8f04340a48b3e541ec0b
(cherry-picked from 3a2766a06675f675761f8f04340a48b3e541ec0b)

Change-Id: Icbd20289b1fdea7da1c8074775702c09ab865e1f
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Observation without caching.

Added support to receive all observe notifications.

Background:-
RE ignores the observe notification if there is no change in the representation.
This patch introduces a default argument in"RCSRemoteResourceObject::startCaching" to let users
decide whether all notifications need to be reported or not.

API Usage:
startCaching(std::move(cb), CacheMode::OBSERVE_ONLY, CacheReport::REPORT_ALL);

Note: Existing functionalities/usages are not affected.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/378/commits/8be52525d302ef933fda2ca4032fbd716b40582b
(cherry-picked from 8be52525d302ef933fda2ca4032fbd716b40582b)

Change-Id: Ib96e91da07edcdeb9bcedd4cf733f7966bd83e50
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Implementation of Filtered Scan for BLE android client

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/550/commits/122fb3ee9a1ad66d5bbeeeeb6410f9f10e1977a6
(cherry-picked from 122fb3ee9a1ad66d5bbeeeeb6410f9f10e1977a6)

Change-Id: I537661ef606540fd36a8c352330ef831b96ed732
Signed-off-by: samanway-dey <samanway-dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Merge "Update snapshot info" into tizen_5.0

Update snapshot info

Change-Id: Ia1e559e398090e88087e394cf031aca4c60969ce
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Replace select with poll.

1. select has a limitation of 1024 file descriptors to be monitored.
2. Calling select() or FD_* macros with invalid file descriptor could
result in stack corruption.
3. Currently we don't validate the file descriptors which are passed to it.
Even if we add logic to validate, we cannot recreate the underlying socket
with file descriptor lesser than 1024.

Stack corruption:-
fd_set is an array of bits, of FD_SETSIZE elements.
A variable of fd_set is created in the stack segment.
FD_SET macro apparently doesn’t know about the FD_SETSIZE value,
so even if you pass a FD greater than 1024,
it will actually set to “1” the corresponding bit in the fd_set array of bits,
which actually is OUTSIDE the array. Thus, corrupting the stack.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/560/commits/842a27d1c6be3397687d7788d113f872308de2bc
(cherry-picked from 842a27d1c6be3397687d7788d113f872308de2bc)

Reference:
https://sigquit.wordpress.com/2009/12/24/stack-corruption-improper-use-of-fd_set/

Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Change-Id: Ie8f7e0b90c9a458ee82f247132c45ff82f2a37ae
Co-authored-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Merge "Update snapshot history" into tizen_5.0

Merge "CONPRO-1481 crash while fuzzing with nmap" into tizen_5.0

Merge "[CONPRO-1476] Fix memory leak in TCP server." into tizen_5.0

Merge "[CONPRO-1473] Fix for build error [-Werror=implicit-function-declaration]" into tizen_5.0

Merge "QR Code Random Pin CB" into tizen_5.0

Update snapshot history

Change-Id: I3d51e155908cb8f0449d05ac55ad6d55cbaf9a9a
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

CONPRO-1481 crash while fuzzing with nmap

Check dataLen before read data from TLS connection

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/7cc9764f1b6698759f76bbfa35d9d497e22b13f9
(cherry-picked from 7cc9764f1b6698759f76bbfa35d9d497e22b13f9)

Change-Id: I33e010519573155725e5f1986b60bdcacfa3db2b
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

[CONPRO-1476] Fix memory leak in TCP server.

On starting TCP server, CAReceiveHandler thread is created but it is not destroyed when it is stopped.
Though the thread stops asynchronously, its handle which is stored in the thread pool is not removed and destroyed during stop
which causes memory leak to persist till stack termination.

Note: Cherry-picked the patch from https://github.sec.samsung.net/SES/SmartThingsThing/commit/c1d8cf83510f988fb4f8bf0e6b72cb18f618d4ec
Reviewed & Verified on current 1.2-rel codebase.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/ced355b7c49a76966fe4961ef93f53e470543c76
(cherry-picked from ced355b7c49a76966fe4961ef93f53e470543c76)

Change-Id: I8eeff40b22b57cc75717f8df3e34d1fbb1388c12
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

[CONPRO-1473] Fix for build error [-Werror=implicit-function-declaration]

Cherry-picked code changes from
https://github.sec.samsung.net/SES/SmartThingsThing/commit/cb59d751fc93d9715a514d85c33ee41969f43886

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/6473747735b2339c92ce01ff58d7c0b9dcad343e
(cherry-picked from 6473747735b2339c92ce01ff58d7c0b9dcad343e)

Change-Id: Idb186e07ece03a6a13f44830be125bd7ce16a51a
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

QR Code Random Pin CB

Added an API to set preconfigured PIN code

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/553/commits/d5ebdbfdb3287aea754fc6a637ba771d6485004f
(cherry-picked from d5ebdbfdb3287aea754fc6a637ba771d6485004f)

Change-Id: I0d1ccdf352ddabe9bb57c59a15c9a5ac8eb6f189
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Map the error code of CAGenerateToken() to OCStackResult.

CAGenerateToken could fail for memory overflow or invalid token parameters.
Currently, from OCDoRequest(), we return OC_STACK_ERROR for all failure cases.

This commit maps the error code to OCStackResult.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/a7e9837b18e33dd536af97f5c9ad35417b9457b8
(cherry-picked from a7e9837b18e33dd536af97f5c9ad35417b9457b8)

Change-Id: Ib26555a13eba9e7d925b0eb1db13b4fc12f74c6f
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Make NS Consumer message handler thread as joinable thread.

Background:
Currently, NS Consumer message handler thread is a detached thread.
When stopping NS Consumer, we have to destroy thread handle and other resources of message handler thread.
We cannot destroy if message handler thread is running.
So before we destroy, we need to wait for the message handler thread to terminate.
pthread_join() is called internally. As it is on a detached thread, it is useless and it could result in undefined behavior.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/93e66a00acc08ce0c7a3fb217bfb2cc92f2a6c15
(cherry-picked from 93e66a00acc08ce0c7a3fb217bfb2cc92f2a6c15)

Change-Id: I43113a1d6ac0dcbba15a6b12032d71c5369e8b3b
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Merge "Update snapshot history" into tizen_5.0

Merge "Handle race condition and mutex issues." into tizen_5.0

Merge "Mutex Unlock Corrected" into tizen_5.0

Merge "Adding fix for Sonarqube major issues for IoTivity 1.2-rel" into tizen_5.0

Update snapshot history

Change-Id: I0c82b1cf489e0552444daff419d9c0b952dec738
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Handle race condition and mutex issues.

NSStopConsumer() results in crash at NSDestroyQueue().
As per the crash log, after consumer message handler thread (NSConsumerMsgHandleThreadFunc) comes to an end,
there seems to be a race condition between the thread which called NSStopConsumer() and another thread which calls NSConsumerMsgPushThreadFunc().
Both threads try to access the message queue. One enqueues and another dequeues which could result in undefined behaviour.
Handled it by checking the running status of message handler thread before enqueuing request.

Another issue in with improper access of "g_create_mutex" in NSThread.c.
There is a chance that NSThreadInit could initialize the same mutex multiple times.
And NSDestroyThreadHandle unlocks the mutex without locking it. (NSThreadInit & NSDestroyThreadHandle are called
from several threads and the way they access the mutex could result in undefined behavior).
As the usage and the main intention of the mutex is not clear, removed it.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/554/commits/93e66a00acc08ce0c7a3fb217bfb2cc92f2a6c15
(cherry-picked from 93e66a00acc08ce0c7a3fb217bfb2cc92f2a6c15)

Change-Id: Iaa11c9b9b0088d4626cc92f85bbb55fb69f417af
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Mutex Unlock Corrected

 - For tizen BLE caleclient.c file, in function CALEAdapterScanResultCb(),
g_LEServerListMutex was placed in a wrong nested block, as a result even if
g_LEServerListMutex was not locked in some case, ittas being unlocked following
crash in IoTivity stack.
 - Hence, corrected it

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/538/commits/4e49610943156f45e6b0e7c2a0a9783ba5c2b94b
(cherry-picked from 4e49610943156f45e6b0e7c2a0a9783ba5c2b94b)

Change-Id: I9d76583346029f46ef7ad7ded4c850ca1feb4b06
Signed-off-by: Samanway Dey <samanway.dey@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Adding fix for Sonarqube major issues for IoTivity 1.2-rel

     - Fixed Invalid number of character ')'s in caleadapter.c
     - Fixed Possible null pointer dereference in ccmessagehandler.c
     - Fixed double memory free condition JniNotificationConsumer.cpp
     - Fixed double memory free condition JniNotificationProvider.cpp

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/548/commits/222bbb7e84830c5a2ecc17332df1c60f2bcf3a71
(cherry-picked from 222bbb7e84830c5a2ecc17332df1c60f2bcf3a71)

Change-Id: I724ee387dfc932c0614b7e19bb289b85d0254106
Signed-off by: samanway <samanway@samanway.sa.corp.samsungelectronics.net>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

Throw exception for errors in EnrolleeSecurity::performOwnershipTransfer()

Current:
Returning ES_ERROR for all error cases doesn't let the caller know what went wrong,

Proposed:
Throw ESPlatformException with the actual OCStackResult for all error cases.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/551/commits/d7bf5d91b812d1cd3a62ab7d51e33d8101cf27a7
(cherry-picked from d7bf5d91b812d1cd3a62ab7d51e33d8101cf27a7)

Change-Id: I4b8f39a4dc749f2393908a02df68df251fded24c
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>

CA API to retrieve the some internal values in TCP socket

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/537/commits/cebbe139c44e3001a7a4ad4a09a80ceb2478ecbd
(cherry-picked from cebbe139c44e3001a7a4ad4a09a80ceb2478ecbd)

Change-Id: Ibb9139afc3e2da1b88288c1f6a14c8676b23adbf
Signed-off-by: Amit Singh <amit.s.r@samsung.com>
Signed-off-by: Kush Agrawal <kush.agrawal@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Updated snapshot(2018-07-25)

Change-Id: I35dc6e4f15eebc6543b3bf3f12e26c79700d776b
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Build support to generate gcov code coverage.

Build flag: COVERAGE_CHECKS
Supported mode: debug
Platform: linux

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/549/commits/7dc3dab0cb819a91a7bf56d31e39677b8ec5c640
(cherry-picked from 7dc3dab0cb819a91a7bf56d31e39677b8ec5c640)

Change-Id: I32e16780891f1e97b91a4c0f9589ef8f56c4a048
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Return accurate error codes for error cases.

1. Returning CA_MEMORY_ALLOC_FAILED instead of CA_STATUS_FAILED.
2. If request doesn't contain RequestURI/Proxy URI, then return OC_STACK_INVALID_URI.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/545/commits/a2e9bce4cc70b63f9a82cce82970167126794e9a
(cherry-picked from ac207215d4c4550ad89c9b72ab81b859a83a0c2b)

Change-Id: Ib5f2b05dbc621ee8cc70ae9760a70b44a8c476f8
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Crash in OCCreateResource

Added check for uri before strncmp

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/544/commits/ba1c2fd49c1fd4f519c64943656a5329cf36b0bd
(cherry-picked from ba1c2fd49c1fd4f519c64943656a5329cf36b0bd)

Change-Id: Ieddc1809174a1360a1bb82a6aeec580cb34e4755
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Fixed build issue with SECURED=0 option

Moved common APIs from secure definition section

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/543/commits/4612b9818aa6b21a8dc1e07b1b1522d69b1206e0
(cherry-picked from 4612b9818aa6b21a8dc1e07b1b1522d69b1206e0)

Change-Id: I47418a8488c774bb343a845d828f6a56999a20d7
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Init pstat->sm to NULL

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/542/commits/732215dde47f1ed69461f874707b38c98b518d08
(cherry-picked from 732215dde47f1ed69461f874707b38c98b518d08)

Change-Id: I6efcc7a268fa9027ac1b080ce865ef7cd4020372
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Add gPstat null check

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/541/commits/d070ff1e409154409db8bcb7528c0cb9fc7ed636
(cherry-picked from d070ff1e409154409db8bcb7528c0cb9fc7ed636)

Change-Id: I1c0a5295ebc2962132933335cfb33b578b3cad55
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

[CONPRO-1454]:[VD][DF190528-00531] Crash

resHandle is being freed twice once in DeleteClientCB and once
in OICFree(resHandle) in OCDoRequest in exit condition.
So freeing resHandle only if clientCB is NULL

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/532/commits/b63e8200da46aa3e5505288bcf284568798a6069
(cherry-picked from b63e8200da46aa3e5505288bcf284568798a6069)

Change-Id: I486cfb9038524292be6d311302719e36fce5aaa4
Signed-off-by: sourav bhuwalka <s.bhuwalka@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

OCRemoveDeviceWithUuid doesn't change owned device

API should call SRPResetDevice() inside

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/539/commits/1211889827f00390219402eef5576b85347b6750
(cherry-picked from 1211889827f00390219402eef5576b85347b6750)

Change-Id: If1dc94edcc340b49506a8c580324756708de4091
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Merge "Update snapshot_history with changes of CONPRO-1461" into tizen_5.0

Merge "RFNOP right reset" into tizen_5.0

Merge "Check devID for owned device" into tizen_5.0

Update snapshot_history with changes of CONPRO-1461

Change-Id: I93b886f9a23571440b9173f13a8e9d70693084e4
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

RFNOP right reset

Reset ACL, Cred, Doxm, Pstat in case of validation failed.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/528/commits/ae296ce2cccb6e14fe39575b62690b44b56c0d56
(cherry-picked from ae296ce2cccb6e14fe39575b62690b44b56c0d56)

Change-Id: I9f3d6f02e5b4d2c6c8b18c53ee25c535e9af2d62
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Check devID for owned device

devID should be the same for owned device.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/529/commits/3b966521b2c0ced20bacce722b741f998ad0391b
(cherry picked from 3b966521b2c0ced20bacce722b741f998ad0391b)

Change-Id: Icd13121c99faf0cfde92667a5d5fcaf902e0f205
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Tracking OTM state on client side

Tracking OTM state in DB, to allow only one client start OTM.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/531/commits/8d05749742ede4553ab9829fe747fc376672c274
(cherry picked from 8d05749742ede4553ab9829fe747fc376672c274)

Change-Id: Ic8d02209d8de41c5b6f9029daa2d55cd20661e67
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Update Snapshot(2019-06-27)

Change-Id: If755f04ec28c5c003897bd3e4bdaf460995bcce9
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Merge "Putting check guard if thread already destroyed" into tizen_5.0

Merge "Add CASetSecureEndpointUuid APIs" into tizen_5.0

Validate device state for RFNOP

Added more conditions before device set state to RFNOP

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/526/commits/09d560036053995d8bd1dee875d696e8d1eb3701
(cherry picked from 09d560036053995d8bd1dee875d696e8d1eb3701)

Change-Id: I9fccbd932a1f4e56af692300e3121b39358f88c6
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Add CASetSecureEndpointUuid APIs

In the tls connection, the subject name in the certificate is set to uuid.
So need this api to set the identity with doxm or device uuid.
Give the endpoint and uuid, it finds the peer and sets identity to uuid.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/522/commits/cb5bfdca63fd5919005e69988363f0d951aa75d9
(cherry picked from cb5bfdca63fd5919005e69988363f0d951aa75d9)

Change-Id: I61b701e2fb95b2af61894431ece9c164e68f9c9e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Putting check guard if thread already destroyed

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/527/commits/ead7a6d1d2220a5ccbed468dc71c212fc784151e
(cherry picked from ead7a6d1d2220a5ccbed468dc71c212fc784151e)

Change-Id: Id229f4f85ba9b06bfca84f5991d245584cfdfa48
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: Sudipto Bal <sudipto.bal@samsung.com>

Set the queue handle to null before stop & destroy. (#525)

g_sendQueueHandle is set to NULL to prevent new requests from being enqueued.
It avoids a race condition which could occur when adding elements to QueueingThread if it's already stopped.

Race condition scenario:-
Background:-
-> If a thread has called CAQueueingThreadStop(), it signals the condition variable
to wake up the CAQueueingThreadBaseRoutine.

-> After signaling, it waits on the same condition variable
to wait for the completion of CAQueueingThreadBaseRoutine.

-> CAQueueingThreadBaseRoutine will finish its current task and signals the condition variable.

-> CAQueueingThreadStop should wake up upon signal and return back to caller.

Issue:-
-> CAQueueingThreadAddData also signals the condition variable which can wake up the thread that called CAQueueingThreadStop.
-> CAQueueingThreadStop returns back to caller assuming that the CAQueueingThreadBaseRoutine has stopped. But it could still be running.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/525
(cherry picked from eb98e19b49ab4d4475449f99f3a4a53607dbea01)

Change-Id: I5b22c034b30b00fc1ae7f08c37c278c29910345c
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

100% CPU usage by iotivity stack

Here before the max number of observers was 255 and when more
than 255 observers were there an infinite loop was running.
Increasing the number of observers and changing the logic so
that infinite loop should not be run when observer count reaches
max number of observers.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/3f9cb8af60cd5ed929ed876d95e82f2650309f9c
(cherry picked from 3f9cb8af60cd5ed929ed876d95e82f2650309f9c)

Change-Id: Ib0bb86817d2dbf8c2d5f5806cb49ffa2e002cd21
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fixing crash in ocrandom.c (#516)

* Fixing crash in ocrandom.c

-In function OCFillRandomMem() in ocrandom.c, location array was filled by incrementing the pointer. As a result,
the base pointer was pointing out the last byte of memory chunk instead of pointing the beginning of the array.

Signed-off-by: Samanway Dey <samanway.dey@samsung.com>
* Update ocrandom.c

Iterating till i > 1 for random swaps.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/516
(cherry picked from 643d922896dfeaf5f3d829009bd1d5b09654d93b)

Change-Id: I8031d4cf5cc22c682ff5c0df607c78e276923bcf
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix Build Error in cloudCommon.c

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/2ce4b758f6b751d564b25a8d9cc29ef1d36983f3
(cherry picked from 2ce4b758f6b751d564b25a8d9cc29ef1d36983f3)

Change-Id: I2e5642555a1f50e27fea73d939c05104c95a81e0
Signed-off-by: Jaehyun Cho <jaehyun3.cho@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fixing crash in OCFillRandomMem (#512)

- In commit ca4adaec79350756d58b124af22bece9c3ad186d there was
  a bug which causes crash in IoTivity, fixed that

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/c5711fd40dfbcaa3e47a6ac06ab08efd84ca66f2
(cherry picked from ca4adaec79350756d58b124af22bece9c3ad186d)

Change-Id: I65d5e1ce3cd2a51ca9d0dd60b10158c9c97bbef7
Signed-off-by: Samanway Dey <samanway.dey@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Adding more randomised token generation logic

- Added shuffling logic by each byte after generating token

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/c5711fd40dfbcaa3e47a6ac06ab08efd84ca66f2
(cherry picked from c5711fd40dfbcaa3e47a6ac06ab08efd84ca66f2)

Change-Id: I941397f2a5b6452299c9e80649d0de0efc4cdd7a
Signed-off-by: Samanway Dey <samanway.dey@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix for server request with duplicate token issue

- Adding return statement so that server doesn't process a request
  if another one with same token already exists in serverRequestList

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/c5711fd40dfbcaa3e47a6ac06ab08efd84ca66f2
(cherry picked from c5711fd40dfbcaa3e47a6ac06ab08efd84ca66f2)

Change-Id: Iee2618576c4bbce9904251276848b493c731b9bc
Signed-off-by: Samanway Dey <samanway.dey@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix crash in cpp wrapper.

When application is run with Both mode, in InProcClientWrapper start
logic for making procession thread is not executed. But, when stop
application, thread join processing and event free logic is executed
regardless mode. So I moved that logic into mode check statement. This
can make that logic is executed only mode is client.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/b5c0bd60cef0c305dfb07239cbfbd3529a39afec
(cherry picked from b5c0bd60cef0c305dfb07239cbfbd3529a39afec)

Change-Id: I713f0019051f4970d6122e458186795fd070112e
Signed-off-by: Jaehyun Cho <jaehyun3.cho@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Adjust server request handling

[Model] IoTivity
[BinType] AP
[Customer] IoT-Core

[Issue#] CONPRO-1398
[Request] Robert Chudek / r.chudek
[Occurrence Version] n/a

[Problem] IoT-Core needs some additional server request handling.
[Cause & Measure] n/a
[Checking Method] n/a

[Team] IoT Connection
[Developer] Robert Chudek / r.chudek
[Solution company] Samsung
[Change Type] adjustment

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/735a165c3239cfc5e0b01cd2ef1b5843321d3edb
(cherry picked from 735a165c3239cfc5e0b01cd2ef1b5843321d3edb)

Change-Id: If183e682dd165c64830d71f70d74eb15a5bb82ab
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Remove securevirtualresourcetypes.h from ocpayload

OicSecKey_t is used to set/get Payload data. ocpyalod.h do not
need to use securevirtualresourcetypes.h file directly. that header
is moved to implement file and removed from ocpayload header.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/546fc54a4fea6ffb1b52d5dbbf88e2b784bebc2b
(cherry picked from 546fc54a4fea6ffb1b52d5dbbf88e2b784bebc2b)

Change-Id: I520f507624e99d5b0a3ea131f09c6d6f91dddc61
Signed-off-by: Jaehyun Cho <jaehyun3.cho@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix build error on gcc version 7.x

- Add missing standard library header
- Rebuild google test 1.7.0

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/5434c42da3c3d0deec5104aa022fce51e86660f1
(cherry picked from 5434c42da3c3d0deec5104aa022fce51e86660f1)

Change-Id: Ia416aedec5c338088066b75667cec80f745969dc
Signed-off-by: Daedong Park <daedong.park@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

BlockWiseTransfer Error

Issue : If packet is already received , then it was giving error.

Fix : Skip processing packet if it was received once. So after receving packet which was already received earlier, it will still wait for next packet.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/9974e6582da652f59b474e37027a46737efbac71
(cherry picked from 9974e6582da652f59b474e37027a46737efbac71)

Change-Id: I20889dc55a58665bc5507d1e2e2e39bb72f65b91
Signed-off-by: kush.agrawal <kush.agrawal@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fixed acl update issues

When update aclresource then if using payload
with not fixed lenght of rt list, occur error.
And if an empty rel is received,
it will be updated to the garbage value.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/35dc2c8878f87c7f9d4313102c1676cf13480d8e
(cherry picked from 35dc2c8878f87c7f9d4313102c1676cf13480d8e)

Change-Id: I1ecd9eb2e23c1c2c2e3a752585b73b62d3b24247
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Revert "Avoid adding elements to QueueingThread if it's already stopped."

This reverts commit faddbd1d266d8d5a6f4947779247cd7fa91db84a.

Change-Id: I332eec53216157ebf32dd7a1a754e17c31cef26b

Avoid adding elements to QueueingThread if it's already stopped.

Backgraund:-
-> If a thread has called CAQueueingThreadStop(), it signals the condition variable
to wake up the CAQueueingThreadBaseRoutine.

-> After signaling, it waits on the same condition variable
to wait for the completion of CAQueueingThreadBaseRoutine.

-> CAQueueingThreadBaseRoutine will finish its current task and signals the condition variable.

-> CAQueueingThreadStop should wake up upon signal and return back to caller.

Issue:-
-> CAQueueingThreadAddData also signals the condition variable which can wake up the thread that called CAQueueingThreadStop.
-> CAQueueingThreadStop returns back to caller assuming that the CAQueueingThreadBaseRoutine has stopped. But it could still be running.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/475
(cherry picked from 069d45ab60a7cd90d451aea4fdcf9d03dda421de)

Change-Id: Ib64d83a2560f31d44cb33148eba4f8b4e9a1289e
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Default OTM select CB

Default OTM select callback introduced

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/469
(cherry picked from 051a32dd63c54a309ff698d9143e9cb8a9733a3c

Change-Id: I5f437da5c654d763c7c467e7ce11a39efbc67e19
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Algorithm for obtaining uuid from TLS data changed

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/487
(cherry picked from d42e96b2cea21f6c5ffa623d3a89f88789fdc260

Change-Id: I533bda62a54e3bad053764aaa99ac564b32e947e
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Disable auto-discovery of NSProvider over TCP.

For disabling auto-discovery, DISABLE_AUTO_TCP_NSPROVIDER_DISCOVERY flag should be set to 1
in scons build command.

Background:-
For TCP Connected events, NS Consumer automatically discovers initiates the discovery
of NS Provider. Due to which, there is a problem which occurs when app perform sign-in
and there is no TCP connection, then connection will be established first.
NS Consumer will then receive the TCP connected event and initiate NS Provider discovery.
Even before sign-in, upon receiving the NS Provider discovery closes the connection as it is
in the process of sign-in.

This patch addresses the problem by disabling auto-discovery of NSProvider over TCP
for TCP connected events.

As auto discovery is disabled, application should explicitly perform discovery by calling
"NSConsumerEnableRemoteService" API (strictly after sign-in).

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/488
(cherry picked from 8edd5e6a62a3d3892871efc9f4fb1f7f4b32fd9b)

Change-Id: I41910070ad8c60c64aa8fa4567f98d98690965a4
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix for crash in BLE receive thread.

Synchronizing access to client and server senderinfo as there are
chances of data receive handler may be acting on deleted SenderInfo
data when connection is closed. When connection closed, all senderInfo
for that connection are cleared in another thread.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/69383ab5a059d7dd114c69d5d5ff5371b5946c98
(cherry picked from 69383ab5a059d7dd114c69d5d5ff5371b5946c98)

Change-Id: Ibc495dba0143eef908eaa35a0173dde77288d4be
Signed-off-by: Harish Kumara M <h.marappa@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Update Snapshot(2019-03-21)

Change-Id: I3f24c2a727c70bb608b70748a75653aca41482fc
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Parse UUID in parentheses

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/474
(cherry picked from c7dc17bd0571265e187e73148b8b7ab153b3f1ff)

Change-Id: Ic1509d9164c80d8cd9b10f0404db61b52772c48b
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Adding changes in octhread related to Process Event

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/483
(cherry picked from a6f36988f0f0206b26837f98061e594a74dd5990)

Change-Id: Ic4b846bfc46734a7ce32d193318c85afdd7d49e9
Signed-off-by: kush.agrawal <kush.agrawal@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Make OCProcessEvent method.

OCProcess() need to poll periodically to check if any
work to process. This can be burden in some cases.
OCProcessEvent can get wake-up time using out parameter.
So we can use timed_wait not polling every periodic seconds.
To wake up for handling any receive event, we need to register
oc_event and this will send a signal to waited one.

Following patches are taken frm 2.0-rel branch :

1. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/385
2. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/393
3. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/401
4. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/431
5. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/450
6. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/470

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/479
(cherry picked from 7ced5d4ee1b0fc3ee3cf0f4478f8df085b540b8e)

Change-Id: I27d1e17dcf21c5a45a7ff4a8b1a988b5c5edaf0a
Signed-off-by: kush.agrawal <kush.agrawal@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix the i586 build error for tizen 5.5's dlog format

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/462
(cherry picked from 0bb13996ff595f59e1a0f7547a67dc447390cb8b)

Change-Id: I00cd7eda4b627a3a5fa7e5adb907e7ca0ae479bf
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Fix the build error for tizen 5.5's dlog format

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/460
(cherry picked from 2d37162b292d4feb28339626604c19a365ce0e1e)

Change-Id: Ic4a8642d74aa146055b00cd9f9f338b2e6813f1d
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Hiding Privacy Logs for LUX

Changing INFO level private log to INFO_PRIVATE level
for LUX PRA.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/433
(cherry picked from b1e404691b0293404dcc4bd51c94ea029f885a87)

Change-Id: I91a33553988de53d228c0e6b9179d212c1e87b4f
Signed-off-by: samanway-dey <samanway-dey@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Update catcpserver.c

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/40206f09f18e1d2f01efe3f449a24f69703e7718
(cherry picked from 40206f09f18e1d2f01efe3f449a24f69703e7718)

Change-Id: I28bf6c8d266ccd4334aea89f58431a704625c588
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

ioTivity [BinType] AP [Customer] iot-core

[Issue#] CONPRO-1393
[Request] SRPOL
[Occurrence Version] n/a

[Problem] Build failed for platform others than Tizen
[Cause & Measure] Tizen specific code has not been commented out
[Checking Method] Build IoTivity

[Team] IoT Connection
[Developer] Michał Bonio
[Solution company] Samsung
[Change Type] Fix

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/1eeeedf56e0f1f962065896107ff21ba786bf6b7
(cherry picked from 1eeeedf56e0f1f962065896107ff21ba786bf6b7)

Change-Id: I7f3d32b2dcaeea769d7e249d3e0a6861812414f2
Signed-off-by: Michał Bonio <m.bonio@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>