platform/upstream/iotivity.git
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 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>
7 years agoadd OCSetLogLevel API in logger
jihwan.seo [Fri, 10 Feb 2017 10:46:49 +0000 (19:46 +0900)]
add OCSetLogLevel API in logger

we can filter log with level through setLogLevel API.
it will be helpped to reduce unnecessary log
without additional build option in some lite device.
and also we can filter private information such as Device ID,
Access Token, etc.

Change-Id: I91bff24737cbc7f09985adc142fc5f3d37e8f577
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17197
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 new BLE scan through android public API (upper than API level 21)
jihwanseo [Mon, 12 Dec 2016 11:25:38 +0000 (20:25 +0900)]
add new BLE scan through android public API (upper than API level 21)

since previous scan api - startLeScan() was deprecated in API level 21.
we should use startScan(List, ScanSettings, ScanCallback).
https://developer.android.com/reference/android/bluetooth/BluetoothAdapter.html

Change-Id: Ife58de26f1b132c260b94a6d0ba5c6aa17d1e7f3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17005
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1814] Add OCRepPayloadSetPropByteStringAsOwner to .def.
Todd Malsbary [Mon, 13 Feb 2017 18:16:15 +0000 (10:16 -0800)]
[IOT-1814] Add OCRepPayloadSetPropByteStringAsOwner to .def.

Bug: https://jira.iotivity.org/browse/IOT-1814
Change-Id: I5ad17d44d16b9f3940173d59ae23ee2fc50ac838
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17223
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFix BLE crash issue when IoTivity Stop is called.
jihwan.seo [Mon, 6 Feb 2017 10:35:56 +0000 (19:35 +0900)]
Fix BLE crash issue when IoTivity Stop is called.

Change-Id: Iee01565d5aab088c597f43f7bad463ab11553e41
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17075
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFix svace defects in csr.c
Andrii Shtompel [Tue, 31 Jan 2017 16:37:36 +0000 (18:37 +0200)]
Fix svace defects in csr.c

Change-Id: I2c1870a7773ff4d56eec0539d0641c51e510a36f
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16933
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1800] Implement OCF Security CR1291
Dan Mihai [Mon, 6 Feb 2017 22:42:07 +0000 (14:42 -0800)]
[IOT-1800] Implement OCF Security CR1291

1. After establishing the secure OTM connection, GET the doxm
   properties again, and verify that they are still the same as those
   obtained during un-owned device discovery.

2. All GET and POST requests for /oic/sec/pstat are now performed
   using the secure OTM connection, after finishing step #1 above.

3. Assert that a secure OTM connection is used for all Onboarding
   related communication, except for:
   - The initial discovery, and
   - Posting the OxmSel property value (PostOwnerTransferModeToResource)

Note that:
- These are just Client-side changes. No Server-side changes were
  required.
- A newer Client is still compatible with a Server based on IoTivity 1.2
- A newer Server is still compatible with a Client based on IoTivity 1.2

Not directly-related to this CR: set-up DTLSHandshakeCB earlier, to
avoid a possible race condition with the initiation of the OTM secure
connection triggered by PostOwnerTransferModeToResource.

Change-Id: I1a94505756205d3b40ed70cb73dc41c8ce6ce0e1
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17135
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1816] Windows: Fix build breaks
Dan Mihai [Tue, 14 Feb 2017 01:00:50 +0000 (17:00 -0800)]
[IOT-1816] Windows: Fix build breaks

1. Most likely the ocrandom compiler error was hiding the RD linker
   errors.

2. Support both RD Client and Server functionality with
   octbstack.dll

3. Avoid building sqlite3.obj with several different compiler options,
   by building it a single time and packaging it in sqlite3.lib

Change-Id: I8b9fe95f97d88a28a8b6bb48fd9932f51a65ecdb
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17253
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoAdd support for needed functionality to mbedTLS
Kevin Kane [Tue, 20 Dec 2016 20:51:27 +0000 (12:51 -0800)]
Add support for needed functionality to mbedTLS

Support for directoryName-based subject alternative name
Creating certificates containing this extension
Specifying a particular EKU to check for in TLS negotiation instead
of standard client/server authentication EKUs

This work will be offered upstream to the mbedTLS maintainers; if
they accept it, this will later be reverted when IoTivity ingests
a newer version of mbedTLS.

Change-Id: I4f81d75b767683327564e27758d1aa1bc02613de
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15733
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
7 years agoIOT-1812: OICStrcpy is not safe with OICMalloc if the string can be empty
Dave Thaler [Fri, 10 Feb 2017 18:51:23 +0000 (10:51 -0800)]
IOT-1812: OICStrcpy is not safe with OICMalloc if the string can be empty

OICMalloc does not zero the memory allocated, and OICStrcpy does not
initialize the destination buffer if the source strlen is 0. Indeed
this seems to be by design, as the StringTests.StrcpyZeroSource
explicitly verifies that it does not initialize the destination buffer.

As a result, OICMalloc + OICStrcpy can result in uninitialized memory
(in a 1 byte buffer) that results in subsequently reading past the end
of the buffer, which can cause a crash.

Several security code paths are susceptible to this bug, which is
easy to reproduce with Application Verifier.

Change-Id: I6a3e2840c310d15a52656bf309ac9995de813683
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17177
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1805] Fix SSL session leak on error
Dan Mihai [Tue, 7 Feb 2017 22:47:56 +0000 (14:47 -0800)]
[IOT-1805] Fix SSL session leak on error

The SSL session is always using the secure port - never the unsecured
port.

Change-Id: If4f490a720dc1943404f9364230ba1de1e232133
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17099
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1488] Remove workaround
Dan Mihai [Mon, 6 Feb 2017 22:11:03 +0000 (14:11 -0800)]
[IOT-1488] Remove workaround

Remove workaround, now that change 82c4c656ea508d6014419b0f82c6b734e55118e5
is releasing the mutex, from the error code path.

Change-Id: Ibfb5fad559d9351e3279d7af3346b49de8570738
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17083
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoFix mbedtls debug format
Dmitriy Zhuravlev [Mon, 6 Feb 2017 08:32:21 +0000 (10:32 +0200)]
Fix mbedtls debug format

Remove carriage return from debug message
added by default in mbedtls

Change-Id: Ie6077a5eb294f1790b87472b4baa69fc283016c0
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16761
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoIOT-1811 Move MOT device info cleanup to fix AV
Alex Kelley [Thu, 9 Feb 2017 02:16:46 +0000 (18:16 -0800)]
IOT-1811 Move MOT device info cleanup to fix AV

Change-Id: Ia7ce7aca7224da855776b47a46749c0baed18b39
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17163
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1815] Add missing OCRDDatabase functions to .def.
Todd Malsbary [Mon, 13 Feb 2017 18:28:54 +0000 (10:28 -0800)]
[IOT-1815] Add missing OCRDDatabase functions to .def.

Note OCRDDatabaseGetStorageFilename was previously an internal API.
However to allow the RD lib to locate it, it is now exported.

Bug: https://jira.iotivity.org/browse/IOT-1815
Change-Id: I40c579c7e14024257b343737833664df858aa8e5
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17227
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoAdd missing handle parameter in rdtests.cpp.
Todd Malsbary [Mon, 13 Feb 2017 18:25:12 +0000 (10:25 -0800)]
Add missing handle parameter in rdtests.cpp.

Handle parameter was introduced in commit
ce5af55ebf421d7d550563da266b76dfd89e3051.

Change-Id: Id9e5f149e65c0a41d3e46cab15a416a59d2ef626
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17225
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-1765] Fix for DT_SONAME warning messages in Android
Larry Sachs [Wed, 8 Feb 2017 22:32:13 +0000 (14:32 -0800)]
[IOT-1765] Fix for DT_SONAME warning messages in Android

Although the jira issue was against 1.2-rel, this fix is being
applied to master for inclusion in 1.3.

Change-Id: I81d7f6669c4ab4c41e1649c02021512da6fc7f3a
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17127
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years ago[IOT-1540] Connection manager logic add.
jg.ham [Mon, 13 Feb 2017 00:48:03 +0000 (09:48 +0900)]
[IOT-1540] Connection manager logic add.
Add the function to switch cloud IP to local IP
in connection manager.

Change-Id: I032d2ae38e63ad79694ebc92b900f6621d0130c3
Signed-off-by: Jonggyu Ham <jg.ham@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15909
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoAdd OCDoHandle parameter on resource-directory function
hyuna0213.jo [Mon, 13 Feb 2017 02:32:40 +0000 (11:32 +0900)]
Add OCDoHandle parameter on resource-directory function

this parameter is used to refer to the request sent out on behalf
of calling this API.

Change-Id: I7032f9e5afea6ecba44cb09e39c6bd654b59e5a9
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17205
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoFix callback issue which there is no payload in case of error message.
jihwan.seo [Fri, 10 Feb 2017 04:24:24 +0000 (13:24 +0900)]
Fix callback issue which there is no payload in case of error message.

check logic what payload is parsed was modified in
https://gerrit.iotivity.org/gerrit/#/c/15197/.
However that change cause some issue which
there is no payload in case of error message
with general get/put/post/delete message except for oic/res.

payload should be set in common in OCHandleResponse method.

Change-Id: I0c415022e35573ae76e730d9973206d218f18174
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17165
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoModify confirmable certificate OTM
Jongmin Choi [Tue, 31 Jan 2017 09:49:14 +0000 (18:49 +0900)]
Modify confirmable certificate OTM

- In case of user denial, send relevant error message
- Reset in case of confirmation failure
- https://gerrit.iotivity.org/gerrit/#/c/16295/4

Patch #1: initial upload
Patch #2-3: Fix build error
Patch #4: resolve merge conflict

Change-Id: Ib53181fda2300056d69bcc6beac9bad872d0aaea
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16923
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoCheck initialized and Changed logic of IP connect state check.
Jaehong Jo [Mon, 6 Feb 2017 10:14:48 +0000 (19:14 +0900)]
Check initialized and Changed logic of IP connect state check.

getNetworkInfo was deprecated in API level 23.
So changed to getActiveNetworkInfo() API.

Change-Id: I72942758ecf3576d79bb889f168569a24967b1dd
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17069
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix blocking issue when OCStop is called in android BLE.
jihwan.seo [Mon, 6 Feb 2017 09:38:42 +0000 (18:38 +0900)]
Fix blocking issue when OCStop is called in android BLE.

Change-Id: If115ae64a1b85fa30a1af184698552b28925084b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17077
Tested-by: jenkins-iotivity <jenkins@iotivity.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 static analysis issue in base layer.
Jaehong Jo [Thu, 9 Feb 2017 02:58:52 +0000 (11:58 +0900)]
Fix static analysis issue in base layer.

ocresource.c, ocstack.c

Change-Id: I8568bb8942eae29da646f7e9efa30d4f73fa9e07
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17133
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1531]PAL API for get link-local zone id from ifindex
bg.chun [Tue, 8 Nov 2016 12:00:56 +0000 (21:00 +0900)]
[IOT-1531]PAL API for get link-local zone id from ifindex

PAL API for get IPv6 link-local zone id from ifindex.
This changes need for mapping zone-id with IPv6 link-local Address
on Endpoint and CAGetNetworkInfo().

Change-Id: Ib5043d3de5747f3e461de775dba2d04e804297dd
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14123
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoUpdated SSL_CHECK_FAIL macro to ignore bad client hello message.
Chul Lee [Fri, 13 Jan 2017 05:12:58 +0000 (14:12 +0900)]
Updated SSL_CHECK_FAIL macro to ignore bad client hello message.

Change-Id: I317e63d192af372844e672650c261578508e9331
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16367
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7198d2fdd91adec7df769a78ef66d2b87d8d9e47)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17171

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

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

Change-Id: I9a61d7d4d323fe83e988c792284179c099bc2855
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17079
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoIOT-1583: Preparing SConscripts for /W3 and /WX changes.
Pawel Winogrodzki [Wed, 1 Feb 2017 20:47:31 +0000 (12:47 -0800)]
IOT-1583: Preparing SConscripts for /W3 and /WX changes.

Initial commit making changes and small clean-up in SConscript
files to enable adding /W3 and /WX compiler options limited
to the resource/csdk/stack/ directory.

Changes made:
1. Building of stack's code moved to resource/csdk/stack/SConscript.
2. Turned extlibs/timer/ into a static lib, so that it doesn't compile
(and generate warnings) along with other modules' code.

Change-Id: I6c64916dbcfd23edb546d43db7b2470100528baa
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16975
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoreplace parameter name in setDevAddr
jihwan.seo [Tue, 7 Feb 2017 22:45:44 +0000 (07:45 +0900)]
replace parameter name in setDevAddr

Change-Id: I78a46e9c8be9f844277f6ccc9ac6820a69e75047
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17097
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoIOT-1804 Add option to build without MOT in run.bat
Alex Kelley [Tue, 7 Feb 2017 22:12:17 +0000 (14:12 -0800)]
IOT-1804 Add option to build without MOT in run.bat

Change-Id: Ie1e1a6d15acfbc02d3b6446b0ca1d700376260a7
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoImplement RD update.
Todd Malsbary [Wed, 14 Dec 2016 23:17:39 +0000 (15:17 -0800)]
Implement RD update.

Change-Id: I6d115b14ddefb60fbcfc289e40f69228b7878551
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15639
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-1810]Fix for Double free of payload in C for Notification Message
abitha.s [Thu, 9 Feb 2017 11:08:59 +0000 (16:38 +0530)]
[IOT-1810]Fix for Double free of payload in C for Notification Message

Change-Id: I8f1ddb3208e6383e4e4154c78b03838aa579c902
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17149
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix for missing-field-initializers compiler warning
George Nash [Tue, 7 Feb 2017 23:30:30 +0000 (15:30 -0800)]
Fix for missing-field-initializers compiler warning

The OCDevAddr struct has 7 values only 2 were
initilized when the addr struct was created.

Two values the port and addr were set after the
initilization. All values are now intilized when
the OCDevAddr struct is created.

In addition the EXPECT_EQ was changed to EXPECT_STREQ
the macro undertands that a string is expected and
will display more informative errors if the test fails.

Change-Id: I74093d0a42961f65c3709254e949b8feb8aec587
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17101
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoAdd API to allow application to set RD storage filename.
Todd Malsbary [Wed, 18 Jan 2017 18:51:25 +0000 (10:51 -0800)]
Add API to allow application to set RD storage filename.

Change-Id: I4afa1607ea9758747c212906a8ecf5b7f0099f72
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoFix static analysis issue in base layer
hyuna0213.jo [Wed, 1 Feb 2017 11:53:50 +0000 (20:53 +0900)]
Fix static analysis issue in base layer

-cainterfacecontroller.c: fix dereference memory
-oickeepalive.c: add null check logic

Change-Id: Iaa839b5a8c4eba44934931d9e3b3a529a07a762e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16997
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFix defect found by static analyzer
ChaJiWon [Fri, 3 Feb 2017 06:04:45 +0000 (15:04 +0900)]
Fix defect found by static analyzer

- ocpayloadparse : double free
- occollection : need to NULL check
- ocRepresentation : big size of m_devAddr parameter

Change-Id: I5bd4cbc6d5dab1dfe7293a234e90d2c465a0039c
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17007
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoClean up log messages in CA Layer.
jihwan.seo [Thu, 2 Feb 2017 10:08:49 +0000 (19:08 +0900)]
Clean up log messages in CA Layer.

- To make sure of analysis, Debug level is replaced with Info level.
- Remove unnecessary Logs of BLE and CA common.

Change-Id: Ifab4d264c7347e8575e008ca1bd7fd7deed03b9d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17023
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoImplement RD delete.
Todd Malsbary [Fri, 2 Dec 2016 19:59:43 +0000 (11:59 -0800)]
Implement RD delete.

Change-Id: I492034351d388b58a349024270d5abd9506da86d
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15075
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoUpdate MOT Enable API and added some ESResult.
Parkhi [Thu, 9 Feb 2017 07:30:21 +0000 (16:30 +0900)]
Update MOT Enable API and added some ESResult.

 - Security-layer support MOT enabled API. So updated MOT enabled API.
   Please check following changes.

   1. When the mediator finds an owned-secured resource that is MOT disabled,
      it can enable it according to whether it is the owner or the sub-owner.
   2. MOT related functions are separated.
   3. Changes in DB synchronized check logic have occurred as the above changes occur.

 - Added some ESResult(e.g. ES_MOT_NOT_SUPPORTED, ES_MOT_ENABLING_FAILURE)

Change-Id: I5af3bdfcfbdf6b62b50a07e2d6d699c96a7a2667
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17087
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix crash in ssl retransmission thread
Joonghwan Lee [Thu, 19 Jan 2017 08:33:20 +0000 (17:33 +0900)]
Fix crash in ssl retransmission thread

It is possible to happen segmentation fault if retransmission thread
lock a mutex during CAdeinitSslAdapter function is called

Patch 1: Initial upload

Change-Id: I446aeb2cc9d6cd07d2683984ba2783ab72020c58
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16575
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17107

7 years agoAdding Android Interface API saveACL() and doSelfOwnershiptransfer()
Randeep Singh [Wed, 18 Jan 2017 09:50:56 +0000 (15:20 +0530)]
Adding Android Interface API saveACL() and doSelfOwnershiptransfer()

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

7 years agoChange the cred usage according to CR33(MfgCertOTMClarifications)
Chul Lee [Wed, 18 Jan 2017 00:44:06 +0000 (09:44 +0900)]
Change the cred usage according to CR33(MfgCertOTMClarifications)

Change-Id: I042a93cd8acc6c0ec5f6e77f24ecb78b667b9912
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 317078b7708e6542aa84f30da44afc2f1e14e0d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17109

7 years agoFix selected ciphersuite info of established session
Joonghwan Lee [Thu, 19 Jan 2017 04:25:46 +0000 (13:25 +0900)]
Fix selected ciphersuite info of established session

Fixed selected ciphersuite infomation to get from
the session object when session established.
This patch will be needed in case of multiple (D)TLS session are initiating.

Patch 1:Initial upload

Change-Id: I245443f9e1216da72c742fe7eafaf24445050dfa
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16569
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit f14b783b1828361a41de813f9780ae61ec8a6597)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17105

7 years agoIOT-1806: Temporarily disabling one of OCDiscover* tests.
Pawel Winogrodzki [Wed, 8 Feb 2017 20:27:20 +0000 (12:27 -0800)]
IOT-1806: Temporarily disabling one of OCDiscover* tests.

One of these tests is failing for Windows only. We're disabling it
temporarily to unblock other developers' changes.

Change-Id: I73bbad157acbd618d50f49bcd1fc7ef07baf2aee
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17103
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1685] Make /oic/res observable.
Todd Malsbary [Wed, 7 Dec 2016 01:57:38 +0000 (17:57 -0800)]
[IOT-1685] Make /oic/res observable.

The application is expected to do the following when it wishes to
enable this behavior:
- handle = OCGetResourceHandleAtUri(OC_RSRVD_WELL_KNOWN_URI)
- OCSetResourceProperties(handle, OC_DISCOVERABLE|OC_OBSERVABLE)
- OCNotifyAllObservers(handle, OC_NA_QOS)

Note that this change enables OCNotifyAllObservers for virtual
resources (such as OC_RSRVD_WELL_KNOWN_URI).

Change-Id: I5c49ab168791e6b5a6e3a97f561c2851614e0f8f
Bug: https://jira.iotivity.org/browse/IOT-1685
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15633
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoResource directory related fixes.
Todd Malsbary [Mon, 21 Nov 2016 20:01:33 +0000 (12:01 -0800)]
Resource directory related fixes.

- Use the passed in ID in OCRDPublishWithDeviceId(),
- Set the size of the CBOR array to the length of the discovery
  payload list in OCConvertDiscoveryPayload(),
- Return all local and published resources in response to GET
  /oic/res,
- Set the di and baseURI correctly in discovery payloads,
- Only return resources that match the intersection of 'rt' and 'if'
  queries.
- Add missing calls to ROLLBACK in error paths.

Change-Id: Ib1ad770fec8ec6f9eafff0e5f864ee115f1ba5b5
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14581
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-789] [IOT-792] [IOT-794] [IOT-1763 partial fix]
Nathan Heldt-Sheller [Tue, 24 Jan 2017 06:30:50 +0000 (22:30 -0800)]
[IOT-789] [IOT-792] [IOT-794] [IOT-1763 partial fix]
Remove AMS and clean up SRM context and response code.

The AMS code is dead, broken, and needs to be removed.

Also, the SRM uses a tangled and inconsistent set of context objects,
leaving it unclear which request is being processed, what the state
of processing is, and whether or not a response has been sent to the
requester.

This patch fixes this and should be used as the basis
for future improvements to the policy engine (ACL) code,
SVR handling, etc.

There is some additional cleanup I'd like to do, but this needs
to get merged, and is already a large change, so I'll add those
other fixes as smaller patches once this is merged to master.

NOTE TO REVIEWERS: a few places are marked "TODO Samsung" and need
review by Samsung engr because it is a Samsung feature.

patch set 7: deleted commented out code and files

patch set 8: fixed const assignment warning that was causing Arduino
build to fail

patch set 9: rebased and merged 16883

patch set 10: addressed Kevin's comments and automated build issue

patch set 11: automated build issue

patch set 12: automated build issue

Change-Id: I9560c8aeb1ee59925c0b7aa1282f0cf39f3cae9b
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16719
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix a wrong usage of return value of getMediatorDevId API
Jihun Ha [Tue, 7 Feb 2017 01:03:53 +0000 (10:03 +0900)]
Fix a wrong usage of return value of getMediatorDevId API

Instead of OCUUIdentity *, a value of std::string should be returned.
Additionally, removed a defect point in returning a value after OICFree

Change-Id: Ibcd204b14ea6f488f689ff0ff61da9b618124a4d
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17085
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>