platform/upstream/iotivity.git
6 years agoReplace tizen BLE internal APIs with public 24/176624/1
Veeraj Khokale [Thu, 12 Apr 2018 11:07:33 +0000 (16:37 +0530)]
Replace tizen BLE internal APIs with public

Tizen 4.0 build fails in case BLE internal API's are used,
therefore replace them with public API's. All changes are
made under the preprocess define TIZEN_4

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

Change-Id: I6b5f9e67209e70bd654db4182c5ef70220792459
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoFix Asan build errors (#281) 91/176391/1 accepted/tizen/unified/20180420.081822 submit/tizen/20180419.060512
dh79.pyun@samsung.com [Tue, 17 Apr 2018 06:31:54 +0000 (15:31 +0900)]
Fix Asan build errors (#281)

Remove duplicate variables
multiple definition of `g_ESEasySetupResource'
multiple definition of `g_ESDevConfResource'
multiple definition of `g_ESCoapCloudConfResource'
multiple definition of `g_ESWiFiConfResource'

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/281
(cherry picked from commit 0cbbcfa65ff14d751dd1193f75b7c20269e26991)

Change-Id: If5f4a7d87e95350d70187cb21e070c5193130487
Signed-off-by: Oleg Ogurtsov <o.ogurtsov@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
6 years ago[CONPRO-1269] Creating socket everytime when network bearer changes 71/176271/1
Kush [Tue, 10 Apr 2018 07:14:19 +0000 (12:44 +0530)]
[CONPRO-1269] Creating socket everytime when network bearer changes

Socket was created only once but changed the logic for creating on every network change

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

Change-Id: Iaeabe733b6b8728ae74b1903d49c9596dcf021e8
Signed-off-by: Kush <kush.agrawal@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoUpdate Snapshot(2018-04-12) 18/175818/1
Amit KS [Thu, 12 Apr 2018 12:38:42 +0000 (18:08 +0530)]
Update Snapshot(2018-04-12)

Change-Id: I34509db28a4ab393675b6783b4a011f72989022f
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoCrash in OCProcessPresence() 17/175817/1
Veeraj Khokale [Fri, 6 Apr 2018 09:03:12 +0000 (14:33 +0530)]
Crash in OCProcessPresence()

1. Set presence to NULL incase allocation of timeout
array fails. This ensures that OCProcessPresence does
not process this cbNode, thereby preventing possible
NULL dereference of timeout.
2. Do not send request if timeout has reached/exceeded
the  PresenceTimeOutSize. This prevents a possible buffer
overrun in accessing the timeout array.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/279
(cherry picked from commit 22079af2bd0f22a80b98c3b17469c3b8ed601ede)

Change-Id: I9398fa4870a719eb0bbaa00102157e8487af5236
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoUpdate Snapshot(2018-04-05) 28/175028/1
Amit KS [Fri, 6 Apr 2018 05:15:26 +0000 (10:45 +0530)]
Update Snapshot(2018-04-05)

Change-Id: I24184456b2aff374d89f7bed23a6481cb1da9eee
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoUnset gatt callback in network monitor 27/175027/1
Veeraj Khokale [Tue, 3 Apr 2018 10:58:55 +0000 (16:28 +0530)]
Unset gatt callback in network monitor

Gatt connection state changed callback is set in the
network monitor (calenwmonitor.c) but is unset in the
gatt client (caleclient.c). Move this to network
monitor instead

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/278
(cherry picked from commit 961ff08710e7acd99277a335f7d9eeca2f68c16e)

Change-Id: I386499c475a241bca840610df823f84d1a74ee0d
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years ago"have choice" error of libmbedtls.so 17/174717/1 submit/tizen/20180404.002721
Vadym Riznyk [Fri, 30 Mar 2018 13:35:56 +0000 (16:35 +0300)]
"have choice" error of libmbedtls.so

delete +%{_libdir}/libmbedtls.so from iotivity-devel

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

Change-Id: I264692bb5ce86cdbcabb11f84b1634b9a1991f8a
Signed-off-by: Oleksiy Volkov <a.volkov@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
6 years agoUpdate Snapshot(2018-03-28) 30/174230/1
Amit KS [Thu, 29 Mar 2018 07:23:59 +0000 (12:53 +0530)]
Update Snapshot(2018-03-28)

Change-Id: I5b107aa308a184b0ee70eef14a2e31d840273b4d
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoSynchronized observe notification using mutex. 23/174223/1
Harry [Thu, 22 Mar 2018 13:43:09 +0000 (19:13 +0530)]
Synchronized observe notification using mutex.

As InProcClientWrapper class creates separate thread for every
obseve callback, There is a chance that more than one thread enter
ObserveCache object and trying to modify m_attributes. More over
same m_attributes is being passed out or RE layer by const reference,
so application is using same member object m_attributes. Mutex allows
only one thread to modify m_attributes.

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

Change-Id: Ibee9b9326e6d7a3be093bc387db70a7c8f9a626d
Signed-off-by: Harry <h.marappa@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years ago[CONPRO-1212] Removing invocation of lock_guard destructor. 19/174219/1
Harry [Wed, 31 Jan 2018 09:22:21 +0000 (14:52 +0530)]
[CONPRO-1212] Removing invocation of lock_guard destructor.

std::lock_guard follows RAII for std::mutex. Invoking
std::lock_guard<std::mutex>::~lock_guard() makes unlock
call twice on underlying mutex. As per the API documentation
calling unlock from thread which does not own lock results in
undefined behaviour.

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

Change-Id: I9ef2f3eed0e4989a7d73ad1ab40a3bae0a01a11c
Signed-off-by: Harry <h.marappa@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>
6 years agoUpdate Snapshot(2018-03-21) 30/173630/1 accepted/tizen/unified/20180323.134348 accepted/tizen/unified/20180326.075305 submit/tizen/20180323.050258 submit/tizen/20180325.234529
DoHyun Pyun [Thu, 22 Mar 2018 23:58:35 +0000 (08:58 +0900)]
Update Snapshot(2018-03-21)

Change-Id: I4e58e8e3e61558da4d42132b411fd54a086c8cec
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
6 years ago[CONPRO-1251]Updated typo error 72/173472/3
Kush [Tue, 20 Mar 2018 11:38:36 +0000 (17:08 +0530)]
[CONPRO-1251]Updated typo error

Changed interface declaration in ocobserve.h

Change-Id: If14e1de31caf31ed941c49570e37db8d3bf1a860
Signed-off-by: Kush <kush.agrawal@samsung.com>
6 years agoUpdate Snapshot(2018-03-07) 25/171825/1
Amit [Wed, 7 Mar 2018 11:38:24 +0000 (17:08 +0530)]
Update Snapshot(2018-03-07)

Change-Id: I79678d132217d7056f146a899e1768fb6d27e45a
Signed-off-by: Amit <amit.s12@samsung.com>
6 years agoUpdate Snapshot(2018-02-28) 20/171320/1
Amit [Thu, 1 Mar 2018 06:52:19 +0000 (12:22 +0530)]
Update Snapshot(2018-02-28)

Change-Id: Iac61820dccb00d3c775c0495468dcbb49722c47b
Signed-off-by: Amit <amit.s12@samsung.com>
6 years agoUpdate snapshot(2018-02-21) 44/170844/1
Amit [Thu, 22 Feb 2018 13:46:01 +0000 (19:16 +0530)]
Update snapshot(2018-02-21)

Change-Id: I0c6253b0fc7db9200b9c9281a5c1217e1a18dd9c
Signed-off-by: Amit <amit.s12@samsung.com>
6 years agoUpdate snapshot(2018-02-14) 87/170287/1
DoHyun Pyun [Sun, 18 Feb 2018 23:46:20 +0000 (08:46 +0900)]
Update snapshot(2018-02-14)

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

6 years agoUpdate snapshot(2018-02-07) 40/169640/2 accepted/tizen/unified/20180208.163721 submit/tizen/20180208.081254 submit/tizen/20180208.081917
Hongkuk, Son [Thu, 8 Feb 2018 04:37:16 +0000 (13:37 +0900)]
Update snapshot(2018-02-07)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
Change-Id: Id7dbc4ca15ab77968a5b2d8103a1bc045c76af04

6 years agoUpdate snapshot(2018-01-31) 48/168848/1 accepted/tizen/unified/20180201.080009 submit/tizen/20180201.042114
Hongkuk, Son [Wed, 31 Jan 2018 10:34:12 +0000 (19:34 +0900)]
Update snapshot(2018-01-31)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I9924efad707f22fb391e2474a441d3d8276d1649

6 years agoUpdate snapshot(2018-01-24) 65/168165/1 accepted/tizen/unified/20180130.144310 submit/tizen/20180125.015148
Hongkuk, Son [Wed, 24 Jan 2018 15:49:11 +0000 (00:49 +0900)]
Update snapshot(2018-01-24)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ibdaa01124bffca9512ee93aaa0045e5f91effd0c

6 years agoUpdate snapshot(2018-01-17) 89/167489/1 accepted/tizen/unified/20180118.142723 submit/tizen/20180118.072546
Hongkuk, Son [Thu, 18 Jan 2018 03:15:03 +0000 (12:15 +0900)]
Update snapshot(2018-01-17)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ifcbe9a53b46849c046ffc8d0276dc69f8a154465

6 years agoUpdate snapshot(2018-01-10) 78/166578/1 accepted/tizen/unified/20180111.074230 submit/tizen/20180111.020111
Hongkuk, Son [Thu, 11 Jan 2018 01:38:46 +0000 (10:38 +0900)]
Update snapshot(2018-01-10)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I28f0ac1b4501582c84236f8ef8d8212790cd9e70

6 years agoUpdate snapshot(2018-01-04) 76/165876/1 accepted/tizen/unified/20180108.062548 submit/tizen/20180105.072814
Hongkuk, Son [Thu, 4 Jan 2018 11:47:25 +0000 (20:47 +0900)]
Update snapshot(2018-01-04)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ifc34479a8f033e99bbe0740f3e4d281e723aec9a

6 years agoUpdate snapshot(2017-12-20) 16/164716/1 accepted/tizen/unified/20171221.071331 submit/tizen/20171221.013850
Hongkuk, Son [Wed, 20 Dec 2017 12:30:42 +0000 (21:30 +0900)]
Update snapshot(2017-12-20)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I4d948dca96a3ae784cc0278e96b09c49f809bd06

6 years agoUpdate snapshot(2017-12-14) 70/163970/1 accepted/tizen/unified/20171215.060615 submit/tizen/20171214.102437
Hongkuk, Son [Thu, 14 Dec 2017 09:01:34 +0000 (18:01 +0900)]
Update snapshot(2017-12-14)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Iace03beab45ea8839e72170fd9d9b7b6e31ab58d

6 years agoUpdate snapshot(2017-12-06) 61/163061/1 accepted/tizen/unified/20171211.061308 submit/tizen/20171208.075007
Hongkuk, Son [Thu, 7 Dec 2017 05:29:58 +0000 (14:29 +0900)]
Update snapshot(2017-12-06)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I8eea641086585cab78abc370067e76b0f4fe34b2

6 years agoUpdate snapshot(2017-11-29) 50/162250/1 accepted/tizen/unified/20171130.113340 submit/tizen/20171130.055456
Hongkuk, Son [Thu, 30 Nov 2017 02:03:56 +0000 (11:03 +0900)]
Update snapshot(2017-11-29)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Id4d682d07ae11ccff14f9548c930ce146df8cf85

6 years agoUpdate snapshot(2017-11-23) 31/161531/1 accepted/tizen/unified/20171124.064710 submit/tizen/20171124.015816
Hongkuk, Son [Fri, 24 Nov 2017 01:49:14 +0000 (10:49 +0900)]
Update snapshot(2017-11-23)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I4daa62ca37c2ef8e0a739f63a258022ccdc354d8

6 years agoUpdate snapshot(2017-11-14) 31/160231/1 accepted/tizen/unified/20171115.174050 submit/tizen/20171115.060233
Hongkuk, Son [Wed, 15 Nov 2017 02:34:20 +0000 (11:34 +0900)]
Update snapshot(2017-11-14)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ief7e3ae9c8c4e11ab1f7f82d05b3879fc5afc0ef

6 years agoUpdate snapshot(2017-11-08) 86/159486/1
Hongkuk, Son [Thu, 9 Nov 2017 07:16:19 +0000 (16:16 +0900)]
Update snapshot(2017-11-08)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I96da45cf94f6940c6ac37f57912fbfa61516630d

7 years agoUpdate snapshot(2017-11-02) 54/158754/1 accepted/tizen/unified/20171106.073102 submit/tizen/20171103.052424
Hongkuk, Son [Fri, 3 Nov 2017 01:17:44 +0000 (10:17 +0900)]
Update snapshot(2017-11-02)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I2a5a1b9b72b71b1979f136aadce4ac0534765641

7 years agoUpdate snapshot(2017-10-25) 93/158193/1
Hongkuk, Son [Mon, 30 Oct 2017 09:04:27 +0000 (18:04 +0900)]
Update snapshot(2017-10-25)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ib3354833ae4d27bcbcd5718358886e02e932299f

7 years agoUpdate snapshot(2017-10-11) 34/155134/1
Hongkuk, Son [Thu, 12 Oct 2017 06:41:29 +0000 (15:41 +0900)]
Update snapshot(2017-10-11)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ia16b9b063f1ca9f2734e865385d7a519c3d2f5bb

7 years agoUpdate snapshot(2017-10-04) 27/154427/1
Hongkuk, Son [Tue, 10 Oct 2017 07:47:00 +0000 (16:47 +0900)]
Update snapshot(2017-10-04)

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Idf480dc4361b14c8902e15f74ca253a55b2f3e1e

7 years agoreplace : iotivity -> iotivity-sec 10/153710/3 accepted/tizen/unified/20171010.063815 submit/tizen/20171010.021131
Hongkuk, Son [Fri, 29 Sep 2017 07:24:47 +0000 (16:24 +0900)]
replace : iotivity -> iotivity-sec

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I5096b7e6faeadd98d5ee48279b24cb9fbdb1f24f

7 years agoRemove unused pkg dependancy 40/136640/2 accepted/tizen/4.0/unified/20170816.011821 accepted/tizen/4.0/unified/20170816.014940 accepted/tizen/4.0/unified/20170828.222902 accepted/tizen/unified/20170710.154111 submit/tizen/20170707.013155 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0/20170828.100006 submit/tizen_4.0_unified/20170814.115522
Jooseok Park [Fri, 30 Jun 2017 11:52:25 +0000 (20:52 +0900)]
Remove unused pkg dependancy

Change-Id: I310c2e37d0a94c3c9cf3191b8162abc873ceb316

7 years agodelete wifi API and pkg config in tizen. 38/136638/2
jihwan.seo [Mon, 6 Feb 2017 02:19:26 +0000 (11:19 +0900)]
delete wifi API and pkg config in tizen.

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

Change-Id: I9a61d7d4d323fe83e988c792284179c099bc2855
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17079
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Conflicts:
resource/csdk/connectivity/build/tizen/scons/SConscript
resource/csdk/stack/samples/tizen/build/scons/SConscript

Change-Id: I401a44313a3a48fd7bfc5ca9c8519ec1186a8083

7 years ago[IOT-1643] Fix illegal memory access - Don't return local string 42/134142/1
George Nash [Thu, 1 Dec 2016 22:31:43 +0000 (14:31 -0800)]
[IOT-1643] Fix illegal memory access - Don't return local string

the std::string ret  is a local varaible and is destroyed when the
what() member function returns.

Put the return string into the m_whatMessage variable. Since
'what()' member function is a const function it can not modify the
member variable m_whatMessage so it is generated in the
ResourceInitException constructor.

Issue found using static analysis tool.

Change-Id: I907b984f35dee59b2f300afe6a640b15a26f020f
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15035
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoUpdate spec file (in tools) 28/128828/1 accepted/tizen/unified/20170511.173702 submit/tizen/20170511.133005 submit/tizen/20170511.133012 tizen_4.0.m1_release
Jooseok Park [Thu, 11 May 2017 13:16:00 +0000 (22:16 +0900)]
Update spec file (in tools)

Change-Id: I3840a6b3b10070df30e66ca0de8852d0ea76264e

7 years agoUpdate License 09/128809/1 submit/tizen/20170511.125231
Jooseok Park [Thu, 11 May 2017 11:30:13 +0000 (20:30 +0900)]
Update License

Change-Id: I47861f7f52f61ef1f5dbda201564f058560d3688

7 years agoIOT-1877 : start presence issue 61/118861/2 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20170314.173157 accepted/tizen/ivi/20170314.224217 accepted/tizen/mobile/20170314.224141 accepted/tizen/tv/20170314.224144 accepted/tizen/unified/20170315.014656 accepted/tizen/wearable/20170314.224157 submit/tizen/20170314.094744
ChaJiWon [Thu, 2 Mar 2017 12:06:00 +0000 (21:06 +0900)]
IOT-1877 : start presence issue

When called OCStartPresence() second, OCStartPresence() returns error.
Fixed presenceState variable to OC_PRESENCE_UNINITIALIZED.

Change-Id: I089c826f4105eb3aaf835a8feda4c10b848ebd5d
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17623
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 2f11e9592a7374ce28082a523b0c367a6d31baee)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17775

7 years agoMoved a requestId declaration in OCServerRequest 59/118859/1
hyuna0213.jo [Thu, 2 Feb 2017 07:48:37 +0000 (16:48 +0900)]
Moved a requestId declaration in OCServerRequest

we should not add attributes after payload as they get overwritten
when payload content gets copied over.

Change-Id: I0c8a430f92c2196d3f9c816e9ba9d16fd44d88e4
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17015
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFixed memory leak on OCSetDeviceInfo and CARetransmissionDestroy 25/114525/1 accepted/tizen/common/20170214.173627 accepted/tizen/ivi/20170214.225844 accepted/tizen/mobile/20170214.225749 accepted/tizen/tv/20170214.225811 accepted/tizen/unified/20170309.035854 accepted/tizen/wearable/20170214.225829 submit/tizen/20170214.012629 submit/tizen_unified/20170308.100413
jihwanseo [Fri, 10 Feb 2017 07:26:51 +0000 (16:26 +0900)]
Fixed memory leak on OCSetDeviceInfo and CARetransmissionDestroy

Change-Id: Ic53ae0759020fa26f5f70425d3dab09ff5e7d375
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17167
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix the easy-setup mediator SConscript 71/113471/1 accepted/tizen/common/20170209.122246 accepted/tizen/ivi/20170210.003759 accepted/tizen/mobile/20170210.003711 accepted/tizen/tv/20170210.003726 accepted/tizen/wearable/20170210.003742 submit/tizen/20170209.011845
Jooseok Park [Wed, 8 Feb 2017 00:42:34 +0000 (09:42 +0900)]
fix the easy-setup mediator SConscript

Change-Id: If484c27c7336608326af35f3e0aebeac4e4a580a

7 years agoFixed double free issue when destroying endpoint 51/113251/1
hyuna0213.jo [Thu, 19 Jan 2017 03:52:31 +0000 (12:52 +0900)]
Fixed double free issue when destroying endpoint

- after destroying memory, set NULL value to prevent double free
- add the usage of oc_mutex_lock() when block data is updated

Change-Id: I78d0d46e37333e099ec737ac4500a2f388d58c4e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agotizen: Enable CLOUD and ship ES lib (downstream) 85/112585/7
Philippe Coval [Wed, 1 Feb 2017 14:35:59 +0000 (15:35 +0100)]
tizen: Enable CLOUD and ship ES lib (downstream)

Sync with upstream's spec

Change-Id: I84ce3dd94e1a90f13f0ff875221ca50600000001
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/I84ce3dd94e1a90f13f0ff875221ca5061828618e
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: Enable CLOUD and ship ES lib 84/112584/6
Philippe Coval [Wed, 1 Feb 2017 14:15:31 +0000 (15:15 +0100)]
tizen: Enable CLOUD and ship ES lib

Change-Id: I84ce3dd94e1a90f13f0ff875221ca5061828618e
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/I84ce3dd94e1a90f13f0ff875221ca5061828618e
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16965
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Use mediator richsdk lib 83/112583/6
Philippe Coval [Wed, 1 Feb 2017 14:15:31 +0000 (15:15 +0100)]
tizen: Use mediator richsdk lib

Change-Id: Ib63db28697925b02349da82c5feabc1334a39ba2
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/Ib63db28697925b02349da82c5feabc1334a39ba2
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16963
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years ago[4.0] Unification: Remove Profile Build Dependency & Prepare 4.0 Build 53/112653/3
Geunsik Lim [Thu, 2 Feb 2017 06:15:37 +0000 (15:15 +0900)]
[4.0] Unification: Remove Profile Build Dependency & Prepare 4.0 Build

This is for Tizen 4.0.
 - Removed profile build dependency.
 - Prepare for Tizen 4.0 build.

a. Remove profile build dependency
 - This commit completely removes the build dependencies on Tizen profile.

b. Prepare for Tizen 4.0 build
 - We have assumed that Tizen 4.0 code is going to be more similar with 3.0
   than 2.0. Please do not rely on string '==' compare for version check.
   And, refer to the official macros that are defined in Project Config.
   https://build.tizen.org/project/prjconf?project=<project_name>

@To maintainer:
Please, keep a spec file syntax that was written at an official webpage.
https://docs.fedoraproject.org/ro/Fedora_Draft_Documentation/0.1/html/\
RPM_Guide/ch-specfile-syntax.html
First, if you want to use a comparison operator in %if, don't use
a double-quotes. Second, RPM macro does not support a floating-point
number for the comparison operator.

Change-Id: I8904a25e5e24f6e1bdbd460e434ad563695a3001
Signed-off-by: Geunsik Lim <geunsik.lim@samsung.com>
7 years agotizen: Use easy-setup mediator 19/110919/1
Philippe Coval [Wed, 18 Jan 2017 14:06:18 +0000 (15:06 +0100)]
tizen: Use easy-setup mediator

Change-Id: I2b0681b70218613c0df0d82e0f46fdc61668296e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agobuild: Install provisioning ESException.h 16/110916/1
Jihun Ha [Wed, 18 Jan 2017 08:28:59 +0000 (17:28 +0900)]
build: Install provisioning ESException.h

Add ESException.h to 'inc' folder and a list of install target headers

Change-Id: Ib0b7e7bbab9cf5d8f7cc0c69e223d966e4b055b0
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/16521/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agoeasy-setup: Rename header to EasySetup.hpp 15/110915/1
Philippe Coval [Tue, 17 Jan 2017 08:48:05 +0000 (09:48 +0100)]
easy-setup: Rename header to EasySetup.hpp

Prevent potential name clash on case insensitive filesystems:

./service/easy-setup/mediator/richsdk/inc/EasySetup.h
./service/easy-setup/enrollee/inc/easysetup.h

Mediator one is C++ so we rename it to .hpp

Change-Id: I6d784378b5065b162d06abb2338bf70e0147d864
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16479
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 98b92dae54a9244e1947937fcf7432ac38956659)
Origin: https://gerrit.iotivity.org/gerrit/#/c/16481/
pp

7 years agobuild: Ship provisionning headers 05/110905/1
Philippe Coval [Wed, 18 Jan 2017 12:03:56 +0000 (13:03 +0100)]
build: Ship provisionning headers

New headers should be installed if part of public API:

- OCProvisionningManager.hpp
- OCCloudProvisioning.hpp

Change-Id: I29a322f2dae9b0d978cdd05d4ca3ad71729d1923
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/16531/

7 years agofix the build error when appcliation build resource encapsulation 50/110550/1
Jooseok Park [Tue, 17 Jan 2017 04:16:25 +0000 (13:16 +0900)]
fix the build error when appcliation build resource encapsulation

 - add the missing header file in installed target header

Change-Id: I71b65d6df422bd758e543118c2580ac770213399
Signed-off-by: JooseokPark <jooseok.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16461
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agorevise the spec file for ES 45/110545/2
Jooseok Park [Tue, 17 Jan 2017 03:49:12 +0000 (12:49 +0900)]
revise the spec file for ES

 - tizen: avoid to duplicate headers
 - Rely on pkg-config instead.

Change-Id: I5944d59bb08d8aeeda617f0af5ba95ae9e76e9cc

7 years agotizen: avoid to duplicate headers 96/110496/2
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
tizen: avoid to duplicate headers

Rely on pkg-config instead.

Change-Id: Ieff754b33a21015a17fc9a8d107ee29f1376dfa1
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Add ES NS paths to pkg-config 95/110495/2
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
build: Add ES NS paths to pkg-config

Public easy-setup and notification headers,
are copied in 2 level depths directory.

Change-Id: I7c9fd3a4bd1143c5ea05e7902292af23cf5e8934
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Install easy-setup headers 94/110494/2
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
build: Install easy-setup headers

It look like project public headers
 are installed to 2 level depth
 subdirectories (service/$domain/*.h*)

Change-Id: Ia7a66caf5381d24b56f0c5ac1a91929eff9ba7d7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16445
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Install notification headers 93/110493/2
Philippe Coval [Mon, 16 Jan 2017 20:01:49 +0000 (21:01 +0100)]
build: Install notification headers

It look like project public headers
 are installed to 2 level depth
 subdirectories (service/$domain/*.h*)

Change-Id: I36ab613ff6aaf7d960e6ba1e94263f8cfdf7c559
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16443
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix the notification service SConscript 44/110544/1
Jooseok Park [Mon, 16 Jan 2017 07:53:23 +0000 (16:53 +0900)]
Fix the notification service SConscript

 - when application use the notification service, build error occurs.
 - i.e) /usr/include/service/notification/NSConsumerInterface.h:35:22: fatal error: NSCommon.h: No such file or directory
 - Although NSConsumerInterface.h includes NSCommon.h, NSCommon.h file is not installed in SConscript.
 - So, need to add NSCommon.h in installed header

Change-Id: I2f28f84504d68c5506c89513d74adcdf32d2bbfc
Signed-off-by: JooseokPark <jooseok.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16427
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit e4eca38246a40013530b7df74c1b369960c88897)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16459
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agomerge tizen_3.0 to tizen branch 29/109329/1 accepted/tizen/common/20170110.155003 accepted/tizen/ivi/20170110.081445 accepted/tizen/mobile/20170110.081323 accepted/tizen/tv/20170110.081348 accepted/tizen/wearable/20170110.081414 submit/tizen/20170110.045728
Jooseok Park [Tue, 20 Dec 2016 05:06:17 +0000 (14:06 +0900)]
merge tizen_3.0 to tizen branch

Change-Id: Ib7f30f0231385d4f6c2d2cee8ff430ad6ed6b6ac

7 years agotizen: Replace speedpython by python-accel 81/105681/2
Philippe Coval [Mon, 19 Dec 2016 09:23:47 +0000 (10:23 +0100)]
tizen: Replace speedpython by python-accel

Tizen toolchain provide same functionality with python-accel's macro

Also Chan Lee from Tizen toolchain project reported:
{
Speedpython macro sometimes cause some build problem

Speedpython macro is parsed when spec parsing time
and it includes other macro in its own.
(I mean, %{build_hostarch} macro)

And when the OBS project config updates,
OBS sometimes cannot sync-up the changes perfectly.

It this case, build error occurs when we use speedpython macro.

It seems OBS limitation but,
we can avoid this problem by using other macro
which provides same functionality.
}

Change-Id: I265220b5e1f2dcb1956ef546a799a94eb460dd88
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years ago[Tizen]change flag which used for detect ip changed 37/105537/1 accepted/tizen/3.0/common/20161219.113747 accepted/tizen/3.0/ivi/20161219.095709 accepted/tizen/3.0/mobile/20161219.091514 accepted/tizen/3.0/tv/20161219.095715 accepted/tizen/3.0/wearable/20161219.091122 submit/tizen_3.0/20161219.033311
bg.chun [Wed, 14 Dec 2016 08:41:26 +0000 (17:41 +0900)]
[Tizen]change flag which used for detect ip changed
change netlink interface flags to addr flags
which used for detect network IPv4/6 changed

Change-Id: I827db082879aafdc3e8bd688917180af09531ab2
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15595
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1671] Fixed base layer terminate logic 62/104962/1 accepted/tizen/3.0/common/20161215.164648 accepted/tizen/3.0/ivi/20161216.083348 accepted/tizen/3.0/mobile/20161216.083319 accepted/tizen/3.0/tv/20161216.083332 accepted/tizen/3.0/wearable/20161216.083338 submit/tizen_3.0/20161215.040308
hyuna0213.jo [Mon, 12 Dec 2016 12:02:51 +0000 (21:02 +0900)]
[IOT-1671] Fixed base layer terminate logic

- ObserverList should be removed before destroying ResourceList
to avoid the error of dangling pointer. because ResourceObserver
object includes a resource handle which is memory address allocated
when resource is created.
- Add function to unset network monitoring callback when OCStop()
is called.

bug: https://jira.iotivity.org/browse/IOT-1671
Change-Id: I8a367a24a2100c97bf612db26bc41db5f47f2feb
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15499
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix package install error 69/103269/2 accepted/tizen/3.0/common/20161209.160941 accepted/tizen/3.0/ivi/20161209.103525 accepted/tizen/3.0/mobile/20161209.103425 accepted/tizen/3.0/tv/20161209.103437 accepted/tizen/3.0/wearable/20161209.103456 submit/tizen/20161213.050408 submit/tizen_3.0/20161209.001010
Jooseok Park [Thu, 8 Dec 2016 01:24:17 +0000 (10:24 +0900)]
fix package install error

 - install error is caused by no manifest in the package (wrong path)
 - remove manifest redefinition

Change-Id: If5ef103231509addb50b5d62a59c27fc8692a2b4

7 years agotizen: use tag as base even if not in upstream branch 18/103118/1
Philippe Coval [Wed, 7 Dec 2016 08:44:15 +0000 (09:44 +0100)]
tizen: use tag as base even if not in upstream branch

Change-Id: I53e451092168b9469090b888c12e53ee118a0395
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: Adapt to support other buildsystem 24/102824/8
Philippe Coval [Tue, 6 Dec 2016 12:41:25 +0000 (13:41 +0100)]
tizen: Adapt to support other buildsystem

Some build system does not support .gbs.conf
so we rely on default packging folder

This change is use by other build systems (MCD auto-sync?)

Note, Any suggestion to align to gbs is welcome.

Change-Id: I59a9bc4d67a683dd22e7dbbb9aae67fb6ec5c570
Credit-to: Jooseok Park <jooseok.park@samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/102824/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: relocate all liboc*.so to resource subpackage 71/102871/4
Philippe Coval [Tue, 6 Dec 2016 14:40:54 +0000 (15:40 +0100)]
tizen: relocate all liboc*.so to resource subpackage

iotivity.pc bring those libs so they should come along.
This was observed while porting Tizen's iotcon to iotivity-1.2.1

Change-Id: I82e7121520c1a7ed8d79e7b85089bec2b0b5012b
Origin: https://gerrit.iotivity.org/gerrit/#/c/15195/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agobuild: Fix to also support SECURED=0 07/102807/6
Philippe Coval [Mon, 5 Dec 2016 16:07:21 +0000 (17:07 +0100)]
build: Fix to also support SECURED=0

Note, for later it would be nice to test booleans instead of strings.

Change-Id: I069d865c6e2cc6a80a812e60ab278af15b7eaa85
Origin: https://gerrit.iotivity.org/gerrit/#/c/15163/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: Ship more security headers if enabled 19/102819/5
Philippe Coval [Thu, 14 Jul 2016 22:45:28 +0000 (07:45 +0900)]
tizen: Ship more security headers if enabled

[youngman]
- Add header files related to security

[Philippe Coval]
- If built with security on, ships all headers or none
- To be used by iotcon
- Only ship them if usable (with security flag on)

Change-Id: I9c8edccddec5626119cb3adb39959437ab350413
Signed-off-by: youngman <yman.jung@samsung.com>
Credit-to: youngman <yman.jung@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/13047/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: Enable TCP 18/102818/5
Philippe Coval [Tue, 4 Oct 2016 08:37:48 +0000 (10:37 +0200)]
tizen: Enable TCP

Change-Id: I56b8abcea1a3397f546ef0b8edc42711ff62b9d8
Origin: https://gerrit.iotivity.org/gerrit/#/c/15193/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: Enable SECURED 17/102817/5
Philippe Coval [Wed, 19 Oct 2016 18:17:37 +0000 (20:17 +0200)]
tizen: Enable SECURED

Change-Id: Id88b113bc256a51f97f5d1772df323d7bf244bd7
Origin: https://gerrit.iotivity.org/gerrit/#/c/14675/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agombedtls: Apply OCF patch (20161125) 34/102834/4
Philippe Coval [Thu, 1 Sep 2016 19:53:16 +0000 (21:53 +0200)]
mbedtls: Apply OCF patch (20161125)

To provide TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256 feature.

It is strongly recommended to rely on scons instead,
 if not possible, this change workaround this.

For more details about building IoTivity please check:

https://wiki.iotivity.org/build

Bug: https://jira.iotivity.org/browse/IOT-820
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: I638ec0c0a45e855dcee711c8321039b7489d7e5a
Origin: https://gerrit.iotivity.org/gerrit/#/c/12429/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agombedtls: Update to mbedtls-2.4.0 15/102815/5
Philippe Coval [Tue, 22 Nov 2016 10:21:52 +0000 (11:21 +0100)]
mbedtls: Update to mbedtls-2.4.0

t is strongly recommended to rely on scons instead,
 if not possible, this change workaround this.

For more details about building IoTivity please check:
https://wiki.iotivity.org/build

Bug: https://jira.iotivity.org/browse/IOT-820
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: I29c0d7c6b0d1bb50b82e9bcbeba38cfe1daa9857
Origin: https://gerrit.iotivity.org/gerrit/#/c/14677/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agombedtls: Import mbedtls-2.3.0 14/102814/5
Philippe Coval [Thu, 1 Sep 2016 19:51:02 +0000 (21:51 +0200)]
mbedtls: Import mbedtls-2.3.0

It is strongly recommended to rely on scons instead,
 if not possible, this change workaround this.

For more details about building IoTivity please check:
https://wiki.iotivity.org/build

Bug: https://jira.iotivity.org/browse/IOT-820
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: I97e8f34408dde1c95bd0587cb74834df966d2463
Origin: https://gerrit.iotivity.org/gerrit/#/c/12423/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotinycbor: Update import to v0.4 13/102813/5
Philippe Coval [Thu, 17 Nov 2016 10:21:00 +0000 (11:21 +0100)]
tinycbor: Update import to v0.4

git "module" was converted to patch this way:

  git clone https://github.com/01org/tinycbor.git -b v0.4 extlibs/tinycbor/tinycbor
  rm -rf extlibs/tinycbor/tinycbor/.git
  git add -f  extlibs/tinycbor/tinycbor/
  git commit -sm 'tinycbor: Update import to v0.4' extlibs/tinycbor/tinycbor/

It is strongly recommended to rely on scons instead,
 if not possible, this change workaround this.

For more details about building IoTivity please check:
 https://wiki.iotivity.org/build

Change-Id: I5492732be93e2b0fdf5e1c3eabcdc949b420e4fb
Bug: https://jira.iotivity.org/browse/IOT-820
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Origin: https://gerrit.iotivity.org/gerrit/#/c/14679/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotinycbor: Update to v0.3.2 12/102812/5
Philippe Coval [Thu, 1 Sep 2016 15:11:20 +0000 (17:11 +0200)]
tinycbor: Update to v0.3.2

Needed for IoTivity 1.2.0 and later

It is strongly recommended to rely on scons instead,
 if not possible, this change workaround this.

For more details about building IoTivity please check:
https://wiki.iotivity.org/build

Bug: https://jira.iotivity.org/browse/IOT-820
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: I9b33b8dd7a97b48b6fd3157b1ef25dadb79f11e2
Origin: https://gerrit.iotivity.org/gerrit/#/c/12705/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotinycbor: Import v0.2.1 11/102811/5
Philippe Coval [Thu, 1 Sep 2016 10:04:08 +0000 (12:04 +0200)]
tinycbor: Import v0.2.1

Needed for Iotivity-1.1.1 and lower

It is strongly recommended to rely on scons instead,
 if not possible, this change workaround this.

For more details about building IoTivity please check:
https://wiki.iotivity.org/build

Bug: https://jira.iotivity.org/browse/IOT-820
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: I0a622b8c7c47cfc4ea7afd8a3cf82720a50618bd
Origin: https://gerrit.iotivity.org/gerrit/#/c/12703/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
7 years agotizen: Remove deprecated libresource_hosting.so 1.2.1 upstream/1.2.1
Philippe Coval [Thu, 1 Dec 2016 13:54:29 +0000 (14:54 +0100)]
tizen: Remove deprecated libresource_hosting.so

To be squashed into:
https://gerrit.iotivity.org/gerrit/15003

Change-Id: I512cc51a9ad53929a57d30034cb70f1d153789ea
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15029
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
7 years agoandroid: Fix resource_directory build issue
Philippe Coval [Fri, 2 Dec 2016 00:40:44 +0000 (01:40 +0100)]
android: Fix resource_directory build issue

Adding resource_directory to notification like in master branch,
 then this lib will be found by Android.mk,
 while building on jenkins:

  gradle build -bservice/resource-container/android/build.gradle \
   -PTARGET_ARCH=armeabi -PRELEASE=debug --stacktrace

  Android NDK: ERROR:jni/Android.mk:android-rd: \
   LOCAL_SRC_FILES points to a missing file

  Android NDK: Check that ibresource_directory.so \
   exists  or that its path is correct

https://build.iotivity.org/ci/job/iotivity-verify-android/3761/console

To be squashed into:
https://gerrit.iotivity.org/gerrit/15031

Change-Id: I18af0742fc4e76eda33bd89f721b8fef59f6f490
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15039
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1627][Android]resolve ipadapter memory leak issue
bg.chun [Thu, 1 Dec 2016 06:01:54 +0000 (15:01 +0900)]
[IOT-1627][Android]resolve ipadapter memory leak issue

On android ipadapter there is memory leak issue
since the function which used for free pointer
of structure does not free all pointer member

Change-Id: If44dd9dc7562f851fa3f38526830aa84e4b35491
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd links and rep in the response for the collection
Habib Virji [Wed, 30 Nov 2016 21:24:52 +0000 (21:24 +0000)]
Add links and rep in the response for the collection

- Use common ExtractParamFromQuery in ocresource and occollection to extract query parameters.
- Added links tag to the oic.if.ll and oic.if.baseline.
- Added rts tag in the payload for the baseline. - Added rep tag for oic.if.b response.
- occollection was using extra structure to differentiate ll, baseline, batch and group. Simplified the code to use
a simpler code and removed unwanted structure.
- oic.wk.col added in the types.
- OCStackIfTypes is removed as it was used only internally. This is not needed due to usage of ExtractParamFromQuery.
- BuildResponseRepresentation is updated as it is used in collection. For inner payload, these
values were not being used by ocpayloadconvert.
- oic.if.ll has been updated to give response in form of {links:[{href:"", rt:[""], if:[""]}]}
- oic.if.baseline has been updated to give response in form of {rt:[], if:[], rts:[], links:[{href:"", rt:[""], if:[""]}]}
- oic.if.b has been to response in form of [{"href": "", "rep": {""}}]
- in case of wrong query it will respond with error message.

Change-Id: I98489ac9923ab3c63012ddfe6b55c2b3064c3f28
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix Android SetPropertyValue function call
Habib Virji [Thu, 1 Dec 2016 12:01:43 +0000 (12:01 +0000)]
Fix Android SetPropertyValue function call

setPropertyValue call in the Android was swapped, compared to function call how it  was in the JNI layer.
setPropertyValue0 is for passing string array and setPropertyValue1 is passing string.

Change-Id: I91c480f162cc53712a68bef078371559fd2eff21
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoandroid: Fix resource_directory build issue
Philippe Coval [Thu, 1 Dec 2016 18:47:25 +0000 (19:47 +0100)]
android: Fix resource_directory build issue

jni/../../../../out/android/armeabi/debug/libresource_directory.so exists  or that its path is correct

In https://gerrit.iotivity.org/gerrit/#/c/14731, resource_directory was added in the resource-container. It is not
needed and break android build.

Change-Id: I05a1b422f6561102c641cc50cd68baa58768b11a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agotizen: resource-encapsulation prevent to import tools.scons.RunTest
Philippe Coval [Thu, 1 Dec 2016 12:07:56 +0000 (13:07 +0100)]
tizen: resource-encapsulation prevent to import tools.scons.RunTest

As unit tests are not enabled on tizen, there is no need to import it.

A smarter way would be to follow other tests patterns
 and have them separated and included in supported platforms.

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I2a925a251480c35d90bab6b2661c4da60f959b6f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15027
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoservice: [IOT-1562] Fix for unittest with SECURED at RE/RC
KIM JungYong [Mon, 28 Nov 2016 08:33:18 +0000 (17:33 +0900)]
service: [IOT-1562] Fix for unittest with SECURED at RE/RC

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

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

Change-Id: I4094bd01cba84d395c408a56f4c57d4ebcb45b44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1562
Reviewed-on: https://gerrit.iotivity.org/gerrit/14837
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoconnectivity: Enable resource/csdk/connectivity test
Philippe Coval [Thu, 1 Dec 2016 01:35:43 +0000 (02:35 +0100)]
connectivity: Enable resource/csdk/connectivity test

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I6b47f7b3439b923ec12f26b0e159e3b7a1144658
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12721
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoRemove resource-hosting service which is deprecated.
KIM JungYong [Thu, 1 Dec 2016 08:26:45 +0000 (17:26 +0900)]
Remove resource-hosting service which is deprecated.

Current resource-hosting service is deprecated because
concept of resource proxy can cover with functionality of cloud or relay server.
And this service would not handled for previous releases.
So this service can't cover for recent basic protocols.
If needs is arised for this concept, will be develop on the new service.

Change-Id: Ie14482924b7ccbebbd2512f017ad4b6039d72dd2
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoCorrect callback function for security provisioning in easy setup
Parkhi [Thu, 1 Dec 2016 09:21:56 +0000 (18:21 +0900)]
Correct callback function for security provisioning in easy setup

Change-Id: Id7d1deb6371d49e4810c191bc52979693ce16e8d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15013
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix defects detected by static analysis
Parkhi [Thu, 1 Dec 2016 09:07:45 +0000 (18:07 +0900)]
Fix defects detected by static analysis

Change-Id: I9eba31f8f716f8d3b5b04b803bc4c9ecdf035e10
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15009
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoHandle Error during Ownership Transfer
Jongmin Choi [Thu, 1 Dec 2016 07:23:05 +0000 (16:23 +0900)]
Handle Error during Ownership Transfer

If an error is returned during ownership transfer,
on-boarding tool needs to remove the server's information from PDM DB
and close secure connection with the server.

Patch #1: Initial patch
Patch #2: Change Log Level

Change-Id: I641529552de0e25438bd94da9b2ec45320428a61
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14999
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agobuild: Bypass and/or fix suspicious tests (workaround)
Philippe Coval [Tue, 29 Nov 2016 14:07:08 +0000 (15:07 +0100)]
build: Bypass and/or fix suspicious tests (workaround)

- Run tests using tools.scons.RunTest
- Add a file parameter to enable valgrind check
- Disable failed test, to make verifier sane again

To be tracked at:
http://wiki.iotivity.org/1.2-rel

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f27487f4e
Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agobuild: Bypass non finishing security test (workaround)
Philippe Coval [Tue, 29 Nov 2016 21:02:57 +0000 (22:02 +0100)]
build: Bypass non finishing security test (workaround)

Occured when SECURED=1

This change is temporary to make QA verifier sane again,
 with this change:
https://gerrit.iotivity.org/gerrit/#/c/14903/

If merged I will raise bugs for each bypassed testcase related to
https://gerrit.iotivity.org/gerrit/#/q/topic:IOT-1486

Bug: https://jira.iotivity.org/browse/IOT-1486
Origin: https://gerrit.iotivity.org/gerrit/#/c/14925/
Change-Id: I574f92375703bf8a82cad7be6948d46c10776360
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoRemoved href from device and platform payload
Habib Virji [Wed, 30 Nov 2016 22:09:30 +0000 (22:09 +0000)]
Removed href from device and platform payload

- Created a separate function to handle Device and Platform payload.
- rt, if and attribute information are the only included in the payload.
- BuildResponseRepresentation updated to avoid information about device and platform payload.
- Updated dmv value from res.1.1.0,sh.1.2.0 to res.1.1.0,sh.1.1.0.

Change-Id: I59059997f170d177663e87eddea9df32275ca882
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Enable unit testing in SECURED=1 mode for resource
Philippe Coval [Wed, 30 Nov 2016 22:10:57 +0000 (23:10 +0100)]
build: Enable unit testing in SECURED=1 mode for resource

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I38e593d49401f7e14bfa26dd980938d36e66ac68
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate a payload format to be compatible to OIC spec in easysetup
Parkhi [Wed, 30 Nov 2016 02:42:56 +0000 (11:42 +0900)]
Update a payload format to be compatible to OIC spec in easysetup

1. In a response for get/post request with batch interface,
   "rep" keyword should be included for containing child resource's properties
   for each child resource.
2. Provisioning resource is a collection resource so it should have
   a "oic.wk.col" resource type.
3. "links" property for baseline and linklist interfaces should include a
   "p"(i.e. policy) property.

e.g. response for baseline:
{
  "rt":[
    "oic.wk.prov",
    "oic.wk.col"
  ],
  "if":[
    "oic.if.baseline",
    "oic.if.ll",
    "oic.if.b"
  ],
  "ps":0,
  "lec":0,
  "links":[
    {
      "href":"/WiFiProvisioningResURI",
      "rt":[
        "oic.wk.wifi"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/DevConfProvisioningResURI",
      "rt":[
        "oic.wk.devconf"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/CloudServerProvisioningResURI",
      "rt":[
        "oic.wk.cloudserver"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    }
  ]
}

e.g. response for linklist:
{
  "links":[
    {
      "href":"/WiFiProvisioningResURI",
      "rt":[
        "oic.wk.wifi"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/DevConfProvisioningResURI",
      "rt":[
        "oic.wk.devconf"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/CloudServerProvisioningResURI",
      "rt":[
        "oic.wk.cloudserver"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    }
  ]
}

e.g. response for batch:
[
  {
    "href":"/ProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline",
        "oic.if.ll",
        "oic.if.b"
      ],
      "rt":[
        "oic.wk.prov",
        "oic.wk.col"
      ],
      "ps":0,
      "lec":0
    }
  },
  {
    "href":"/WiFiProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.wifi"
      ],
      "swmt":[
        2,
        3,
        4
      ],
      "swf":1,
      "tnn":"",
      "cd":"",
      "wat":0,
      "wet":0
    }
  },
  {
    "href":"/CloudServerProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.cloudserver"
      ],
      "ac":"",
      "apn":"",
      "cis":""
    }
  },
  {
    "href":"/DevConfProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.devconf"
      ],
      "dn":"Test Device",
      "mnmo":"Test Model Number",
      "loc":"",
      "lang":"",
      "ctry":""
    }
  }

]

Change-Id: I13ccda6fedb7c628dc77cc13e84c1c10c0e1b487
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: use tools.scons.RunTest for provisioning tests
Philippe Coval [Tue, 29 Nov 2016 14:07:08 +0000 (15:07 +0100)]
build: use tools.scons.RunTest for provisioning tests

To avoid race conditions

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I8f1e4823a7c4642b4b03fb4dca924447079d7e39
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
7 years agobuild: use tools.scons.RunTest for csdk security tests
Philippe Coval [Tue, 29 Nov 2016 14:35:03 +0000 (15:35 +0100)]
build: use tools.scons.RunTest for csdk security tests

To avoid race conditions.

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I1c525d58b7c220dd8043b65bf873e0d1d294a020
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
7 years agoFix static analysis issue in ocresource
Jaehong Jo [Wed, 30 Nov 2016 08:25:53 +0000 (17:25 +0900)]
Fix static analysis issue in ocresource

- add initial value and null checking

Change-Id: I50731d23865c72d2c03cb3b149b19bf4236bf587
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix static analysis issue in keepalive
Minji Park [Wed, 30 Nov 2016 01:16:50 +0000 (10:16 +0900)]
Fix static analysis issue in keepalive

- add return value checking logic after memory allocation

Change-Id: I1c28e13e01c2dd7bf4b78585adf0ffdc0e6ecdfd
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>