contrib/iotivity.git
7 years agoMerge branch 'master' into iot-1785
Kevin Kane [Fri, 3 Mar 2017 20:59:10 +0000 (12:59 -0800)]
Merge branch 'master' into iot-1785

Build breaks fixed.
occertutility.{c,h} moved back into security subtree.

Change-Id: I348dbe5d2133b57a49d4cdef05ce6e747af5eea0
Signed-off-by: Kevin Kane <kkane@microsoft.com>
7 years agoIOT-1874 Enable /W4 /WX for resource/csdk/security
Alex Kelley [Wed, 1 Mar 2017 05:39:10 +0000 (21:39 -0800)]
IOT-1874 Enable /W4 /WX for resource/csdk/security

Change-Id: Ib4b1fbd905a1c8510128f422b6b39d3ef4e42f45
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17591
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1878] Windows: Fix build breaks
Dan Mihai [Fri, 3 Mar 2017 16:07:15 +0000 (08:07 -0800)]
[IOT-1878] Windows: Fix build breaks

Don't try to link with both:
    1. Static lib ocsrm.lib
    2. Import lib octbstack.lib
because octbstack.lib provides references to the copy of ocsrm.lib
that is linked inside octbstack.dll.

Change-Id: I91ec755a58f9fbdf6d203daa3b9ad2cc7ada7988
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17657
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
7 years agoFixed Dtls cookie context setup
Joonghwan Lee [Wed, 15 Feb 2017 02:01:16 +0000 (11:01 +0900)]
Fixed Dtls cookie context setup

This patch moves DTLS cookie context under SslContext struct and
updates relavant cookie setup operation in order to fix the dtls reconnect.
Also it might be happened a crash when one among sessions is removed
and some client try to reconnect because SslEndPoint has cookie context.

Patch 1: Initial upload
Patch 2: Added __WITH_DTLS__ preprocess define

Change-Id: I271047d458fd1fb5f5477f362c140f1764ae1f2e
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17283
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoUpdate Update OCF log level for NS LOG.
jake [Mon, 27 Feb 2017 07:18:38 +0000 (16:18 +0900)]
Update Update OCF log level for NS LOG.

 - Change DEBUG to INFO_PRIVATE in NS LOG with private data

Change-Id: I69a764e8a1fc9c1cc4a1a4e9785d658dd9d754bd
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17523
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
7 years agoAdd more detailed ACE logging
Dan Mihai [Thu, 23 Feb 2017 22:29:54 +0000 (14:29 -0800)]
Add more detailed ACE logging

This additional logging has been useful for investigating recent CTT
failures related to Access Control.

Output is similar to:

OIC_SRM_ACL: GetACLResourceData: found matching ACE:
OIC_SRM_ACL: =================================================
OIC_SRM_ACL: ACE @ 000001AE29C86FC0
OIC_SRM_ACL:     permission = 0x2
OIC_SRM_ACL:     subjectuuid = 2a000000-0000-0000-0000-000000000
OIC_SRM_ACL:     resources[0]:
OIC_SRM_ACL:         href = /oic/res
OIC_SRM_ACL:         types[0] = oic.wk.res
OIC_SRM_ACL:         interfaces[0] = oic.if.ll
OIC_SRM_ACL:     resources[1]:
OIC_SRM_ACL:         href = /oic/d
OIC_SRM_ACL:         types[0] = oic.wk.d
OIC_SRM_ACL:         interfaces[0] = oic.if.baseline
OIC_SRM_ACL:         interfaces[1] = oic.if.r
OIC_SRM_ACL:     resources[2]:
OIC_SRM_ACL:         href = /oic/p
OIC_SRM_ACL:         types[0] = oic.wk.p
OIC_SRM_ACL:         interfaces[0] = oic.if.baseline
OIC_SRM_ACL:         interfaces[1] = oic.if.r
OIC_SRM_ACL: =================================================

Change-Id: Ib4fd44bcc7be09d426b09cc955894aab2455a711
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17491
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoAdd callback to close a PIN display.
Chul Lee [Tue, 14 Feb 2017 10:50:31 +0000 (19:50 +0900)]
Add callback to close a PIN display.

Change-Id: Ifad924b7d700d03af43997dbfdd604b72bd09cc5
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17267
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoRemove unnecessary glib dependency in security
Youngman [Thu, 23 Feb 2017 06:49:51 +0000 (15:49 +0900)]
Remove unnecessary glib dependency in security

Change-Id: Ic2eaca23d5d64f2433e3aaf5c1bd04767a383d66
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17463
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoFix warning from static analyzer
jake [Thu, 2 Mar 2017 05:11:49 +0000 (14:11 +0900)]
Fix warning from static analyzer

 - Remove unnecessary function (isdigit)
   * it is valid function when the param is char but used int param
 - Add memory free when return error.

Change-Id: I1bbecc7e88f8973340299b8393736e6fd24f1587
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17609
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFixed core dump during Security Discovery
js126.lee [Fri, 24 Feb 2017 08:16:18 +0000 (17:16 +0900)]
Fixed core dump during Security Discovery

Issue : Core dump occur in (un)owned device discovery on provisionclient sample,
        when build option with SECURED=1 WITH_TCP=1 WITH_CLOUD=1.
Cause : Incorrect condition to set remoteId in OCHandleResponse.
        So, wrong type casting happen as OCDiscoveryPayload,
        and then core dump occure in OCCMDiscoveryResource function.
        (https://gerrit.iotivity.org/gerrit/#/c/15909)

Change-Id: I5a4c521ad14f8d5a6a9ec944cfdcfc3b705e409d
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17497
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoSupport for multiple ciphersuites
Jongmin Choi [Tue, 28 Feb 2017 08:39:41 +0000 (17:39 +0900)]
Support for multiple ciphersuites

SetupCipher() modified to support multiple ciphersuites
rather than using a fixed one

Patch #1: initial upload
Patch #2: Rebased and SetupCipher() related changes applied
Patch #3: Rebased

Change-Id: I6cb57605984c273bcdb98c5130da9a9995ae50db
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16251
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16633

7 years agoIOT-1869: Fixing Windows builds with "logging" option.
Pawel Winogrodzki [Tue, 28 Feb 2017 00:48:50 +0000 (16:48 -0800)]
IOT-1869: Fixing Windows builds with "logging" option.

A fix for the broken Windows build, if run.bat was used
with the "-logging" option.

Change-Id: Ic8d506535889c9dd948310461d6b60516b597096
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17545
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoChange property names for IoTivity only security features
Jongmin Choi [Thu, 26 Jan 2017 04:10:22 +0000 (13:10 +0900)]
Change property names for IoTivity only security features

IoTivity only security property names changed to use "x.org.iotivity"

Patch #1: initial upload

Change-Id: Iee08b3e0a4d862d90fec5c6be738e8e70bf9d037
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16791
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17315

7 years agoUpdate sample SVR DB for MOT
Chul Lee [Mon, 6 Feb 2017 08:28:20 +0000 (17:28 +0900)]
Update sample SVR DB for MOT

according to https://gerrit.iotivity.org/gerrit/#/c/16791/

Change-Id: Ia765112faa639e40770f35e3a34bcd51db60a340
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17063
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17137
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoAdding Android API's for Multiple Owner Transfer (MOT)
Randeep Singh [Fri, 17 Feb 2017 05:58:24 +0000 (11:28 +0530)]
Adding Android API's for Multiple Owner Transfer (MOT)

Change-Id: I3fd43ae1285989f1a316d4fbeeb4684ace893b53
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17329
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoHelpers to create key pairs, identity, and role certificates
Kevin Kane [Thu, 9 Feb 2017 02:03:43 +0000 (18:03 -0800)]
Helpers to create key pairs, identity, and role certificates

Changed the SSL adapter to use the MBEDTLS_OID_SIZE macro.
Corrected a couple signed/unsigned issues in provisioningclient
to fix warnings.

Change-Id: I45e9723e57513a5281073e76b960622dae0cc15b
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17303
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoIOT-1836 Make resource/csdk/security/provisioning W4 compliant.
Alex Kelley [Wed, 15 Feb 2017 23:59:02 +0000 (15:59 -0800)]
IOT-1836 Make resource/csdk/security/provisioning W4 compliant.

These changes include the following:
- Fix W4 warnings under resource/csdk/security/provisioning

Other changes to resource/csdk/security/ are tracked in the IOT-1835 code review.

Change-Id: Ibf9d1e1bc70bc37ddead0f97d38964f01d712d54
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17401
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoIOT-1835 Make resource/csdk/security W4 compliant.
Alex Kelley [Wed, 15 Feb 2017 23:50:32 +0000 (15:50 -0800)]
IOT-1835 Make resource/csdk/security W4 compliant.

These changes include the following:
- Prepare resource/csdk/security/SConscript to enable /W4.
- Fix W4 warnings under resource/csdk/security/src
- Fix W4 warnings under resource/csdk/security/tool

Changes to resource/csdk/security/provisioning will come in another review.

Change-Id: I3a26fa952103b3b218569155cd1341aa696944e1
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17399
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years ago[IOT-1845] Fix session leak
Dan Mihai [Thu, 23 Feb 2017 21:53:42 +0000 (13:53 -0800)]
[IOT-1845] Fix session leak

1. Close OCDoOwnershipTransfer session after successful Ownership
   Transfer (i.e., from ReadyForNomalStatusHandler).

2. Use OC_STACK_UNAUTHORIZED_REQ instead of the CA result returned
   by CAcloseSslConnection when calling SetResult - because SetResult
   expects an OC result as parameter.

Change-Id: I075f7fe168a35a0ab6f5c74f1faa12108156727b
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17485
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoMove common Callback test helper to gtest_helper.h.
Todd Malsbary [Thu, 16 Feb 2017 17:53:53 +0000 (09:53 -0800)]
Move common Callback test helper to gtest_helper.h.

This code was present in both stacktests.cpp and rdtests.cpp.

Change-Id: Ie0b7366fdc23986460994a947e57b8f222129dcc
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17325
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agocsdk: Use OIC_LOG instead of OIC_LOG_V for logging single string
Philippe Coval [Wed, 22 Feb 2017 18:31:40 +0000 (19:31 +0100)]
csdk: Use OIC_LOG instead of OIC_LOG_V for logging single string

This was creating mess with arduino macros (using VA lists).
An other patch to come later

Change-Id: I9657e11c96e84f375408e732917a275c7c3c1fb0
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17439
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agosecurity: Conditionnal include of mbedtls
Philippe Coval [Thu, 23 Feb 2017 11:32:55 +0000 (12:32 +0100)]
security: Conditionnal include of mbedtls

Change-Id: I13155cbd4425421c340db74e60c367a76d529cec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17473
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
7 years agobuild: Enable security by default
Philippe Coval [Wed, 21 Sep 2016 14:11:02 +0000 (16:11 +0200)]
build: Enable security by default

From now on, developer will need to disable security explicitly:
  scons SECURED=0

Bug: https://jira.iotivity.org/browse/IOT-1295
Change-Id: Ic09acf3996b47799020730fc34cd382325a981d8
Origin: https://gerrit.iotivity.org/gerrit/#/c/12073/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12073
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
7 years agoResolving svace issues
amar [Thu, 2 Feb 2017 04:54:47 +0000 (13:54 +0900)]
Resolving svace issues

Change-Id: I9086e50f802d93dbacf45858646ddfd828791296
Signed-off-by: Amar Srivastava <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17043
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17295
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
7 years ago[IOT-1851] Update log level for private info
ch79.cho [Fri, 24 Feb 2017 08:10:57 +0000 (17:10 +0900)]
[IOT-1851] Update log level for private info

Extended log levels for noti-service to print private info
seperately such as uuid and IP address.

Change-Id: I17cdbc515d581644b7e40902eb2924cd2e614bea
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17495
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUnregister CA Network Monitor
ch79.cho [Thu, 23 Feb 2017 11:09:14 +0000 (20:09 +0900)]
Unregister CA Network Monitor

unregisted a listener to monitor the network status from CA.
The listener has not been unregisted when stopping noti-provider.

Change-Id: I236f11db64d8dd02f6dff957719eef912e4b6f5b
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17467
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1850] Fix logging on Notification service.
KIM JungYong [Fri, 24 Feb 2017 05:10:04 +0000 (14:10 +0900)]
[IOT-1850] Fix logging on Notification service.

Unsafe location of log was moved to safety location.

Bugs: https://jira.iotivity.org/browse/IOT-1850
Change-Id: I5ba9537f10546e1eff6968ec2dcdd95ec04abf34
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17493
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix calling invalid CAfunction on Notification service.
KIM JungYong [Thu, 23 Feb 2017 05:58:43 +0000 (14:58 +0900)]
Fix calling invalid CAfunction on Notification service.

When consumer service terminated,
consumer service will unregister Network monitoring.
but, consumer service call invalid function.

In this patch,
modify calling with valid function for unregister monitoring.

Change-Id: I89c5a7f022d144c2b98a43fd956a4155d708a4c6
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17461
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Update to 1.3.0
Philippe Coval [Fri, 27 Jan 2017 15:23:29 +0000 (16:23 +0100)]
build: Update to 1.3.0

Note libcoap still uses IoTivity-1.2.1 branch:
extlibs/libcoap/SConscript

It could be updated in later patch, to be tracked on this page:
https://wiki.iotivity.org/build

Change-Id: I92e93372886380e716c6bf9212035c3925df415a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16831
Tested-by: jenkins-iotivity <jenkins@iotivity.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 ago[IOT-1207] Endpoint C++ API
bg.chun [Tue, 23 Aug 2016 10:06:01 +0000 (19:06 +0900)]
[IOT-1207] Endpoint C++ API

Provide public C++ api for map ocf endpoint flag to resource in server
and change host of resource in client.

Change-Id: I2f4892144c9732fb38162b7174812fa8c51ce02c
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10797
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoMoved a requestId declaration in OCServerRequest
hyuna0213.jo [Thu, 2 Feb 2017 07:48:37 +0000 (16:48 +0900)]
Moved a requestId declaration in OCServerRequest

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

Change-Id: I0c8a430f92c2196d3f9c816e9ba9d16fd44d88e4
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17015
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17293

7 years ago[IOT-1840] Fix incorrect check for IPv4 when generating endpoint
Todd Malsbary [Wed, 22 Feb 2017 17:26:06 +0000 (09:26 -0800)]
[IOT-1840] Fix incorrect check for IPv4 when generating endpoint
string.

Bug: https://jira.iotivity.org/browse/IOT-1840
Change-Id: I6950ba6a06965f94848d7fb53d13f416fa4906b3
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17431
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoPer CR-47 (doxmtype URN Correction), renamed references to oic.sec.oxm to oic.sec...
Craig Pratt [Tue, 21 Feb 2017 03:41:18 +0000 (19:41 -0800)]
Per CR-47 (doxmtype URN Correction), renamed references to oic.sec.oxm to oic.sec.doxmtype

Signed-off-by: Craig Pratt <craig@ecaspia.com>
Author: Craig Pratt <craig@ecaspia.com>
Change-Id: I97c22125baee550266deb3a17b65f6a185c22006
Reviewed-on: https://gerrit.iotivity.org/gerrit/17391
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
7 years agoInitial plugin "Hue Plugin" for bridging project.
skambalx [Thu, 23 Feb 2017 12:23:53 +0000 (17:53 +0530)]
Initial plugin "Hue Plugin" for bridging project.

Change-Id: Ia570d82f47d63418433c73adb6cae043264ea48a
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: Gaganpreet Kaur <gaganpreetx.kaur@intel.com>
Signed-off-by: skambalx <srikarx.kambaluru@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16861
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
7 years agobuild: Update version to 1.2.1
Philippe Coval [Thu, 17 Nov 2016 09:41:31 +0000 (10:41 +0100)]
build: Update version to 1.2.1

Change-Id: Ib8994521a91c17d3714d0594d6fbc05e335cd82e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15263
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix null pointer deref.
Todd Malsbary [Wed, 22 Feb 2017 23:22:56 +0000 (15:22 -0800)]
Fix null pointer deref.

Change-Id: Idf532c330e1a7115036c043e48cd08d3f00b426c
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17479
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdd missing limits.h to oicresourcedirectory.c.
Todd Malsbary [Wed, 22 Feb 2017 17:13:35 +0000 (09:13 -0800)]
Add missing limits.h to oicresourcedirectory.c.

This fixes a build error when built with RD_MODE="CLIENT,SERVER".

Change-Id: I5229d05c49507493a00b1fb5bf1930f9e66e36aa
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17429
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoIOT-1583: Preparing connectivity scons script for /W3 changes (part 1).
Pawel Winogrodzki [Mon, 20 Feb 2017 08:08:45 +0000 (00:08 -0800)]
IOT-1583: Preparing connectivity scons script for /W3 changes (part 1).

First batch of changes connectivity scons scripts to allow
enabling of /W3 level warnings for the connectivity directory
only.

This change makes sure the connectivity Environment variable
is separated from the global "env", so it only modifies the way
connectivity is built.

Change-Id: I76e9f742bb462b8b9dd6c5c26e07d9c553d70446
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17367
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoexclude internal Discovery when User connection Preference is "CA_USER_PREF_CLOUD"
jinhyuck83.park [Fri, 24 Feb 2017 01:22:52 +0000 (10:22 +0900)]
exclude internal Discovery when  User connection Preference is "CA_USER_PREF_CLOUD"
with this modification, internal discovery only carry out in case D2D.

Change-Id: If0938186c9c887a2fe67e5a351b2d4b27b4c7e44
Signed-off-by: jinhyuck83.park <jinhyuck83.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17395
Reviewed-by: Jonggyu Ham <jg.ham@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoIOT-1830: Enabling Cbor tests.
Pawel Winogrodzki [Mon, 20 Feb 2017 09:46:47 +0000 (01:46 -0800)]
IOT-1830: Enabling Cbor tests.

Enabling Cbor tests, so they'll be run during regular builds.

Change-Id: Icdd8fcc83e4a9a32acd7726da8c59f008de99b8e
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17373
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoHandling of missing parent property in collection response
Jay Sharma [Thu, 22 Dec 2016 00:05:35 +0000 (00:05 +0000)]
Handling of missing parent property in collection response

In case parent is not included in the response. It creates an empty representation.
The first node is not considered parent.

Change-Id: I088a2bdb552cf6b75e67cc2f16fb9150878d717d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15879
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoChange a maximum size of URI format property to 256 octets
Jihun Ha [Thu, 23 Feb 2017 01:17:18 +0000 (10:17 +0900)]
Change a maximum size of URI format property to 256 octets

As per OCF specification, a normal string-type property without
any statement for maximum length can have a 64 octets size at maximum.
However, for some cases, e.g. a string for URL, one can use longer string
value with a explicit statement of length in its resource model.
Fortunately, url format is already defined in OCF spec. as one of property type,
which can have 256 octets at maximum.

Change-Id: Ia8536ced5f4ab71ccdabd98e9936b00513efaa27
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17457
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix functionality of remote service in Notification service.
KIM JungYong [Wed, 22 Feb 2017 10:52:56 +0000 (19:52 +0900)]
Fix functionality of remote service in Notification service.

Functionality of parsing address is fixed in the consumer service.
When NSConsuemrEnableRemoteService() was called,
address parsing module used fixed for flags(transport type and secured).
And, consumer service was used previous version of prefix("/di")
for using remote service.

In this patch,
1. Whatever tcp or udp and secured or not, using ipv4 or v6,
   address will be parsed effectually.
2. Prefix of Remote service was modified to "/oic/route" from "/di".

Change-Id: I0f20c308e2e4e84cff377e938d010f195177f8bd
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17427
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Jaehong Lee <jaehong2.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoIOT-1583: Adding /W4 and /WX to gtest build.
Pawel Winogrodzki [Fri, 17 Feb 2017 20:51:23 +0000 (12:51 -0800)]
IOT-1583: Adding /W4 and /WX to gtest build.

Making sure any version changes of gtest don't introduce
any level 4 warnings.

Change-Id: I951aee6029d5f48482aea93240f926a82549e5f0
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17345
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoInitial plugin "Nest Plugin" for bridging project.
vijendrx [Thu, 23 Feb 2017 11:33:18 +0000 (17:03 +0530)]
Initial plugin "Nest Plugin" for bridging project.

Change-Id: I79bc33cf7ddf7a6b29c870f0922c5db3d970f6b8
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: vijendrx <vijendrax.kumar@intel.com>
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: vijendrx <vijendrax.kumar@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16863
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
7 years agoInitial plugin "Lyric Plugin" for bridging project.
Gaganpreet Kaur [Wed, 15 Feb 2017 10:41:15 +0000 (16:11 +0530)]
Initial plugin "Lyric Plugin" for bridging project.

Change-Id: I3bc2ef0bd0d86f0e307a5648a3a252513c694a5d
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: Gaganpreet Kaur <gaganpreetx.kaur@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16865
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
7 years agoInitial commit of the Bridging Project's Mini Plugin Manager + 1 plugin.
Gaganpreet Kaur [Thu, 23 Feb 2017 04:19:48 +0000 (09:49 +0530)]
Initial commit of the Bridging Project's Mini Plugin Manager + 1 plugin.

This commit is comprised of the Mini Plugin Manager framework along with
1 plugin and 1 stubbed plugin. This commit allows a user to test the full
end-to-end story of the MPM.

Change-Id: I3914963442cb175b438c3e3d8ff2d244f8eb339b
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: vijendrx <vijendrax.kumar@intel.com>
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: skambalx <srikarx.kambaluru@intel.com>
Signed-off-by: Gaganpreet Kaur <gaganpreetx.kaur@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16707
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
7 years ago[IOT-1841] Allow OT sessions to post to /pstat
Dan Mihai [Thu, 23 Feb 2017 01:48:32 +0000 (17:48 -0800)]
[IOT-1841] Allow OT sessions to post to /pstat

Until yesterday, IOT-1831 was hiding IOT-1841, a bug in the
implementation of IOT-1801.

Change-Id: Icada8099f8c4cef9c271db8f672caa55cd63f0f5
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17459
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
7 years agotizen: Revert "tizen: Bump to 1.2.0+RC1"
Philippe Coval [Fri, 27 Jan 2017 14:39:07 +0000 (15:39 +0100)]
tizen: Revert "tizen: Bump to 1.2.0+RC1"

This reverts commit 3ed2eecfa49256ae1a86d765effff1522b67be63.
https://gerrit.iotivity.org/gerrit/#/c/13515/

Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: Ia58a4f66793506c80f5e7bc5da6e895d00000000
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16829
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agotizen: Bump to 1.2.0+RC1
Philippe Coval [Thu, 1 Sep 2016 13:43:39 +0000 (15:43 +0200)]
tizen: Bump to 1.2.0+RC1

In master branch closest tag is currently 1.2.0-RC1,
but can't be used as RPM does not allow to use "-" in version,
so it needs to be aliased:
make sure to create a tag before using gbsbuild
  git tag 1.2.0+RC1 1.2.0-RC1

Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Change-Id: Ia58a4f66793506c80f5e7bc5da6e895deb79e288
Origin: https://gerrit.iotivity.org/gerrit/#/c/13515/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoModify CreateResetProfile() to preserve the original profile
Jongmin Choi [Mon, 9 Jan 2017 00:31:16 +0000 (09:31 +0900)]
Modify CreateResetProfile() to preserve the original profile

CreateResetProfile() modified to preserve the original profile
created at first

Patch #1: Initial upload

Change-Id: I3420d83a8c8a8b17f947dd244bb03ce7926159bb
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16237
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 3b065c39527b8d98b3a53c5762e1b1281e2003c1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17145

7 years agobuild: Remove tinydtls library
Philippe Coval [Tue, 21 Feb 2017 17:11:21 +0000 (18:11 +0100)]
build: Remove tinydtls library

[Chul Lee]

Remove tinydtls library

[Philippe Coval]

Ported from 1.2-rel branch to master,
and removed presence is other SConscript.

Conflicts:
service/coap-http-proxy/unittests/SConscript
resource/csdk/SConscript
resource/csdk/connectivity/src/SConscript
resource/csdk/stack/test/SConscript
resource/csdk/security/src/doxmresource.c

Change-Id: I78f470af822587f2cd50eac6e9b1fb4ff5b87219
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16941
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoImplement /oic/sec/csr resource
Kevin Kane [Wed, 25 Jan 2017 18:40:51 +0000 (10:40 -0800)]
Implement /oic/sec/csr resource

Change-Id: I04a98127e2414c2e3c35f00c4d702bb228fb7dec
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17251
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
7 years ago[IOT-1833] [IOT-1834] CTT 1.7.8.3 fixes
Dan Mihai [Mon, 20 Feb 2017 18:28:29 +0000 (10:28 -0800)]
[IOT-1833] [IOT-1834] CTT 1.7.8.3 fixes

1. Remove bogus memset from ClearRequestContext.

2. Don't try to log already-freed block from CAAddBlockOption1.

3. Fix (read) buffer overrun due to logging non-zero-terminated
   payload as a string, from CAUpdatePayloadData

Change-Id: I0e02f7656471921098ebce1cb5e216c0934d2eb2
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17387
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoIOT-1583: Adding /W4 and /WX to sqlite3 build.
Pawel Winogrodzki [Wed, 15 Feb 2017 03:01:24 +0000 (19:01 -0800)]
IOT-1583: Adding /W4 and /WX to sqlite3 build.

Making sure any version changes of sqlite3 don't introduce
level 4 warnings.

Change-Id: I7eb89e4f4bf9c06d5b0f3e2981770fd89bb623bb
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17343
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1825]Adding exceptions in Notification service C++ layer
Poovizhi [Thu, 16 Feb 2017 10:35:12 +0000 (16:05 +0530)]
[IOT-1825]Adding exceptions in Notification service C++ layer

patch 2,3 : rebased

Change-Id: Ie2ff81b2b372d80919783df4da5d1c42a1970f54
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17317
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoChange the name of 'tcp' of 'p' property
hyuna0213.jo [Mon, 13 Feb 2017 08:12:44 +0000 (17:12 +0900)]
Change the name of 'tcp' of 'p' property

The name of "tcp" key was changed from "tcp" to
"x.org.iotivity.tcp".

Change-Id: I200c9a32116b5740ec8994d4b6600ad54b5f102e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17333
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix a maximum size of wifi mode in easy setup
Jihun Ha [Wed, 22 Feb 2017 03:25:26 +0000 (12:25 +0900)]
Fix a maximum size of wifi mode in easy setup

The maximum number of supported WiFi mode is increased to 10, sufficiently.

Change-Id: Ib87f0e78aaefee23bd0302f210a5926344398ed4
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17421
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1832] Restore error code
Dan Mihai [Mon, 20 Feb 2017 17:01:53 +0000 (09:01 -0800)]
[IOT-1832] Restore error code

Restore the error code expected by the unit test, recently
modified by change df063552a4dfab53662653566fe73ed491820aaf.

Change-Id: If5393030a4019485aad5dc0c13159b5b895dc2f8
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17385
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years ago[IOT-1831] Fix requested permission
Dan Mihai [Mon, 20 Feb 2017 15:50:56 +0000 (07:50 -0800)]
[IOT-1831] Fix requested permission

1. Calculate requestedPermission based on requestInfo->method,
   inadvertently removed by recent change
   1c13401adfdabcc9de0a9bbd1e6eb2abf749faf6.

2. Add asserts to catch similar bugs in the future.

3. Logging improvements related to this investigation.

Change-Id: I9f6119901d63422f4646142c52fd45586bb75366
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17379
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoProvide OCSetLogLevel API in CAUtil for C SDK/C++ SDK.
jihwan.seo [Sat, 11 Feb 2017 04:00:07 +0000 (13:00 +0900)]
Provide OCSetLogLevel API in CAUtil for C SDK/C++ SDK.

Change-Id: Ib6a60f1f89c27bdf18f91a1f4fd9c5e87a83d246
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17199
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agotizen: Enable SECURED
Philippe Coval [Wed, 19 Oct 2016 18:17:37 +0000 (20:17 +0200)]
tizen: Enable SECURED

Change-Id: Id88b113bc256a51f97f5d1772df323d7bf244bd7
Origin: https://gerrit.iotivity.org/gerrit/#/c/14373/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14675
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-1801] Implement OCF Security CR1339
Dan Mihai [Tue, 14 Feb 2017 23:04:11 +0000 (15:04 -0800)]
[IOT-1801] Implement OCF Security CR1339

1. Use the initial Ownership Transfer session even after setting-up
   the Owner Credential, when onboarding Servers based on OCF 1.0 -
   rather than closing that session and establishing a new one.

2. Posting the Owner Credential ACL might fail for older Servers.
   In that case, close the initial Ownership Transfer session and
   establish a new session, for compatibility with those older
   Servers.

Change-Id: If242c0af4ec05ad9ca144c274ee5385bc7738d92
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17279
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoeliminate [-Wenum-conversion] warnings
Gregg Reynolds [Sat, 11 Jun 2016 13:33:39 +0000 (08:33 -0500)]
eliminate [-Wenum-conversion] warnings

warning: implicit conversion from enumeration type 'TWResultCode' to different enumeration type 'OCStackResult' [-Wenum-conversion]

Change-Id: I13b69ddc470f2be1f45bf5a54a2127d6d4845a81
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8601
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoMinor change on documentation for OCSendResponse API.
Ziran Sun [Thu, 16 Feb 2017 14:40:53 +0000 (14:40 +0000)]
Minor change on documentation for OCSendResponse API.

Change-Id: I566c6debe216cdb8fb0ce029b1646b7845e32c19
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17323
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoDocument ZoneID for IPv6 host address in
Ziran Sun [Tue, 14 Feb 2017 14:31:03 +0000 (14:31 +0000)]
Document ZoneID for IPv6 host address in
OCPlatform::constructResourceObject.

Bug: https://jira.iotivity.org/browse/IOT-1758
Change-Id: I0b080f4f97748b5435d5594b45b0634efc42ad2f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17269
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
7 years agonotification: delay timeout for test in secured mode
Philippe Coval [Wed, 15 Feb 2017 10:24:58 +0000 (11:24 +0100)]
notification: delay timeout for test in secured mode

timeout have been arbitrary doubled to prevent issues like:

  Segmentation fault (core dumped)
  scons: *** [out/linux/x86_64/debug/service/notification/unittest/utservice/notification/unittest/notification_consumer_test] Error 139
  service/notification/unittest/NSProviderTest.cpp:238: Failure
  Expected: (nullptr) != (g_consumerID), actual: 8-byte object <00-00 00-00 00-00 00-00> vs NULL
  error: discovery failure

If problem is still happening, it can be bigger, please raise bugs.

Change-Id: Ief98f156a870d9a346fc6507e2a26bc063cbceae
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17297
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agotizen: Set secured by default in gbsbuild.sh
Philippe Coval [Wed, 1 Feb 2017 15:58:10 +0000 (16:58 +0100)]
tizen: Set secured by default in gbsbuild.sh

Change-Id: I5c75a94ff6b8006210dabd6acb87615e0f39b777
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16969
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoCorrect the errata in docs related to security
Youngman [Tue, 24 Jan 2017 05:24:41 +0000 (14:24 +0900)]
Correct the errata in docs related to security

Change-Id: I3f16e16cd4fff4fce1006672478337965e2f9d11
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16721
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17369
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
7 years agoUpdate attributes name for notification.
jake [Tue, 21 Feb 2017 05:01:19 +0000 (14:01 +0900)]
Update attributes name for notification.

 - Add prefix "x.org.iotivity.ns."

Change-Id: I245e9c78b90019699e49a129b2910045eb5602b5
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17393
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoResolving build issue for WITH_CLOUD flag
saurabh.s9 [Fri, 27 Jan 2017 10:34:31 +0000 (16:04 +0530)]
Resolving build issue for WITH_CLOUD flag

Change-Id: I1215e269c56282af01faeac264b58342e1d7a0db
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16809
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoIOT-1583: Removing /W3 warnings inside resource/csdk/stack/
Pawel Winogrodzki [Wed, 1 Feb 2017 20:49:01 +0000 (12:49 -0800)]
IOT-1583: Removing /W3 warnings inside resource/csdk/stack/

Removing the /W3 warnings and adding a /WX option to prevent new
ones from being added inside the resource/csdk/stack/ directory.

Change-Id: I59190795483086a9f5a4f3293091e3a84e7013a7
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17057
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoIOT-1807: Disabling discovery tests to improve productivity of other developers.
Pawel Winogrodzki [Thu, 16 Feb 2017 20:40:31 +0000 (12:40 -0800)]
IOT-1807: Disabling discovery tests to improve productivity of other developers.

More details:
1. Tests don't check if the timeout has been hit, so they do not
   report failures properly. By looking at Jenkins it's clear, that
   the timeout issue is happening in most cases.
2. The tests fail randomly from time to time, if the test's callback
   is called, so the timeout is NOT hit and the tests are actually
   doing their job, indicating that something works incorrectly.

This change is ment to prevent other developers from being
disturbed by the random test failures, which should be eventually
fixed in IOT-1807.

Change-Id: Ibe25cd2adc74ec0676719a1ec506977c35ec20ce
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17327
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1817] RD should notify observers of /oic/res when resources are
Todd Malsbary [Fri, 20 Jan 2017 22:33:55 +0000 (14:33 -0800)]
[IOT-1817] RD should notify observers of /oic/res when resources are
registered or unregistered.

Bug: https://jira.iotivity.org/browse/IOT-1817
Change-Id: I9bd756258ef8950baa2a43cfbbf2e7cf82837301
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17237
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoAdd an callback for EasySetup resource in case of "connect" method
Jihun Ha [Thu, 16 Feb 2017 05:57:15 +0000 (14:57 +0900)]
Add an callback for EasySetup resource in case of "connect" method

A new property, "connect", is managed in EasySetup resource, which can handle
POST operation. For that, an additional callback gets to be needed for
EasySetup resource.

Change-Id: I34d5ddeb7f9f1469b992099e75bed78ee3450bab
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17067
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agocsdk: Remove exec permission of stack headers
Philippe Coval [Wed, 1 Feb 2017 17:19:04 +0000 (18:19 +0100)]
csdk: Remove exec permission of stack headers

Change-Id: I93f4be4a92068ee8d6f80acb05f232971d47168b
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16971
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate error handling logic in EnrolleeSecurity.
Parkhi [Mon, 20 Feb 2017 06:09:05 +0000 (15:09 +0900)]
Update error handling logic in EnrolleeSecurity.

 - OCSecure::discoverSingleDevice API is updated with another return value.(https://gerrit.iotivity.org/gerrit/#/c/17361/)
   According that patch, EnrolleeSecurity::discoverTargetSecureResource api is updated additional error handling logic.

Change-Id: If0e9c2e1000c1c754386c77f204a7bdd5bd0923b
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17363
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdated Easysetup EnrolleeSecurity module according to coding convention.
Parkhi [Mon, 20 Feb 2017 03:58:12 +0000 (12:58 +0900)]
Updated Easysetup EnrolleeSecurity module according to coding convention.

Change-Id: I89de37f9dd93b3b34581cd8463e592a3b6ee6ab2
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17359
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1701] Added check for int overflow
saurabh.s9 [Wed, 8 Feb 2017 06:31:47 +0000 (12:01 +0530)]
[IOT-1701] Added check for int overflow

Change-Id: I5b613534ab19344a5d261f0773df52c4d9bb2176
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17111
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agocode clean up on the ocstack.h and ocstackinternal.h
Jaewook Jung [Wed, 15 Feb 2017 02:50:43 +0000 (11:50 +0900)]
code clean up on the ocstack.h and ocstackinternal.h

- removed unused function declarations
- modified indentation

Change-Id: Ia2985dec4d415898e92810ef0a235d08ab3bdbd4
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17285
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
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 ago[IOT-1824] Add an API to request a WiFi Connection to Enrollee
Jihun Ha [Thu, 16 Feb 2017 09:32:32 +0000 (18:32 +0900)]
[IOT-1824] Add an API to request a WiFi Connection to Enrollee

This API would be helpful to Enrollee when it destroys its Soft AP network
and tries to connect an WiFi AP with given WiFi information from Mediator

oic.r.easysetup resource
 + "connect" or "cn" property
    - type: array of integer(enum)
    - e.g., "cn" : [ 1 ] or ''cn" : [ 2 ] or "cn" : [ 1, 2 ]  // 1 : WiFi, 2 : BLE , 3 : other transport to be added in a future

Change-Id: I476c95696c8df243e83232cedc27852c875b2dbe
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17061
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFixed a bug of patch 16719
js126.lee [Thu, 16 Feb 2017 08:03:23 +0000 (17:03 +0900)]
Fixed a bug of patch 16719

Issue : OicSecSvrType_t does not matched to GetSvrRownerId_t
        due to https://gerrit.iotivity.org/gerrit/#/c/16719.
        So, it's broken a checking permision logic with ResourceOwner

Patch 1 : Upload Patch
Patch 2 : Fixed typo

Change-Id: I84878994d7dbb03f208fb041b9be24ab889d8c26
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17311
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agofix crash issue related findResource in OCConnectionManager
jihwan.seo [Thu, 16 Feb 2017 12:08:18 +0000 (21:08 +0900)]
fix crash issue related findResource in OCConnectionManager

Change-Id: I0684c10f499e5bbf48127cc271cc0d58535cf28e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17321
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoreplace strcmp with strcasecmp in android BLE
jihwan.seo [Mon, 13 Feb 2017 09:59:29 +0000 (18:59 +0900)]
replace strcmp with strcasecmp in android BLE

since there is no difference between upper case and lower case
for BLE MAC address.
strcmp method should be replaced.

Change-Id: I729a55216551d1062679148bc9511a4fb9164163
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17221
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoAdd adapter type parameter to CAcloseSslConnectionAll
Joonghwan Lee [Thu, 9 Feb 2017 07:14:16 +0000 (16:14 +0900)]
Add adapter type parameter to CAcloseSslConnectionAll

Adapter(Transport) type parameter is added to CAcloseSslConnectionAll function
in order to enable sessions related to the only specified transport type to be closed.

Patch 1: Initial upload
Patch 2: Fixed print format

Change-Id: I3bb658cf4c90e0e283a0b052f69f1fa8b593e748
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17139
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agobuild: Use mbedtls in secured mode regardless WITH_TCP
Philippe Coval [Mon, 19 Dec 2016 20:33:00 +0000 (21:33 +0100)]
build: Use mbedtls in secured mode regardless WITH_TCP

As mbedtls comes now in SECURED mode (even without TCP),
 project is not buildable anymore
 since this change:
https://gerrit.iotivity.org/gerrit/#/c/14883/21/resource/csdk/connectivity/src/SConscript

Ported from 1.2-rel branch to master

Conflicts:
resource/csdk/stack/samples/linux/OCSample/SConscript
service/easy-setup/mediator/richsdk/unittests/SConscript
service/resource-encapsulation/src/common/SConscript
service/resource-encapsulation/src/serverBuilder/SConscript
service/scene-manager/unittests/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1622
Change-Id: I202b0e8a9aea6f0675e966ae72325a1ed2cf13f9
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16931
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoRemoved build issue
Randeep Singh [Thu, 16 Feb 2017 09:25:25 +0000 (14:55 +0530)]
Removed build issue

Change-Id: I5ce1a35730c4e736c77c07532367b7aff7000fb1
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17313
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
7 years agoconnectivity: Add NULL check across the ca_adapter_net_ssl.c
Chul Lee [Tue, 17 Jan 2017 09:19:23 +0000 (18:19 +0900)]
connectivity: Add NULL check across the ca_adapter_net_ssl.c

[Philippe Coval]

Ported from 1.2-rel to master branch
Conflicts:
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c

Change-Id: If2f43c0150afcb344c290f8bcb21f7647b0daa01
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16487
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17299
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoUpdate all of easysetup log message's level
Parkhi [Wed, 15 Feb 2017 07:23:29 +0000 (16:23 +0900)]
Update all of easysetup log message's level

 - Public API's log level is changed "INFO"
 - Internal API's log level is changed "DEBUG"
 - All of infomation which is Easysetup data is changed "INFO_PRIVATE" log level

Change-Id: I0eb97517be4da52fb0b202eb7c6379e85045a77d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17291
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix defects detected by static analysis
Parkhi [Tue, 14 Feb 2017 04:50:02 +0000 (13:50 +0900)]
Fix defects detected by static analysis

 - mediator/submediator sample app.
 - enrolleeSecurity class memory issue.

Change-Id: I74652088e48008458f6b76b119cc068895d640b4
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17255
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1808]Changes in C++ APIs to remove TopicList raw pointers.
abitha.s [Wed, 8 Feb 2017 09:16:32 +0000 (14:46 +0530)]
[IOT-1808]Changes in C++ APIs to remove TopicList raw pointers.

1. Changes in NSProvider APIs for get and set TopicsList to shared pointers.
2. Changes in NSConsumer API for get ConsumerTopicList to shared pointer
3. Changes in NSProviderService API to get RegisteredTopicsList to shared pointer.
4. changes to return as object of list of Topics in TopicsList

Patch 2 : rebased

patch 3 : added shared_ptr changes to setTopicList as per review

patch 4 : added modifiability feature for preventing TopicsList modification
patch 5 : added unsetModifiability to only preven modification
patch 6 : rebased

Change-Id: I3aacef4f3a5809623add69a16fd2ad9f93d11dd9
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17113
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd to checking logic to set subject of cred in case of NULL or *
js126.lee [Thu, 9 Feb 2017 12:16:51 +0000 (21:16 +0900)]
Add to checking logic to set subject of cred in case of NULL or *

Issue : If deviceuuid is null and required pre-install certificate in SVR DB,
        it is impossible to set a subject of SIGNED_ASYMMETRIC_KEY type (certificate).

According to OCF Security Spec and Raml, subject of Cred allows UUID format only,
so CTT decides a failure in case of wildcard(*).
But, it is not clear how to set a subject of cred in case of SIGNED_ASYMMETRIC_KEY on spec.

So, this patch set it with own deviceuuid in case of NULL or wildcard,
because own deviceuuid is only UUID a device knows at all time.

Patch 1,2: Upload patch
Patch 3 : Set subject of cred with own deviceuuid in case of NULL or wildcard
Patch 4: Apply review comment
Patch 5-8 : Re-trigger jenkins build

Change-Id: Idb09357a821be81bb9f05489ebb40403e66c3514
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17153
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agossl: fix compilation against non debug mbedtls
Hauke Mehrtens [Sat, 3 Dec 2016 23:18:37 +0000 (00:18 +0100)]
ssl: fix compilation against non debug mbedtls

The function mbedtls_debug_set_threshold() is only available when
MBEDTLS_DEBUG_C is set. make the call depend on this condition.

Change-Id: I8158bc4c55b428167e36084e7a46359c269c5fc7
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15119
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agostyle: Reformat source to current standards
Philippe Coval [Sat, 2 Jul 2016 09:00:14 +0000 (11:00 +0200)]
style: Reformat source to current standards

I noticed that source is not matching project's coding standards.

This change is a only subset of badly formated file(s)
 which were also used modified in a to near commit(s),
 changing them in a separate commit will make maintainance easier.

If for any reason this patch is causing troubles
 it can be safely skipped or reverted,
 as there is no logical changes.

I know this can be annoying,
 but it has to be done small steps by small steps
 to align project's rules amd improve cooperation flow over time.

FYI, I blindly used ./tools/style/astyle-cpp-format.sh on current base.

For reference please check:
  https://wiki.iotivity.org/iotivity_coding_standards

Change-Id: I6e1bc12539c4ae21f23a22f2727309bb11d1ea43
Origin: https://gerrit.iotivity.org/gerrit/#/c/9095/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9095
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agobuild: Convert EOL to use UNIX convention (yaml)
Philippe Coval [Fri, 27 Jan 2017 21:14:16 +0000 (22:14 +0100)]
build: Convert EOL to use UNIX convention (yaml)

Remove CRLF

Change-Id: I04414a45967439cb99d0627c3a8cf00260b93c2c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16855
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoLogs added for confirmation callbacks
Jongmin Choi [Fri, 6 Jan 2017 06:43:35 +0000 (15:43 +0900)]
Logs added for confirmation callbacks

Logs added for confirmation callbacks

Patch #1: initial upload
Patch #2: Additional logs added
Patch #3: Rebased

[Philippe Coval]
Conflicts:
resource/csdk/security/provisioning/src/ownershiptransfermanager.c

Change-Id: I0b42eeaccb21c9b11d1c8effecd8797ee80c2929
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16189
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17213

7 years agoconnectivity: Fixed double free issue when destroying endpoint
Philippe Coval [Thu, 19 Jan 2017 03:52:31 +0000 (12:52 +0900)]
connectivity: Fixed double free issue when destroying endpoint

[hyuna0213.jo]

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

[Philippe Coval]

Ported from 1.2-rel branch to master

Conflicts:
resource/csdk/connectivity/inc/cablockwisetransfer.h
resource/csdk/connectivity/src/cablockwisetransfer.c

Change-Id: I78d0d46e37333e099ec737ac4500a2f388d58c4e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16567
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Author: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17021

7 years ago[IOT-1685] Add exports for new APIs.
Todd Malsbary [Tue, 14 Feb 2017 18:28:36 +0000 (10:28 -0800)]
[IOT-1685] Add exports for new APIs.

Bug: https://jira.iotivity.org/browse/IOT-1685
Change-Id: I25bd19660777c82ea4fbfd3ce136fe2e4be8ce8c
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17273
Tested-by: jenkins-iotivity <jenkins@iotivity.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>
7 years ago[IOT-1820]Commenting C Unit Test to resolve build error
abitha.s [Wed, 15 Feb 2017 06:01:08 +0000 (11:31 +0530)]
[IOT-1820]Commenting C Unit Test to resolve build error

Change-Id: Id2be7a1201d248b39e05acac360064299891e957
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17289
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFixed memory leak on CARetransmissionDestroy
Jaewook Jung [Fri, 10 Feb 2017 07:26:51 +0000 (16:26 +0900)]
Fixed memory leak on CARetransmissionDestroy

Change-Id: Ic53ae0759020fa26f5f70425d3dab09ff5e7d375
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17207
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>