[CONPRO-1561] Crash in memcpy

- In Caremotehandler.c, function CACloneInfo was copying token into buffer in vulnurable way
- Fixed it appending NULL in destination string

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

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

[CONPRO-1560] iotivity crash in data receiver thread

- In function CADropSecondMessage(), an input argument pointer NULL check was missing, added the same
- In function CAGetInfoFromPDU(), 512 bytes memory was getting assingned from stack, which may fail in case stack overflow.
Hence allocated memory from heap. this fix is already in IoTivity 2.0-rel.

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

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

[CONPRO-1564] Doxm deadlock

Deadlock in case of not supported oxm method fixed

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

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

[CONPRO-1549] Create new method in RDClient

Added new (publishAllResourceToRD) to publish resources to resource-
directory.Dont include virtual resources /oic/p and /oic/d to resourceHandles
argument of this API.This API internally appends the two virtual resources.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/655
(cherry-picked from 3f75969eec27bc8b6264de42faf01cf811de5037)

Change-Id: I3a6877d885d8c1537b2d767d06f8e1e1e9acd8cd
Signed-off-by: Sourav Bhuwalka <s.bhuwalka@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

[CONPRO-1555] oneconnect:Core / Application crashed

- In function NSConsumerMsgPushThreadFunc for locking 'msgHandleThread', there could be a
possibility of destruction of the thread running NSConsumerMsgHandleThreadFunc function
and destruction of the mutex as well at the time of locking it
- Hence handled this critical mutex with a global lock

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/657
(cherry-picked from 5289e48a0aa9ce007d44cd443dd73cc8f509fcee)

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

Add uuid convert

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/661
(cherry-picked from 43c552c67605b0e6a5980d85a897673233aff370)

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

Remove unused source file in tizen bt_le_adapter

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

CONPRO-1551 Adding support for LE bi directional request.

Issue : Currently Tizen LE Server only supports sending response
        and LE Client supports sending request and response for response.
        But in some scenarios if server tries to send request using same BLE
        connection, then that is not possible.

Solution: This patch will allow LE server to send Request using same BLE connection

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

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

Adding NULL check in CALEClientAddUuid

- NULL check was missed before passing string to strcmp()
- Hence, added NULL check

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

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

Update mbedTLS sources

Include updated in 28c4c80e (PR#609) mbedTLS source codes

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/656
(cherry-picked from 9592ed1c8f26b8ddb8cc44ac897a42f4a9209c5a)

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

Merge "Update snapshot_history.txt" into tizen_5.5

Merge "[CONPRO-1552] Build fail for -Werror=implicit-function-declaration]" into tizen_5.5

Update snapshot_history.txt

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

[CONPRO-1552] Build fail for -Werror=implicit-function-declaration]

- caadapterutils.h was not included in caipnwmonitor_common.c, hence added
- oic_malloc.c was not included in caipnwmonitor_common.c, hence added

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

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

[CONPRO-1552] Fixing lack of header guards in RDClient.h

- Added header guard in RDClient.h

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

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

Merge "Update snapshot_history" into tizen_5.5

Update snapshot_history

Change-Id: Iaf49d04b13c0cb0876708e5a939f1329e88c57f8
Signed-off-by: Sudipto <sudipto.bal@samsung.com>
(cherry picked from commit 6543d611cf2c3ae26b6aa1b9696d4cb8e4dd2926)

Iotivity crash on 502 Bad Gateway error

Initialising dimensions with 0 which was not done earlier
In case OCRepPayloadGetPropObjectArray function fails links
become NULL but since dimensions is not initailised with 0 it will
have some garbage value and will enter in loop and crash will occur

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

Change-Id: I9f156c9f3459ad756d3fde2759aa518d48380d54
Signed-off-by: Sudipto <sudipto.bal@samsung.com>
(cherry picked from commit 176c9ded8f1aeb60bb2e6d9966d7b4253c1cd033)

Update mbedTLS

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

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

Merge "crash in NSConsumerMsgHandleThreadFunc" into tizen_5.5

Merge "CONPRO-1542 Adding left out error codes conversion from EntityHandler to OCStackResult" into tizen_5.5

Merge "New API for self ACL updating" into tizen_5.5

Merge "Bug fix in set/unset adapter state change callback. (#640)" into tizen_5.5

Merge "BLE Scan when GATT already connected." into tizen_5.5

Merge "Fixing Iotivity crash in catcpserver" into tizen_5.5

Merge "Adding retry logic for gatt connection for VD client" into tizen_5.5

Merge "Deadlock after BLE connection error in caleserver_mcd.c" into tizen_5.5

Merge "Enable GCOV Coverage & Logging in UT. (#628)" into tizen_5.5

Fixing Iotivity crash in catcpserver

- Memory was being freed in function CADisconnectTCPSession without checking NULL condition
- This caused crash in IoTivity, fix is patched
- Also, a potential dangling pointer issue fized in uqeue.c

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

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

crash in NSConsumerMsgHandleThreadFunc

Before checking size of queue adding a check to see
queue is null or not

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

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

CONPRO-1542 Adding left out error codes conversion from EntityHandler to OCStackResult

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

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

New API for self ACL updating

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

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

Bug fix in set/unset adapter state change callback. (#640)

A bug was introduced in a recent patch to reduce code complexity,
This patch fixes the issue.

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

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

BLE Scan when GATT already connected.

If GATT is already connected by some other service
then Iotivity should use that GATT connection only.

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

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

Adding retry logic for gatt connection for VD client

- There was an issue initially reported for LUX, that Gatt Client disconnects just after it connects
- Connection retry logic was added as a fix in the commit 25ef240cc9978fa5945a26e72a8e763c436960db
- Again the same issue was reported for TV
- So adding the same fix in VD client

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

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

Deadlock after BLE connection error in caleserver_mcd.c

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

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

Enable GCOV Coverage & Logging in UT. (#628)

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

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

Build fix for tizen when TARGET_TRANSPORT=BLE

- Commit 63d798167fd9695cb278bc3c228864163dde5292 in IoTivity 1.2-rel branch added 3 APIs which should build only for TCP adapter
- For this reason BLE build was being failed
- Corrected that with adding Flag

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

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

Merge branch 'tizen' into tizen_5.5

Fix RE unit test case. (#632)

Unit test case which was failing:
RemoteResourceObjectTest.IsCachingReturnsTrueAfterStartCaching()

Reason for failure: Shared pointer reference for RCSRemoteResourceObject
was not released. Due to which, there was a problem in tearing down the test case.

This PR has the fix.
Additionally, application will receive caching callback
from RCSRemoteResourceObject only if remote resource object is available.

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

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

Fix for crash at FindResourceByUri(). (#629)

NULL check was not there before accessing "pointer->uri" due to which segmentation fault has occurred.
So NULL check is done at two different places.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/629
(cherry-picked from 727d5f58b67d83d3c82452b0afb7781bba59ec81)

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

Avoiding code duplications in tizen BLE VD client files.

- Caleclient.c and Caleclient_vd.c two files had duplicate code
- Hence merged them into a single one
- Additionally, Sconscript is modified to enable build flag for VD

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

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

Split TCP Server Mutex into different file

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

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

QB_linux_SECURED build failed

Fixed issues for SVR DB Validity APIs

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

Change-Id: I6c1826f501230414a8c04596ede23ff01a1651d9
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Split Android CaleClient in two different files. (#619)

caleclient.c is now divided into caleclient.c and caleclient_jni.h
Additionally caleclient_utils.h is also added

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/619
(cherry-picked from 6bb06b060dff697c20a13b638c6d6bbcd83a2360)

Change-Id: Ia1592b281ef64a293eb7075ea88bf03fd4db7228
Signed-off-by: sourav bhuwalka <s.bhuwalka@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Split Routing Table into Gateway and Endpoint (#617)

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

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

Added changes for SVR DB Validity API

Don't stop stack initialization process even if DVR DB corrupted

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

Change-Id: I0adf81f55a7a012730a792bac5e7f5b423190be7
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Removed duplicated code blocks (#615)

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/615
(cherry-picked from 1dd8501207e6c6865cf7bd0d5483003c4bad1ff7)

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

Draft Created API for SVR DB Integrity check

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

Change-Id: I6fe01f4de77a8e8f538666f8745b9b46cfd057fd
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Android QuickBuild fix.

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

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

Removing code duplication from Caleadapter.c (#606)

- Checking CAResult_t returning from different APIs called in Caleadapter.c was being checked multiple times
 - This was contributing in increasing code complexity
 - Replaced each block with a single macro

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

Change-Id: I54e7061743bdcf12acbe2bc201086b0e833db1f9
Signed-off-by: samanway-dey <samanway.dey@samsung.com>

Avoid CA IP NW monitor code duplications.

Code duplications in CA IP Network Monitor reported by Sonarqube
has been addressed in this patch.

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

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

Remove code duplication in easy-setup service.

Code duplications in easy-setup service reported by Sonarqube
has been addressed in this patch.

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

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

Fix process event life cycle

process event variable need to initialize before OCInit(), event need to
register after OCInit and also event variable should be freed after OCStop()

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/586
(cherry-picked from 3a00d744cac2e026b2b7b195b8b2984fd06ca049)

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

Change the header install path for c_common and logger

ttrace moudle installs "ttrace.h" header in /usr/include,
so conflict error is occured. To resolve this issue,
iotivity-dev changes the header install path.

[80s] [372/388] installing iotivity-devel-1.2.1-0
[80s] file /usr/include/trace.h from install of iotivity-devel-1.2.1-0.armv7l conflicts with file from package ttrace-devel-1.0.3-1.armv7l

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

Change the header install path for c_common and logger

ttrace moudle installs "ttrace.h" header in /usr/include,
so conflict error is occured. To resolve this issue,
iotivity-dev changes the header install path.

[80s] [372/388] installing iotivity-devel-1.2.1-0
[80s] file /usr/include/trace.h from install of iotivity-devel-1.2.1-0.armv7l conflicts with file from package ttrace-devel-1.0.3-1.armv7l

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

Merge branch 'tizen' into tizen_5.5

Change-Id: I4b938307646c13c4011edeed494fbe930d1ce3a1

Update snapshot_history

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

Added check resetSVRDB callback to NULL

Fixed possible NULL pointer dereferences

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

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

Static Analyzer Bug Fixes. (#603)

Patch contains fixes for the bugs reported by Sonarqube Tool.

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

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

Fix Werror=implicit-function-declaration

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

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

Added notification callback on reset SVR DB

Created API's for notifing when SVR DB is reset

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

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

Workaround for CONPRO-1516

Added APIs for setting device ID in reset profile

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

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

Added missing catch block for std::exception (#598)

* [CONPRO-1523]Added missing catch block for std::exception

This exception is thrown when thread execution fails

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/598/commits/2a57dc73fe7dc0d0c9fdf7b93ec3e4ac1974d9f2
(cherry-picked from 2a57dc73fe7dc0d0c9fdf7b93ec3e4ac1974d9f2)

Signed-off-by: Kush <kush.agrawal@samsung.com>
* Removed extra space

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

Replace API's for reverting all secure resources

Call ResetSecureResourceInPS() instead of RestoreDoxmToInitState() and RestorePstatToInitState()

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

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

Avoid adding elements to QueueingThread if it's stopped. (#596)

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

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 which might
result in race condition/unwanted behavior.

This will have a positive impact for CONPRO-1515 in which IP send thread was not stopped during OCStop() and new requests were getting added.

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

Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
* Indentation fix.

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

Revert "Add empty string check of uuid"

This reverts commit ca00c37c2f8583fb754d03ca37c716d7c1cd1401.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/597/commits/061901767e9f842a83fb304a0a7d3d79ffc738af
(cherry-picked from 061901767e9f842a83fb304a0a7d3d79ffc738af)

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

Added logging into IsRequestFromDevOwner() API

Added logging for CONPRO-1516 issue

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/592/commits/094b5ea90860840b4e0b7026ee6160d8c2866e8c
(cherry-picked from 094b5ea90860840b4e0b7026ee6160d8c2866e8c)

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

Fix OTM issue during DTLS handshake

Revert all secure resources after DTLS handshake error

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

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

Set error code to 0 for normal TCP disconnection.

g_lastErrorCode is set to 0 to indicate normal session disconnections(recv() returns 0).

Background;
"g_lastErrorCode" is being set as errno when send() returns -1 or recv() returns under 0.
For instance, in case of recv(),
    - normal TCP session disconnect happens when recv() returns 0 len.
    - abnormal TCP session disconnect happens when recv() returns under 0. ( "g_lastErrorCode" is set as errno. )
Let's guess this scenario,
    - abnormal TCP session disconnect => "g_lastErrorCode" is set as X => ...... => retry TCP session connect => ...... => normal TCP session disconnect
From above scenario, then, is "g_lastErrorCode" not changed to default value 0?
I think, it is needed to set "g_lastErrorCode" as default value 0 when normal TCP session connect/disconnect happens.

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

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

Added logging in CheckPermission() API

Allow to track valuable OTM parameters

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/592/commits/26549bd4237f6a4f8efa8d9a005adbf51d2de0db
(cherry-picked from 26549bd4237f6a4f8efa8d9a005adbf51d2de0db)

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

Add missing compile secure option in CXXFLAGS

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

Add missing compile secure option in CXXFLAGS

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

Update snapshot_history.txt

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

Set socket family for IPv4

Patch for [CONPRO-1509] https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/588 has a bug
due to which the following error comes in Tizen Platform.

"01-01 11:43:56.060+0900 E/OIC_CA_TCP_SERVER_1023(P 2022, T 2031): catcpserver.c:
CATCPCreateSocket(1029) > bind socket failed: Address family not supported by protocol"

Reason: Address family is not set.

This patch fixes the issue.

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

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

TCP Socket Bind API

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/593
https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/588/commits/1f7cb27e719bfd876fd0ff900747eeb3d7210d46
(cherry-picked from 1f7cb27e719bfd876fd0ff900747eeb3d7210d46)

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

Build fix for visual display files

- There was an undefined LOG TAG used in Caleclient_vd.c file
- Replaced that with another predefined TAG

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/591/commits/87dc9af44ba4e3cbf7ae87dcb5bb29434a6c672d
(cherry-picked from 87dc9af44ba4e3cbf7ae87dcb5bb29434a6c672d)

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

New APIs to configure TCP Socket Keep-Alive.

Added new APIs to enable TCP keep alive, set and unset configuration parameters.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/587/commits/731061249edabbf05b9e8cb4a35f7dfe41009183
(cherry-picked from 731061249edabbf05b9e8cb4a35f7dfe41009183)

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

Fix for SVACE Issues

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

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

Crash in Select

Fixing bug in counter of CAPollReturned in case of shutdownFds socket
for ipserver and also introducing sleep between each subsequent
poll system call whenever the system remains idle.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/583/commits/817a3e30d2c7f2fa6064cdfd13fc8a9294a5d956
(cherry-picked from 817a3e30d2c7f2fa6064cdfd13fc8a9294a5d956)

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

Remove the white space in caleadapter.c

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

Remove the white space in snapshot_history.txt

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

CONPRO-1467: Improve Reset

Enable complete SVR DB reset on OTM error.
Recently, only pstat and doxm resources has been reset.

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

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

Crash in select

When the system remains idle i.e. there is no exchange of data then
poll would be called repeatedly very fast.some of the fields/parameters
inside poll are not getting set/reset by kernel on calling repeatedly.
So applying a sleep whenever poll gets timed out.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/585
(cherry-picked from 4cc2d76d5835a4ccb9d7a7569376e8d0938db264)

Change-Id: I33dca282cdc9406d543b8f887bb8a5f576b7f4b3
Signed-off-by: sourav bhuwalka <s.bhuwalka@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Merge "Enable GATT server indication for Tizen Speaker" into tizen

Fix for SVACE defects

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

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

Crash at CADestroyDataSet()

Setting info->token to NULL after free to avoid double free

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/582
(cherry-picked from 3fb0338b52b04ee58f12bb46f27ef20cf12c2d47)

Change-Id: If6268f9ebb9965b84809c54d38b3b3826cf51830
Signed-off-by: sourav bhuwalka <s.bhuwalka@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Move CASetSecureEndpointUuid APIs

Since this API is used externally,
moved it to the cautil header instead of the security header.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/577
(cherry-picked from 991775c94943140fd72ee564f142aee55df058ac)

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

Enable GATT server indication for Tizen Speaker

Change-Id: I7511f1ab1d2b010e0caf353ee51ef8eea67e244c
Signed-off-by: Anupam Roy <anupam.r@samsung.com>

updated snapshot_history.txt

Change-Id: I52cad3afcfa36dbd1f8ab5f2ffbe116229a4873a
Signed-off-by: himanshu <h.himanshu@samsung.com>

Fix for destroying gatt client in case of error.

Client Handle was not destroyed.
Because of that from second time onwards client handle was not getting created.
MTU size was set to default and bt buffer overflow error was coming.

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

Change-Id: I65e5092c8b9c230b4394dd6239706b5f2d28fd36
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: himanshu <h.himanshu@samsung.com>

Remove a dependency of the deprecated wifi API

Wifi API deprecated, and wifi manager API is used in Tizen.
So remove the dependency and replace APIs to wifi manager.

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

Merge "Updated snapshot_history.txt" into tizen

Merge "[CONPRO-1483] Implementation of API for setting scanfilter UUIDs" into tizen

Merge "Enabling build of simpleclientblescan application" into tizen

Merge "SimpleClient Android Application change for BLE" into tizen

Merge "Adding Retry logic for LUX disconnection issue" into tizen

Merge "[CONPRO-1471]Adding logic for caching MTU in tizen LE Server" into tizen

Merge "Memory leak fixes" into tizen

Updated snapshot_history.txt

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