iotivity.git
2 years agobuild: Reformat the service SConscripts 01/21001/9
Mats Wichmann [Sun, 4 Jun 2017 20:48:05 +0000 (14:48 -0600)]
build: Reformat the service SConscripts

[Mats Wichmann]

These reformattings are not supposed to change any behavior,
but they are not all purely whitespace. For example, consecutive
lines of Append(LIBS=  or Append(CPPPATH= were collapsed into
one call with multiple entries in the list.

A few comments were beefed up, as were occasional informative messages.

Import of run_test moved to top (Python style), except the two scripts
where the unittest code is not isolated to a subdirectory - the import
has to be protected so it is only called for targets that support
the tests - the import fails on Tizen for some reasons.  Change this
when separate patches to isolate unit test building/running are merged.

[Philippe Coval]

Ported to 1.3-rel from master

Conflicts:
service/easy-setup/enrollee/unittests/SConscript
service/easy-setup/mediator/richsdk/unittests/SConscript
service/notification/cpp-wrapper/unittest/SConscript
service/notification/unittest/SConscript
service/resource-container/unittests/SConscript
service/resource-encapsulation/src/common/SConscript
service/resource-encapsulation/src/serverBuilder/SConscript
service/resource-encapsulation/unittests/SConscript

Change-Id: Ifaf3eb2d837e773a06e59b50132f0d3c8881fdd8
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20553
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21001
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agotizen: install library from variant dir 21/21021/4
Philippe Coval [Mon, 26 Jun 2017 16:47:57 +0000 (18:47 +0200)]
tizen: install library from variant dir

This change is imported from this json build change in master:
https://gerrit.iotivity.org/gerrit/#/c/20363/

Change-Id: I4f65b3947db8ffd37c687c5583b602f37d61ed3a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21021
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Fail on unsupported argument 07/21007/2
Philippe Coval [Wed, 14 Jun 2017 07:30:47 +0000 (09:30 +0200)]
build: Fail on unsupported argument

Also use same sys.exit everywhere

1.3-rel should fail un tizen_unsecured
because that component is not yet merged

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I98e14eff713a6434d0521bc2235d127826a45acf
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20781
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
(cherry picked from commit ae20072dc07ad11d770bbeccdcbefee685aeb504)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21007
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRevert "[IOT - 2386] Fix for NULL reference..." 63/20963/4
Dan Mihai [Thu, 22 Jun 2017 19:32:59 +0000 (12:32 -0700)]
Revert "[IOT - 2386] Fix for NULL reference..."

This reverts commit 2819a9def15e8b401ee21ab1f941fa2af8a3f41e.

LL_FOREACH_SAFE already checks for NULL list entry, so there is no
need to check a second time inside the loop.

Change-Id: Ia7a33ce6a3c6bb88cd529831af07010729a2badb
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20963
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years ago[IOT-2426] Update IPCA ElevatorServer files 61/20961/3
Alex Kelley [Tue, 20 Jun 2017 21:08:43 +0000 (14:08 -0700)]
[IOT-2426] Update IPCA ElevatorServer files

Update the JSON and DAT files to comply with the recent security changes.

Change-Id: I8b5f70a4f3153b4000eba9f5569ed54bc28529e9
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20961
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoeasy-setup: Add missing path for android ndk-r13b 19/21019/4
bg.chun [Mon, 27 Feb 2017 06:24:35 +0000 (15:24 +0900)]
easy-setup: Add missing path for android ndk-r13b

[IOT-1863]force to include missing  header for build with ndk-r13b

current android build script using ndk-r10d
when update ndk as ndk-r13b,
it showing build fail due missing header file.
So, force to include missing header file

Change-Id: Ic23ab789f907c4e576e83bccc0c26f41350a6446
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17525
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 73b39d4c5450f0863fce16743ee424b5cb95ddfd)
Bug: https://jira.iotivity.org/browse/IOT-1863
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21019

2 years ago[IOT-1917]Fix memory leak: cert/key/CRL 33/20933/3
Oleksandr Dmytrenko [Tue, 21 Mar 2017 13:40:52 +0000 (15:40 +0200)]
[IOT-1917]Fix memory leak: cert/key/CRL

Fix memory leak: cert/key/CRL information returned by cred resource
https://jira.iotivity.org/browse/IOT-1917

Change-Id: Ic563b5e5b79ccac8855ebb5b215e475d1b4e57be
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18057
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
(cherry picked from commit dba44fd8ce7219897966054446c992184369fbfa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20933
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agobuild: Improve target message in build_common 79/20579/5
Mats Wichmann [Thu, 4 May 2017 15:09:12 +0000 (09:09 -0600)]
build: Improve target message in build_common

Improve the text of host/target unsup message in build_common

No operational changes

Change-Id: I6a8b95fac210a8f80132bebab148a67dfa76d51d
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19637
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 570d343aa00bb5b503c7c6cea904eb52691a42e0)
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20579
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years agobuild: Use sys.exit instead of exit 05/21005/2
Philippe Coval [Wed, 17 May 2017 10:33:49 +0000 (12:33 +0200)]
build: Use sys.exit instead of exit

This change is to fix conflict between master and 1.3-rel

Reviewed-on: https://gerrit.iotivity.org/gerrit/19955

Bug: https://jira.iotivity.org/browse/IOT-2237
Change-Id: Ib000a648b889d7d9956d6b26a9dc2111e7b96200
Origin: https://gerrit.iotivity.org/gerrit/#/c/20877/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20877
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit f99878445ce793627a4af92e26c9b1ce797b8949)
Reviewed-on: https://gerrit.iotivity.org/gerrit/21005
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years ago[IOT-2424] Fixed non-UUID subject rowner. 77/20977/3
Nathan Heldt-Sheller [Fri, 23 Jun 2017 21:55:49 +0000 (14:55 -0700)]
[IOT-2424] Fixed non-UUID subject rowner.

Also added additional debug logging to rowner check.

Change-Id: Ic6c2849ebe9519568e789b2a4b34e40252746474
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20977
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
2 years ago[IOT-2395] security: tcp provisioning fix 41/20641/4
Oleksandr Dmytrenko [Thu, 8 Jun 2017 11:29:54 +0000 (14:29 +0300)]
[IOT-2395] security: tcp provisioning fix

Security provisioning samples via tcp fixed

Change-Id: Iff96834af80413053dee9318a352132eeaf60ebb
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20641
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoSwitch to preferred Python method for checking sys.platform 25/20925/4
Mats Wichmann [Thu, 4 May 2017 16:01:07 +0000 (10:01 -0600)]
Switch to preferred Python method for checking sys.platform

Older Pythons can set linux or linux2 in sys.platform.
The suffix is meaningless, deprecated, and no longer happens as of Python 3.3.
The preferred idiom (from Python docs) is:

    if sys.platform.startswith('linux'):

Twiddled a few other things, "imports at the top" rule,
and a couple of related error msgs, and a few strings

In a few places, more could have been done to clean up, but skipped
to keep the patches small

Change-Id: Iccdfa9eb77ff4bc1429e3b38837a8732455a5dfd
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19641
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 39f1ec664b3abc4e9d58b48a2e281a66ef11a153)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20925
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
2 years agobuild: Add a way for auto_build.py to print actions without executing 89/20789/5
Mats Wichmann [Sun, 9 Apr 2017 15:25:37 +0000 (09:25 -0600)]
build: Add a way for auto_build.py to print actions without executing

[Mats Wichmann]

EXEC_MODE={one of: False, false, 0} python auto_build.py args
will print what the script would do without actually running the actions
Found it hard to keep track of all the different targets,
this is a quick way to report.

[Philippe Coval]

Port from master to 1.3-rel

Conflicts:
auto_build.py

Change-Id: I6e03cc45ef4e51a5accde6f9866f7b62d3e002b7
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18635
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20789
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agoresource-encapsulation: Fix typo on Destroyed word 73/20973/2
Philippe Coval [Thu, 15 Jun 2017 18:16:08 +0000 (20:16 +0200)]
resource-encapsulation: Fix typo on Destroyed word

Bug: https://jira.iotivity.org/browse/IOT-2267
Change-Id: I4f582fb992a0829de0549fd164c283726650c363
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20853
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 5f97a0d81aa2b495a4ce122ad193ec22955c8569)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20973

2 years ago[IOT-2207] Update build to use android-ndk-r10e 39/20939/2
George Nash [Mon, 5 Jun 2017 21:48:14 +0000 (14:48 -0700)]
[IOT-2207] Update build to use android-ndk-r10e

The android-ndk-r10d is unsupported. This updates the scripts
to download and use version r10e.

Bug: https://jira.iotivity.org/browse/IOT-2207
Change-Id: I730524749f76868f81756a1f704ee761819d1891
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20561
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 09dd38165eae5a7313cabf39ae2f817d892f1f7b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20939
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoconnectivity: Fix typo on success word 31/20931/3
Philippe Coval [Fri, 16 Jun 2017 11:10:33 +0000 (13:10 +0200)]
connectivity: Fix typo on success word

Change-Id: I74042b17ef67725c42b40eb239e977c43e60ec10
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20875
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
(cherry picked from commit 62ea2a7f506ddf23ebb8985b03ad640ed361a8c4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20931
Reviewed-by: Peter Hatina <phatina@gmail.com>
2 years agobuild: Enable MULTIPLE_OWNER by default 21/20821/3
Philippe Coval [Mon, 12 Jun 2017 14:24:48 +0000 (16:24 +0200)]
build: Enable MULTIPLE_OWNER by default

Bug: https://jira.iotivity.org/browse/IOT-2241
Change-Id: Id2e1bd03d887076204117c6f7ab60e435804d886
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20699
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 16e1df43f7f04a5c0950397f2282defb1bdb0c13)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20821
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
2 years agoRemoved print statments from SConscripts 87/20887/4
George Nash [Tue, 13 Jun 2017 23:47:32 +0000 (16:47 -0700)]
Removed print statments from SConscripts

The print statments were basically added in for
debugging the SCons scripts. Unless the debug messages
are expected they provide zero help and cause
confusion.

Change-Id: I96cc33e93997fb2b9b7f55c664f2e2aa059d25a3
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20777
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 673cccdd0b656158c7d35474d419c8bf40466aca)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20887

2 years agoReformat all of the bridging SConscripts to be more Pythonic 69/20569/6
Mats Wichmann [Fri, 2 Jun 2017 15:37:24 +0000 (09:37 -0600)]
Reformat all of the bridging SConscripts to be more Pythonic

There are not intended to be any functional changes,

Change-Id: Ife37bdb04c0ff05fcf50d9f7274b71026f053fd9
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20543
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 900b6fcf57a2515880a1238ed794515f7dde9372)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20569
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2 years agoReformat all of the cloud SConscripts to be more Pythonic 75/20575/3
Mats Wichmann [Fri, 2 Jun 2017 13:12:54 +0000 (07:12 -0600)]
Reformat all of the cloud SConscripts to be more Pythonic

There are not intended to be any functional changes, and
this set of changes turned out to be relatively minor.

Change-Id: I738b2f2f43d3edd069426daa06ba29f7aaa33bef
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20535
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit b3aa625df006bb6c0a5d6269e6a82219d0bffefc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20575
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agobuild: Reformat resource/csdk SConscripts to be more Pythonic 4/4 07/20907/5
Philippe Coval [Mon, 19 Jun 2017 10:22:37 +0000 (12:22 +0200)]
build: Reformat resource/csdk SConscripts to be more Pythonic 4/4

These are the resource/csdk/security subset

There are not intended to be any functional changes, with a minor exception:
in resource/csdk/security/provisioning/sample/SConscript, the samples are
now assigned to an appropriately constructed list, which is extended
in the case of MULTIPLE_OWNER, this list is then assigned an Alias.
This is done to avoid having two parallel lists and needing to keep
in sync.

Header lines with doubled comment styles were changed to just Python,
that is, change this style (quoted so git doesn't strip the lines):

"# // Copyright 2015 Samsung Electronics All Rights Reserved."

to this:

"# Copyright 2015 Samsung Electronics All Rights Reserved."

There is no consistently "pretty" way to fold long lines,
the choices were made by a tool (yapf) but occasionally overridden
to be a little more consistent

The test harness is now consistently imported as:
  from tools.scons.RunTest import run_test
rather than import * - should normally avoid importing whole
namespace unqualified unless it is really needed

Change-Id: If1876589b2cad83c1c4795dae5e3ddc59c78fca1
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20805
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Origin: master
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20907
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agoImprove the frustrating gtest SConscript 05/20905/5
Mats Wichmann [Sun, 9 Apr 2017 15:15:31 +0000 (09:15 -0600)]
Improve the frustrating gtest SConscript

Define gtest version in a single variable, for future-proofing
Fix to "python style" (except long lines and constant names) - indents, etc.
Fix redefinition of builtin name 'var' (windows section)
Quit right away if target does not need gtest, and remove extra checks
  for this elsewhere
Add checks for help and clean targets: should not unpack/config/build in
  these cases, and actually clean if clean is called
Split configure and build targets for non-windows:
  may still need to build even if already configured (due to clean target)

Change-Id: Ic9818fdd221eb2d3d7fead8c9585c41db80b3d5a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18633
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Origin: master
Reviewed-on: https://gerrit.iotivity.org/gerrit/20905
Reviewed-by: Peter Hatina <phatina@gmail.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years ago[CHP] Unit test fixes for the Coap-http proxy. 13/20913/3
Jay Sharma [Mon, 19 Jun 2017 11:20:56 +0000 (16:50 +0530)]
[CHP] Unit test fixes for the Coap-http proxy.

Some build failure seen at:
https://build.iotivity.org/ci/job/iotivity-verify-unit_tests/16257/console

Reason : In the test cases we are sending the http request to the http server.
There is a possibility if http server does not respond, test case may fail.

Change-Id: I0a0a823779c8c30819af3973393d3fb744cc9d7f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20913
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years ago[RE] Added print statement in the rcs_common_test for fixing mocking crash. 03/20803/2
Jay Sharma [Wed, 14 Jun 2017 12:26:04 +0000 (17:56 +0530)]
[RE] Added print statement in the rcs_common_test for fixing mocking crash.

There is a crash on the specific ubuntu 16.04 [64-bit]version, while running the
rcs_common_test. Added the print statement to fix it,

Issue seems to be of mocking framework support for 16.04 [64-bit] as same code
is working on 14.04 [32-bit and 64-bit].
Moreover, I tried to remove the print statement in other services mocking calls
it also results in the crash.

bug: https://jira.iotivity.org/browse/IOT-2416
Change-Id: Ic848e889aa3985567dad2d88b4945efdcd0733fd
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20803
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoeasy-setup: Drop unnecessary gtest flags 39/20239/4
Philippe Coval [Wed, 26 Apr 2017 10:50:15 +0000 (12:50 +0200)]
easy-setup: Drop unnecessary gtest flags

This will help for upgrading gtest to latest release

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ic807bfcd7356aa807671e0b378fcda2a558c24b2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20239
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2 years ago[NS] Notification consumer valgrind invalid read/write fix. 63/20663/4
Jay Sharma [Fri, 9 Jun 2017 06:39:31 +0000 (12:09 +0530)]
[NS] Notification consumer valgrind invalid read/write fix.

Bug: https://jira.iotivity.org/browse/IOT-2373
Change-Id: Ifd3789538c3d368b7ca3da52d274bb7ed531c126
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20831
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit bdc2263c344879854b914ec5efd0e232137c49c2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20663
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
2 years agoReformat all of the java SConscripts to be more Pythonic 01/20901/2
Mats Wichmann [Fri, 2 Jun 2017 13:45:16 +0000 (07:45 -0600)]
Reformat all of the java SConscripts to be more Pythonic

There are not intended to be any functional changes

Some reformatting after initial comments

Change-Id: I2db5b04e2498974396ff3ba6033b521ebd3ab61a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20537
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
(cherry picked from commit 44c0f9d561e356d685544f15134999bf90184d9e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20901

2 years ago[IOT-2097][IOT-2098] Cleanup of base64 code 87/19187/13
George Nash [Fri, 21 Apr 2017 05:48:41 +0000 (22:48 -0700)]
[IOT-2097][IOT-2098] Cleanup of base64 code

[IOT-2097] According to RFC4648 Base64 can accept empty data.
Fixed error for input containing no data for b64Encode and
b64Decode.

[IOT-2098] Add error checking to b64Decode. The original code
would decode any string even if it contained characters that are
invalid for base 64 encoding. Code now checks that all
characters found in the encoded string are [A-Z][a-z][0-9]+/=

The padding character '=' is checked to only be at the end of
the encoded string.

Unit tests improved. They now include test vectors from RFC4648
Unit tests now cover failure cases. Not just pass cases.

Improved documentation
 - Add file documentation for base64.h file
 - Add reference to RFC4648.
 - Documented all B64Result enum values
 - Add [in],[out] markup for b64Encode function
 - Add code example for b64Encode function
 - Add [in],[out] markup for b64Decode function
 - Add code example for b64Decode function

Bug: https://jira.iotivity.org/browse/IOT-2097
Bug: https://jira.iotivity.org/browse/IOT-2098

Change-Id: I3d6167c85a766ae8200339f00ef5c978f0ec55b7
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19187
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years agobuild: Install csdk to resource/stack 51/20851/3
Philippe Coval [Fri, 9 Jun 2017 13:51:50 +0000 (15:51 +0200)]
build: Install csdk to resource/stack

To avoid to mix C and C++ headers
As iotivity.pc suggests (and aligned to Yocto)

Change-Id: Ib7294d8cae27c3e9a496f06fe293d77a087c860e
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20671
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit bdf5c0ecb075c5664755fe77f4b31a7c347cb5e3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20851
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agobuild: Include gtest header using system path 33/19833/9
Philippe Coval [Fri, 12 May 2017 14:06:26 +0000 (16:06 +0200)]
build: Include gtest header using system path

Change-Id: If22cffaa199d1057497019fd45c502b8ae69b8de
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20341
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 4ec6ab957de7fe29db51e66586f00e40fde6519a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/19833

2 years agosecurity: Apply code style to json2cbor.c code 83/20883/3
Philippe Coval [Fri, 16 Jun 2017 13:07:01 +0000 (15:07 +0200)]
security: Apply code style to json2cbor.c code

There is not functionnal change,
It was done to make upcoming changes easier to review.

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: I6f8cd3ed7cd0a6e3c9d9879996964de8e8aa3a99
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20879
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
(cherry picked from commit 837d2ee9b23e24ca47651cbaa5ceb6b6d6beebf6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20883
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-1583: Removing /W4 warnings - part 6. 91/19691/18
Pawel Winogrodzki [Sat, 6 May 2017 12:22:28 +0000 (05:22 -0700)]
IOT-1583: Removing /W4 warnings - part 6.

Removing remaining /W4 warnings and enabling /W4 along
with /WX globally.

Change-Id: I521f17e36038e0cc74c14afbb7e6a7a2cee6c45e
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19691
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agotizen: Change permission for scripts to executable 83/20783/3
Philippe Coval [Fri, 26 May 2017 10:17:50 +0000 (12:17 +0200)]
tizen: Change permission for scripts to executable

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ife97d14d33dc8321913765e4b5ffca2c71e1a3ee
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20435
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
(cherry picked from commit 22e4be493821d9a538de5e0995d3982daec194da)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20783

2 years agobuild: Windows: Work around coap.h race 91/20891/2
Dan Mihai [Fri, 16 Jun 2017 14:41:45 +0000 (07:41 -0700)]
build: Windows: Work around coap.h race

Build coap.h before everything else, to work around an apparent
multi-threaded build race condition.

Bug: https://jira.iotivity.org/browse/IOT-2376
Change-Id: Ic112cfea42dfa1ac12735b4af882dc45a74c853d
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20891
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Omar Maabreh <omarm@microsoft.com>
2 years agoIOT-1583: Removing /W4 warnings - part 5. 31/20731/5
Pawel Winogrodzki [Mon, 12 Jun 2017 22:31:27 +0000 (15:31 -0700)]
IOT-1583: Removing /W4 warnings - part 5.

Removing variable type and size mismatch warnings.

Change-Id: Ic0c2f4935faf5136c93c79f58f58cb0f3f59d2ab
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20731
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoresource/examples: Removing /W4 warnings 27/20727/8
Pawel Winogrodzki [Mon, 12 Jun 2017 22:17:36 +0000 (15:17 -0700)]
resource/examples: Removing /W4 warnings

Removing "unreachable code" warnings due to infinite waits.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I8d057494e39540f35f1ec447217d70eff556d1c0
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20727
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRD: Removing /W4 warnings 23/20723/4
Pawel Winogrodzki [Mon, 12 Jun 2017 22:07:15 +0000 (15:07 -0700)]
RD: Removing /W4 warnings

Making sure variables are always initialized before they get used.
This was an issue in case we'd hit an error and use "goto" to skip
parts of the code.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I35a114585371c61dab94a67d957f0b01a98938a5
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20723
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agooc_logger: Removing /W4 warnings 29/20729/7
Pawel Winogrodzki [Mon, 12 Jun 2017 22:26:38 +0000 (15:26 -0700)]
oc_logger: Removing /W4 warnings

Disabling "unreachable code" warning for a known issue
inside a boost header.

See: https://svn.boost.org/trac/boost/ticket/5904.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: Ic313fd1debc9df73eca2d747d6eda1b883b7b9be
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20729
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Reformat the examples SConscript to be more pythonic. 71/20571/2
Mats Wichmann [Fri, 2 Jun 2017 15:22:56 +0000 (09:22 -0600)]
build: Reformat the examples SConscript to be more pythonic.

There are no functional changes.  A comment was updated.

Change-Id: I9200be3cc66559de0c40c0d3c99c09f15a039291
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20571
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agostack/samples: Removing /W4 warnings. 35/20735/3
Pawel Winogrodzki [Tue, 13 Jun 2017 00:12:12 +0000 (17:12 -0700)]
stack/samples: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I9b20da2c4ebea8bdb4bbc3b64c7d308060bf258e
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20735
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agoresource/examples: Removing /W4 warnings. 37/20737/3
Pawel Winogrodzki [Tue, 13 Jun 2017 00:12:53 +0000 (17:12 -0700)]
resource/examples: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: Ifb3d1237bea27faa4b94739c13607c48cb0de46a
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20737
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoconnectivity: Fix permission of sources 75/20675/6
Philippe Coval [Tue, 9 May 2017 17:28:56 +0000 (19:28 +0200)]
connectivity: Fix permission of sources

Change-Id: Ibc63061b15d67481370214fc322c7db302537018
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20657
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
(cherry picked from commit 98f5dc539f79f02615791397d4827480e2cc05f4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20675

2 years agoresource/unittests: Removing /W4 warnings. 41/20741/4
Pawel Winogrodzki [Tue, 13 Jun 2017 00:14:13 +0000 (17:14 -0700)]
resource/unittests: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I6405fd2119722b24c3a29c7f8478d1b801d0c1d4
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20741
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRD: Removing /W4 warnings. 33/20733/4
Pawel Winogrodzki [Tue, 13 Jun 2017 00:06:31 +0000 (17:06 -0700)]
RD: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I13a8e9456f280347e2035cc80a9c7818facc51e9
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20733
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2409] IUT rejects /acl2 Update from CTT 79/20779/4
Nathan Heldt-Sheller [Wed, 14 Jun 2017 00:59:48 +0000 (17:59 -0700)]
[IOT-2409] IUT rejects /acl2 Update from CTT

The CTT was posting an Update to /acl2 that included only
rowneruuid in the payload.  The IUT was rejecting because it
could not determine that the payload was /acl2 (vs. /acl v1).

This is wrong behavior by IUT because such a payload is actually
valid /acl2 and/or /acl v1 payload.

This patch changes the logic so that it only rejects an Update
based on version if it can determine it is an incompatible version -
in this case, v1 - and accepts it otherwise.

A similar problem exists in the /cred Update handler, which
(in a particular state) treats a payload containing just rowneruuid
as a failed attempt to Update the Owner credential.

This patch changes that logic too, to no longer treat a "NO_SECURITY_MODE"
credType as an Owner credential.

Change-Id: Ica9bde112cb87bd6ad6ee014cf7526928545d786
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20779
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
2 years agoresource/src: Removing /W4 warnings. 39/20739/2
Pawel Winogrodzki [Tue, 13 Jun 2017 00:13:28 +0000 (17:13 -0700)]
resource/src: Removing /W4 warnings.

Removing variable shadowing warnings: there were a few
variables using the same name in one scope and thus one
overwritten the other.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: Ic30ecba67a98154eb506929ef23b1fabb560a42a
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20739
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Enable WITH_PROXY by default 19/20819/2
Philippe Coval [Mon, 12 Jun 2017 14:42:34 +0000 (16:42 +0200)]
build: Enable WITH_PROXY by default

Bug: https://jira.iotivity.org/browse/IOT-2240
Change-Id: Iabf0f5bbff2c2c9fbb284a0614c206b66e3cd1bd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20819
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years agobuild: Set executables mode on extlibs scriptlets 77/20577/3
Philippe Coval [Fri, 26 May 2017 10:17:50 +0000 (12:17 +0200)]
build: Set executables mode on extlibs scriptlets

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I767a9c68b0270b71ca4bd814526e51ddd4dad990
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20433
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
(cherry picked from commit 1191376d2ae3ccdf9888c105f21e8d9d68934638)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20577
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years agonotification: Drop unnecessary gtest flags 75/19775/6
Philippe Coval [Wed, 26 Apr 2017 10:50:27 +0000 (12:50 +0200)]
notification: Drop unnecessary gtest flags

This will help for upgrading gtest to latest release

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I4ddf3bb98ad257d8bb21b5e0ef388405d574131c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19775
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2 years ago[IOT-1802] Changing POST to PUT for creating a resource in sample 91/20191/3
saurabh.s9 [Sun, 21 May 2017 09:34:00 +0000 (15:04 +0530)]
[IOT-1802] Changing POST to PUT for creating a resource in sample

Change-Id: I8b57b71a2642c0da041034f85c4c66f55e67d782
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20191
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoReformat the resource/csdk SConscripts to be more Pythonic 1/4 17/20817/2
Mats Wichmann [Sat, 3 Jun 2017 18:54:54 +0000 (12:54 -0600)]
Reformat the resource/csdk SConscripts to be more Pythonic 1/4

This is now part 1 of 4, containing the sconscripts not
in connectivity, stack or security (see other three parts for those)

There are not intended to be any functional changes.

In a couple of places, for general consistency, changed
  SConscript('#foo') to SConscript('#/foo') - these are equivalent
"help vars" assignments formatted so messages can be improved later
  without changing formatting
all EnumVariable usage now calls out allowed_values= to be more clear

The test harness is now consistently imported as:
  from tools.scons.RunTest import run_test
rather than import * - should normally avoid importing whole
namespace unqualified unless it is really needed

The test harness is now consistently imported as:
  from tools.scons.RunTest import run_test
rather than import * - should normally avoid importing whole
namespace unqualified unless it is really needed

Change-Id: I3f818ef972a9c84f9d0aec27348ec6da07f49e02
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20817
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
2 years agotizen: prepare mbedtls for tizen_unsecured 75/20775/5
Philippe Coval [Tue, 13 Jun 2017 22:32:55 +0000 (00:32 +0200)]
tizen: prepare mbedtls for tizen_unsecured

crypto functions are used by connectivity module

This prevents instalation of obsolete version,
like on jenkins:

https://build.iotivity.org/ci/job/iotivity-verify-tizen_unsecured/151/consoleFull

  + '[' '!' -d /home/jenkins-ci/workspace/iotivity-verify-tizen_unsecured/extlibs/mbedtls ']'
  + cp -r /home/jenkins-ci/iotivity-extlibs-03272015/mbedtls/mbedtls /home/jenkins-ci/workspace/iotivity-verify-tizen_unsecured/extlibs/mbedtls/mbedtls

Bug: https://jira.iotivity.org/browse/IOT-2237
Change-Id: Iffc8929e646b4edb624a12481b32f4929b743af4
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20773
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Peter Hatina <phatina@gmail.com>
Reviewed-by: Sushil Kumar Yadav <sushil.ky@samsung.com>
(cherry picked from commit 77da2a4856a79a1ab08e9c474d297e7ed6b75594)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20775
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
Tested-by: C.J. Collier <cjcollier@linuxfoundation.org>
2 years agotizen: Also build without security all configs 55/19955/12
Philippe Coval [Wed, 17 May 2017 10:33:49 +0000 (12:33 +0200)]
tizen: Also build without security all configs

Introduce tizen_{secured,unsecured} for jenkins
For smooth transition tizen builder is preserved.

Also use bash for advanced tests (to parse options args)

Bug: https://jira.iotivity.org/browse/IOT-2237
Change-Id: Ib0a648b889d7d9956d6b26a9dc2111e7b9623b02
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19955
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
2 years agoresource-encapsulation: Isolate unit_tests building 41/20241/8
Philippe Coval [Fri, 19 May 2017 16:53:57 +0000 (18:53 +0200)]
resource-encapsulation: Isolate unit_tests building

Previously gtest libs were propagated to shared libs:

  g++ -o .../resource-encapsulation/src/common/librcs_common.so \
  (...) \
  -lgtest -lgtest_main \
  -lc_common -llogger -ldl -lpthread -luuid -lrt -loc

Change-Id: I9bcaa39d8cd5e1166b2ec7d7ede14d44f79a476e
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20241
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Gregg Reynolds <dev@mobileink.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
2 years ago[IOT-1928] Update mbedTLS to version 2.4.2 59/20059/13
Kevin Kane [Thu, 18 May 2017 16:28:58 +0000 (09:28 -0700)]
[IOT-1928] Update mbedTLS to version 2.4.2

Make the build script a bit smarter about figuring out if it
needs to update and re-patch the mbedTLS dependency.

Change-Id: I6402a045ea03121b0704b9d83be0224bdb98ada4
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20059
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT 1819: Return URI of new resource in option header. 45/19245/19
Soemin Tjong [Tue, 25 Apr 2017 06:33:57 +0000 (23:33 -0700)]
IOT 1819: Return URI of new resource in option header.

https://tools.ietf.org/html/rfc7252#section-5.8.2 specifies that the URI
of a new resource created by a server is returned in Location-Path
option.

Change-Id: I358d8ee127a598c2f2fdb8f101413eebbf100a89
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19245
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoRef count IPCAOpen() with same app ID. 51/18851/8
Soemin Tjong [Thu, 6 Apr 2017 01:52:31 +0000 (18:52 -0700)]
Ref count IPCAOpen() with same app ID.

In codegen implementation, it is difficult to pass around IPCAAppHandle
returned by IPCAOpen() to compartmentalized code generated for
each device or resource type.

IoTivity currently supports 1 server (an app is also a server) per
process (tracked by https://jira.iotivity.org/browse/IOT-1379).
Therefore multiple calls to IPCAOpen() in the same process is not
supported.

This change makes an exception so that IPCAOpen() will now return same
IPCAAppHandle when called with same app ID.

Change-Id: I9a3a2334e6fc9230595a68e3451c2a863c532824
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18851
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT - 2386] Fix for NULL reference possibility. 65/20565/3
arya.k [Tue, 6 Jun 2017 06:56:09 +0000 (12:26 +0530)]
[IOT - 2386] Fix for NULL reference possibility.

Change-Id: I89898afd650f7095dd89b4b9616176092fd41c3a
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20565
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2063] Enabled ca_api_unittest for CAGetNetworkInformation 93/20293/5
hyuna0213.jo [Tue, 23 May 2017 04:49:24 +0000 (13:49 +0900)]
[IOT-2063] Enabled ca_api_unittest for CAGetNetworkInformation

Change-Id: I2279dc5ce94ae7262d7f425d857d929791c18796
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20293
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agocsdk: Fix permission of sources 35/20135/8
Philippe Coval [Tue, 9 May 2017 17:29:22 +0000 (19:29 +0200)]
csdk: Fix permission of sources

Change-Id: I2e15f2378c03ddaa5972ebc4e126b6f914158f42
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20135
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
Reviewed-by: Thiago Moura <thiagogcm@gmail.com>
2 years agoBuild warning cleanup policyengine.cpp unit test 95/20595/2
George Nash [Tue, 30 May 2017 22:49:12 +0000 (15:49 -0700)]
Build warning cleanup policyengine.cpp unit test

This cleans up [-Wcomment] warning from gcc.

This warning is given if comments end in the '\',
i.e. the line continuation character, because this
will cause the comment to be wrapped to the next
line of code.

This removes the error without changing the code.

Change-Id: I1323d4236f73985613b4acadc5655863310ab9f2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20489
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
(cherry picked from commit 1e70a844529a8810975f091c1869cef92946f8d2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20595
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2276] Add Calling Convention to Public APIs on Windows 89/20289/15
Omar Maabreh [Tue, 23 May 2017 00:33:43 +0000 (17:33 -0700)]
[IOT-2276] Add Calling Convention to Public APIs on Windows

Change-Id: Ia7b382c29c12d5997894234eee93c57edaec819c
Signed-off-by: Omar Maabreh <omarm@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20289
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-1583: Temporary fix for remaining /W3 warnings. 87/20487/4
Pawel Winogrodzki [Sat, 20 May 2017 05:34:21 +0000 (22:34 -0700)]
IOT-1583: Temporary fix for remaining /W3 warnings.

This change suppresses some of the remaining /W3 VS compiler warnings,
fixes for which are too intrusive to meet the 1.3-rel bar.

In addition to that we're enabling the /WX compiler option
to prevent any new /W3 warnings from being checked in.

Change-Id: I061bc1c83615e052d77f8eb6b96fd488d1f49e4b
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20487
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-2246 Avoid touching already-freed peer 59/19859/5
Dan Mihai [Sat, 13 May 2017 03:40:22 +0000 (20:40 -0700)]
IOT-2246 Avoid touching already-freed peer

Change-Id: I55802664860aec4a02da209d3597d68ad405a4a9
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19859
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoFix potential infinite wait in IPCAFactoryReset() and IPCAReboot(). 19/20519/4
Soemin Tjong [Thu, 1 Jun 2017 01:59:43 +0000 (18:59 -0700)]
Fix potential infinite wait in IPCAFactoryReset() and IPCAReboot().

Without the predicate parameter, the wait_for() won't be unblocked from
earlier notify_all().

Also, relax the timing waiting for notifications in the unit tests.

Change-Id: I04d34f8221dc92239b27877b365dcb0d211c3458
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20519
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-2355: Change IPCA unit test agressive timeout. 75/20375/3
Soemin Tjong [Wed, 24 May 2017 22:52:01 +0000 (15:52 -0700)]
IOT-2355: Change IPCA unit test agressive timeout.

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

The IPCA unit test "IsIoTivityWorking" has failed sporadically.
This test directly uses IoTivity OC APIs to ensure that the underlying
IoTivity stack is working.
The 2 second timeout is incorrect, it should follow RFC 7252.

Change-Id: Iff640c2dbc2423e4865a4d2c8856a766d5345fa4
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20375
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-2126 IOT-2349 CA: Windows: shutdown improvements 35/20335/4
Dan Mihai [Tue, 23 May 2017 16:52:21 +0000 (09:52 -0700)]
IOT-2126 IOT-2349 CA: Windows: shutdown improvements

Continuing to use WSA after shutting it down might have unpredictable
side effects.

Change-Id: I738097cd83baacc24c673eb751fb363a05b67ebd
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20335
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoWindows: Fix Intermitent build error 03/20403/4
Ibrahim Esmat [Thu, 25 May 2017 02:19:20 +0000 (19:19 -0700)]
Windows: Fix Intermitent build error

Linking to mbedcrypto fails when running build with multiple threads.
Add workaround to use the lib from the source of InstallTarget().
Also, Minor change to add an output line between building and
running tests.

Change-Id: I887bdaa99fe7d00728b5a0e40543bc77c5d726e3
Signed-off-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20403
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoeasy-setup: Fix permissions of sources 65/20365/3
Philippe Coval [Tue, 9 May 2017 17:26:52 +0000 (19:26 +0200)]
easy-setup: Fix permissions of sources

Change-Id: I82e895918b69dc3eddd35917349807a3be03c40e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20365
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
2 years agotizen: Remove extlibs git history for gbs export 43/20343/4
Philippe Coval [Tue, 23 May 2017 23:03:26 +0000 (01:03 +0200)]
tizen: Remove extlibs git history for gbs export

Note this is executed just before gbs build,
to allow prepare scripts to use git if needed.

Note:
I noticed an old version of mbedtls is cached on jenkins.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I6d28421e2778ca5f6815a450678df3a8e08033e3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/20345/
Reviewed-on: https://gerrit.iotivity.org/gerrit/20345
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 5fb0d3438b27afb6a1284bba5e4898c2daed6202)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20343

2 years agoFix ocserver sample code that causes memory corrupt. 97/20497/4
Ziran Sun [Wed, 31 May 2017 14:08:05 +0000 (15:08 +0100)]
Fix ocserver sample code that causes memory corrupt.

Bug: https://jira.iotivity.org/browse/IOT-2381
Change-Id: I3aca7c79d97a2e4295568dbbb24de384b6993f50
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20497
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years ago[IOT-2380] Update ocserver sample to working with versioning. 93/20493/3
bg.chun [Wed, 31 May 2017 06:10:46 +0000 (15:10 +0900)]
[IOT-2380] Update ocserver sample to working with versioning.

Update ocserver sample to work with versioning.

Change-Id: Idae7063273a41b7a522719d830d464e7e0490eb9
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20493
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agotizen: Support Tizen:4:Unified 27/20327/2
Philippe Coval [Tue, 23 May 2017 15:05:53 +0000 (17:05 +0200)]
tizen: Support Tizen:4:Unified

Tizen:3 Profiles are not more used into Tizen:4:Unified,
so generic BT package is used.

Change-Id: Ie2a8fc01f2649b7ab389081c52f1d6eec8801e87
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20327
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
2 years ago[IOT-2384][CHP][SampleApp] Delete request not working in secure mode 77/20477/3
Veeraj Khokale [Tue, 30 May 2017 09:48:22 +0000 (15:18 +0530)]
[IOT-2384][CHP][SampleApp] Delete request not working in secure mode

Modify server ACE to provide full permission (0xF) so
that client can perform delete request as well

Change-Id: Iff3687505d8d3c27baac1b58ffd262bc7f10bb53
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20477
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agosecurity: Force link to libm (workaround) 39/19839/6
Philippe Coval [Fri, 12 May 2017 18:50:10 +0000 (20:50 +0200)]
security: Force link to libm (workaround)

This is a workaround for g++-4.7,

For some (really) weird reason ceil function was not found
when linking (even if added only at end of linker command line).

If doubled (-lm -lm) it worked.

Observed issue:

  scons VERBOSE=1 RELEASE=true WITH_RA=1 WITH_RA_IBB=1

  g++ -o out/linux/x86_64/release/resource/csdk/security/provisioning/unittest/sample_server1 \
  -m64 -pthread out/linux/x86_64/release/resource/csdk/security/provisioning/unittest/sampleserver1.o \
  -Lout/linux/x86_64/release -L. (...)
  -Lout/linux/x86_64/release/resource/c_common -Lresource/c_common \
  -Lout/linux/x86_64/release/resource/csdk/logger -Lresource/csdk/logger \
  -Lextlibs/gtest/googletest-release-1.7.0/lib/.libs
  -locpmapi_internal -loc -loctbstack_internal -locsrm -lroutingmanager \
  -loc_logger_internal -lconnectivity_abstraction_internal
  -lcoap -lgtest -lgtest_main -lc_common -llogger -ldl -lpthread -lstrophe -lssl -lcrypto -lresolv
  -lwksxmppxep -lm
  -lboost_system -lboost_thread -luuid -lrt -lmbedtls -lmbedx509 -lmbedcrypto -lsqlite3 -lgio-2.0 -lgobject-2.0 -lglib-2.0
  out/linux/x86_64/release/libwksxmppxep.so: undefined reference to `ceil'

  gcc (Ubuntu/Linaro 4.7.3-12ubuntu1) 4.7.3

Bug: https://jira.iotivity.org/browse/IOT-2244
Change-Id: Ie8a69a4fdd99c346244cfaee17cc7e3780942b5a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19839
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agobuild: Propagate RPATH for crosscompilers 73/20273/4
Philippe Coval [Wed, 24 May 2017 16:33:51 +0000 (18:33 +0200)]
build: Propagate RPATH for crosscompilers

Without this change,
depended libraries need to be specified explitly to linker.

Observed problem on Yocto:

  i586-poky-linux/i586-poky-linux-g++ (...) \
  -Lout/yocto/i586/release (...) \
  -lipca -lc_common -llogger -ldl -lpthread -luuid -lrt -lmbedcrypto (...)
  i586-poky-linux/6.3.0/ld: warning: liboc.so, \
  needed by out/yocto/i586/release/libipca.so, not found \
  (try using -rpath or -rpath-link) (...) \
  out/yocto/i586/release/libipca.so: \
  undefined reference to `OC::operator<<(std::ostream&, OC::AttributeType)'

Change-Id: I1dcbf18af601415c2261b44185a84225a2869281
Bug: https://jira.iotivity.org/browse/IOT-1745
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20273
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
2 years agoAdd Failure check for OCGetResourceIns() in OCRDDeleteWithDeviceId(). 17/20317/4
Ziran Sun [Tue, 23 May 2017 10:33:53 +0000 (11:33 +0100)]
Add Failure check for OCGetResourceIns() in OCRDDeleteWithDeviceId().

Bug: https://jira.iotivity.org/browse/IOT-1809
Change-Id: I1aac3d7fae0dfc5fbee4d9715b328d18bd492b14
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20317
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2359][IOT-2360][IOT-2364] Separate provisioning with DOS 87/20387/9 1.3.0
Dmitriy Zhuravlev [Thu, 25 May 2017 12:03:12 +0000 (15:03 +0300)]
[IOT-2359][IOT-2360][IOT-2364] Separate provisioning with DOS

Restore functions removed in https://gerrit.iotivity.org/gerrit/#/c/19931/
Add NULL checking for pDev2 in SRPProvisionCredentialsDos

Change-Id: Icf3397247478c97c7029380aadcaa5dd89b42870
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20387
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agochecking on empty host case in OCResource::setHost(). 91/20391/2
Ziran Sun [Thu, 25 May 2017 12:53:36 +0000 (13:53 +0100)]
checking on empty host case in OCResource::setHost().

Change-Id: Ia3cb2fb34e6b64ad4a5874bf49045550f4c5426c
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20391
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoIOT-2204: Fix IPCA build warnings on Linux. 67/20367/5
Soemin Tjong [Wed, 24 May 2017 17:49:59 +0000 (10:49 -0700)]
IOT-2204: Fix IPCA build warnings on Linux.

A couple of warnings didn't get fixed earlier.

resource/IPCA/src/ocfframework.cpp:237:17: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix]
resource/IPCA/src/ocfframework.cpp:255:17: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix]

Change-Id: Id901213b83a45a0f6798d7f2b8c501339b7af71c
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20367
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2357] Platform error messages 81/20381/3
Ibrahim Esmat [Thu, 25 May 2017 00:32:20 +0000 (17:32 -0700)]
[IOT-2357] Platform error messages

Update expected WARNING/ERROR messages to be INFO when trying to
get the local application data path.

Change-Id: I434f12f0183261e38cc14d6b37a05618690e736d
Signed-off-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20381
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2362] Fix OT for sampleserver_mfg 93/20393/3
ol.beketov [Thu, 25 May 2017 13:27:44 +0000 (16:27 +0300)]
[IOT-2362] Fix OT for sampleserver_mfg

.dat and .json from resource/provisioning/examples
updated with cred field

Change-Id: I3f5e5ecbd3e08fda30762fb4b5ca57a4cad84d3c
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20393
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2368] fix JNI crash issue for client terminate 95/20395/2
jihwan.seo [Thu, 25 May 2017 13:30:58 +0000 (22:30 +0900)]
[IOT-2368] fix JNI crash issue for client terminate

Change-Id: Ibc28948afc01f5a905d7cbd4f5bcac0772d270c7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20395
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2369] check the start flag when ip adapter is enabled 89/20389/3
hyuna0213.jo [Thu, 25 May 2017 12:34:37 +0000 (21:34 +0900)]
[IOT-2369] check the start flag when ip adapter is enabled

Change-Id: I4fff403f809931b1bd2d4c49ea087b07d498333d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20389
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Masud Bhuiyan <m.parves@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-1943] updated .json and .dat in /csdk/stack/samples/linux/secure 67/20267/2
Nathan Heldt-Sheller [Mon, 22 May 2017 17:54:48 +0000 (10:54 -0700)]
[IOT-1943] updated .json and .dat in /csdk/stack/samples/linux/secure

These are being referenced as examples in addition to the files
in /csdk/security/provisioning/samples and so must be updated.

Please include these updates in 1.3.0 to avoid creating additional
bad .json and .dat files based off these.

Change-Id: I9f54988c1fb2914a2b63b7d4887edef99e27f440
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20267
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agofixed testcase for creating mongodb in account 57/20357/2
Jung Seungho [Wed, 24 May 2017 08:16:16 +0000 (17:16 +0900)]
fixed testcase for creating mongodb in account

Change-Id: Ic391d7315225d04fd39a414d1400c2b8f5d24178
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20357
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
2 years agoFix invalid test case code 55/20355/3
Jee Hyeok Kim [Wed, 24 May 2017 02:33:19 +0000 (11:33 +0900)]
Fix invalid test case code

1. Fix test case regarding changed framework

Change-Id: I13eadf1143e7118ba6d55416aa14d5c6838455c3
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20355

2 years agoFix a crash error on AccountManager APIs 53/20353/3
Jaewook Jung [Wed, 24 May 2017 01:54:14 +0000 (10:54 +0900)]
Fix a crash error on AccountManager APIs

Fix a crash error occurred when throwing jni exception.

Change-Id: I941b0f90c62e7965bd112f27061c4835e5e3a9bc
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20353
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix TLSAdapter unit tests in RC3 25/20325/6
ol.beketov [Tue, 23 May 2017 16:49:55 +0000 (19:49 +0300)]
Fix TLSAdapter unit tests in RC3

Change-Id: I4cf4a6a01c64e8e455e51a3fca88e512b516e60c
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20325
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoIOT-2351 CA: Parse all interfaces 37/20337/3
Dan Mihai [Tue, 23 May 2017 20:49:32 +0000 (13:49 -0700)]
IOT-2351 CA: Parse all interfaces

The local variable interfaces gets decremented during the loop,
but the entire iflist has to be parsed.

Fixes new test errors that started on my machine with recent change
e3a3f65569f15fdf711c9d0a3123e6951f6499ba :

[ RUN      ] CATests.GetNetworkInformationTest
resource\csdk\connectivity\test\ca_api_unittest.cpp(517): error:
Value of: tempInfo[index].adapter != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(518): error:
Value of: strlen(tempInfo[index].addr) != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(517): error:
Value of: tempInfo[index].adapter != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(518): error:
Value of: strlen(tempInfo[index].addr) != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(517): error:
Value of: tempInfo[index].adapter != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(518): error:
Value of: strlen(tempInfo[index].addr) != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(517): error: Value of:
tempInfo[index].adapter != 0
  Actual: false
Expected: true
resource\csdk\connectivity\test\ca_api_unittest.cpp(518): error: Value of:
strlen(tempInfo[index].addr) != 0
  Actual: false
Expected: true
[  FAILED  ] CATests.GetNetworkInformationTest (5 ms)

Change-Id: If3a74a0739be6a53373f8b25436a50304029d751
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20337
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2340] Added NULL check for 'pdu->transport_hdr' 15/20315/2
arya.k [Tue, 23 May 2017 10:07:50 +0000 (15:37 +0530)]
[IOT-2340] Added NULL check for 'pdu->transport_hdr'

Change-Id: Id8c6c86421f156cad612417c70aa58064b3ab5ad
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20315
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2314] De-reference pResponse done after null check. 19/20319/3
Sushil Yadav [Tue, 23 May 2017 10:34:20 +0000 (16:04 +0530)]
[IOT-2314] De-reference pResponse done after null check.

In InProcServerWrapper::sendReponse() pResponse tries to dereference before
checking for the null. The bug was introduced for as part of IOT-1583.
Change-Id: Ic4ec8a08d3934d698af493703de1966b78702dba
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20319
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2300] Call callback when delete roles resource 69/20269/3 mbedtls 1.3.0-RC3
Greg Zaverucha [Mon, 22 May 2017 18:26:06 +0000 (11:26 -0700)]
[IOT-2300] Call callback when delete roles resource

When deleteting roles with OCDeleteRoleCertificateByCredId, the
callback provided by the caller was not being called.

Change-Id: I51da5fe61760ff5561fd676e5c220905f106f512
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20269
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2113] Change the logic not to delete double time 31/19631/3
ol.beketov [Thu, 4 May 2017 13:59:56 +0000 (16:59 +0300)]
[IOT-2113] Change the logic not to delete double time

Change-Id: I56923e53e9b81da45b9ff9e50e7df9cdde233c25
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19631
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2342] Fix a crash issue on secureresourcemanager.c 97/20297/3
Jaewook Jung [Tue, 23 May 2017 05:26:46 +0000 (14:26 +0900)]
[IOT-2342] Fix a crash issue on secureresourcemanager.c

Add null checking for a resource object which could be NULL if server
receives a request message including resource uri which server doesn't
have.

Change-Id: Idf29a43aeca5a919c0b22d3f0cd9ce507c8935ab
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20297
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix compile error with g++ 6.3.1 and RD unit tests. 63/20263/2
Todd Malsbary [Mon, 22 May 2017 16:11:45 +0000 (09:11 -0700)]
Fix compile error with g++ 6.3.1 and RD unit tests.

gtest.h: In instantiation of 'testing::AssertionResult \
    testing::internal::CmpHelperNE(const char*, const char*, const \
    T1&, const T2&) [with T1 = long int; T2 = char*]':
rddatabase.cpp:126:9:   required from here
gtest.h:1577:28: error: ISO C++ forbids comparison between pointer \
    and integer [-fpermissive]

Change-Id: I6e5a2863fc6d45dffb5bc61526ae9f786eb1c638
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20263
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2322][CHP][SampleApp] Coap http proxy is not working in secured mode 57/20257/8
Veeraj Khokale [Tue, 23 May 2017 04:31:01 +0000 (13:31 +0900)]
[IOT-2322][CHP][SampleApp] Coap http proxy is not working in secured mode

1. Update dat files for proxy samples to be same as linux
   secure samples.
2. Modify logic to form server address according to linux
   secure samples while initiating proxy request.
3. Since request URI is NULL for proxy request check this
   condition before asserting role certificates in OCDoRequest().
   This also removes the need for NULL check of request info
   resource uri.

Change-Id: I20003ac7c7781666bbd4aa8955c4cc18b5a3262f
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: uzchoi <uzchoi@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20257
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2303] Modify comment to OCProvisionCredentials 01/20101/2
Jongmin Choi [Fri, 19 May 2017 07:35:28 +0000 (16:35 +0900)]
[IOT-2303] Modify comment to OCProvisionCredentials

IOT-2303. Comment modified to show optional parameter

Change-Id: Iae07f2496ca3295d569ab0653afc8b61b0643605
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20101
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2344] Use correct index when checking for alloc failure. 71/20271/2
Todd Malsbary [Mon, 22 May 2017 18:45:40 +0000 (11:45 -0700)]
[IOT-2344] Use correct index when checking for alloc failure.

dimensions[0] and i may be different values.  The urlInfo is allocated
to dimensions[0] but checked against i.

Bug: https://jira.iotivity.org/browse/IOT-2344
Change-Id: Ibff3fc62d551417a71e7496027452b3d88cad413
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20271
Reviewed-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoFix build warning on RE. 27/20227/4
KIM JungYong [Mon, 22 May 2017 08:54:28 +0000 (17:54 +0900)]
Fix build warning on RE.

When RE build as Tizen, one of defination was redefined.
In this patch, defination tag is changed.

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