iotivity.git
2 years agosecurity: Refactor json2cbor for error checking 95/20795/22
Philippe Coval [Fri, 16 Jun 2017 13:07:35 +0000 (15:07 +0200)]
security: Refactor json2cbor for error checking

Detect JSON type and make json2cbor fail on error.
IoTivity JSON are "upgraded" by default,
Swagger files are just converted.
Json2cbor report not zero on failure.
This prevents silent failure when generating CBOR from JSON.
Many MLK fixed.

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: I905b7d2ba1021686e3794167266b1853ad0f9872
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20795
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoresource: Include functional header for g++-7.1.0 67/21067/3
Philippe Coval [Wed, 28 Jun 2017 02:54:05 +0000 (04:54 +0200)]
resource: Include functional header for g++-7.1.0

It was tested on yocto poky master on iotivity-1.2.1 (and later):

  resource/include/OCUtilities.h: \
  In function 'OCStackResult OC::nil_guard(PtrT&&, FnT&&, ParamTs&& ...)':
  resource/include/OCUtilities.h:85:21: \
  error: 'bind' is not a member of 'std'
  return std::bind(fn, p, std::ref(params)...)();

  resource/include/OCApi.h: At global scope:
  resource/include/OCApi.h:362:18: \
  error: 'function' in namespace 'std' does not name a template type
  typedef std::function<void(std::shared_ptr<OCResource>)> FindCallback;

Change-Id: Ie1cab497c33fde394f77490a1d636eb36a563396
Origin: https://gerrit.iotivity.org/gerrit/#/c/21069/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21067
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agotizen: Guess TARGET_ARCH from gbs param 09/20309/16
Philippe Coval [Sat, 27 May 2017 23:29:05 +0000 (01:29 +0200)]
tizen: Guess TARGET_ARCH from gbs param

I noticed that previously arm binary where built into out/x86
Even if this is not harmful, It's better to rely on gbs's %{_arch}.

Change-Id: I1968c8d3c0705c536a2b055090ea142100f91bc2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20309
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agobuild: Enable WITH_PROXY by default 01/20701/10
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>
(cherry picked from commit 106d2a0de72c6ba45c8128a23eeedd23599a6c4f)
Origin: 1.3-rel
Reviewed-on: https://gerrit.iotivity.org/gerrit/20701
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
2 years ago[RE] Code coverage script fix for rcs_common_test 51/20951/3
Jay Sharma [Wed, 21 Jun 2017 09:33:32 +0000 (15:03 +0530)]
[RE] Code coverage script fix for rcs_common_test

  - Updated the executables path in the script.

Change-Id: I94e21911ef113edf5fa227cf1f438f61d85b111e
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20951
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years agoservice/simulator: SConscript cleanup 65/19565/15
Pawel Winogrodzki [Fri, 28 Apr 2017 04:15:08 +0000 (21:15 -0700)]
service/simulator: SConscript cleanup

This is a scons scripts cleanup left after fixing /W4 warnings for Windows.

Preparing SConscript files for removal of arbitrary global "env"
modifications in script files outside build_common/ directory.

Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I6f6e01d1c95b28637aba494feed2801670a7947f
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19565
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
2 years agoModify observer list to be belong to resource 97/20397/9
Jaewook Jung [Thu, 25 May 2017 09:19:29 +0000 (18:19 +0900)]
Modify observer list to be belong to resource

Currently all observer info is managed in a global list in ocobserve.c.
Conceptually, observers should be belong to each resource which the
observer is interested in.
It is more intuitive and easy to manage observers per each resource.
And the function codes in ocobserve could be simple by optimization
after this patch merged.

Change-Id: Ic76816a2729d3fd1715ba5f3f1e5de4253167909
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20397
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agosimulator: Disable SECURED mode 03/20703/5
Philippe Coval [Mon, 12 Jun 2017 14:51:37 +0000 (16:51 +0200)]
simulator: Disable SECURED mode

Simulator will be built only in Unsecured mode on IP transport.

Bug: https://jira.iotivity.org/browse/IOT-2239
Change-Id: I1bf19643c7ffe53ea995ca4b1dfd5a713fbe864a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20703
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
2 years agobuild: Reformat the examples SConscript to be more pythonic. 41/20541/7
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>
(cherry picked from commit 480d03d55d2c811f468fc238c73b7f8af5da3455)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20541
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
2 years agoReformat the rest of resource SConscripts to be more Pythonic 49/20549/8
Mats Wichmann [Sat, 3 Jun 2017 14:01:59 +0000 (08:01 -0600)]
Reformat the rest of resource SConscripts to be more Pythonic

There are not intended to be any functional changes
file lists are one-per-line
library lists are one-per-line if there are more than two libs

Change-Id: I7cefd2562bf275ceff5c4347c646fea4e681f080
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoresource-encapsulation: Fix typo on Destroyed word 53/20853/4
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>
2 years agoWrong use of fflush() standard library removed 33/17033/5
Manoj Gupta [Fri, 3 Feb 2017 07:06:27 +0000 (12:36 +0530)]
Wrong use of fflush() standard library removed

Change-Id: Ic78a44f9dec3144de5a043accaa18ca2a0b38b02
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17033
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2 years agoconnectivity: Fix typo on success word 75/20875/4
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>
2 years agoReformat resource/csdk SConscripts to be more Pythonic 3/4 07/20807/8
Mats Wichmann [Mon, 12 Jun 2017 18:22:36 +0000 (12:22 -0600)]
Reformat resource/csdk SConscripts to be more Pythonic 3/4

These are the resource/csdk/connectivity subset.

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

Change-Id: Ic062a8e3a81586a6eddbc0ca414f5e51d5d97b86
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20807
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoAdding Tizen UI app for Notification consumer 25/19825/6
Poovizhi [Fri, 12 May 2017 09:53:32 +0000 (15:23 +0530)]
Adding Tizen UI app for Notification consumer

Change-Id: I7cbd0ef964615035e41f37e582ca44e55a48ad9c
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19825
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoReformat all of the build_common SConscripts to be more Pythonic 45/20545/21
Mats Wichmann [Fri, 2 Jun 2017 19:19:34 +0000 (13:19 -0600)]
Reformat all of the build_common SConscripts to be more Pythonic

There are not intended to be any functional changes.
The help variable definitions are split into multi-line,
in anticipation of later improving the descriptions and using
keyword-argument style to make the purpose of other args more clear.

Also included two files at the top level in this set,
as they seem to have the same intent as build_common.

In build_common/android/SConscript, an identical 4-line stanza, beginning:
  elif cmp(flags[0:9], 'PLATFORM=') == 0:  # get target platform: android-x
appears three times, the second and third were dropped in this change.

Change-Id: I0077e7350754fef25e75621fdb4a41cfcf28ef2a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20545
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoRemove 'using namespace' keyword from JNI headers 67/20767/5
George Nash [Tue, 13 Jun 2017 21:32:25 +0000 (14:32 -0700)]
Remove 'using namespace' keyword from JNI headers

The use of the 'using namespace OC' was causing an
ambiguous symbol between the C++ OC::OCResource and
the C OCResource when including ocpayload.h.

It is bad practice to use 'using namespace' key words in
header files because any code that includes that header
also imports the namespace, whether they want it or not.

This defeats the purpose of namespaces and can cause name
collisions.

This is part of the work for IOT-2405

Bug: https://jira.iotivity.org/browse/IOT-2405
Change-Id: I8e7e01b1bf645b6333166bd4624a82e9f0345bf8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20767
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.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>
2 years agoresource-encapsulation: Isolate unit_tests building 73/20873/15
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>
Origin: 1.3-rel
Reviewed-on: https://gerrit.iotivity.org/gerrit/20873
Reviewed-by: Alex Kelley <alexke@microsoft.com>
2 years agoTCP: Avoid calling WSASetEvent(NULL) 11/20711/5
Dan Mihai [Mon, 12 Jun 2017 17:36:35 +0000 (10:36 -0700)]
TCP: Avoid calling WSASetEvent(NULL)

Cope with unit tests calling CATCPStopServer even without
CATCPStartServer being called.

Change-Id: I9942985ea91a35992c7a9b6763c867748aed4b98
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20711
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoTrigger OC_PRESENCE_TRIGGER_CHANGE on adapter and address change 31/12331/7
Harry [Tue, 27 Sep 2016 12:38:18 +0000 (13:38 +0100)]
Trigger OC_PRESENCE_TRIGGER_CHANGE on adapter and address change

Presence status is triggered to the connected clients when a adapter or
address change occurs.

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

Change-Id: Ia981a60aae63d9c386795ba25d0326a99fc13ae9
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Signed-off-by: Harry <h.marappa@samsung.com>
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12331
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agobuild: Use sys.exit instead of exit 77/20877/7
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>
2 years agodisable BLE Multicast for Tizen Platform. 51/20751/7
jihwan.seo [Tue, 13 Jun 2017 10:39:30 +0000 (19:39 +0900)]
disable BLE Multicast for Tizen Platform.

once BLE is not supported multicast.
and also current codes related multicast is not working.
(since it has some methods which has wrong parameter)
and code related tizen 3.0 will be updated soon,
it is better to remove the codes first.
otherwise it will causes a big problem related build error

Change-Id: I6dfb29668450b628e98438f3631609c6778d6ffb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20751
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoCoverage Reports for all modules in html/gcov/xml format 31/20431/16
Sushil Yadav [Fri, 26 May 2017 07:09:59 +0000 (12:39 +0530)]
Coverage Reports for all modules in html/gcov/xml format

The Coverage Report generation has been human effort.
This patch adds the needed script and changes to automate
this process as much as possible.

It will be two step process:
1. Build the IoTivity code for all modules.
2. Run the script for generating Coverage Reports.

Change-Id: If065fb0faf0506185609ab238ade473b259dd954
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20431
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoReformat resource/csdk SConscripts to be more Pythonic 4/4 05/20805/8
Mats Wichmann [Wed, 14 Jun 2017 14:41:27 +0000 (08:41 -0600)]
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>
2 years agosecurity: Apply code style to json2cbor.c code 79/20879/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>
2 years agoRemoved print statments from SConscripts 77/20777/3
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>
2 years agobuild: Include gtest header using system path 41/20341/7
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>
2 years agoReformat resource/csdk SConscripts to be more Pythonic 2/4 97/20697/10
Mats Wichmann [Mon, 12 Jun 2017 14:13:42 +0000 (08:13 -0600)]
Reformat resource/csdk SConscripts to be more Pythonic 2/4

These are the resource/csdk/stack subset

There are not intended to be any functional changes, with a minor
exception: in resource/csdk/stack/samples/linux/secure/SConscript,
the samples are now assigned to an appropriately constructed list,
which is assigned an Alias, rather than two similar but different
conditional Alias lines with the list inline.

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: I0e15b375a052ef792b2a1c4470552e5e0e4fb3fc
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20697
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoReformat all of the bridging SConscripts to be more Pythonic 43/20543/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>
2 years agoresource-encapsulation: Include boost as lib header 87/19987/11
Philippe Coval [Wed, 17 May 2017 14:26:23 +0000 (16:26 +0200)]
resource-encapsulation: Include boost as lib header

This change is harmless and done to test build process

Bug: https://jira.iotivity.org/browse/IOT-2279
Change-Id: Ia8889790f19d6e02a0fc5c2d857ac19e717e2ec4
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19987
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoReformat the resource/csdk SConscripts to be more Pythonic 1/4 51/20551/14
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>
(cherry picked from commit ef06102929d6245471f82965ee9ee7e21a9980d5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20551
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2086]Fix FTBFS when WITH_MQ is defined by removing the incorrect use of OICFree... 01/20801/3
abitha.s [Wed, 14 Jun 2017 12:25:24 +0000 (17:55 +0530)]
[IOT-2086]Fix FTBFS when WITH_MQ is defined by removing the incorrect use of OICFree macro

Change-Id: Ib9fdb7e994850475b233c914a71d4b94346e0c01
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20801
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoMerge "Merge branch '1.3-rel' (95fd9f5b)"
Philippe Coval [Fri, 16 Jun 2017 09:27:33 +0000 (09:27 +0000)]
Merge "Merge branch '1.3-rel' (95fd9f5b)"

2 years agoReformat the service sconcscripts 53/20553/9
Mats Wichmann [Sun, 4 Jun 2017 20:48:05 +0000 (14:48 -0600)]
Reformat the service sconcscripts

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.

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>
2 years agoReformat all of the cloud SConscripts to be more Pythonic 35/20535/4
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>
2 years agoImprove the text of host/target unsup message in build_common 37/19637/7
Mats Wichmann [Thu, 4 May 2017 15:09:12 +0000 (09:09 -0600)]
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>
2 years agoMerge branch '1.3-rel' (95fd9f5b) 55/20255/4
Philippe Coval [Thu, 15 Jun 2017 22:53:50 +0000 (00:53 +0200)]
Merge branch '1.3-rel' (95fd9f5b)

Change-Id: I5b229d7413ab206f635548ff6af82fabd5edc8af
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2 years agobuild: Install csdk to resource/stack 71/20671/4
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>
2 years agobuild: Enable MULTIPLE_OWNER by default 99/20699/5
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>
2 years ago[NS] Notification consumer valgrind invalid read/write fix. 31/20831/2
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>
2 years agoresource-directory: Fix condition on uninitialised value 29/20829/3
Philippe Coval [Thu, 15 Jun 2017 09:13:46 +0000 (11:13 +0200)]
resource-directory: Fix condition on uninitialised value

Issue was observed using valgrind on GNU/Linux:

https://build.iotivity.org/ci/job/iotivity-verify-unit_tests/16067/valgrindResult/pid=13739,0x2/

Bug: https://jira.iotivity.org/browse/IOT-2279
Change-Id: Ide0a2cca989466fefd4a13b41cc81bf38fa8afff
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20829
Reviewed-by: Habib Virji <habib.virji@samsung.com>
2 years agoresource: Restore previously removed CBOR files 69/20769/3
Philippe Coval [Tue, 13 Jun 2017 17:49:47 +0000 (19:49 +0200)]
resource: Restore previously removed CBOR files

Previous change removed dat files to rebuild them:
https://gerrit.iotivity.org/gerrit/#/c/20363/

This is not desired for crosscompilers,
so they are preserved for this purpose.

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: Iffc75ea52fcadea76dcfef85137a69a57dd03cb1
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20769
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
2 years agoMerge "Merge branch '1.3-rel' (c95aa699)"
Philippe Coval [Wed, 14 Jun 2017 21:53:23 +0000 (21:53 +0000)]
Merge "Merge branch '1.3-rel' (c95aa699)"

2 years agobuild: Fail on unsupported argument 81/20781/4
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>
2 years agoconnectivity: Fix permission of sources 57/20657/3
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>
2 years agoDeprecate resourceHandle parameter in OCEntityHandlerResponse 17/20517/8
Jaewook Jung [Thu, 1 Jun 2017 13:12:49 +0000 (22:12 +0900)]
Deprecate resourceHandle parameter in OCEntityHandlerResponse

resourceHandle of OCEntityHandlerResponse is not used.

Change-Id: I7630e0cd891872a7788873ecd75a738b8e0c362d
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20517
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoprovisioning: Support python 2 or 3 77/19277/6
Philippe Coval [Mon, 24 Apr 2017 14:28:35 +0000 (16:28 +0200)]
provisioning: Support python 2 or 3

Change-Id: I92cd2266e46c7f1b81de92ad4b6a0ad3fdf6f27d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19277
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agocsdk: Fix permission of sources 61/20361/10
Philippe Coval [Tue, 9 May 2017 17:29:22 +0000 (19:29 +0200)]
csdk: Fix permission of sources

Harmless change to test CI

Change-Id: I2e15f2378c03ddaa5972ebc4e126b6f914158f42
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20361
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agotizen: prepare mbedtls for tizen_unsecured 73/20773/4
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>
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 ago[IOT-1928] Update mbedTLS to version 2.4.2 45/20445/5
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/20445
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
2 years agoresource-container: Drop unnecessary gtest flags 89/19289/7
Philippe Coval [Mon, 24 Apr 2017 23:30:19 +0000 (01:30 +0200)]
resource-container: Drop unnecessary gtest flags

This will help to upgrade gtest to latest release

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I1608aeee7898ae4633098e5194ad8dec7e55c1b9
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19289
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years agoReformat all of the java SConscripts to be more Pythonic 37/20537/6
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>
2 years agoUpgrade mbedtls to 2.4.2 tag 15/20715/2
C.J. Collier [Mon, 12 Jun 2017 18:58:58 +0000 (11:58 -0700)]
Upgrade mbedtls to 2.4.2 tag

IoTivity is upgrading the mbedtls version from 2.4.0 to 2.4.2

Change-Id: I994a34d013a89c029d15026a4a97b3ed1563694e
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20715

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 agoUpgrade mbedtls to 2.4.2 tag 09/20709/2
C.J. Collier [Mon, 12 Jun 2017 17:16:00 +0000 (10:16 -0700)]
Upgrade mbedtls to 2.4.2 tag

IoTivity is upgrading the mbedtls version from 2.4.0 to 2.4.2

Change-Id: Ia40520417580e1053125f33f422dff12108260b0
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20709
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoMerge branch '1.3-rel' (c95aa699) 05/20705/2
Philippe Coval [Mon, 12 Jun 2017 16:31:15 +0000 (18:31 +0200)]
Merge branch '1.3-rel' (c95aa699)

Conflicts:
extlibs/gtest/SConscript
resource/c_common/octimer/include/octimer.h
resource/c_common/octimer/src/octimer.c

Change-Id: I0092ab525bb2d70f21ea608422423f8862fe7df4
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2 years agotizen: Update doc about not downloading sqlite 41/20441/3
Philippe Coval [Fri, 26 May 2017 11:39:42 +0000 (13:39 +0200)]
tizen: Update doc about not downloading sqlite

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ie2d729e17e97a2fe364ff6a37926ff67fdf0abd3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20441
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Youngman Jung <yman.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
2 years agoReformat all of the plugins SConscripts to be more Pythonic 33/20533/4
Mats Wichmann [Fri, 2 Jun 2017 12:49:40 +0000 (06:49 -0600)]
Reformat all of the plugins SConscripts to be more Pythonic

There are not intended to be any functional changes.

Change-Id: Ifb5cadc8f6de73b55d5f6fece7cb401f34b81674
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20533
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.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 agoAdding tizen UI app for Notification Service 93/19193/6
Poovizhi [Fri, 21 Apr 2017 08:46:00 +0000 (14:16 +0530)]
Adding tizen UI app for Notification Service

Change-Id: Iaacca4746cb0bd73b3053abf22dd8c40a32dec09
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19193
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoRemove unused TIZEN package capi-network-wifi from Makefile 89/20689/2
Sushil Yadav [Mon, 12 Jun 2017 07:19:21 +0000 (12:49 +0530)]
Remove unused TIZEN package capi-network-wifi from Makefile

Change-Id: I77467cb92104554db238092690d2075b7120e02d
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20689
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@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 agobuild: Set executables mode on extlibs scriptlets 33/20433/5
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>
2 years agoIOT-2399 Normalize run.bat line ending to CRLF 99/20599/2
Way Vadhanasin [Wed, 7 Jun 2017 20:53:12 +0000 (13:53 -0700)]
IOT-2399 Normalize run.bat line ending to CRLF

Windows needs run.bat to have line ending as CRLF and this change
ensures that.

Change-Id: I3f879424b72e101281c2bfe4a03784886332742e
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20599
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoIOT-1828 Implement ocevent 11/19311/13
Way Vadhanasin [Tue, 6 Jun 2017 05:45:17 +0000 (22:45 -0700)]
IOT-1828 Implement ocevent

This change implements ocevent object in c_common, which will be used
by a later change in OCStack to remove the responsibility of calling
OCProcess from applications so that they don't have to call it in an
endless loop.

Note that the patch requires the oc_mutex_assert_owner fix change ID:
I0d60188af9bce866f5ba18800292204c78daba12.

Change-Id: I0d60188af9bce866f5ba18800292204c78daba10
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19311
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agotizen: Add support for Tizen:4:Unified (x86_64) 67/20667/2
Philippe Coval [Fri, 9 Jun 2017 08:39:15 +0000 (10:39 +0200)]
tizen: Add support for Tizen:4:Unified (x86_64)

To use on x86_64:
gbsarch=x86_64 gbsprofile=tizen_4_0_unified_x86_64 ./gbsbuild.sh

Other arch might come later, if needed.

x86_64 was preferred, because that way,
we could run units tests on build hosts (TBC).

Change-Id: Ie827470e85b5eeacdcc3c35a1e596768f74e1e58
Bug: https://jira.iotivity.org/browse/IOT-2397
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20667
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
2 years agotizen: Also build without security all configs 49/20349/5
Philippe Coval [Tue, 23 May 2017 23:12:40 +0000 (01:12 +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/20349
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
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 ago[IOT-1863]force to include missing header for build with ndk-r13b 25/17525/3
bg.chun [Mon, 27 Feb 2017 06:24:35 +0000 (15:24 +0900)]
[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>
2 years ago[IOT-1998] Set remote ID 23/19123/7
Greg Zaverucha [Thu, 11 May 2017 17:52:57 +0000 (10:52 -0700)]
[IOT-1998] Set remote ID

Since "f7e8c4b PSK check before ciphersuite selection" PSK
ciphersuites will only be negotiated if the local peer has
a credential with the remote peer's UUID. Make sure the UUID
is present in the endpoint information used when calling
OCDoRequest.

In the SSL adapter, when setting up a connection, if no
ciphersuites are usable based on the credentials available, fail.

Change-Id: I64db80379e8055e35e051dd5b90191625f1d5033
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19123
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 agoMerge branch '1.3-rel' (a7840d49) 65/20265/3
Philippe Coval [Thu, 8 Jun 2017 07:40:50 +0000 (09:40 +0200)]
Merge branch '1.3-rel' (a7840d49)

Change-Id: I9ff7c6336fdc0257153a23c5c09f8e2b349c1986
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
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 agoBuild warning cleanup policyengine.cpp unit test 89/20489/3
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>
2 years agobuild: Build .dat files from json source using json2cbor 63/20363/18
Philippe Coval [Thu, 18 May 2017 09:30:41 +0000 (11:30 +0200)]
build: Build .dat files from json source using json2cbor

Previously generation was done manually by developer,
now it's part of build process for
safety, consistancy and reproductibility reasons.

If verified, this method will be used in all examples,
then all .dat files should be removed from sources tree.

Also json2cbor is now built for Tizen too

Bug: https://jira.iotivity.org/browse/IOT-2310
Change-Id: I87e3278c2445a2d088238d76de9130407fa4b606
Origin: https://gerrit.iotivity.org/gerrit/#/c/20363/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20363
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years agoSwitch to preferred Python method for checking sys.platform 41/19641/6
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>
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 ago[IOT-2207] Update build to use android-ndk-r10e 61/20561/3
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>
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 agoMerge branch '1.3-rel' (f51f0e11) 71/20171/2
Philippe Coval [Tue, 6 Jun 2017 07:53:00 +0000 (09:53 +0200)]
Merge branch '1.3-rel' (f51f0e11)

Change-Id: I7ac5eb3b513625a7db49a16fd368f8db71ee915e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2 years ago[IOT-2346] Accessing 'g_errorHandler' without NULL check 65/20465/3
Veeraj Khokale [Mon, 29 May 2017 11:55:08 +0000 (17:25 +0530)]
[IOT-2346] Accessing 'g_errorHandler' without NULL check

Add null checks before accessing g_errorHandler in
le adapter.

Change-Id: I9285ca29f91e99eefb0f8db23ccc7e31dca7e702
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20465
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.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 agoMerge "Merge branch '1.3-rel' (194b1bee)"
Philippe Coval [Sat, 3 Jun 2017 01:00:58 +0000 (01:00 +0000)]
Merge "Merge branch '1.3-rel' (194b1bee)"

2 years agoModify the occlientcb module 43/18643/9
Jaewook Jung [Mon, 10 Apr 2017 09:31:11 +0000 (18:31 +0900)]
Modify the occlientcb module

 - no logical code change
 - update comment for doxygen style
 - separate GetClientCB() to 3 functions for each usage
 - replace FindAndDeleteClientCB() with DeleteClientCB()
 - change InsertResourceTypeFilter() to static function

Change-Id: I40f31d7d983666417367f8317a25ff780e87a410
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18643
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: George Nash <george.nash@intel.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
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 agoMerge branch '1.3-rel' (194b1bee) 33/20233/2
Philippe Coval [Thu, 1 Jun 2017 20:49:29 +0000 (05:49 +0900)]
Merge branch '1.3-rel' (194b1bee)

Change-Id: I68444112017df2003428e67adb6c13bb408d2d65
Signed-off-by: Philippe Coval <philippe.coval@osg.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 agoFix run.bat merge 91/20491/2
Dan Mihai [Tue, 30 May 2017 23:03:28 +0000 (16:03 -0700)]
Fix run.bat merge

BUILD_OPTIONS are not supposed to include the TEST and -j parameters
anymore, after recent change 4d9c14696dded8996a281143dfccd312e5efcda9
from 1.3-rel.

Change-Id: Ib8984fb8f3567d55df5465c34b193a4f35046799
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20491
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.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 agoAdded missing OCStackResult case to OCException. 63/20063/6
Ossama Othman [Thu, 18 May 2017 20:07:12 +0000 (13:07 -0700)]
Added missing OCStackResult case to OCException.

The OC_STACK_SERVICE_UNAVAILABLE OCStackResult was missing from the
switch() statement in OCException::reason().  Addresses "not handled
in switch" compile-time warnings.

Change-Id: I4e7cb2ef2e10e30b029acac1295dd8aa3aab202f
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20063
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agotizen: Run gsbuild.sh using shebang (bash) 43/20443/6
Philippe Coval [Fri, 26 May 2017 11:39:41 +0000 (13:39 +0200)]
tizen: Run gsbuild.sh using shebang (bash)

That script use BASH advanced features ([[ tests ]])

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I87bc5677c502c86ad7b4fdca630c6dee9c28e335
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20443
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoDelete client callback with OCCancel. 99/20299/3
Jaehong Jo [Tue, 23 May 2017 05:44:50 +0000 (14:44 +0900)]
Delete client callback with OCCancel.

Change-Id: I3bde95b535fcbfd3290a7b9ae0610c3e9333be7a
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20299
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>