summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-02-19[CONPRO-1561] Crash in memcpysubmit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5/20200224.011218submit/tizen_5.5/20200219.001653accepted/tizen/5.5/unified/wearable/hotfix/20201027.100634accepted/tizen/5.5/unified/20200224.123517tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5accepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unifiedsamanway1-1/+1
- 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>
2020-02-19[CONPRO-1560] iotivity crash in data receiver threadsamanway2-10/+35
- 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>
2020-02-19[CONPRO-1564] Doxm deadlockOleksii Beketov1-0/+8
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>
2020-02-19[CONPRO-1549] Create new method in RDClientSourav Bhuwalka2-0/+65
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>
2020-02-19[CONPRO-1555] oneconnect:Core / Application crashedsamanway1-3/+16
- 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>
2020-02-19Add uuid convertOleksii Beketov1-1/+8
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>
2020-01-30Remove unused source file in tizen bt_le_adaptersubmit/tizen_5.5/20200218.000609submit/tizen_5.5/20200217.025028submit/tizen_5.5/20200203.002145accepted/tizen/5.5/unified/20200204.042423DoHyun Pyun1-1665/+0
Change-Id: I8cf29c80bf61adcfba26c8a2acaa9a63f21b4460 Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
2020-01-30CONPRO-1551 Adding support for LE bi directional request.Kush2-3/+34
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>
2020-01-30Adding NULL check in CALEClientAddUuidsamanway1-3/+14
- 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>
2020-01-30Update mbedTLS sourcesOleksii Beketov715-17812/+82162
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>
2020-01-28Merge "Update snapshot_history.txt" into tizen_5.5Pyun DoHyun1-0/+6
2020-01-28Merge "[CONPRO-1552] Build fail for -Werror=implicit-function-declaration]" ↵Pyun DoHyun1-0/+2
into tizen_5.5
2020-01-28Update snapshot_history.txtSudipto1-0/+6
Change-Id: I6d58b5392e2ce3a698cfcaa468fe2e2bff5fa0eb Signed-off-by: Sudipto <sudipto.bal@samsung.com>
2020-01-28[CONPRO-1552] Build fail for -Werror=implicit-function-declaration]samanway1-0/+2
- 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>
2020-01-28[CONPRO-1552] Fixing lack of header guards in RDClient.hsamanway1-0/+5
- 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>
2020-01-17Merge "Update snapshot_history" into tizen_5.5submit/tizen_5.5/20200121.084903Pyun DoHyun1-0/+6
2020-01-17Update snapshot_historySudipto1-0/+6
Change-Id: Iaf49d04b13c0cb0876708e5a939f1329e88c57f8 Signed-off-by: Sudipto <sudipto.bal@samsung.com> (cherry picked from commit 6543d611cf2c3ae26b6aa1b9696d4cb8e4dd2926)
2020-01-17Iotivity crash on 502 Bad Gateway errorSourav Bhuwalka1-1/+1
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)
2020-01-15Update mbedTLSOleksii Beketov3-191/+404
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>
2020-01-12Merge "crash in NSConsumerMsgHandleThreadFunc" into tizen_5.5Pyun DoHyun1-0/+1
2020-01-12Merge "CONPRO-1542 Adding left out error codes conversion from EntityHandler ↵Pyun DoHyun1-0/+18
to OCStackResult" into tizen_5.5
2020-01-12Merge "New API for self ACL updating" into tizen_5.5Pyun DoHyun7-39/+205
2020-01-12Merge "Bug fix in set/unset adapter state change callback. (#640)" into ↵Pyun DoHyun5-14/+18
tizen_5.5
2020-01-12Merge "BLE Scan when GATT already connected." into tizen_5.5Pyun DoHyun1-18/+64
2020-01-12Merge "Fixing Iotivity crash in catcpserver" into tizen_5.5Pyun DoHyun2-9/+20
2020-01-12Merge "Adding retry logic for gatt connection for VD client" into tizen_5.5Pyun DoHyun1-21/+1
2020-01-12Merge "Deadlock after BLE connection error in caleserver_mcd.c" into tizen_5.5Pyun DoHyun1-0/+2
2020-01-12Merge "Enable GCOV Coverage & Logging in UT. (#628)" into tizen_5.5Pyun DoHyun7-3/+32
2020-01-06Fixing Iotivity crash in catcpserversamanway2-9/+20
- 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>
2020-01-06crash in NSConsumerMsgHandleThreadFuncSourav Bhuwalka1-0/+1
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>
2020-01-06CONPRO-1542 Adding left out error codes conversion from EntityHandler to ↵Kush1-0/+18
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>
2020-01-06New API for self ACL updatingIurii Metelytsia7-39/+205
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>
2020-01-06Bug fix in set/unset adapter state change callback. (#640)senthil.gs@samsung.com5-14/+18
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>
2020-01-06BLE Scan when GATT already connected.Kush1-18/+64
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>
2020-01-06Adding retry logic for gatt connection for VD clientsamanway1-21/+1
- 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>
2020-01-06Deadlock after BLE connection error in caleserver_mcd.cKush1-0/+2
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>
2020-01-06Enable GCOV Coverage & Logging in UT. (#628)senthil.gs@samsung.com7-3/+32
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>
2020-01-06Build fix for tizen when TARGET_TRANSPORT=BLEsamanway2-1/+4
- 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>
2019-11-28Merge branch 'tizen' into tizen_5.5submit/tizen_5.5/20191128.235213accepted/tizen/5.5/unified/20191203.011249DoHyun Pyun49-2234/+2348
2019-11-28Fix RE unit test case. (#632)submit/tizen/20191128.075235accepted/tizen/unified/20191201.221455senthil.gs@samsung.com2-14/+18
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>
2019-11-28Fix for crash at FindResourceByUri(). (#629)senthil.gs@samsung.com2-2/+3
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>
2019-11-28Avoiding code duplications in tizen BLE VD client files.samanway2-9/+80
- 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>
2019-11-28Split TCP Server Mutex into different fileKush4-115/+211
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>
2019-11-28QB_linux_SECURED build failedVitalii Irkha3-17/+43
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>
2019-11-28Split Android CaleClient in two different files. (#619)s.bhuwalka@samsung.com5-628/+729
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>
2019-11-28Split Routing Table into Gateway and Endpoint (#617)kush.agrawal@samsung.com5-244/+387
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>
2019-11-28Added changes for SVR DB Validity APIVitalii Irkha5-22/+52
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>
2019-11-28Removed duplicated code blocks (#615)kush.agrawal@samsung.com4-385/+113
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>
2019-11-28Draft Created API for SVR DB Integrity checkVitalii Irkha8-2/+359
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>
2019-11-28Android QuickBuild fix.Senthil Kumar G S5-4/+12
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 21:57:25 +0000