platform/upstream/iotivity.git
7 years agodisable default scan interval time in android BLE
jihwan.seo [Wed, 7 Dec 2016 07:41:20 +0000 (16:41 +0900)]
disable default scan interval time in android BLE

since there is some issue related power consumption in scanning.
it is better to disable it basically

Change-Id: Ic0da8da453b9c0596e521fd5078ec97cad514788
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15215
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: Rick Bell <richard.s.bell@intel.com>
7 years agobuild: Fix easy-setup unittests
Philippe Coval [Wed, 30 Nov 2016 08:35:31 +0000 (09:35 +0100)]
build: Fix easy-setup unittests

Need to add a parameter to enable valgrind check

Without this change, a race condition may occur and complain like:
service/easy-setup/enrollee/unittests/easysetup_enrollee_test: not found

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: If927c9a2f6e00b18ab92664f014f4f85f34209aa
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 47f52b3977fd9c78f549abc0683e8fadc840cac0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15219
Reviewed-by: George Nash <george.nash@intel.com>
7 years ago[IOT-1615] Correct return type of callback in SubOwnerClient
Kevin Kane [Fri, 2 Dec 2016 22:02:17 +0000 (14:02 -0800)]
[IOT-1615] Correct return type of callback in SubOwnerClient

Sample only built when MULTIPLE_OWNER=1 has callback that differs in
return type from what's required. Change return type to the required
OCStackApplicationResult and have the callback return OC_STACK_OK.

Bug: https://jira.iotivity.org/browse/IOT-1615
Change-Id: I5f787f64a16f308c182067d20009decd29760730
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
7 years ago[IOT-1525] Keep credential resource encrypted on-disk on Windows
Kevin Kane [Thu, 10 Nov 2016 22:00:27 +0000 (14:00 -0800)]
[IOT-1525] Keep credential resource encrypted on-disk on Windows

The Windows platform provides a way to encrypt and decrypt data
with system-managed keys. Since the cred resource contains
sensitive symmetric and private keys, keep this resource encrypted
on disk.

Change-Id: I88f3cab76f2e782ce778bc64830491822b7d9842
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15033
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
7 years agoadded filter to handle an IP loopback message in CA directly
Jaewook Jung [Thu, 6 Oct 2016 10:35:27 +0000 (19:35 +0900)]
added filter to handle an IP loopback message in CA directly

If IoTivity stack sends a message to itself, which means the loopback,
it is unnecessary to let them go through the socket layer.
Especially it is a waste when the large payload will be sent by block-wise transfer.
So I made CA layer to handle the loopback message directly.

Change-Id: I2b8e5217575df391dd4ab66d924a3a24c2584915
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12887
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.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>
(cherry picked from commit 2bf1598fa14d918f3c254feaedd61716cba8d0f1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15101
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IoT-1562] Handle unit test segfaults at notification service
cc [Mon, 28 Nov 2016 12:39:35 +0000 (21:39 +0900)]
[IoT-1562] Handle unit test segfaults at notification service

Fix unittest segfault caused by discovery failure.
It is because external consumers or providers on the same network
interupt discovery or subscription precedure.
The test will be terminated once this situation happens,
even though precondition of the unittest is guided
to prevent this issue.

Change-Id: I0f763db760d8d2af0a185b9e7c3c6e71dfc5e5bf
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit eb8ec52d48bb8def2a8862118d2fb97aed4c3c2f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14987
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years ago[IOT-1591] Add warning code as notification type
cc [Wed, 23 Nov 2016 06:32:13 +0000 (15:32 +0900)]
[IOT-1591] Add warning code as notification type

It is required to notification message with warning type.

Change-Id: I8ea23690382a0f32d084ce3ed9903971f2a4c390
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit d2671aafa1c61b98b2e20fbef0d9c57957526d17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14989
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoRemove Thing-manager service which is deprecated.
Jihun Ha [Tue, 6 Dec 2016 12:13:18 +0000 (21:13 +0900)]
Remove Thing-manager service which is deprecated.

Functionalities of the current things manager are deprecated because
OCF specification describes oic/con and oic/mnt resources with ambiguousness.
When it comes to be more specific, then a new service for managing those
resource will be developed.

Conflicts:
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java
service/things-manager/sampleapp/linux/configuration/SConscript
service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp
service/things-manager/sampleapp/linux/configuration/con-server.cpp
service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp
service/things-manager/sampleapp/tizen/TMSampleApp/src/group.cpp
service/things-manager/unittests/SConscript
service/things-manager/unittests/ThingsManagerTest.cpp

Change-Id: I00671da74f467461ae6c5ba76d697641dfacdf06
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix defects detected by static analysis
Parkhi [Mon, 5 Dec 2016 02:21:31 +0000 (11:21 +0900)]
Fix defects detected by static analysis

Change-Id: I9f2fd3a24df5f1394174e71ee561ed02ac8d0769
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15133
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
(cherry picked from commit 94ad6508f77f5904de76e85ee30de43b44d738fc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15135
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>
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>
(cherry picked from commit dd3fd8bf61ebe380ce638a32da08e6d6a8977735)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14969
Reviewed-by: George Nash <george.nash@intel.com>
7 years agoadded fail case for coap_add_option2
Jaewook Jung [Fri, 2 Dec 2016 07:07:22 +0000 (16:07 +0900)]
added fail case for coap_add_option2

If coap_add_option2 fails, it has to return fail while sending data.
Otherwise, it causes a crash error when it tries to use a pdu wrong.

The below is the comment for coap_add_option2 on libcoap-4.1.1
/**
 * Adds option of given type to pdu that is passed as first
 * parameter. coap_add_option2() destroys the PDU's data, so
 * coap_add_data() must be called after all options have been added.
 * As coap_add_token2() destroys the options following the token,
 * the token must be added before coap_add_option2() is called.
 * This function returns the number of bytes written or @c 0 on error.
 */
size_t coap_add_option2(coap_pdu_t *pdu, unsigned short type, unsigned int len,
                        const unsigned char *data, coap_transport_t transport);

Change-Id: I405c77a63902d9c48b50cb9b94448a9f0e1990f0
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15053
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: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdd client side logic when obs request failed.
bg.chun [Wed, 19 Oct 2016 07:30:48 +0000 (16:30 +0900)]
Add client side logic when obs request failed.

Add client side logic and fix example.

Change-Id: Iffedfddde5906a5d27fd7cbad0176197730d89e3
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13783
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>
7 years agoUpdate publish request payload for RD
hyuna0213.jo [Tue, 8 Nov 2016 05:35:34 +0000 (14:35 +0900)]
Update publish request payload for RD

1. add device name (mandatory)
2. add platform model number

Change-Id: If26e6a2b75a68a1e67b20b19e10524c31fb918f8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13321
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-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agodisable BLE send logic related multicast
jihwan.seo [Wed, 30 Nov 2016 01:55:54 +0000 (10:55 +0900)]
disable BLE send logic related multicast

since BLE has limited policy which can't be connected with 8 times device,
there are many issue related pending thread in multicast scenario.
and there is no spec related multicast in BLE spec.
Thru, multicast will be not supported until get specific comment
from BLE spec.

ps. tizen ble will be disabled when tizen 3.0 ble is updated

Change-Id: Id278f17299fa9b128bb73718257cf2b0e5e90ea9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14937
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agotizen: Remove the build macro for RELEASE flag
Philippe Coval [Mon, 5 Sep 2016 01:31:38 +0000 (10:31 +0900)]
tizen: Remove the build macro for RELEASE flag

(tizen_build_binary_release_type_eng)

 - always enable RELEASE to TRUE

Change-Id: Iac9caa72d6747e65f73040eeea7046bd462d251f
Bug: https://jira.iotivity.org/browse/IOT-1320
Author: Jooseok Park <jooseok.park@samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/86784/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
(cherry picked from commit d57f55d22a8d655e596a945a490e3351f06c46c9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13707
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoUse RTM_NEWADDR, RTM_DELADDR to receive info about an IP address.
hyuna0213.jo [Mon, 14 Nov 2016 06:50:36 +0000 (15:50 +0900)]
Use RTM_NEWADDR, RTM_DELADDR to receive info about an IP address.

We use RTM_NEWLINK multicast group mask to receive information about
a created or removed network interface. and If a specific network
interface is added, we call getifaddrs() to get an IP address
associated with an interface. but it is more correct to use
RTM_NEWADDR, RTM_DELADDR to detect IP address changes.

Change-Id: I9389cac95473583a015dd4d40489943dc856e0fd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14277
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: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1575] Fixed session delete function to resolve double free issue
Minji Park [Thu, 17 Nov 2016 11:33:05 +0000 (20:33 +0900)]
[IOT-1575] Fixed session delete function to resolve double free issue

- fix double free issue in tcpserver
  when disconnecting TCP session

Change-Id: Ica0b9f0976426d66309ef7304149eb54489b6b66
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14495
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14775
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1517] Update scons scripts to pull gtest from github
George Nash [Tue, 15 Nov 2016 20:07:13 +0000 (12:07 -0800)]
[IOT-1517] Update scons scripts to pull gtest from github

Stop downloading gtest-1.7.0 from the fedora project mirror.
Download it from github googletest project page.

The major changes as a result are:
    - The name of the zip file has changed from
      gtest-1.7.0.zip to release-1.7.0.zip
    - The name of the extracted folder has changed from
      gtest-1.7.0 to googletest-release-1.7.0
    - Google test no longer contains a configure file to
      run auto make files. The autoreconfig tool is used
      to produce a new configure file from the
      configure.ac file.

Change-Id: I3316af1f3a875137a872577a22f0e4db74f0b0f3
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14381
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoPlatform ID must be a UUID to be valid
Dave Thaler [Thu, 1 Dec 2016 02:10:31 +0000 (18:10 -0800)]
Platform ID must be a UUID to be valid

Change-Id: Ifbbeb18fa2f2bf73c857ad3bfc25b3706d972d61
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agotizen: Port spec file to fedora for ARTIK
Philippe Coval [Mon, 21 Nov 2016 14:25:15 +0000 (15:25 +0100)]
tizen: Port spec file to fedora for ARTIK

Change-Id: I9c00704cd10cd86787d928753058735f995efaa7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
(cherry picked from commit b0a73daf9c58e8ad1d09539567670396c028ff0b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14803

7 years agoVendor-specific OTM: Mutual Verified Just-Works & Confirmed MFG Cert
Jongmin Choi [Tue, 6 Dec 2016 09:38:51 +0000 (18:38 +0900)]
Vendor-specific OTM: Mutual Verified Just-Works & Confirmed MFG Cert

This patch adds vendor-specific Ownership Transfer Methods,
Mutual Verified Just-Works, which works the same as
https://gerrit.iotivity.org/gerrit/#/c/14359/7
and Confirmed Manufacturer Certificate
Due to difference between this method and Verified Just-Works (CR29)
this method has been implemented as a separate vendor-specific OTM.
Also confirmation on server side has been added to manufacturer certificate
to make a new vendor-specific OTM: confirmed manufacturer certificate
Cherry-picked from https://gerrit.iotivity.org/gerrit/#/c/14739/

Change-Id: I80d77b6e36cc857916f3e89f36d2c1f4dfbc5215
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@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>
(cherry picked from commit 6b309e20370eafe2780007ae13cbbdba2612fe6e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14917

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>
(cherry picked from commit 162ce85af58df04c539b33e63a33d672eeb5317e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15103

7 years ago[IOT-1612] Fix OCRDPublishWithDeviceId() to publish with a specific id
hyuna0213.jo [Tue, 29 Nov 2016 07:49:39 +0000 (16:49 +0900)]
[IOT-1612] Fix OCRDPublishWithDeviceId() to publish with a specific id

Fixed OCRDPublishWithDeviceId() to publish resource with a specific id
bug: https://jira.iotivity.org/browse/IOT-1612

Change-Id: Id0242a1c4a7040c928db179a840abf1c7f85400e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14893
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 6dbd734ef4ca54d49ae474f8e7291a54e70cbcbf)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15149

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>
(cherry picked from commit e1409c4bb075b7be18d911b07df07568a694c971)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15139

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>
(cherry picked from commit c54aaa1f7de9227236cb8f023df99209c6dddb64)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15067
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agodoc: Fix typo in NOTICE.md
Philippe Coval [Thu, 1 Dec 2016 15:55:29 +0000 (16:55 +0100)]
doc: Fix typo in NOTICE.md

Harmless change to test CI

Change-Id: I3aa34dbdeb8905f53939d6eaee90a681bf85d730
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14919
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 88eeaaf37ee848a28eab10b8916dcde28a122c0b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/8149

7 years ago[IOT-1578] Fix OSx build with SECURED=1 option
George Nash [Wed, 23 Nov 2016 18:49:15 +0000 (10:49 -0800)]
[IOT-1578] Fix OSx build with SECURED=1 option

Add the symbols for mBedTLS if building a secure build

Change-Id: Ibbe2387307bc432193daaa2b7f88491cb18687bd
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoCleanup output from Gradle builds done in services
George Nash [Thu, 17 Nov 2016 19:26:31 +0000 (11:26 -0800)]
Cleanup output from Gradle builds done in services

This change cleans up the build output from android service samples
 - easy-setup
 - notification
 - resource-container
 - resource-encapsulation

Change-Id: I942e365fd787387a30d6358f4586b9caa98fbeda
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years ago[IOT-1643] Fix illegal memory access - Don't return local string
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 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/14997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoAdd unittest test-case for cafragmentation code.
jaehyun Cho [Mon, 28 Nov 2016 06:31:16 +0000 (15:31 +0900)]
Add unittest test-case for cafragmentation code.

Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Change-Id: Id98b2151b8149d892d1e063ca893c85fd672af50
Reviewed-on: https://gerrit.iotivity.org/gerrit/14353
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoadd stop API of base stack in android.
jihwan.seo [Tue, 25 Oct 2016 09:58:52 +0000 (18:58 +0900)]
add stop API of base stack in android.

since some user application want to use IoTivity more dynamically.
stop API of IoTivity should be provided effeciently.

Change-Id: Ie9ebb874b9b1d49703d5023a972cff5c630acaf3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13649
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoChange service type config in platform unit tests.
Ziran Sun [Mon, 8 Aug 2016 13:30:50 +0000 (14:30 +0100)]
Change service type config in platform unit tests.

Using ServiceType::OutofProc causes exception throw in
registerResource unit test. Replace with ServiceType::InProc.

Change-Id: I89ea8741c19af2567f9ae84dc88983a8e54fb64f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoAdding C++ API for MOT
saurabh.s9 [Mon, 5 Dec 2016 06:52:24 +0000 (12:22 +0530)]
Adding C++ API for MOT

Patch #11 Fix Review comments
          Changed MACRO _ENABLE_MULTIPLE_OWNER_ to MULTIPLE_OWNER and this
          change propagated upto C-API's.

Change-Id: I55305d5cf9210b25c68f0eaf04c1362111735979
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15145

7 years agoModify gbsbuild script file to support other options
YounghyunJoo [Thu, 24 Nov 2016 06:59:00 +0000 (15:59 +0900)]
Modify gbsbuild script file to support other options

- before this commit, gbsbuild script file can get a few build options like as "WITH_TCP, WITH_CLOUD, WITH_PROXY, etc.."
- so, to add other option, need to modify gbsbuild scriptfile.
- in this commit, I modified gbsbuild script file to support other options
- using bash script, gets other option like way to get option in other platform
- ex) ./gbsbuild.sh WITH_TCP=1 WITH_CLOUD=1 SECURED=1 WITH_MQ=PUB,SUB

Change-Id: I61c0b02fe68acf517b64de7e3a8a10fe2549c3d2
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14637
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JunHo Lee <junho13.lee@samsung.com>
Reviewed-by: daeken kwon <daeken.kwon@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoEasySetup Tizen Sample App. Build Script is fixed.
sy01.youn [Mon, 5 Dec 2016 01:39:58 +0000 (10:39 +0900)]
EasySetup Tizen Sample App. Build Script is fixed.
There was a build error when building enrollee sample app based on tizen, because of missing ocrandom.h file in iotivity.spec file.

Change-Id: I3e20cac04d2691d58fc291ea88e2983845e9fbd6
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JunHo Lee <junho13.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoApply print log method in Android EDR adapter.
jihwan.seo [Wed, 30 Nov 2016 06:48:58 +0000 (15:48 +0900)]
Apply print log method in Android EDR adapter.

Change-Id: I7d88f7f140781ea23db02d0bfbf00f66cd145a13
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoadd exception check login in android BLE
jihwan.seo [Fri, 2 Dec 2016 08:11:07 +0000 (17:11 +0900)]
add exception check login in android BLE

Change-Id: If324fc9399f48ce64d759d016da124963e136ea9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15057
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: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1576] Changed error handling logic when tls message send failed
Minji Park [Fri, 18 Nov 2016 02:48:12 +0000 (11:48 +0900)]
[IOT-1576] Changed error handling logic when tls message send failed

- Changed error handling logic when tls message send failed
  in tcpadapter.

Change-Id: I22d11d34d2092a7f452d41be9f243dcfdf16a02d
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 5f39be87c9c3a9c657c9828260a9db5e383cee6c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14771

7 years agoAdd shutdown() to disable send/receive on a socket in catcpserver
Minji Park [Tue, 15 Nov 2016 07:30:02 +0000 (16:30 +0900)]
Add shutdown() to disable send/receive on a socket in catcpserver

- Add shutdown() before close socket when closing connection in catcpserver

Change-Id: Ibe2ed942428f754dc148bd1c48422036f84a319c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14343
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: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 009b22f7cead9bf9bb0a5d66fbe6dc653e0f8057)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14773

7 years agoApply print log method in Android BLE adapter.
jihwan.seo [Mon, 28 Nov 2016 13:17:51 +0000 (22:17 +0900)]
Apply print log method in Android BLE adapter.

Change-Id: I5b0873a56e8c98094412b536309fa77f3643d126
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14853
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: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agomodified print log method in CA layer.
jihwan.seo [Mon, 28 Nov 2016 06:04:52 +0000 (15:04 +0900)]
modified print log method in CA layer.

to make sure of analyze transmission state,
all messages related important code point is printed same log method.

- print CoAP message.
- print send result.
- print adapter state callback.

Change-Id: Iccd8c8e9351165c7a6feb477e62b3b8814af0955
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14829
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>
7 years agoFix for result of static analysis.
KIM JungYong [Wed, 30 Nov 2016 06:08:29 +0000 (15:08 +0900)]
Fix for result of static analysis.

In this patch, incorrect coding rule is fixed and resolved warning of static analysis.
1. Uninitialized variables is fixed with initialized.
2. Invalid bracket location is fixed.
3. Incorrect division with zero is prevented.
4. Incorrect referenced pointer is prevented.

Change-Id: I715d671241f3d48a1174c49cbe34074b31a50f02
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IoT-1597] bug fix about retransmission
jaesick.shin [Thu, 24 Nov 2016 00:18:38 +0000 (09:18 +0900)]
[IoT-1597] bug fix about retransmission

When a consumer had control, they did not send a response
So I modified it to respond.

and remove duplicate defined about NS_QUERY_COSUMER_ID
In the commit below,
Committed without adding the file.
https://gerrit.iotivity.org/gerrit/#/c/14657/

Change-Id: Ie38aec8895422d9edab9d46bef7c6b17499f5bce
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14709
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 9dae1cd32d99938b6f86e2337229d54cac26bb5e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15129

7 years ago[IoT-1590] Modify attribute key name followed by OCF property naming convention.
jaesick.shin [Wed, 23 Nov 2016 09:12:48 +0000 (18:12 +0900)]
[IoT-1590] Modify attribute key name followed by OCF property naming convention.

All the OCF property should be written as lower case.
So, change the key name of attributes.

second patch include,
removed duplicated NS_QUERY_CONSUMERID.

Change-Id: I2fcc76fac003e805ad19edb0d7ee10c659218b5f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14657
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 421ca0f436ae959caba272030df9b10d3024f788)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15131
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[IoT-1557] Bug fix about related relay server.
jaesick.shin [Tue, 15 Nov 2016 01:38:55 +0000 (10:38 +0900)]
[IoT-1557] Bug fix about related relay server.

This patch include,
missing the declare of function.

Change-Id: I1b543402a9ba8487029d8b59e806c6b570439652
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit ff0148a824e06fd94c5a67a7e6133391fb336f01)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14809
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
7 years agoCorrect missuse of get attribute value in ResourceClient unit test.
Ziran Sun [Mon, 28 Nov 2016 11:50:14 +0000 (11:50 +0000)]
Correct missuse of get attribute value in ResourceClient unit test.

Change-Id: I57863e2291451aea5f1ce6d5fb7059b29d68a102
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14847
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
(cherry picked from commit 9146a47b8249bda1f62a45592d81dde47dcb2942)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14875
Reviewed-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/15007
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoVoid function RemoveOTMContext should not return a value
srijon.sb [Fri, 2 Dec 2016 04:28:51 +0000 (10:28 +0600)]
Void function RemoveOTMContext should not return a value

Change-Id: I3855ed16970eb5a0cb686ffe396410c6e0934709
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15047
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1611] Memory corruption in OCSetAttribute
Dave Thaler [Tue, 29 Nov 2016 02:26:30 +0000 (18:26 -0800)]
[IOT-1611] Memory corruption in OCSetAttribute

Fix memory corruption bugs in OCSetAttribute introduced by
https://gerrit.iotivity.org/gerrit/#/c/14377/ which left pointers to
freed memory in the attribute list, which was then later used.

Change-Id: Ib776d4bd14aab7b39c74188246005628fbe18ecf
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit f4217dab180e728271e79d5a3ea314c39fb1d628)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14905
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[tizen]Modify bt_edr adapter to apply new logger
bg.chun [Wed, 30 Nov 2016 10:19:16 +0000 (19:19 +0900)]
[tizen]Modify bt_edr adapter to apply new logger

Modify tizen bt_edr apdapter to apply new logger
which is Analyzer.

Change-Id: I49d57a1d633c1d899494567080763f4ebdb26ccb
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14961
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>
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>
(cherry picked from commit ca6799753d9ce26f42b69af30f39548cf99b990f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15021

7 years ago[IOT-1116] Support heterogeneous array encoding.
Todd Malsbary [Tue, 25 Oct 2016 17:30:12 +0000 (10:30 -0700)]
[IOT-1116] Support heterogeneous array encoding.

OCRepPayloads with values having only sequential integer names are
encoded/decoded as CBOR arrays of mixed types.

Change-Id: I2cdd87f9fb4b8473e00aefdd5bc5daa74941290f
Bug: https://jira.iotivity.org/browse/IOT-1116
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.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/15011
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoadd log message for TCP adapter
jihwan.seo [Wed, 16 Nov 2016 22:36:27 +0000 (07:36 +0900)]
add log message for TCP adapter

Change-Id: I7803348f17ac8b860863e25a35c6a12b73a5886d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1540] Add plumbling logic of connection manager
jihwan.seo [Mon, 14 Nov 2016 22:36:49 +0000 (07:36 +0900)]
[IOT-1540] Add plumbling logic of connection manager

Change-Id: Ieffef039491a8895c359efb807dc36daa55860d1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoadded fail case for coap_add_option
Jaewook Jung [Mon, 21 Nov 2016 02:27:38 +0000 (11:27 +0900)]
added fail case for coap_add_option

If coap_add_option fails, it has to return fail while sending data.
Otherwise, it causes a crash error when it tries to use a pdu wrong.

The below is the comment for coap_add_option on libcoap-4.1.1

/**
 * Adds option of given type to pdu that is passed as first parameter.
 * coap_add_option() destroys the PDU's data, so coap_add_data() must be called
 * after all options have been added. As coap_add_token() destroys the options
 * following the token, the token must be added before coap_add_option() is
 * called. This function returns the number of bytes written or @c 0 on error.
 */
size_t coap_add_option(coap_pdu_t *pdu,
                       unsigned short type,
                       unsigned int len,
                       const unsigned char *data);

Change-Id: I1add40ab44e0e57e675f56db0211b12414dfa5ae
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14539
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: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoremove unused callback method in securityinterface.h
jihwan.seo [Tue, 22 Nov 2016 05:05:16 +0000 (14:05 +0900)]
remove unused callback method in securityinterface.h

Change-Id: I2f1118de1217f61a8d0c7aa820bf27d0ef14773b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoocf.patch for mbedtls compatibility fix
Oleksii Beketov [Fri, 25 Nov 2016 15:55:20 +0000 (17:55 +0200)]
ocf.patch for mbedtls compatibility fix

Fixed to comfirm compatibility in case if no PSK hint received on the client side.

Change-Id: I2860188f966d8a71dbd834873f206b3ae78ec93e
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 12f1087b073263dc6122dd04c06b5ee070d83b32)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14881

7 years agoRemoved unnecessary/duplicated log in connectivity abstraction
hyuna0213.jo [Wed, 16 Nov 2016 06:43:24 +0000 (15:43 +0900)]
Removed unnecessary/duplicated log in connectivity abstraction

remove unnecessary/duplicated log in connectivity abstraction
to print the correct message.

Change-Id: I2d0c4535bb4abc576d7e7130b0d38111f37cd3e0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14269
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoRemove cJSON library include from resource
Habib Virji [Wed, 23 Nov 2016 12:16:31 +0000 (12:16 +0000)]
Remove cJSON library include from resource

Removing this reduces ocbtstack from 180kb to 168kb in size.

cJSON is not used anymore in the resource, except in json2cbor tool in
the security module.

cJSON is used in coap-http and simulator and scripts has been updated
to include and build cjson. It was included mostly in sconscript.

pmutility had helper function which was not used anywhere.
smutility, psinterface, oicgroup all had function calling cjson but the
function was not used anywhere in the code. Except psinterface and
smutility there are no public API with cjson. The public API are not
called by either sample or test code. The API are obsolete and using them
will not yield any result and can crash the platform.

Change-Id: Ifbf3384536394a26cd6b168dcd15285ef9ce08a7
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14685
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFree strings allocated by TinyCBOR with free(), not OICFree().
Ossama Othman [Wed, 23 Nov 2016 18:52:49 +0000 (10:52 -0800)]
Free strings allocated by TinyCBOR with free(), not OICFree().

The TinyCBOR API requires that strings it allocates should be
deallocated with the free() function.  OICFree() is not an appropriate
replacement in this case since it is conceivable the underlying memory
allocator could differ.

Change-Id: I48325c8fd41eaee156bf2da5e2f67b243114e3de
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14695
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1207] Endpoint C API with request filtering
bg.chun [Fri, 5 Aug 2016 09:48:18 +0000 (18:48 +0900)]
[IOT-1207] Endpoint C API with request filtering

provide public capi "OCCreateResourceWithEp" for mapping endpoint to
resource and filltering request which come from unbinded endpoint.

Change-Id: I7f273acdacff9116d99b60afb76f70fa48709341
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10073
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 agoresolved svace issues
Randeep Singh [Tue, 29 Nov 2016 11:14:30 +0000 (16:44 +0530)]
resolved svace issues

Change-Id: If2b022d06a46c46cba1b3535c49ddcdbc794bf3c
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
(cherry picked from commit 73c1e373ddba4e748fc1466e352f812038a17b3e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14943

7 years agoInsert license text.
Chul Lee [Wed, 30 Nov 2016 00:29:16 +0000 (09:29 +0900)]
Insert license text.

Change-Id: Ide755195b0041412d04aca7b11793682c4b0a406
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14933
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 347410c8569a8d88671a7b5fc29f1b4a03fa0831)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14939

7 years agoRemove unused functions that introduced compilation warnnings.
Ziran Sun [Mon, 28 Nov 2016 15:24:26 +0000 (15:24 +0000)]
Remove unused functions that introduced compilation warnnings.

These functions were initially introduced for a test that had been
removed at a later stage.

Change-Id: I5bd5f0f4cae38627b34b8cd7a14d8ea99b7f5435
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1546] add DeleteLocalRef method in send logic for BLE
jihwan.seo [Mon, 14 Nov 2016 23:46:11 +0000 (08:46 +0900)]
[IOT-1546] add DeleteLocalRef method in send logic for BLE

Change-Id: I93f97239a40534c7005c6527992db4ef285b2bff
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14297
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>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoadd deviceID information in CA layer
jihwan.seo [Fri, 25 Nov 2016 00:00:39 +0000 (09:00 +0900)]
add deviceID information in CA layer

since IP can be changed by AP status.
it is needed to have deviceID in CA layer.

Change-Id: I94fe8c3f48356a9d58ec8004387b99a39398041e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14769
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1596]Fix ocendpoint/BT static analyze issue
bg.chun [Wed, 23 Nov 2016 23:08:44 +0000 (08:08 +0900)]
[IOT-1596]Fix ocendpoint/BT static analyze issue

Wrap unused code by if/def when BT adapter unselected.

Change-Id: I684add2261d2a76ed45f00529a98a45dd2102526
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoCleanup unused-parameter warnings
George Nash [Thu, 17 Nov 2016 17:25:28 +0000 (09:25 -0800)]
Cleanup unused-parameter warnings

Note:
 The OC_UNUSED macro from octypes.h is not avalible for
 caconnectivitymanager so casting to (void) was used to
 avoid the unused-parameter warning.

Change-Id: I653156039ddd9e9bf6096ec5c0b6e313de56c343
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14463
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years ago[IOT-1588] Update cJSON to v1.0.1 and add version tracking note
Kevin Kane [Tue, 22 Nov 2016 18:17:28 +0000 (10:17 -0800)]
[IOT-1588] Update cJSON to v1.0.1 and add version tracking note

Added README file that notes the source repository for this
dependency, the commit ID and release tag (where applicable)
used when copying the source files from it, and any local
modifications made.

Change-Id: Ic19b2bcc0cf6e0c2b77906eacb4203a0874dec55
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14625
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 41010a8a4bac41f27c53a4036daf67e6dda87d81)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14767

7 years agoRemove Client side sample code. This code is not
Ziran Sun [Mon, 21 Nov 2016 11:12:21 +0000 (11:12 +0000)]
Remove Client side sample code. This code is not
needed and not in right place either.

Bug: https://jira.iotivity.org/browse/IOT-1384
Change-Id: I60d89ba42b01962d68ab9fd903c32b776ae06605
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
7 years agoAdd including headers description.
KIM JungYong [Mon, 31 Oct 2016 07:31:39 +0000 (16:31 +0900)]
Add including headers description.

Change-Id: I304790db3f9346e7eb80a1e662dcbe4ba6d4a616
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13869
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 6eb9c9cfeacfd97fc92429fd524933713b698c8f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoAdd to Null checking log in IsSameEowner
js126.lee [Tue, 29 Nov 2016 07:42:50 +0000 (16:42 +0900)]
Add to Null checking log in IsSameEowner

When building with MULTIPLE_OWNER=1, ace is updated as appending alwadys,
because the return value is false in IsSameEowner in case both ewoner1 and
ewoner 2 are NULL.

Change-Id: I0068db4196fb467e4c95d29ae808848d95776bbe
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14891
Reviewed-by: Chul Lee <chuls.lee@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 73b04a36692e1d23931b621262298b5a4b7f8431)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14899

7 years ago[IOT-1382] Fix MediaServer db file extension
Alex Kelley [Mon, 31 Oct 2016 21:23:02 +0000 (14:23 -0700)]
[IOT-1382] Fix MediaServer db file extension

Change-Id: I4fd66025d07e20c9d0b98424fb6e2f23636d6b15
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13901
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1513] One more incorrect URI construction
Dave Thaler [Tue, 22 Nov 2016 00:49:57 +0000 (16:49 -0800)]
[IOT-1513] One more incorrect URI construction

Change-Id: I3ea6f8cc55935ea3f30f30320386d7c430ee1b77
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14587
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1547] add stop BLE scan API
jihwan.seo [Tue, 15 Nov 2016 01:08:17 +0000 (10:08 +0900)]
[IOT-1547] add stop BLE scan API

scanning should be stopped for saving battery when BLE is not using.

Change-Id: I0e12afb4f0961bd1fa4ec579b3e0412796cacf23
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14309
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>
7 years agoFixed Brace location
Jaehong Jo [Wed, 23 Nov 2016 13:51:59 +0000 (22:51 +0900)]
Fixed Brace location

The matched '{' and '}' symbols in compound statements(except do-while) shall have the same indentation,
and these symbols in a line shall be used alone (except comment)

Change-Id: I3f760f430120a2bea371376eb0a589189613e64e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14681
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoDon't display third party library warning on x86_64 build
George Nash [Fri, 18 Nov 2016 00:09:35 +0000 (16:09 -0800)]
Don't display third party library warning on x86_64 build

Change-Id: I7cef30cfc4c8199d45cdb7e9824f56d2995ba3d5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14487
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agobuild: only add dependency for valgrind supported hosts
Philippe Coval [Mon, 28 Nov 2016 12:14:33 +0000 (13:14 +0100)]
build: only add dependency for valgrind supported hosts

Windows is confused with implicit .exe suffix ie:

  scons: *** [out\windows\...\utresource\csdk\connectivity\test\catests] \
  Explicit dependency ...\utresource\csdk\connectivity\test\catests' \
  not found, needed by target \
  ...

Change-Id: I010eb13f7904cba510e492b73be1caeeb0061edd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14849
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agobuild: Valgrind script now depends on unit test executable
Philippe Coval [Wed, 23 Nov 2016 22:27:46 +0000 (23:27 +0100)]
build: Valgrind script now depends on unit test executable

This prevents Sporadic Valgrind Failures, caused by race conditions
Common error message is like:
  out/linux/x86_64/debug/resource/unittests/unittests: Permission denied

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I49bfb21ee7cd934b965e132cb150d59c047ef383
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agosqlite: Use in needed cases (RD and Secured) only
Philippe Coval [Fri, 25 Nov 2016 16:41:27 +0000 (17:41 +0100)]
sqlite: Use in needed cases (RD and Secured) only

Today, only a few modules are using it:
* resource-directory (in Server mode)
* provisioning

Bug: https://jira.iotivity.org/browse/IOT-1296
Change-Id: I918c17820f78fe222d2410cdf7a820ef8f0b579d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years ago[IOT-1601]Adding logic to validate oxmsel updating
js126.lee [Thu, 24 Nov 2016 11:19:16 +0000 (20:19 +0900)]
[IOT-1601]Adding logic to validate oxmsel updating

Oxms should be considered at updating oxmsel.
Oxm should be read-only.

Patch 1: Init patch
Patch 2: Rebase
Patch 3: If owned=Ture, validate oxmsel is omitted for CTT testing
Patch 4: Revert file permission to 644

Don't merge this patch because need to confirm an operation in case of owned=True

Change-Id: I57fbd6a65db9a8d4400934e11ec40cc4c8e96051
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14755
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 d53432d2d090a3ea28611454650c9cc285dd1ba6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14833

7 years ago[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP
Joonghwan Lee [Tue, 15 Nov 2016 08:25:49 +0000 (17:25 +0900)]
[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP

Fixed sending/receiving for large size of data which is bigger than 16kbytes on TLS.

https://jira.iotivity.org/browse/IOT-1548

*Notice : This patchset necessarily requires https://gerrit.iotivity.org/gerrit/#/c/14325/.

Change-Id: I1921d1d2d9d18acb921f093136457120ac862a2c
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14351
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14827

7 years agoCloudProvisioningClient Signout bug fixed. updated to call new api
Sunil Kumar K R [Thu, 24 Nov 2016 09:40:21 +0000 (15:10 +0530)]
CloudProvisioningClient Signout bug fixed. updated to call new api

Change-Id: I26f60b5ec04583907170ea7c49796b58003e5120
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit eb98d88a7485ab43639a9fa3789b15e1a836266f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14793

7 years agofix: messageID for coap over TCP always is null
Oleksandr Dmytrenko [Fri, 18 Nov 2016 13:25:14 +0000 (15:25 +0200)]
fix: messageID for coap over TCP always is null

Change-Id: Iaf883a1a63a3b221bbcfe9f13bb4856d676de9fe
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e62ef1079225787d3c757325409c8142a93bdf22)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14789

7 years agoRemove shared resource directory library usage from other modules
Habib Virji [Fri, 11 Nov 2016 11:51:33 +0000 (11:51 +0000)]
Remove shared resource directory library usage from other modules

All the added code for the resource directory shared library dependency on library oc.

https://jira.iotivity.org/browse/IOT-1510

Change-Id: Ic8710588bf0a044e8b29283dc36a411c1928b6ae
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoAdd secure and port in policy
Habib Virji [Thu, 24 Nov 2016 11:14:26 +0000 (11:14 +0000)]
Add secure and port in policy

In the collection response, add secure and port information.

Change-Id: Iaec8788bba04fa0a404dfb16ddf54a704493e65b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14751
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoFix query handling for /oic/res
Habib Virji [Thu, 24 Nov 2016 12:30:48 +0000 (12:30 +0000)]
Fix query handling for /oic/res

There was a mix up when query was supplied, it was only working if the interfaceQuery passed too. With just rt supplied,
it was returning all the resource. This patch fixes up the issue.

Change-Id: I980f0dd73fafdadd3d1dabae5edf024ac256f95c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoAdd param check code in PrepareMCertificateCallback.
Chul Lee [Thu, 24 Nov 2016 07:37:35 +0000 (16:37 +0900)]
Add param check code in PrepareMCertificateCallback.

Change-Id: I1bd917024ab1ac20c000dccf9da5e31ba865a2a0
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 83a63409ebe7e320e835c62aaeb87359bdc29b47)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14749

7 years agoAdd cipher suites
Chul Lee [Wed, 23 Nov 2016 09:36:27 +0000 (18:36 +0900)]
Add cipher suites

TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 and TLS_ECDHE_ECDSA_WITH_AES_128_CCM
cipher suites were added in order to support manufacturer certificate based OxM.

Change-Id: I3ec5ddce982e5bfd5f7591b493448eec5468653f
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14619
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e2a98487b8fffab23e11e93e8cd0fd21b5df0340)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14745

7 years ago[IOT-1569] Use OICMalloc/OICFree consistently
Kevin Kane [Sat, 19 Nov 2016 00:17:11 +0000 (16:17 -0800)]
[IOT-1569] Use OICMalloc/OICFree consistently

Lingering and mixed uses of malloc/free exist throughout
IoTivity. Some buffers allocated with malloc are later freed
with OICFree; this is dangerous in case the implementation of
OICMalloc/OICFree ever changes.

This change harmonizes the code to use the OIC versions to
ensure code is always using the same heap allocation and free
functions with two exceptions:

* Sample code continues to use malloc/free; samples should not
refer to internal functions.
* The oc_logger module also still uses malloc/free; oic_malloc
calls oc_logger when operating in ENABLE_MALLOC_DEBUG mode, and
could result in a circular dependency if changed over.

Change-Id: Icd47243eec33500fe7fcd7d5d79ddf2128a9e717
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 8141de8815b7c7a39b8b7d8ce9acb91608cf9e17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14697
Reviewed-by: Omar Maabreh <omarm@microsoft.com>
7 years agoAdd p in response of oic.if.ll
Habib Virji [Wed, 23 Nov 2016 20:11:30 +0000 (20:11 +0000)]
Add p in response of oic.if.ll

In collection response add p parameter.
This is the response in case of default entity handler.
Application has to handle on its own adding policy parameter.

Change-Id: Ie2195eb07575fbcc34413fca729a1a7db0805314
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b19d08056e4efe08d3ae3e3a53c01d7c61347e4b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14699
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoAdd generic API for setting and getting defined tag values
Habib Virji [Sun, 20 Nov 2016 22:54:46 +0000 (22:54 +0000)]
Add generic API for setting and getting defined tag values

- Uses the resource attribute of OCResource for storing and retrieving device and platform values.
- Removed global savedDeviceInfo and savedPlatformInfo. The information passed via
OCSetDeviceInfo and OCSetPlatformInfo is stored in rsrcAttributes.
- OCAttribute type change from char * to void * to store generic value, this was part of OCResource but was not used.
- Payload type PAYLOAD_TYPE_DEVICE and PAYLOAD_TYPE_PLATFORM is removed from PAYLOAD_TYPE as this was used only internally.
- Payload convert and parse for payload type device and platform is removed, as device and payload uri uses
OCRepresentation payload type.
- Delete function to delete resource attributes.
- OCDevicePayloadCreate and OCPlatformCreate is removed as this was only used internally, all values are now stored in
resource attributes.
- Moves OCSetDeviceInfo and OCSetPlatformInfo from ocstack to ocresource to avoid duplicate checking.
- Add set and get API to set parameter for /oic/d and /oic/p.
- OCGetResourceHandleAtUri accesible without ifdef RD_CLIENT.
- Updated Unit test to test the functionality.
- Add the OCSSetParam and OCGetParam in C++ and Java

Change-Id: If822ae95a70e681121528679de8da1375718de0c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14377
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoAdd OCConvertStringToUuid on C_common
js126.lee [Tue, 22 Nov 2016 07:07:13 +0000 (16:07 +0900)]
Add OCConvertStringToUuid on C_common

Patch 1,2: Expose ConvertStrToUUID on OC stack to use common
Ptach 3: Add OCConvertStringToUuid on C_common

Change-Id: Icf9b0ee1bda6fa4d914c696fbbdc27e0998a7262
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d026fc6e98db05280cb7e94aacffd1d7d09838d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14723

7 years ago[IOT-1582] Change "PUT" to count as "Create" and never as "Update"
Nathan Heldt-Sheller [Mon, 21 Nov 2016 19:41:01 +0000 (11:41 -0800)]
[IOT-1582] Change "PUT" to count as "Create" and never as "Update"

Per Core Spec conventions, even though PUT is technically legal
for Create or Update, PUT is only ever used for Create.  Therefore
we need to change the CRUDN permission bit check in security layer.

Updated Readme.scons.txt and README-building-and-running-secure-IoTivity-
stack.txt to clarify build and use of secure IoTivity stack.

Change-Id: Id362c9c0225e53240b2d1f844c5f05d55cfa2938
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit da4ccd548c926669896e844a672edb32f8de6d70)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14719
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago[IOT-1595] Change Policy Engine to us ACE Union behavior.
Nathan Heldt-Sheller [Wed, 23 Nov 2016 20:20:52 +0000 (12:20 -0800)]
[IOT-1595] Change Policy Engine to us ACE Union behavior.

The current Policy Engine logic is to assess the permissions on the first matching ACE for a
request (matched via Subject and Resource), and respond to the request (Grant or Deny) based on
that ACE.

The new OCF 1.0 behavior specifies that if any ACE allows a request, it should be Granted (so-called "Union" behavior).

To allow consistency we must fix this in 1.2.1.

This patch changes the Policy Engine to keep searching for an ACE that Grants the request,
until either the request is granted, or the end of the ACL is reached.

Change-Id: Idd4e90c37c7e0fcf963105b34b3e82dfde2ccfd2
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14701
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
(cherry picked from commit 9524976da93a87f1b74e550a672a431e63e858f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14717
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago[IOT-1592] Fix rd publish fail
Jee Hyeok Kim [Wed, 23 Nov 2016 08:51:41 +0000 (17:51 +0900)]
[IOT-1592] Fix rd publish fail

1. RD publish fail due to lack of shared point lock logic.

https://jira.iotivity.org/browse/IOT-1592

Change-Id: I278b67ac050fb5bcb0cb5ee6920c27e446f0f01a
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14647
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>
(cherry picked from commit d1abd0caaa69ba0f4346ecd8958e4fb4363ae239)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14711