iotivity.git
2 years agomodified build scons related cloud provisioning 61/15861/5
jihwan.seo [Wed, 21 Dec 2016 04:46:06 +0000 (13:46 +0900)]
modified build scons related cloud provisioning

Change-Id: I14879be778f977cc817b9530c57914e755b2a370
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-1731] stop BLE advertising for disconnection status.(android/tizen) 31/16131/3
jihwan.seo [Thu, 5 Jan 2017 03:27:17 +0000 (12:27 +0900)]
[IOT-1731] stop BLE advertising for disconnection status.(android/tizen)

since advertising can be caused a big problem related battery.
it should be stopped when it is not used.

Change-Id: Ib645dafe9cba3218972b655cfa0f5b067ad971eb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16131
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoenable WITH RESPONSE and INDICATE property in android BLE 13/15913/4
jihwan.seo [Thu, 22 Dec 2016 11:20:43 +0000 (20:20 +0900)]
enable WITH RESPONSE and INDICATE  property in android BLE

since WITHOUT RESPONSE and NOTIFY property can be caused packet loss,
it is better to provide WITH RESPONSE and INDICATE property.

ps. Tizen BLE will be also provided INDICATE property in the near future

Change-Id: Iaa802a2864511b93a676d65613567406c27ebc93
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFix a logic to handle collection resource payload construction for 45/16245/2
Jihun Ha [Mon, 9 Jan 2017 07:00:01 +0000 (16:00 +0900)]
Fix a logic to handle collection resource payload construction for
vendor-specific properties in easy setup.

For vendor-specific properties in provisioning resource,
they should be included in 'rep' property.

Change-Id: I6644cab3aab43b29ebf5ce48d639a4a8ca9b8016
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoMinor static analysis bug fix. 99/16199/4
Senthil Kumar G S [Fri, 6 Jan 2017 13:15:55 +0000 (18:45 +0530)]
Minor static analysis bug fix.

Solves the self assignment problem (x = x)
which is reported by the static analysis tool(SVACE).

Change-Id: I5d50dda1bc531501c619df7f29bf0e94758f3137
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16199
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoAdded SSL Adapter to Support BLE. 55/13655/12
junghun kim [Tue, 25 Oct 2016 13:18:32 +0000 (22:18 +0900)]
Added SSL Adapter to Support BLE.

1) SSL Adapter supported BLE.

Change-Id: I7b43c4573c100b6459e7794d20e2f21f548030b2
Signed-off-by: junghun kim <jhun1105.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoUpdate for Multi Ownership Transfer condition 91/16191/8
Jihun Ha [Sat, 7 Jan 2017 04:09:08 +0000 (13:09 +0900)]
Update for Multi Ownership Transfer condition

The found enrollee's owner ID indicates a same ID of mediator.
However, a list of owned devices managed in mediator's PMD db has
no element for the found enrollee. In that case, MOT will be failed.

For this, ES_OWNERSHIP_IS_NOT_SYNCHRONIZED value is returned, which
guides a user to reset a Enrollee's SVR DB file.

Change-Id: Ia5feaccccfc4cca4a0673d08cbba4d473324e37f
Signed-off-by: Parkhi <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoUpdate a logic to utilize newly developed security APIs. 13/16013/4
Jihun Ha [Wed, 14 Dec 2016 06:44:40 +0000 (15:44 +0900)]
Update a logic to utilize newly developed security APIs.

A patch for security APIs is submitted: https://gerrit.iotivity.org/gerrit/#/c/15577/
With this patch, some points in easy setup can utilize the new APIs for more
correct decision.

Change-Id: I3b570f7f28d587ef39a0323f6d39294c0a391568
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15581
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit bb947106af8e4b51603cc82c40f96b7c43283dd6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16013

2 years agoyocto: Use tools from sysroot before system PATH (again) 25/16225/3
Philippe Coval [Fri, 16 Sep 2016 18:22:03 +0000 (20:22 +0200)]
yocto: Use tools from sysroot before system PATH (again)

Reintroduce existing change that was (wrongly?) removed in:

https://gerrit.iotivity.org/gerrit/#/c/12029/64/build_common/SConscript

Original review at:

https://gerrit.iotivity.org/gerrit/11935

To ensure reproductibily Scons avoids to rely on environment
 but some systems like Yocto are defining their own cross compiling env.

To deal with those orthogonal paradigms,
 a new CONFIG_ENVIRONMENT_IMPORT variable has been introduced,
 It enables import of needed variables (PATH and pkg-config's ones).

Without this change, system tools might be used by scons
 instead of looking into yocto's sysroot.
 This is not not wanted and may be less reproductible.

This problem was noticed when building Ostro OS
 (on a system without all Yocto dependencies)
 reported error messages were:

  | sh: gdbus-codegen: command not found
  | /bin/sh: 1: pkg-config: not found

More information about using SCONS along Yocto, check some notes at:

https://bitbucket.org/scons/scons/wiki/Notes

Bug: https://jira.iotivity.org/browse/IOT-1219
Change-Id: I6af59a590f8be489398623d29cf85c2f00000002
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/on/master/mine
Thanks-to: Mikko Ylinen <mikko.ylinen@intel.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>
2 years agoPython script that runs the Android smoke test 91/10991/8
George Nash [Fri, 6 Jan 2017 23:19:40 +0000 (15:19 -0800)]
Python script that runs the Android smoke test

This script does the following
1. creates a new avd named smoke_test_avd_####
   where the #### is the port number that will be used to talk
   with the avd
2. starts the created avd
3. waits for the avd to boot
4. builds android smoke tests
5. installs the smoke tests on the avd
6. runs the smoke tests
7. shuts down the avd
8. deletes the avd

Known issue on Ubuntu systems the avd does not shutdown properly

Change-Id: Ib86f8fe779c5806ab280a804d62ad6cb4eebc43a
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10991
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoreplace the path of octypes.h with upper path. 69/15969/15
jihwan.seo [Wed, 28 Dec 2016 04:26:57 +0000 (13:26 +0900)]
replace the path of octypes.h with upper path.

Change-Id: I1134a850cd25f13435dc3ef68b8537ddd7f5a675
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Enable resource-encapsulation tests 03/15403/15
Philippe Coval [Fri, 9 Dec 2016 23:09:49 +0000 (00:09 +0100)]
build: Enable resource-encapsulation tests

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: Iae22fb7f28be7235f215f9f00614f95920880257
Origin: https://gerrit.iotivity.org/gerrit/#/c/15403/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15403
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agofix build scons related MQ for android. 91/15891/2
jihwan.seo [Thu, 22 Dec 2016 08:07:01 +0000 (17:07 +0900)]
fix build scons related MQ for android.

Change-Id: I185762dc484f82e574184bb7b99df8369ab78120
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15891
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agobuild: Enable resource-container unittests 93/15393/13
Philippe Coval [Fri, 9 Dec 2016 23:09:48 +0000 (00:09 +0100)]
build: Enable resource-container unittests

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: I9f1a933e41e832df3ef407a76f3c1300cde2f20a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15393
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agoCleanup documentation warnings in OcCloudProvisioning.java 69/16169/2
George Nash [Thu, 5 Jan 2017 19:39:45 +0000 (11:39 -0800)]
Cleanup documentation warnings in OcCloudProvisioning.java

Change-Id: I9e256dc708c2be0be42cd035a77cf76397432678
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16169
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoCleanup documentation warnings found in OcDirectPairDevice.java 75/16175/3
George Nash [Thu, 5 Jan 2017 22:02:35 +0000 (14:02 -0800)]
Cleanup documentation warnings found in OcDirectPairDevice.java

Change-Id: Ic15c81d22e19b6714afb84f5295057c93decc652
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16175
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoCleanup documentation warning found in OcProvisioning.java 81/16181/2
George Nash [Thu, 5 Jan 2017 23:56:23 +0000 (15:56 -0800)]
Cleanup documentation warning found in OcProvisioning.java

Change-Id: If7dccdec93ed5543df169e02b240ec0e294ef900
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16181
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoCleanup documentation warnings in OcPlatformInfo.java 79/16179/2
George Nash [Thu, 5 Jan 2017 22:29:45 +0000 (14:29 -0800)]
Cleanup documentation warnings in OcPlatformInfo.java

Change-Id: I314dd840b588ee5c105ac32f8c070fc75177396c
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16179
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoCleanup documentation warings found in OcResource.java 13/16213/2
George Nash [Fri, 6 Jan 2017 19:45:00 +0000 (11:45 -0800)]
Cleanup documentation warings found in OcResource.java

Change-Id: I4035b1c03ab4ed2a384aef4333db5eb4f7b87608
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16213
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoCleanup documentation warnings found in OcSecureResource.java 15/16215/2
George Nash [Fri, 6 Jan 2017 20:35:15 +0000 (12:35 -0800)]
Cleanup documentation warnings found in OcSecureResource.java

Change-Id: I02bee702fdcd2351cc65db7f22218dd7f8882d1c
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16215
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago[IOT-1714]Add wifi.p2p connection status changed intent receiver 05/16005/2
bg.chun [Wed, 28 Dec 2016 23:53:50 +0000 (08:53 +0900)]
[IOT-1714]Add wifi.p2p connection status changed intent receiver

Add "android.net.wifi.p2p.CONNECTION_STATE_CHANGE" to intentFilter
to receive wifi-p2p connection changed event.

Change-Id: Id660870b11723df727c99ba7062fe8425772b714
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoRemoved to set visibility mode related BR/EDR in BLE monitoring. 17/15217/3
junghun kim [Wed, 7 Dec 2016 08:00:07 +0000 (17:00 +0900)]
Removed to set visibility mode related BR/EDR in BLE monitoring.

Change-Id: I90d62b83c0286a077f76a84eceafcfa186934bc5
Signed-off-by: junghun kim <jhun1105.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15217
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoChanged all of easysetup-callback-function to static member function. 37/16037/2
Parkhi [Mon, 2 Jan 2017 04:48:39 +0000 (13:48 +0900)]
Changed all of easysetup-callback-function to static member function.
This change can protect from crash when class instance is removed.

Change-Id: I0db76ee443a88ac15d11d62a44af0b92b754d697
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16037
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agocsdk: Fix MLK in ocpayloadconvert.c, endpoint for map 07/16107/4
Philippe Coval [Tue, 3 Jan 2017 01:18:27 +0000 (02:18 +0100)]
csdk: Fix MLK in ocpayloadconvert.c, endpoint for map

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: I20cfa2b42f0a0d25e976c1b53c78b0f55c0973a0
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16107
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoAdding C++ api for configuring SVR db for self-ownership 25/16125/2
amar [Wed, 14 Dec 2016 07:54:27 +0000 (13:24 +0530)]
Adding C++ api for configuring SVR db for self-ownership

Change-Id: I0a65b0a1b1a65c8659b0bc253c4d74087612e75d
Signed-off-by: amar <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 714a7678ef1cc6d488f85ab13a623e4adb53f971)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16125

2 years agoAdd ByteString support for RCSResourceAttributes JAVA and JNI. 29/16029/6
koushik.girijala [Fri, 30 Dec 2016 10:49:36 +0000 (16:19 +0530)]
Add ByteString support for RCSResourceAttributes JAVA and JNI.

ByteString(Binary) was added in the Value of OCRepresentation.
But, RE layer does not covered ByteString type.
In this patch, ByteString type is added in RE layer
for synchronization with OC.

patch 2 : Fix memory leak

Change-Id: I5e52fea9b7d4b5b09384fa24446f550d93b89395
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16029
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-1703] Add UI support in notification android samples to take cloud login details 77/15877/5
nikhil.a [Tue, 3 Jan 2017 10:37:51 +0000 (16:07 +0530)]
[IOT-1703] Add UI support in notification android samples to take cloud login details

- Added dialog box support to take cloud signUp , signIn and other details from UI.
- Proper allignment of braces and other minor formatting.

Patch-3 : Removed fixed strings
Patch-4 : Modified callback listener name

Change-Id: I75d292c4236dc1da7e7c822a5cd6340b8bb77b44
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jaesick shin <jaesick.shin@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoModify for unreachable code in simulator. 43/15843/4
KIM JungYong [Tue, 13 Dec 2016 03:48:36 +0000 (12:48 +0900)]
Modify for unreachable code in simulator.

In this patch, unreachable code is removed in the simulator.

Change-Id: I58db4b332ee063096bc5015afc9cfe8cf6caf6fb
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15843

2 years ago[IOT-1577] Copy Static library files(*.a) into rpm file 05/14505/8
YounghyunJoo [Fri, 18 Nov 2016 07:05:07 +0000 (16:05 +0900)]
[IOT-1577] Copy Static library files(*.a) into rpm file

- copy all builded static library to iotivity-devel-1.2.0-0.armv7l.rpm

Change-Id: I9147c1cbeeb0d53cbee0ac215012d9d57571c06c
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14505
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: JunHo Lee <junho13.lee@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoChange a policy to update a EnrolleeSecurity object with a new OCResource 67/15967/6
Parkhi [Mon, 2 Jan 2017 06:31:12 +0000 (15:31 +0900)]
Change a policy to update a EnrolleeSecurity object with a new OCResource

The EnrolleeSecurity object is managed by dividing it into two in RemoteEnrollee class.
One is used in the local(D2D) security provisioning process
and the other is used in cloud security provisioning.

Change-Id: I3d289577f85f95046f211d59e021334ed2b9d2da
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/15967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoadd comment in cloud interface 73/15273/4
Jung Seungho [Wed, 28 Sep 2016 06:48:51 +0000 (15:48 +0900)]
add comment in cloud interface

Change-Id: I079cdecf04cf3f8739d804ff6f26317fbbcd47fc
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12391
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 1e4047c5a89db80e19be42eb076c253d6828530a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15273
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoInit deviceId to prevent compilation warnings. 93/15793/2
Ziran Sun [Mon, 19 Dec 2016 10:06:51 +0000 (10:06 +0000)]
Init deviceId to prevent compilation warnings.

Change-Id: Ieb939537c1b0f8880d12297dac70a8a111271c8b
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15793
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoAdd revstat into optdata of Cred according to OCF spec 35/16035/2
js126.lee [Tue, 27 Dec 2016 08:15:28 +0000 (17:15 +0900)]
Add revstat into optdata of Cred according to OCF spec

Accoding to ocf security spec, revstat is mandatory property.
"revstat": {
  "type": "boolean",
  "description": "Revocation status flag
                - true = revoked, false = not revoked"

Patch 1: upload patch.
Patch 2: update json2cbor.c to convert revstat

Change-Id: Ifbb7743f8321cb8afbf69cfa307694598e24ea6e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 514ef82fb2ec9865a792b5f252ffbaeed3a3e7eb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16035

2 years agoBug fixed for CON_MFG_CERT 33/16033/2
js126.lee [Wed, 28 Dec 2016 10:00:49 +0000 (19:00 +0900)]
Bug fixed for CON_MFG_CERT

Issue : In case of CON_MFG_CERT, psk_info_callback does not revert after OTM.

Patch 1: Upload patch
Patch 2,3: Aplly this patch to server side.
Patch 4: Re-try jenkis build

Change-Id: Ib850d79cc9ef78dad5c15c97f6dc2cd805b9c7d6
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit df2b9cf5a6191c8118d7cd890922531811fdcb4c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16033

2 years agoFix build break. 31/16031/2
Dan Mihai [Sun, 1 Jan 2017 10:46:39 +0000 (02:46 -0800)]
Fix build break.

Fix conflict between recent commits
1f885a36f6258373bef2c08c46d12b3b9d615551
d4f573ea1f2a0089fb7d53980ac39c39673391cb

Change-Id: Ic740ab0a8c57810b4a5f0841a42905ae09052d88
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
2 years agoIOT-1583: Removing /W4 warning from resource/c_common. 25/15725/17
Pawel Winogrodzki [Tue, 6 Dec 2016 02:09:45 +0000 (18:09 -0800)]
IOT-1583: Removing /W4 warning from resource/c_common.

First batch of refactoring changes to remove /W4 compiler warnings.
For now I'm starting with resource/c_common and adding
_CRT_SECURE_NO_WARNINGS to disable warnings about issues we cannot
change anyway, because the code has to build for multiple platforms.

Change-Id: I03d088f8a7c3263ea994fe075fbb579a14e31f0c
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Enable easy-setup mediator richsdk unittests 85/15785/13
Philippe Coval [Sat, 10 Dec 2016 12:02:55 +0000 (13:02 +0100)]
build: Enable easy-setup mediator richsdk unittests

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: Iec84747226fc6ef086e63cbb1ae03de00c4b8db1
Origin: https://gerrit.iotivity.org/gerrit/#/c/15413/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15785
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agolinux: Add more architectures 73/15773/3
Philippe Coval [Thu, 29 Sep 2016 08:57:59 +0000 (10:57 +0200)]
linux: Add more architectures

This does not scale and this check should be removed.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Author: Hauke Mehrtens <hauke@hauke-m.de>
Change-Id: Ibb271701904745ee4f5dd689c197228239c37262
Origin: https://github.com/openwrt/packages/blob/master/net/iotivity/patches/021-add-some-more-architectures.patch
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14575
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15773
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agobuild: Enable MLK check for csdk provisioning test 81/15781/11
Philippe Coval [Thu, 1 Dec 2016 00:35:50 +0000 (01:35 +0100)]
build: Enable MLK check for csdk provisioning test

For linux.

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Iecefaab80e6b11fada722d1ad00025319f9e7338
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14981
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15781
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years ago[IOT-1675] Added Function of OICSafeFree. 51/15251/6
Jaehong Jo [Thu, 8 Dec 2016 05:04:57 +0000 (14:04 +0900)]
[IOT-1675] Added Function of OICSafeFree.

Previous function just free and do not set to null.
So the caller needs to be set to null.
If use new function, do not need this operation.
So it can avoid use the dangering point.

Change-Id: I067220d9410f23d0b4ba45075f836ec528d83fbf
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15251
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoFixed mismatched message type when the error response is sent 83/15883/4
hyuna0213.jo [Thu, 22 Dec 2016 01:38:56 +0000 (10:38 +0900)]
Fixed mismatched message type when the error response is sent

If the request message is Confirmable, then the response SHOULD be
returned in an Acknowledgement message.

Change-Id: Ifc8bca205d10147b0cd9b867d90f610d57a92024
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15883
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoAdd ByteString type at the Value of RCSResourceAttributes. 95/15695/6
KIM JungYong [Thu, 15 Dec 2016 09:09:36 +0000 (18:09 +0900)]
Add ByteString type at the Value of RCSResourceAttributes.

ByteString(Binary) was added in the Value of OCRepresentation.
But, RE layer does not covered ByteString type.
In this patch, ByteString type is added in RE layer
for synchronization with OC.

patchset #2
handling of OC::AttributeType::Binary is added.
toString method of RCSByteString is fixed.

patchset #4
Description of RCSByteString is added.

patchset #5
Server sample application is update for including byte string
on GET response of custom interface.

Change-Id: If293954c64fe1b072b1bdff967681d6c6e774671
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15695
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoUpdate a condition to decide if ownership transfer succeeds in easy setup 23/16023/3
Jihun Ha [Fri, 30 Dec 2016 05:22:14 +0000 (14:22 +0900)]
Update a condition to decide if ownership transfer succeeds in easy setup

In a case of duplicate request of ownership transfer, PM result and hasError are
returned to OC_STACK_DUPLICATE_REQUEST and 0(false). This case should be
considered as one of error cases.

Change-Id: I660d2985c6b661fd4366e68fa76c5a8e3e939e2e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16023
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoUpdate resource handles of easy setup resources to extern variables 99/15999/7
Parkhi [Thu, 29 Dec 2016 23:40:53 +0000 (08:40 +0900)]
Update resource handles of easy setup resources to extern variables

Change-Id: I9c620f9be0220c235dcce4bba1b52aa0a2a1fc51
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/15999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoreplace error log level with info level for tizen edr 75/15975/2
jihwan.seo [Wed, 28 Dec 2016 07:58:15 +0000 (16:58 +0900)]
replace error log level with info level for tizen edr

since the logs can create some confusion.
it is better to replace.

Change-Id: I813761b1bd3701912b035a0fecd910e0b9a6f691
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agotizen: Replace speedpython by python-accel 33/15833/3
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>
Origin: https://review.tizen.org/gerrit/#/c/105925/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years ago[IOT-1695] Move CAReceiveMessage from stack to heap 73/15973/2
Joonghwan Lee [Thu, 22 Dec 2016 07:45:11 +0000 (16:45 +0900)]
[IOT-1695] Move CAReceiveMessage from stack to heap

CAReceiveMessage at present uses a buffer of 65k which gets
allocated on stack to receive message. This allocation is
not good for embedded OS where the Stack is limited and
results in Stack Corruption.

Change-Id: I974208bc7fdfdd6464c9b34ea122734bf64507bf
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 584bb5d3a36c536911d88de2aeefed8ef782cfa1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15973

2 years ago[IOT-1697]Destory unhandled payload after OCDoResponse() on sample. 29/15829/5
bg.chun [Tue, 20 Dec 2016 07:48:50 +0000 (16:48 +0900)]
[IOT-1697]Destory unhandled payload after OCDoResponse() on sample.

below is list of fixed smaple.
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocserver.cpp

Change-Id: I276d38bffa69e67e8567275b4497d82291bcb01f
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoCleanup documentation in CaInterface.java 19/15819/4
George Nash [Mon, 19 Dec 2016 22:31:01 +0000 (14:31 -0800)]
Cleanup documentation in CaInterface.java

Change-Id: Ibb59c3242f1669f348dc6c4a2d24b17deb6a4e9e
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15819
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoDevice payload update 51/15851/3
Habib Virji [Wed, 30 Nov 2016 22:09:30 +0000 (22:09 +0000)]
Device payload update

- 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: I62cdb12342b4188da4b508a94c007b69d5bb6ad1
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15851
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRemove redundant OC_RSRVD_MFG_DATE define. 31/15631/4
Todd Malsbary [Wed, 14 Dec 2016 18:49:22 +0000 (10:49 -0800)]
Remove redundant OC_RSRVD_MFG_DATE define.

Change-Id: I96c7b1e5f631510983a8d55fb42d4d72289e15f0
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-1332] update to disable connection state changed CB for IP adapter 57/12257/5
jihwan.seo [Tue, 27 Sep 2016 05:47:04 +0000 (14:47 +0900)]
[IOT-1332] update to disable connection state changed CB for IP adapter

Since IP adapter(UDP) is the Connectionless Protocol,
it doesn't need.

Change-Id: I649ab5b1c789e49a283be6d2c77af618ba11c8b6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoAdded a Variant of findResourceList API which support error callback. 15/15915/6
Jay Sharma [Tue, 27 Dec 2016 13:37:32 +0000 (19:07 +0530)]
Added a Variant of findResourceList API which support error callback.

JIRA : IOT-1706

Change-Id: I85fea5c323746534b3f95515c9a7eb920ba7cbb3
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoAdd an API to cloud provisioning with a given OCResource object 47/15947/4
Jihun Ha [Tue, 27 Dec 2016 05:22:00 +0000 (14:22 +0900)]
Add an API to cloud provisioning with a given OCResource object

When a user wants to do cloud provisioning with a specific OCResource object,
the added API can be used and expected that a resource discovery in a current
connectivity for cloud provisioning is skipped.

Change-Id: Ic93da14b39e7576e413442b00db28ed3a6fc4890
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-1699]Fix memory leak on collection 59/15859/5
bg.chun [Wed, 21 Dec 2016 02:47:46 +0000 (11:47 +0900)]
[IOT-1699]Fix memory leak on collection

Fix memory leak on DefaultCollectionEntityHandler

Change-Id: I4070d3f8feae9596f646ecbc24de471eb99a1e8c
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-1683] Add missing defines for standard interfaces. 29/15629/6
Todd Malsbary [Tue, 6 Dec 2016 19:06:30 +0000 (11:06 -0800)]
[IOT-1683] Add missing defines for standard interfaces.

Change-Id: I3d6980b6a907abcb5adff3a08760ce013404f83d
Bug: https://jira.iotivity.org/browse/IOT-1683
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15629
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRevert wrong removal of proxy client sample build 77/15277/3
Abhishek Sharma [Fri, 14 Oct 2016 13:01:22 +0000 (18:31 +0530)]
Revert wrong removal of proxy client sample build

A DTLS related change has wrongly removed build for
proxy client sample.

Change-Id: I1f65c1cadf6a84a69691ad02bc1227793ca2fce7
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit cf5614e1d93d537be20943136beb17b7182d87d2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15277
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-1677] Fix Java build when TARGET_TRANSPORT=ALL 37/15637/4
George Nash [Wed, 14 Dec 2016 23:03:10 +0000 (15:03 -0800)]
[IOT-1677] Fix Java build when TARGET_TRANSPORT=ALL

Currently there is no BTLE manager for linux. Only support
the jni BTLE addapter functions on android.

BUG: https://jira.iotivity.org/browse/IOT-1677
Change-Id: If365690771ab64fe40c49ad30a22707612c3d580
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15637
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-1320] Make SECURED flag default '1' 85/12085/24
George Nash [Fri, 18 Nov 2016 00:20:02 +0000 (16:20 -0800)]
[IOT-1320] Make SECURED flag default '1'

Note:
  arduino does not support build with SECURED=1 see IOT-1331
  Darwin and iOS built with SECURED=0 see IOT-1684

Change-Id: I87c7c0e76423c4f58f8dbea911835f27b2936a0b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12085
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoUpdate documentation on server/device ID. 11/15611/2
Ziran Sun [Wed, 14 Dec 2016 14:17:48 +0000 (14:17 +0000)]
Update documentation on server/device ID.

Bug: https://jira.iotivity.org/browse/IOT-1385
Change-Id: Ib3e616cee6fe1e76a7f8aa8fbc8b33b93b97c2c4
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15611
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix build warning of notification service. 33/15933/2
KIM JungYong [Sun, 25 Dec 2016 23:44:49 +0000 (08:44 +0900)]
Fix build warning of notification service.

In this patch, implicit declaration of function is resloved.
and it is fixed that different environments were specified for target.

Change-Id: Icd6dabc2557da2acc24fc7141d3e8ce0481b80fe
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15933
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoMinor SConscript clean-up for Windows 21/15621/3
Dan Mihai [Wed, 14 Dec 2016 16:39:25 +0000 (08:39 -0800)]
Minor SConscript clean-up for Windows

Change-Id: Ifee94165bd3171b45d2f8791293860f43cf3cdbc
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
2 years agoFix transportFlags and port setting in OCSerialization 55/15155/4
Minji Park [Mon, 5 Dec 2016 10:22:07 +0000 (19:22 +0900)]
Fix transportFlags and port setting in OCSerialization

- Transport flags and port setting logic fixed when making OCResource objects
 with discovery payload.
  Flags and port in devAddr used to be set as secured,
 if any previous resource has the secured information in payload.

Change-Id: I01765c392b9cdd923908f934b3e50e9f1665cb50
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoAdding API to configure SVR db as self-ownership 25/15825/3
js126.lee [Mon, 12 Dec 2016 10:08:48 +0000 (19:08 +0900)]
Adding API to configure SVR db as self-ownership

This patch is
1) to configure SVR db as self-ownership for device (ex. onboarding tool)
   that is not required to Ownership Transfer by other device.
2) DeviceID of both doxm and pstat remains as same after reset.

- Test Configure SVR as self-ownership
1. Build with scons SECURED=1 WITH_TCP=1 WITH_CLOUD=1
2. Run the cloudClient with dat file that is configured as Ready-For-OTM
  ex) ./cloudClient oic_svr_db_server_randompin.dat
3. Perfrom Configure SVRdb as Self-OwnerShip [Menu:11]

-Patch 1: Upload patch
-Patch 2: Fixed build error on arduino
-Patch 3-5 : Rebase due to Jenkins problem
-Patch 6 : Apply review comment
-Patch 7,8 : Apply Greg's review commnets
-Patch 9: Rebase due to merge conflict

Change-Id: I12f178e5955d2d963ba46b88972042ee1c90dff8
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15495
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 1494606f170d49087b06da294afc9af8eac7ba2a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15825

2 years ago[IOT-1700] SendCallBack() doesn't return an error for unsupported adapter 11/15911/2
Joonghwan Lee [Thu, 22 Dec 2016 02:00:13 +0000 (11:00 +0900)]
[IOT-1700] SendCallBack() doesn't return an error for unsupported adapter

Added error return if adapter is not supported

Change-Id: I472864a1b8e20128965905883ab6db60b36bda6f
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15885
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 8064b0c63c5632a47f36d61e3c1972c8d3c2e284)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15911

2 years agoreplace some error log with debug log. 49/15749/4
jihwan.seo [Fri, 16 Dec 2016 07:08:47 +0000 (16:08 +0900)]
replace some error log with debug log.

some log can create some confusion.
because these log are not error cases generally.

Change-Id: I8fd932ee5df707d00db4c7f9662f323697476f78
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15749
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoremoved unreachable code in resource layer 31/15531/7
jihwan.seo [Tue, 13 Dec 2016 02:21:06 +0000 (11:21 +0900)]
removed unreachable code in resource layer

Change-Id: I19367f5f28e32a97f17aa6f7e02423349adeb7ad
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15531
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-1671] Fixed base layer terminate logic 93/15693/4
jihwan.seo [Thu, 15 Dec 2016 09:10:47 +0000 (18:10 +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.

Change-Id: I7c0a11c029054163996f00bd760b1445fb6a7899
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoAdd CAcloseSslConnectionAll method in IP adapter changed logic 21/15821/3
jihwan.seo [Mon, 19 Dec 2016 10:30:51 +0000 (19:30 +0900)]
Add CAcloseSslConnectionAll method in IP adapter changed logic

since session should be cleared when adapter related IP status is disabled.
we add to call CAcloseSslConnectionAll method in IP adapter changed logic.

Change-Id: I3a53852ea3a0ee92a1a75f18e7f0cfd7dc39284c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoFix handshake error check 87/15887/3
Joonghwan Lee [Wed, 14 Dec 2016 09:35:42 +0000 (18:35 +0900)]
Fix handshake error check

- Only delete peer info without sending alert message when socket error returned during handshake
  : this will prevent re-trying TLS handsake in order to send alert message
- Check if received data size is larger than zero

Change-Id: I3e5423b9f82e5b6bc703814fd72166844e6149b3
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15887

2 years agoreplace the name related device ID with remoteId for some structures 35/15735/2
jihwan.seo [Fri, 16 Dec 2016 01:48:49 +0000 (10:48 +0900)]
replace the name related device ID with remoteId for some structures

Change-Id: Id358652f3616f9f4eb7065097cf2225c0d803e6b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15735
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoremove dependency with ocramdon.h for base stack. 83/15683/5
jihwan.seo [Thu, 15 Dec 2016 07:33:53 +0000 (16:33 +0900)]
remove dependency with ocramdon.h for base stack.

Change-Id: Iefaf746059acae16af190564cbd9bcf67cdd277f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-1693]Fix observer header option check logic in OCHandleResponse 45/15745/5
bg.chun [Fri, 16 Dec 2016 04:43:59 +0000 (13:43 +0900)]
[IOT-1693]Fix observer header option check logic in OCHandleResponse
Fix obs header opt check logic which determine
obs rest fail or success

Change-Id: I93d485b4369feacefdc1d3a9452309dd46372c5a
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15745
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoRemove unnecessary code to unset a given fd in catcpserver 31/15731/2
hyuna0213.jo [Fri, 16 Dec 2016 00:47:47 +0000 (09:47 +0900)]
Remove unnecessary code to unset a given fd in catcpserver

After reading data from file descriptor, we set the readFds again.
so it is not required to remove a given file descriptor from a set.

Change-Id: I8c7a72b14bcce2f1a513cc6085d4113fa8fea9b1
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15731
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFixed keepalive to send ping request only when host mode is client 75/15675/2
hyuna0213.jo [Thu, 15 Dec 2016 07:34:53 +0000 (16:34 +0900)]
Fixed keepalive to send ping request only when host mode is client

ping message should be sent when host mode is client

Change-Id: I2ac94e1340c1607969391b86577b9101ddc013b5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15675
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: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFix possible NULL pointer dereference 71/15371/2
George Nash [Fri, 9 Dec 2016 17:55:59 +0000 (09:55 -0800)]
Fix possible NULL pointer dereference

if *userdata was a NULL pointer it would be dereferenced
it even after a NULL pointer check. The dereference
was moved inside the NULL pointer check to prevent the
pointer dereference.

Change-Id: I334d56c210e81329bcfef9936fbe653cc5561e8f
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoAdded build option to decide whether include libocpmapi.so when build liboctbstack.so 63/15663/2
Chul Lee [Thu, 15 Dec 2016 04:07:12 +0000 (13:07 +0900)]
Added build option to decide whether include libocpmapi.so when build liboctbstack.so

This option may helpful in case of only server stack used.

This patch was reviewed from https://gerrit.iotivity.org/gerrit/#/c/15185/

Change-Id: Ibb8eabe3c2e0ffb5370977d11a648886eb4b70ab
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoChange the MAX_VERSION_LEN to OIC_SEC_MAX_VER_LEN. 27/15827/2
Chul Lee [Tue, 20 Dec 2016 07:50:19 +0000 (16:50 +0900)]
Change the MAX_VERSION_LEN to OIC_SEC_MAX_VER_LEN.

MAX_VERSION_LEN is a very common name.
This is not appropriate for use at the SDK level.
So I changed as OIC specific name.

Change-Id: Ia573dda8811f36a60999bbc63bb24cb3b3b04d93
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15827
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoRemove the liboc link from PM's SConcript. 81/15281/4
Chul Lee [Mon, 31 Oct 2016 01:52:14 +0000 (10:52 +0900)]
Remove the liboc link from PM's SConcript.

Change-Id: Ieb3f8ecb87233869242817eeb83e979bf9d50eb9
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 6f66686b4a730964ea1f3991f200892ef3803e96)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15281
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Gregg Reynolds <dev@mobileink.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoFix defects detected by static analysis 41/15841/2
Parkhi [Thu, 15 Dec 2016 07:08:35 +0000 (16:08 +0900)]
Fix defects detected by static analysis
 - mediator/submediator sample app.
 - enrolleeSecurity class memory issue.

Change-Id: Ia224aec14001f66085788eced8a4bb059c8e1715
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15673
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 9eb66a6863398d7be7f49a890d7b5e2829a97ddc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15841
Reviewed-by: Kevin Kane <kkane@microsoft.com>
2 years agoFixed bug of gernerating pin during randompin OTM 83/15583/4
js126.lee [Wed, 14 Dec 2016 04:40:09 +0000 (13:40 +0900)]
Fixed bug of gernerating pin during randompin OTM

Bug : During generating randompin, the bound of curIndex is one more.

Patch 1: Upload patch.

Change-Id: I0c6416adaa8f0fbd8eeb936a0cc17b64047b9222
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15579
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 78fdef84ed34707fac4bf3a6f9abf20803046f88)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15583

2 years agoFix infinite loop 13/15613/3
Oleksandr Dmytrenko [Mon, 12 Dec 2016 14:47:22 +0000 (16:47 +0200)]
Fix infinite loop

The loop is infinite due to incorrectly updated control variable vals

Change-Id: I6b8ace3e206404c75fae66e726b249950f60f46a
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15511
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d68d9a1ee08a703826b06b1bb1eaebe991804585)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15613

2 years agobug fix about organize resources. 37/15837/2
jaesick.shin [Tue, 20 Dec 2016 11:10:40 +0000 (20:10 +0900)]
bug fix about organize resources.

Before remove the provider information,
we first call unregisterResource.

Change-Id: Ib88967d13fa50ba34edc05631122228e59c2ea70
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15837
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agobuild: Enable MLK check for connectivity tests 83/15383/9
Philippe Coval [Fri, 9 Dec 2016 23:09:48 +0000 (00:09 +0100)]
build: Enable MLK check for connectivity tests

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: I91620205843da3c68d600deffe44e55001ff8f51
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15383
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
2 years agoarduino: hotfix preprocessor macro else vs elsif 39/15839/2
Philippe Coval [Mon, 19 Dec 2016 20:17:24 +0000 (21:17 +0100)]
arduino: hotfix preprocessor macro else vs elsif

Change-Id: Ie8a0aceab32130335c3cd471be5ec8b8bfd8cddc
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15811
Reviewed-by: Kevin Kane <kkane@microsoft.com>
(cherry picked from commit e74f0f118b9370b4ee9ec8708d2fe49a4b265286)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
2 years agotizen: Remove resource_directory.so from main package 79/15779/4
Philippe Coval [Fri, 16 Dec 2016 23:17:53 +0000 (00:17 +0100)]
tizen: Remove resource_directory.so from main package

Revert "tizen: Add resource_directory lib to main package"
https://gerrit.iotivity.org/gerrit/14283

Change-Id: If752f8d286d45c720cab9d467edf8846584f35fd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15779
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years agobuild: Enable resource-directory unittests MLK check again 87/15387/11
Philippe Coval [Fri, 9 Dec 2016 23:09:48 +0000 (00:09 +0100)]
build: Enable resource-directory unittests MLK check again

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: I97d242b8eb56fae8c60f902c1b9f2a97258d24d6
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15387
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years ago[IOT-1353] Fixed README file for account server build 71/15271/4
Jongmin Choi [Wed, 28 Sep 2016 07:40:58 +0000 (16:40 +0900)]
[IOT-1353] Fixed README file for account server build

README file fixed to resolve cloud account server build issue

Change-Id: Iaa4e61480a54dd9c5b7d66d5a5c23e77e5fb8d77
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 567ff432a0d79e670b82e75eb7e0238bbd2455c4)
Origin: https://gerrit.iotivity.org/gerrit/#/c/15271/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15271
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agobuild: Enable MLK check on csdk stack test 83/15783/5
Philippe Coval [Sat, 17 Dec 2016 02:41:17 +0000 (03:41 +0100)]
build: Enable MLK check on csdk stack test

Change-Id: I3db43fdf83d816e024c23426cd28a3821fa33cc0
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years ago[IOT-1669] Fixing Notification-service Android API's formatting issue. 57/15457/9
nikhil.a [Wed, 14 Dec 2016 11:47:43 +0000 (17:17 +0530)]
[IOT-1669] Fixing Notification-service Android API's formatting issue.

Proper allignment of braces and  Modified comments from doxygen format to javadoc.

Patch 4: Applied formatter from iotivity/tools/styles
Patch 5:  Resolve conflict due to merge of
https://gerrit.iotivity.org/gerrit/#/c/15497/

Change-Id: I406fb56aad290f06cb0094c09041b13142aed350
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoAdd OxM Select API and MOT related API. 95/15795/2
Chul Lee [Wed, 14 Dec 2016 01:55:22 +0000 (10:55 +0900)]
Add OxM Select API and MOT related API.

- Add OxM Select API on C layer.
  : OCSelectOwnershipTransferMethod

- Add OT/MOT related API on C++ layer.
  : OCSecureResource::getMOTMethod
  : OCSecureResource::getMOTMethod
  : OCSecureResource::isMOTSupported
  : OCSecureResource::isMOTEnabled

- Minor bugfix in OT/MOT.

Change-Id: I476fafe3f69f8bcb00036d60be1ab92ad74c6aae
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15577
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 6ba3036950661ab8c8b4d868adfe80ba12b2f531)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15795

2 years agoFixed sample error due to wrong ACL setting 41/15741/2
js126.lee [Thu, 15 Dec 2016 08:48:37 +0000 (17:48 +0900)]
Fixed sample error due to wrong ACL setting

Sampleserver deny for PUT rquest, because PUT permission is not set in SVR_DB file.

Patch 1: Upload patch.

Change-Id: Ia033ca3a52535bb49954ba8b17e1684047ada768
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15691
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 480fd1b289112459c59e47b11a4b9df5517e4297)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15741

2 years agotizen: relocate all liboc*.so to resource subpackage 75/15775/6
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
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15775
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
2 years ago[IOT-1622] Use PBKDF2 code from mbedTLS 03/15803/2
Greg Zaverucha [Tue, 6 Dec 2016 22:25:12 +0000 (14:25 -0800)]
[IOT-1622] Use PBKDF2 code from mbedTLS

Replace the PBKDF2 implementation in IoTivity
(resource\csdk\security\src\pbkdf2.c) that uses TinyDTLS\92s
implementation of HMAC, with the implementation from mbedTLS.

Add test vectors created with the old implementation to make sure
the new implementation will interoperate.

Change-Id: I8d7e7c5e9ff0cfc8a2a149dee5aa765fc6e00a9c
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15727
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
(cherry picked from commit cbb3e4e08dce06798ef8122c0ab945ee67973aea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15803

2 years agobuild: Enable provisioning tests again 41/15641/6
Philippe Coval [Fri, 9 Dec 2016 23:09:48 +0000 (00:09 +0100)]
build: Enable provisioning tests again

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: I64f6e771aa838d067ae834545c5a95e9c5593db7
Origin: https://gerrit.iotivity.org/gerrit/#/c/15389/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years agotizen: Reformat subpackages specs files to align master one 87/15287/10
Philippe Coval [Tue, 4 Oct 2016 12:41:58 +0000 (14:41 +0200)]
tizen: Reformat subpackages specs files to align master one

To avoid confusion, of configuration flags,
 each configuration change is welcome to be done in all spec files at once.

Change-Id: I4a35d7129719c8bfa29455f41624e1231158c62d
Origin: https://gerrit.iotivity.org/gerrit/#/c/12773/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15287

2 years ago[IOT-1679] Modify package name for notification consumer and provider sample. 07/15607/5
nikhil.a [Fri, 16 Dec 2016 06:10:56 +0000 (11:40 +0530)]
[IOT-1679] Modify package name for notification consumer and provider sample.

Change-Id: I3501d0cf0cdf3f360b86836868dbf1b2243bdfcf
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoSeparate MOT-disabled/enabled SVR DB files for enrollee 97/15597/3
Jihun Ha [Tue, 13 Dec 2016 05:20:54 +0000 (14:20 +0900)]
Separate MOT-disabled/enabled SVR DB files for enrollee

MOT-disabled Enrollee should not have "PRECONFIG_PIN(0xFF00)" method
in oxms property, e.g. "oxms" : [0, 65280]. If SVR db file include the value
and Mediator can not know the value, Ownership transfer will be failed
because mediator presume that enrollee can support unknown method for
ownership transfer.

Change-Id: I8b50677215105244ad351dc1791c88a34a7cff77
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15547
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit cee9ccbb44d8cff3dd17fdf01a519209d4ad131c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15597
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-1676]Removing Unreachable code from Notification Service JNI 67/15567/6
abitha.s [Tue, 13 Dec 2016 13:43:14 +0000 (19:13 +0530)]
[IOT-1676]Removing Unreachable code from Notification Service JNI

Change-Id: If28fb835a94f67f2d37f50ab721ae68ed9234559
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agotizen: Remove deprecated libresource_hosting.so 05/15105/6
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>
(cherry picked from commit 0c90ca6ffcbb6a2c56c977ec11bebb7b1d14053b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15105
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>