GitLab

Avoid acquiring g_sslContextMutex recursively during Ownership
Transfer. Instead, make it a requirement that the caller must
own this lock.

Finding a better solution for this old problem is now tracked
by IOT-1876.

Change-Id: I25ce19a5c48c5adab70e2287288833e40c4db213
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17605Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I2928fed0a97b51f358a0f87f35b164317b4d7b9d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/16967/
Reviewed-on: https://gerrit.iotivity.org/gerrit/16967Reviewed-by: Mats Wichmann <mats@linux.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

Change-Id: Ib4b1fbd905a1c8510128f422b6b39d3ef4e42f45
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17591Tested-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>

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/17657Reviewed-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>

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/17283Tested-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>

 - 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/17523Reviewed-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>

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/17491Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

Change-Id: Ifad924b7d700d03af43997dbfdd604b72bd09cc5
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17267Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

Change-Id: Ic2eaca23d5d64f2433e3aaf5c1bd04767a383d66
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17463Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>

 - 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/17609Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

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/17497Tested-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>

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/16251Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16633

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/17545Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>

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/16791Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17315

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/17063Tested-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/17137Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Change-Id: I3fd43ae1285989f1a316d4fbeeb4684ace893b53
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17329Tested-by: jenkins-iotivity <jenkins@iotivity.org>

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/17401Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

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/17399Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>

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/17485Tested-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>

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/17325Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

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/17439Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Change-Id: I13155cbd4425421c340db74e60c367a76d529cec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17473Tested-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>

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/12073Tested-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>

Change-Id: I9086e50f802d93dbacf45858646ddfd828791296
Signed-off-by: Amar Srivastava <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17043Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17295Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

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/17495Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

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/17467Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

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/17493Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

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/17461Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

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/16831Tested-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>

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/10797Tested-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>

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/17015Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17293

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/17431Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Signed-off-by: Craig Pratt <craig@ecaspia.com>
Author: Craig Pratt <craig@ecaspia.com>
Change-Id: I97c22125baee550266deb3a17b65f6a185c22006
Reviewed-on: https://gerrit.iotivity.org/gerrit/17391Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

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/16861Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>

Change-Id: Ib8994521a91c17d3714d0594d6fbc05e335cd82e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14453Tested-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/15263Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Change-Id: Idf532c330e1a7115036c043e48cd08d3f00b426c
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17479Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

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/17429Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

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/17367Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

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/17395Reviewed-by: Jonggyu Ham <jg.ham@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

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/17373Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>