21 months agotizen: Install configuration settings in package 95/23495/4
Philippe Coval [Wed, 22 Nov 2017 01:13:11 +0000 (02:13 +0100)]
tizen: Install configuration settings in package

To track versions config options (SCONSFLAGS)
are shared into dev package.

Also introduce EXTRA_RPM_SCONSFLAGS that could be used outside (ie: rpmbuild)

It will be helpful for ARTIK7 support on fedora-24

Change-Id: I15a3dcc3d3f74078e561143804562c750d9c4660
Signed-off-by: Philippe Coval <>
21 months agoiOS: Fix to build iOS Iotivity 1.3-Rel branch 45/23945/7
Yogisha Poojary [Fri, 12 Jan 2018 10:18:08 +0000 (05:18 -0500)]
iOS: Fix to build iOS Iotivity 1.3-Rel branch


Change-Id: If8eb4fd34191da7144f39b9e6d1870209d17c9ca
Signed-off-by: Yogisha Poojary <>
21 months ago[IOT-2961] save doxm section 05/24005/5
Oleksandr Dmytrenko [Tue, 9 Jan 2018 15:38:13 +0000 (17:38 +0200)]
[IOT-2961] save doxm section

add json2cbor save doxm section

Change-Id: I2578ebd8162978b489833edc7e6159b30cb851ec
Signed-off-by: Oleksandr Dmytrenko <>
(cherry picked from commit 2a46516cf905d3931862b252db84e0d727c9b2ce)

21 months agoTrap error testing Java version 99/24099/2
Mats Wichmann [Tue, 23 Jan 2018 20:08:24 +0000 (13:08 -0700)]
Trap error testing Java version

In case user is not pointing to correct JAVA_HOME,
the java version check will error out without being
very descriptive.  Catch the error and print a

Change-Id: Ie78bc0882d8f1f1436352c8c1e26307ce2cad731
Signed-off-by: Mats Wichmann <>
(cherry picked from commit 954bec4b65398540ab6fac43d2ebae98cdc2d6e0)

21 months agoDrop use of two deprecated defines 53/23953/2
Mats Wichmann [Mon, 15 Jan 2018 15:08:15 +0000 (08:08 -0700)]
Drop use of two deprecated defines

Per the header ocstackconfig.h, two defines are
deprecated with replacement. Change the single file
which still uses the old names.  The header comment:

 * Maximum length of the Manufacturer name supported by the server
 * for manufacturer name.
 * @deprecated use MAX_PLATFORM_NAME_LENGTH instead.

 * Maximum length of the URL to the Manufacturer details supported by
 * the server.
 * @deprecated use MAX_PLATFORM_URL_LENGTH instead.

Change-Id: I40ae198120de175750447996ebd43bed9ec25fa8
Signed-off-by: Mats Wichmann <>
22 months agobuild: Install security tools 99/23499/14
Philippe Coval [Tue, 28 Nov 2017 12:13:54 +0000 (13:13 +0100)]
build: Install security tools

Change-Id: Idb2b2da72104f91d4a1257f571abdea4ca10d88a
Signed-off-by: Philippe Coval <>
22 months agoFix issues dealing with OOM checking in CBOR 03/24003/3
Thiago Macieira [Fri, 26 Jan 2018 07:44:37 +0000 (23:44 -0800)]
Fix issues dealing with OOM checking in CBOR

Since we're doing err |=, the correct way to check for OOM is with &.

TinyCBOR 0.5 is capable of reporting if you added too many or too few
elements to a container. So don't skip adding one: always add them all,
so we can get the actual size you need.

Change-Id: I56b444f9d6274221a3b7fffd150d4c8e2cb6618a
Signed-off-by: Thiago Macieira <>
22 months agotizen: Add dependency to boost for devel package 89/23489/8
Philippe Coval [Tue, 28 Nov 2017 10:43:00 +0000 (11:43 +0100)]
tizen: Add dependency to boost for devel package

Change-Id: Ia37aade9f23db37bb7e86a81e8639d2b6e0300cd
Signed-off-by: Philippe Coval <>
(cherry picked from commit b5d0182daf8be1a808abd7073df71c836fd51d0f)

22 months agoClean build warnings 65/23965/3
George Nash [Fri, 19 Jan 2018 23:30:31 +0000 (15:30 -0800)]
Clean build warnings

This cleans new build warnings discovered when building
iotivity with GCC 7.2.1

Fixed in json2cbor that was a result of incorrect buffer size in snprintf

With the addition of the [[fallthrough]] keyword in C++17 GCC now detects
fallthrough locations. The fallthrough error can be hidden by adding
the comment "fall through" to the case that is falling though.

-Werror=pragmas and -Werror=attributes
are from the external tinyCbor code. We Ignore build warnings from extern
libraries. We may fix the warnings by working witht he external project
but it should not block any work in IoTivity.

Change-Id: I86c9fb42b987858c66698fe48e4c2a405769b004
Signed-off-by: George Nash <>
22 months agobuild: Add all BuildRequires for fedora 69/23369/5
Philippe Coval [Sun, 19 Nov 2017 01:45:23 +0000 (02:45 +0100)]
build: Add all BuildRequires for fedora

This was needed for ARTIK7 on fedora-24

Change-Id: Ice95627b6afdf19f16c1e9277015f63938d2c132
Signed-off-by: Philippe Coval <>
(cherry picked from commit 5bf81a0cb5afd31d4e589c37c713da03cfc1a74d)

22 months agotizen: Fix typo on chrpath 05/23305/4
Philippe Coval [Thu, 16 Nov 2017 18:42:19 +0000 (19:42 +0100)]
tizen: Fix typo on chrpath

Could be done in scons install too

Change-Id: I60f4684d17d260e1917fe5840b4eda626c196056
Signed-off-by: Philippe Coval <>
(cherry picked from commit df6ca6d52b87dcdae701151a8531479c30c79f5f)

22 months agocoap-http-proxy: Build shared lib also on linux 43/23243/9
Philippe Coval [Wed, 15 Nov 2017 17:57:55 +0000 (18:57 +0100)]
coap-http-proxy: Build shared lib also on linux

Change-Id: Ie7196851c3e623f383e6727b5cbd1c29cf1ae6ac
Signed-off-by: Philippe Coval <>
22 months agobuild: Install Extra Files for samples tests etc 71/23471/10
Philippe Coval [Wed, 22 Nov 2017 19:23:27 +0000 (20:23 +0100)]
build: Install Extra Files for samples tests etc

Working tests will be sorted out in later changes,
for now hierarchy is kept.

libcoap is installed as static lib used by com-oic-es-sample.

This was needed for ARTIK7 on Fedora-24

Change-Id: Idca20f1ddd00fbaf8c980e959a041397887f123b
Signed-off-by: Philippe Coval <>
22 months agorpm: Also support OS without manifest 67/23367/11
Philippe Coval [Sun, 19 Nov 2017 01:08:19 +0000 (02:08 +0100)]
rpm: Also support OS without manifest

This was needed for ARTIK7 on fedora-24

Change-Id: I9a5081fe78299ca57dd2fbfa4efb70b051e4ad28
Signed-off-by: Philippe Coval <>
(cherry picked from commit 924f632d0af575193899b872ecddfd0459a8f49a)

22 months agoBuild gtest output paths correctly 23/23323/2
Mats Wichmann [Sun, 5 Nov 2017 16:08:49 +0000 (09:08 -0700)]
Build gtest output paths correctly

Currently, when the run_tests function is called twice from the
the same scons script (that is, the script has more than one unit
test binary to register), the GTEST_OUTPUT environment variable
becomes malformed.  This is because the string to add is added
to a list instead of just being appended as a string.  The result
is that while all the test output binaries are expected to go to
BUILD_DIR/test_out, in these cases they go deep down underneath
that directory.  Here are the unexpected paths in an unmodified
testing run:


The :xml: is intended as a tag used to signal gtest, it is never
supposed to be part of the real filesystem path.

Note fix was already proposed as part of but since it's a
distinct error with a very simple fix, wanted to get it pushed
through by itself while that one is under consideration.

Change-Id: I05c57d54034686a7c77c783eab758e7f501e86ea
Signed-off-by: Mats Wichmann <>
(cherry picked from commit 0d010e4b64ff853fefb6e55038e6ecaa072fc760)

22 months agoRemove unused TIZEN package capi-network-wifi. 47/23347/3
Sushil Yadav [Mon, 12 Jun 2017 07:19:21 +0000 (12:49 +0530)]
Remove unused TIZEN package capi-network-wifi.

The following change has been merged in the master.

Pushing the change one the 1.3-rel branch as suggested by Phil.

Change-Id: I8d4b8b97d93521174273e08aa9202e6008e6abfe
Signed-off-by: Sushil Yadav <>
Reviewed-by: Jooseok Park <>
Reviewed-by: Phil Coval <>
Reviewed-by: Uze Choi <>
Reviewed-by: Ashok Babu Channa <>

22 months agobuild: install experimental logging headers 51/23051/10
Philippe Coval [Fri, 9 Jun 2017 13:51:56 +0000 (15:51 +0200)]
build: install experimental logging headers

Functions in payload_logging.h can be used in examples,
so it's installed in "experimental" sub namespace
along dependencies.

Change-Id: If3a9e4309601c356ab9a2faaa9fbe26283408633
Signed-off-by: Philippe Coval <>
Tested-by: jenkins-iotivity <>
Reviewed-by: George Nash <>
Reviewed-by: Dan Mihai <>
22 months agoIOT-2966 Do not use -Werror by default 63/23963/2
George Nash [Fri, 19 Jan 2018 19:52:36 +0000 (11:52 -0800)]
IOT-2966 Do not use -Werror by default

Turning on the ERROR_ON_WARN has caused issues for
developers building the code on untested compilers.

We still want the build system to reject new warnings
but we don't want to preven developers from building
on their own system.

Change-Id: I69e9d52185db37d283645ee2fb41e39f288a38ef
Signed-off-by: George Nash <>
22 months agoIOT-2399 Normalize run.bat line ending to CRLF 13/23313/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 <>
Reviewed-by: Kevin Kane <>
Tested-by: jenkins-iotivity <>
Reviewed-by: Dan Mihai <>
Reviewed-by: Phil Coval <>
(cherry picked from commit 88a4786c3829913d362011093478f450ffaa5ab4)

22 months ago[IOT-2957] Fix for crash on some Android phones. 57/23957/3
Larry Sachs [Thu, 18 Jan 2018 18:17:13 +0000 (10:17 -0800)]
[IOT-2957] Fix for crash on some Android phones.

Some Android phones (LG, HTC) crashed on removing listeners when
compiled WITH_CLOUD=1.  By reversing the order in which the
listeners were removed, the crash does not occur.


Change-Id: I32facaaf9a93ad6d0c7125e791c11618aa527587
Signed-off-by: Larry Sachs <>
22 months agobridging: Add explicit dependency to libmpm 11/23411/10
Philippe Coval [Wed, 22 Nov 2017 17:16:45 +0000 (18:16 +0100)]
bridging: Add explicit dependency to libmpm

While working on "scons install", static lib were not resolved.
So I found this could be changed separately

Observed issue was:

 Linking shared .../
 g++: error: .../out/.../libmpmcommon.a: No such file or directory
 scons: *** [out/.../] Error 1

This was needed for ARTIK7 on fedora-24

Change-Id: Ibadd174bd84bcaf48d972fdb3071ba3b03ff1373
Signed-off-by: Philippe Coval <>
22 months agotizen: Use OS enrollee 17/23317/13
Philippe Coval [Thu, 16 Nov 2017 18:41:19 +0000 (19:41 +0100)]
tizen: Use OS enrollee

To support fedora-24 for ARTIK7

Change-Id: I8d40700b8f19fcbc71cb3ad3235cda990290792d
Signed-off-by: Philippe Coval <>
(cherry picked from commit 56ce7b649cdbf2618915d3ff3e3ced376464e343)

22 months agobuild: Ship IPCA in Linux RPM 29/23329/7
Philippe Coval [Thu, 16 Nov 2017 18:41:04 +0000 (19:41 +0100)]
build: Ship IPCA in Linux RPM

This was needed for fedora-24 for ARTIK7

Change-Id: I177a277a07a0684e58f5935b5785de50b3d78af1
Signed-off-by: Philippe Coval <>
22 months agoAdd 15/23315/2
Mats Wichmann [Wed, 13 Sep 2017 17:53:02 +0000 (11:53 -0600)]

github evaluates the maturity of a project in part by whether it has
certain things set up: a readme, a license, a contributions document
and a code of conduct.  There's no cost to adding the
which the github mirror will pick up - it's the content from a web page
(and points to that page as well).

Change-Id: Idb77d3b822482ddc430cf500eca0a6bae5ccc955
Signed-off-by: Mats Wichmann <>
(cherry picked from commit 140f1b9f0ca98661c582e03289610da3ad77316c)

22 months agobuild: Ship plugins on Linux RPM 45/23245/8
Philippe Coval [Wed, 15 Nov 2017 19:03:34 +0000 (20:03 +0100)]
build: Ship plugins on Linux RPM

This was needed for fedora-24 for ARTIK7

Change-Id: I1dab992c31013170d2ec068e8ac05ef9c4d9c84a
Signed-off-by: Philippe Coval <>
(cherry picked from commit c56974d40fd72b830588c5a5e3412c120c666a57)

22 months agobuild: Support scons install 13/23413/10
Philippe Coval [Wed, 22 Nov 2017 17:17:00 +0000 (18:17 +0100)]
build: Support scons install

Fixed some Install rules and where they were missued,
InstalTarget and UserInstall* were somehow overlapping.

If prefix is not used, then install to separate folder in tree.

See python comments for more details.

Maybe this could be refactored later, but this change tried
to keep the difference minimal.

Other related fixes are separated in obvious patches.
Instalation of supported examples to come later

This was needed for ARTIK7 on fedora-24

Change-Id: I2143f41c6dba7356617186f2d9cb68ef82323f5e
Signed-off-by: Philippe Coval <>
23 months ago[IOT-2912] randompin 85/23485/3
Oleksandr Dmytrenko [Tue, 28 Nov 2017 10:06:17 +0000 (12:06 +0200)]
[IOT-2912] randompin

sample randompin server refactoring

Change-Id: I4aa744a34d706a995fb8d4d7d2927ff29a2ec39a
Signed-off-by: Oleksandr Dmytrenko <>
23 months ago[IOT-2912] svr db editor 75/23475/8
Oleksandr Dmytrenko [Mon, 27 Nov 2017 16:32:18 +0000 (18:32 +0200)]
[IOT-2912] svr db editor

svr db editor refactoring

Change-Id: Id08cb65a06c296619bf81814bf4ca9490688e2c8
Signed-off-by: Oleksandr Dmytrenko <>
23 months ago[IOT-2912]cloud sample 73/23473/6
Oleksandr Dmytrenko [Mon, 27 Nov 2017 14:30:52 +0000 (16:30 +0200)]
[IOT-2912]cloud sample

cloud sample refactoring

Change-Id: I5b229f56dcd21efb823e2663e418cfaee99f6ab5
Signed-off-by: Oleksandr Dmytrenko <>
23 months ago[IOT-2912] cpp provisioning 65/23565/6
Oleksandr Dmytrenko [Thu, 30 Nov 2017 16:42:02 +0000 (18:42 +0200)]
[IOT-2912] cpp provisioning

cpp provisioning refactoing

Change-Id: Ic80a6a9df54d1f6930ea779ad0a95dcd5b843c1c
Signed-off-by: Oleksandr Dmytrenko <>
23 months ago[IOT-2912] secureresourceprovider 57/23557/3
Aleksey Volkov [Fri, 1 Dec 2017 16:43:29 +0000 (18:43 +0200)]
[IOT-2912] secureresourceprovider

possible NULL derefence fix

Change-Id: Ib1cb32a746555ae66bc89b26bb35fbcb52223c18
Signed-off-by: Oleksii Beketov <>
Signed-off-by: Aleksey Volkov <>
23 months ago[IOT-2912] multipleownershiptransfermanager 59/23559/4
Oleksandr Dmytrenko [Fri, 1 Dec 2017 08:55:14 +0000 (10:55 +0200)]
[IOT-2912] multipleownershiptransfermanager

Possible NULL dereference fix

Change-Id: I89f0883d2e20616585a143c6b96e00d19528a907
Signed-off-by: Oleksii Beketov <>
Signed-off-by: Oleksandr Dmytrenko <>
23 months agotizen: Install examples to usr,lib,iotivity 33/23333/7
Philippe Coval [Thu, 16 Nov 2017 18:40:02 +0000 (19:40 +0100)]
tizen: Install examples to usr,lib,iotivity

Previously .dat where placed in /bin this not nice

Note yocto should align to this too

Change-Id: I1ea8ebbe63b6ff8d029a195882b9c7e8ec69e640
Signed-off-by: Philippe Coval <>
23 months agoIOT-582 Android build generate universal APK 31/23231/6
George Nash [Wed, 15 Nov 2017 21:14:13 +0000 (13:14 -0800)]
IOT-582 Android build generate universal APK

Two major modifications:
1) The aar file no longer adds the TARGET_ARCH to the
name of the file. The aar file contains all of the
architectures that were built upto that point. This
has been the case for quite a while so the architecture
in the name only indicated the build that created the
aar file not the contents of the aar file.

2) When APK files are built it will try to build all
possible architectures as well as the universal APK

Change-Id: I11f5db9f4cb8c634afe4417b280e5feec6c3d7e9
Signed-off-by: George Nash <>
23 months agoresource: Fix occlientbasicops to support coaps 37/23637/5
Philippe Coval [Tue, 5 Dec 2017 15:20:02 +0000 (16:20 +0100)]
resource: Fix occlientbasicops to support coaps

The fix is to do querry only on resource's address (to use CoAPs channel)

Observed issue was:


  ./occlientbasicops -u 0 -c 0 -d 1 -p 0 -t 2

  INFO: occlientbasicops: Callback Context for GET query recvd successfully
  INFO: occlientbasicops: StackResult: OC_STACK_UNAUTHORIZED_REQ
  INFO: occlientbasicops: SEQUENCE NUMBER: 16777216
  INFO: PayloadLog: NULL Payload
  INFO: occlientbasicops: =============> Get Response

I fixed it to:

  INFO: occlientbasicops: StackResult: OC_STACK_OK (...)
  INFO: PayloadLog: Payload Type: Representation (...)
  INFO: PayloadLog:     URI:/a/led (...)
  INFO: PayloadLog:             state(bool):false (...)

Extra note, it look like the parse function is never returning false.

Change-Id: Id3e48c8a04453e87a09e7636ead9a9f64c499d44
Signed-off-by: Philippe Coval <>
(cherry picked from commit f6394a488449831c0c9070b652c79630d80767ba)

23 months ago[IOT-2709] MOT 79/23579/3
Oleksii Beketov [Fri, 1 Dec 2017 12:54:11 +0000 (14:54 +0200)]
[IOT-2709] MOT

Multiple ownership enable

Change-Id: Ic6cff37ada8f84417c623bead93539f73d61b68d
Signed-off-by: Oleksii Beketov <>
23 months agoIOT-2774 Add getResourceHandleAtUri 59/23659/3 otgc-dekra-changes 1.3.1 1.3.1-RC7
George Nash [Wed, 6 Dec 2017 21:25:58 +0000 (13:25 -0800)]
IOT-2774 Add getResourceHandleAtUri

This is needed to be able to set a deivice type to
the /oic/d resource.

Change-Id: I179d593f4b1e0408c18f7c28e6f8bda586223a9e
Signed-off-by: George Nash <>
23 months agoAdded option for randompin_certificate 45/23545/3
Mushfiqul Islam Antu [Thu, 30 Nov 2017 12:25:31 +0000 (18:25 +0600)]
Added option for randompin_certificate

If a server supports both randompin and certificate
then the doxm.sct value should be 24, instead of
current default 16 on IoTivity.

Change-Id: I017bed18d3e0ad568b662a03d9bd80134538a8c3
Signed-off-by: Mushfiqul Islam Antu <>
23 months ago[IOT-2788] Unlink Pairwise things doesn't work 35/23635/2
Vitalii Irkha [Tue, 5 Dec 2017 11:49:14 +0000 (13:49 +0200)]
[IOT-2788] Unlink Pairwise things doesn't work

This is workaround.

One of callbacks provide OC_STACK_INVALID_QUERY instead of OC_STACK_RESOURCE_DELETED.
Details please see in

Change-Id: Iccf2d6e5308ba2bc8322fa66c3acec395ef21811
Signed-off-by: Vitalii Irkha <>
23 months agoDon't delete in-use credInfo. 31/22931/2
Todd Malsbary [Fri, 20 Oct 2017 18:04:07 +0000 (11:04 -0700)]
Don't delete in-use credInfo.

Change-Id: Iac85f39806857767bbc6f5dcab02057f791bb5bc
Signed-off-by: Todd Malsbary <>
2 years ago[ES] Changes in Easysetup for spec compliance. 31/23431/5
Senthil Kumar G S [Thu, 23 Nov 2017 15:18:43 +0000 (20:48 +0530)]
[ES] Changes in Easysetup for spec compliance.

It includes the following:-
1. [IOT-2909] Exclude read-only properties.
Read-Write interface response for "/WiFiConfResURI" is currently
including the read-only properties ("swat" and "swet") which is incorrect.
These read-only properties should not be added in the "" response
for '/WiFiConfResURI'.

2. [IOT-2910] Handling post request to "/WiFiConfResURI" with baseline
interface when there is no interface in the query paramter.

3. [IOT-2911] Remove "href" from the baseline response for "/WiFiConfResURI".

Change-Id: I730efa70cedda4dbdb1f21df6e38fec657bc9bb7
Signed-off-by: Senthil Kumar G S <>
2 years ago[IOT-2914] Update Randompin database(for sct) 05/23505/2
Mushfiqul Islam Antu [Wed, 29 Nov 2017 04:31:23 +0000 (10:31 +0600)]
[IOT-2914] Update Randompin database(for sct)

Current randompin database is having "sct" value 9.
Which is improper. Correct value should be 16

Change-Id: I017bed18d3e0ad568b662a03d9bd80134538a8c1
Signed-off-by: Mushfiqul Islam Antu <>
2 years ago[IOT-2913] Mirror d.di to match doxm.deviceuuid 07/23507/2
Mushfiqul Islam Antu [Wed, 29 Nov 2017 06:08:07 +0000 (12:08 +0600)]
[IOT-2913] Mirror d.di to match doxm.deviceuuid

OCGetServerInstanceID() & OCGetServerInstanceID() these 2
APIs were keeping a local copy of doxm.deviceuuid, while
there is no way to keep track whether doxm.deviceuuid was
updated by the provisioning manager. So local copies are
removed, each time d.di is required, it will be fetched

Change-Id: I017bed18d3e0ad568b662a03d9bd80134538a8c2
Signed-off-by: Mushfiqul Islam Antu <>
2 years ago[IOT-2906][ES] Remove "href" from child response. 99/23399/2 1.3.1-RC6
Senthil Kumar G S [Wed, 22 Nov 2017 17:25:16 +0000 (22:55 +0530)]
[IOT-2906][ES] Remove "href" from child response.

For requests which come directly to child resources
(/WiFiConfResURI, /CoapCloudConfResURI and /DevConfResURI),
this patch will remove the "href" property from the response
as spec doesn't mandate the addition of "href" in the response.

And also, CTT expects the response from direct request to any child
to be same as the response which comes for the same child
through collection.

For example:
Properties in "rep" for '/WiFiConfResURI' should be same as
the properties in the direct response for GET from '/WiFiConfResURI' resource.

Currently "href" is not included in "rep" for child resources.
But it is included in the direct response for GET/POST.
When CTT compares both responses, it finds them different due of "href".

This patch resolves the issue and still conforms to spec.

Change-Id: I017bed18d3e0ad568b662a03d9bd80134538a8c0
Signed-off-by: Senthil Kumar G S <>
2 years ago[IOT-2904][ES] Fix for issues found through CTT. 89/23389/4
Senthil Kumar G S [Wed, 22 Nov 2017 11:51:03 +0000 (17:21 +0530)]
[IOT-2904][ES] Fix for issues found through CTT.

1. If one of the resources in the POST request over batch
has invalid properties, then the response should include an
empty "rep" for those resources.
For all other resources with valid properties in the request,
"rep" should include all the properties.

2. Allowing "cn" property to be set to ES_CONNECT_NONE.

Change-Id: Ib819bed7a126717cc56df0fb32b3d9f3ec570682
Signed-off-by: Senthil Kumar G S <>
2 years ago[IOT-2494] SVR DB Editor : Add cred edit features 93/23193/3
Vadym Riznyk [Tue, 14 Nov 2017 10:57:44 +0000 (12:57 +0200)]
[IOT-2494] SVR DB Editor : Add cred edit features

Add Cred add symmetric key pair
Add Cred modification

TrustCA cert is saved in cred->publicdata
instead of optional data.

[IOT-2494] SVR DB Editor : Clean codes

Fix typo, memleak
Remove unnecessary codes.

New Feature:
Signed-off-by: Sangjoon Je <>
Change-Id: I487786c432c7d51ead84d08fca0326d34b10e27a
Signed-off-by: Vadym Riznyk <>
2 years ago[IOT-2883] SVR DB editor is broken in 1.3-rel 07/23107/8
Vadym Riznyk [Thu, 9 Nov 2017 15:52:39 +0000 (17:52 +0200)]
[IOT-2883] SVR DB editor is broken in 1.3-rel

Adding InitPstatResourceToDefault() to svrdbeditor,
for initialize gPstat and correctly get dos.state

Change-Id: I5eefd50d6dcfcc35fd20ffd3e6e147acbf924e45
Signed-off-by: Vadym Riznyk <>
2 years ago[IOT-2895] Make DevConf resource non-observable. 99/23199/2
Senthil Kumar G S [Tue, 14 Nov 2017 16:36:22 +0000 (22:06 +0530)]
[IOT-2895] Make DevConf resource non-observable.

Required to make the successful execution of the CTT test case
which expects observe notification from DevConf.
As DevConf is a read-only resource, it is not possible to update its
properties and hence there can't be any observe notifications.
So this change makes DevConf non-observable.

Change-Id: I8c73865aa995a61729e41063dfa0a74d0bea1400
Signed-off-by: Senthil Kumar G S <>
2 years ago[IOT-2899][ES] Notifying collection's observers. 55/23355/1
Senthil Kumar G S [Mon, 20 Nov 2017 06:40:09 +0000 (12:10 +0530)]
[IOT-2899][ES] Notifying collection's observers.

When there is an update in the properties of child resources
(WifiConf, CloudConf) of collection(EasySetup),
a notification should be sent to EasySetup's observers.

Change-Id: I9d4d4ab0b0f7e21995d29376819e014c90408d9c
Signed-off-by: Senthil Kumar G S <>
2 years agoFix arm64-v8a build errors 35/23235/2
George Nash [Wed, 15 Nov 2017 23:21:57 +0000 (15:21 -0800)]
Fix arm64-v8a build errors

Change-Id: Iecff451094731616bbab6b680954e0ec333a61a3
Signed-off-by: George Nash <>
2 years agoignore: android ouput files 07/23207/2
Philippe Coval [Wed, 15 Nov 2017 11:57:13 +0000 (12:57 +0100)]
ignore: android ouput files

Change-Id: Ie54313a0437c8bdffe2d0c6484524a1fc6775f7d
Signed-off-by: Philippe Coval <>
2 years agoRevert "[IOT-2761] Multiple CAs allowed" 29/23229/1
Nathan Heldt-Sheller [Wed, 15 Nov 2017 17:56:05 +0000 (09:56 -0800)]
Revert "[IOT-2761] Multiple CAs allowed"

This reverts commit 7f9d8c71fadc2eb8968e953f78e3b4afce262c52.

22967 caused a regression in the CTT; we'll fix and re-submit
after regression testing.

Change-Id: Ie06cf59b6463072c54b23c61d322bdb7f09cc22f
Signed-off-by: Nathan Heldt-Sheller <>
2 years agotizen: Ship resource_directory in main subpackage 33/23133/2
Philippe Coval [Fri, 10 Nov 2017 08:16:56 +0000 (09:16 +0100)]
tizen: Ship resource_directory in main subpackage

It's part of resource, not service.

Change-Id: I502591a8db1c48bc21d9dd0b768c46efb353b6c3
Signed-off-by: Philippe Coval <>
2 years agobuild: Add linux_full for MOT, RA and SECURED 85/23185/4
Philippe Coval [Wed, 19 Jul 2017 09:34:09 +0000 (11:34 +0200)]
build: Add linux_full for MOT, RA and SECURED

More features could be turned on later

Change-Id: Ie58e4f4f54ab08e2f0a7f7273e4e9943f9389534
Signed-off-by: Philippe Coval <>
Reviewed-by: Dan Mihai <>
Reviewed-by: George Nash <>
Reviewed-by: Alex Kelley <>
Tested-by: jenkins-iotivity <>
Reviewed-by: Mats Wichmann <>
2 years ago[IOT-2815][IOT-2844] 67/22967/20
Oleksandr Dmytrenko [Mon, 23 Oct 2017 14:37:09 +0000 (17:37 +0300)]

provisioningclient set rowneruuid for all the SVRs

Change-Id: I46df6479aeb313955639df32b7e73c52b14691e0
Signed-off-by: Oleksandr Dmytrenko <>
2 years ago[IOT-2761] Multiple CAs allowed 87/22987/4
Oleksii Beketov [Thu, 2 Nov 2017 12:33:38 +0000 (14:33 +0200)]
[IOT-2761] Multiple CAs allowed

Allow to parse all CA certificates when SVR DB
contains more than one root CA.

Change-Id: Ie82632b459a9a064a90ff14e100e4db9ab60492d
Signed-off-by: Oleksii Beketov <>
2 years agoPrepare for scons3: change prints and more 09/22809/4
Mats Wichmann [Thu, 28 Sep 2017 12:51:47 +0000 (06:51 -0600)]
Prepare for scons3: change prints and more

A previous change updated all the scons scripts:

This change picks up the semi-external scripts that are called
by the build, and thus are run in the scons context and need updating.

Print statements are surrounded with parens so they look like function
calls.  This is an scons3 syntax requirement even if still using Python 2.

The old exception format "except FooErr, err" is no longer supported
in Python 3; since the Python 3 format "except FooErr as err" has been
available since Python 2.6, there is no problem switching these and it
makes sense to remove one way things could fail if Py3 is used.

A few comparisons which used <> are changed to the preferred != form.

Reformatted Builder call without changing it, and added a comment in the
forked version to help explain why there are two copies of

With these changes, a full build completes successfully using scons3.0.

Change-Id: Ia8df28d12c6504d6466dcf793779535d1ad3aa8b
Signed-off-by: Mats Wichmann <>
(cherry picked from commit b34da4aa281cfdf94e6bcbe2e6709773c1ed9de7)

2 years agoDelete links lazily when TTL is reached. 09/22709/6
Habib Virji [Tue, 3 Oct 2017 16:28:50 +0000 (17:28 +0100)]
Delete links lazily when TTL is reached.

Add ttl parameter to RD client APIs.

Change-Id: Ic189cebebbcf8127bea1d127dd11a116e09743bb
Signed-off-by: Habib Virji <>
Signed-off-by: Todd Malsbary <>
2 years ago/pstat Resource CBOR fix 89/23089/7
Nathan Heldt-Sheller [Mon, 6 Nov 2017 12:51:58 +0000 (04:51 -0800)]
/pstat Resource CBOR fix

Fix for a binary->CBOR marshaling case, where payload
is to contain "dos", but not "p".  This in in turns causes
the next Property to be incorrectly placed inside the "dos"
CBOR map (and then skipped over by the CBOR->binary
un-marshaling code).

Also improved logging.

Change-Id: Ib28fc1e30fdaf1e639afa940ee2626ba14e77584
Signed-off-by: Nathan Heldt-Sheller <>
2 years agoCherry Pick change to enable building with SCons3 03/23103/2
Ibrahim Esmat [Tue, 19 Sep 2017 23:41:18 +0000 (17:41 -0600)]
Cherry Pick change to enable building with SCons3

Cherry Pick Mats change from master to enable building with SCons 3.0
in 1.3-rel branch. This change and the change in review will be needed to merge

With these 2 changes merged to 1.3-rel, you can successfully build
IoTivity with SCons 3.0. Which will also allow you to build the
UWP versions of the libraries needed for UWP Apps.

Change in master:
Prepare for scons3: change prints and others

In preparation for scons3, recently released, modify remaining print
statements by surrounding them with parens so they look like function
calls. That takes care of the scons3 syntax requirement.

The remaining instances of the sequence "print FOO; Exit(1)" were
changed to "msg = FOO; Exit(msg)" - this helps with the change by
not even using the print statement, and by giving the message to
the output function, it is sent to the error stream rather than
the output stream.

Calls to dictionary keys() and values() are now wrapped in list(),
on Python 3 these return special objects, not the expected list.
That's harmless to Python 2 usage.

The old exception format "except FooErr, err" is no longer supported;
since the Python 3 format "except FooErr as err" has been available
since Python 2.6, there is no problem switching these.

Some instances of using the commands module in extlibs changes to use
subprocess module. Change is transparent.

A couple of instances of filter(lambda ...)) were changes to
a python list comprehension, this is considered preferred for
Python 3 (change was suggested by a conversion tool)

Note on print() change:

  When running with Python2, the print statement is still used. That
  has a bit of an impact: print(a) is just prints the argument, but
  print(a, b, c) is interpreted as printing a tuple (a, b, c), so we
  could see:

  >>> print "This", "is", "a", "test"
  This is a test
  >>> print("This", "is", "a", "test")
  ('This', 'is', 'a', 'test')

  The second is not pretty.  You can make Python2 code use the function
  instead of the statement:

  >>> from __future__ import print_function
  >>> print("This", "is", "a", "test")
  This is a test

  but that's a pain, so the small number of existing prints which
  used a comma as argument separators were updated to use addition,
  so now we're concatenating a string to produce one arg instead
  of supplying multiple "arguments" that would be misinterpreted
  as a tuple in print().  It's fine to add the import statement
  if it's needed.

Change-Id: Idac00e1389b79ee65da4a2eb6ef3246551b66843
Signed-off-by: Mats Wichmann <>
Signed-off-by: Ibrahim Esmat <>
2 years ago[IOT-2874] Do not drop CON duplicated requests 95/23095/4
Veeraj Khokale [Tue, 7 Nov 2017 05:20:44 +0000 (10:50 +0530)]
[IOT-2874] Do not drop CON duplicated requests

According to COAP spec section 4.5, confirmable duplicated
requests should not be silently dropped, instead they need
to be acknowledged every time. Therefore check if message
is confirmable before dropping it.

Change-Id: Ie7a49da9f7869fc11f679054fe8dd5c78684eb53
Signed-off-by: Veeraj Khokale <>
2 years ago[IOT-2618] Fix filter check for interface query 33/23033/3 1.3.1-RC5
Srikrishna Gurugubelli [Fri, 27 Oct 2017 17:30:43 +0000 (10:30 -0700)]
[IOT-2618] Fix filter check for interface query

Introspection resource was not checking for interface filter properly
resulting in missing mandatory properties expected on baseline interface

Signed-off-by: Srikrishna Gurugubelli <>
Change-Id: I920d4a1ecc4442e34fc1de8633291de6f341a123

2 years ago[IOT-2879][ES] Handling read-only properties. 85/23085/5
Senthil Kumar G S [Fri, 3 Nov 2017 11:28:22 +0000 (16:58 +0530)]
[IOT-2879][ES] Handling read-only properties.

If a post request comes with read-only properties,
OC_EH_BAD_REQUEST(400) will be sent.

Change-Id: I26cd3f8f7c24f8d197a39ac96a27c80018d62f2a
Signed-off-by: Senthil Kumar G S <>
2 years agoManufacturer certificate based OTM fix 73/23073/3
Oleksii Beketov [Tue, 31 Oct 2017 12:27:23 +0000 (14:27 +0200)]
Manufacturer certificate based OTM fix

Improper callbacks registration removed.
Manufacturer certificate related info and ciphers
callbacks are already set in StartOwnershipTransfer.

Change-Id: Id1cb14cb31e4325d17961737fa87e0224735235a
Signed-off-by: Oleksii Beketov <>
2 years agoFix a build problem on recent linux host 31/23031/4
Mats Wichmann [Fri, 27 Oct 2017 12:42:21 +0000 (06:42 -0600)]
Fix a build problem on recent linux host

Provisioning unittest will not link when pointed at
connectivity_abstraction_insternal due to dependency of other libs on
connectivity_abstraction.  Leads to this error:

/bin/ld: out/linux/x86_64/debug/libroutingmanager.a(routingmanager.o): undefined reference to symbol 'u_linklist_length'
/home/mats/ error adding symbols: DSO missing from command line

It works fine to link against connectivity_abstraction so use that instead.

Other changes in the SConscript are just cleanup.

Change-Id: I47b846111f4bbaee0ce4d38de7d9e8a0ccc3885b
Signed-off-by: Mats Wichmann <>
2 years agoAdapt gcc version-compare to deal with gcc7, py3 17/23017/4
Mats Wichmann [Thu, 26 Oct 2017 16:02:36 +0000 (10:02 -0600)]
Adapt gcc version-compare to deal with gcc7, py3

For gcc starting with 7, gcc -dumpversion returns a single (non
dotted) number. This is actually an illegal version to distutils'
version.StrictVersion, so use LooseVersion instead, where that is a
legal number but the comparison still works fine.

For Python 3.x, subprocess.check_output returns a byte string,
which needs to be decoded before it can be passed to the version
comparator function. Instead of bothering with the decoder, which is
hard to get right so it works for both Py2 and Py3 case, call the new
subprocess.getoutput() method, falling back to check_output if not

Change-Id: I29e1f43f8fbde130103099be1972b574a23442cf
Signed-off-by: Mats Wichmann <>
2 years agoCT1.7.4.5: Reply with error for bad key 43/23043/2
Dan Mihai [Fri, 27 Oct 2017 21:10:26 +0000 (14:10 -0700)]
CT1.7.4.5: Reply with error for bad key

Return an error response when a Client tries to post a role with a
mistmatched public key.

Change-Id: Ie689f862d1534093026979c076239fdf604b91e1
Signed-off-by: Dan Mihai <>
2 years agoCT1.7.4.5: New null terminator handling 41/23041/3
Dan Mihai [Fri, 27 Oct 2017 18:44:52 +0000 (11:44 -0700)]
CT1.7.4.5: New null terminator handling

Avoid persisting the cert null terminator, to be able to return the
original cert for RETRIEVE. Add the null terminator just temporarily,
before calling mbedtls_x509_crt_parse().

This patch allows CT1.7.4.5 to make progress past Check_3. This test
case still fails later on - to be investigated.

Change-Id: Icda1afaad478548682599f97ff46b3017b01588e
Signed-off-by: Dan Mihai <>
2 years ago[IOT-2843] remove DOXS access to /crl 47/23047/2
Nathan Heldt-Sheller [Sat, 28 Oct 2017 01:05:59 +0000 (18:05 -0700)]
[IOT-2843] remove DOXS access to /crl

Although the Security Spec is silent on whether DOXS has
implicit access (that is, a permanent ACE, or default ACE that
can't be modified) to the /crl Resource.  CTT interprets that
to mean it doesn't have implicit access, even though DOXS
can access related configuration Resources (/doxm, /pstat, /acl2,
/cred).  Rather than fight over it I'm changing because
either way works, it's just more effort for OBT with implicit
access reduced.  Still a reasonable inference (though not
normatively supported).

Change-Id: I86f8a7f1ed217b7bdeb3cae2ab015fb035cd8940
Signed-off-by: Nathan Heldt-Sheller <>
2 years agoPlug memory leak in json2cbor 15/23015/4
Mats Wichmann [Thu, 26 Oct 2017 14:12:16 +0000 (08:12 -0600)]
Plug memory leak in json2cbor

In recently introduced code, a pair of temporary buffers is used
to help convert ascii digits to a number; one is a static
allocation but the other is OICMalloc'd, but was not freed.

Change-Id: Iab1e8ce48c20aa6332d375c891f6b38ecb6939e7
Signed-off-by: Mats Wichmann <>
2 years ago[Easy Setup] POST Request Schema Alignment 11/23011/9
Abhishek Pandey [Fri, 27 Oct 2017 15:48:45 +0000 (21:18 +0530)]
[Easy Setup] POST Request Schema Alignment

JIRA IOT-2847:

Updated updateEasySetupResource() to process "rep" property which is
mandatory as per batch schema.

Change-Id: I0371e68106728d375a390ac395c256ea5e2361c6
Signed-off-by: Abhishek Pandey <>
2 years agobuild: Generate iotivity_config.h in build_dir 51/22351/5
Philippe Coval [Thu, 17 Aug 2017 13:48:20 +0000 (15:48 +0200)]
build: Generate iotivity_config.h in build_dir

The file from "out" dir will be also installed to system include path
using scons install (to /usr/include/ on linux)

Change-Id: Icddfb9354f47fd40ba998fe336b4963be7ade871
Signed-off-by: Philippe Coval <>

2 years ago[IOT-2854][IOT-2858] anon ciphersuite disable 25/23025/5
Nathan Heldt-Sheller [Fri, 27 Oct 2017 04:21:26 +0000 (21:21 -0700)]
[IOT-2854][IOT-2858] anon ciphersuite disable

Right now the /doxm handler code to disable the anon cipher suite is
not correct, so it's removed in this patch.  Instead, the /cred code disables
the anon suite after calculating PSK.

If there is a request is over secure channel, but requester ID
is Nil UUID, then (in current IoTivity at least) it means that this request
arrived over DTLS established via anon cipher suite.  A successful
connection has taken place, and that's an opportunity to disable the anon cipher
suite so no other anon connections can be made during OTM.

For now, we're just removing the incorrect /doxm code to disable,
and leaving the more aggressive disable timing for another release.

See [IOT-2858] for more info.

Change-Id: I99c2a48abbfc6f3e5aa52385ee5b778c4c80ccfc
Signed-off-by: Nathan Heldt-Sheller <>
2 years ago[IOT-2826][IOT-2851]dat file with zero rownerid 93/22993/11
akk0rd [Tue, 24 Oct 2017 17:59:45 +0000 (20:59 +0300)]
[IOT-2826][IOT-2851]dat file with zero rownerid

Fixed false generating dat file, added wrapper functions with rowner parameter

Change-Id: Ia8badb9b0b78de5f620f8dbad6f070c1276ebf74
Signed-off-by: akk0rd <>
2 years agoIOT-2826 Update *.dat files for samples 21/23021/2
George Nash [Thu, 26 Oct 2017 18:55:30 +0000 (11:55 -0700)]
IOT-2826 Update *.dat files for samples

Both client and the server used the incorrect encoding
for the certificate data. When the server .dat file was
updated with the fix from I did not
update the client .dat file because I had not made any modifications to the client. This then caused the
certificates to miss match. If I run json2cbor on both the client and the server *.json input files the error no
longer occurs.

Change-Id: I8d5acc8a49533b7cca7b5c4f46371e495449aa73
Signed-off-by: George Nash <>
2 years agoIOT-2848 Fix for intermitent read error 19/23019/2
George Nash [Thu, 26 Oct 2017 18:07:03 +0000 (11:07 -0700)]
IOT-2848 Fix for intermitent read error

Valgrind was reporting intermitent read errors
from the provisiontest. I think the result of the
failure was a change made for IOT-2599 the name
of the tests db file was changed from ./dbpath
to ./dbpath.tmp however the name of the file was
used in more than one test.

Change-Id: Id72a07b51aee10abe34a428239ca74dfbf7a2641
Signed-off-by: George Nash <>
2 years agoReturn one error response from RD server. 25/22325/4
Todd Malsbary [Tue, 5 Sep 2017 18:59:16 +0000 (11:59 -0700)]
Return one error response from RD server.

Change-Id: I183ad1a588f3646bd0dc3b370c16cf359552f3eb
Signed-off-by: Todd Malsbary <>
2 years agoFixing Build Errors after applying -Werror 09/23009/6
Abhishek Pandey [Thu, 26 Oct 2017 08:43:31 +0000 (14:13 +0530)]
Fixing Build Errors after applying -Werror

JIRA IOT-2845:

This seems to be side effect of JIRA [IOT-2539]. Build is
breaking on some linux platforms (i.e. i686). Most
compilation errors are related to printf format
specifiers. Probably this wasn't caught by jenkins
when merging patch for IOT-2845 due to its system
configuration matches expected size for all data types.

Fixed the error by using portable format specifiers while

%PRId - for int64_t
%PRIu - for unit64_t
%PRIuPTR - for size_t (unsigned)

Change-Id: I30a21cacdddc84776392100ee783ccbe7e1eae0d
Signed-off-by: Abhishek Pandey <>
2 years ago[IOT-2810] [RE] Static Analysis fix for CPP SDK. 65/22865/2
Jay Sharma [Tue, 17 Oct 2017 12:13:53 +0000 (17:43 +0530)]
[IOT-2810] [RE] Static Analysis fix for CPP SDK.

1. Indentation fixes.
2. Uninitialized variable fixes

Change-Id: Ibccf1bc11e590cf1b282e77cac3a9901ccf29fa2
Signed-off-by: Jay Sharma <>
2 years agoChange OICFree to NSOICFree in notification 99/20899/6
jake [Tue, 28 Mar 2017 05:53:21 +0000 (14:53 +0900)]
Change OICFree to NSOICFree in notification

 - Be used OICFree without NULL checking.

[Philippe Coval]


Change-Id: I1ce65d0e41a3b9f276a2b517d7b3d1c06faa92e6
Signed-off-by: jake <>
Reviewed-by: JungYong KIM <>
Tested-by: jenkins-iotivity <>
Reviewed-by: Phil Coval <>
Reviewed-by: Uze Choi <>
(cherry picked from commit acbf9ffd474b3151a1fc5ea6337b4ad53cc1a081)

2 years agoCT1.7.4.5: Avoid DER key parse error 05/23005/3
Dan Mihai [Thu, 26 Oct 2017 03:09:48 +0000 (20:09 -0700)]
CT1.7.4.5: Avoid DER key parse error

mbedtls_pk_parse_key was not able to parse the key converted to DER
by GetDerKey(). It encountered in the DER an unexpected key format

However, mbedtls_pk_parse_key is able to parse correctly the original
PEM format of the same key.

This patch allows CT1.7.4.5 to establish a connection to an IoTivity
server. This test case still fails later on - to be investigated.

Change-Id: I933ea9d3b761ed159faa2c4f371890e477caf23f
Signed-off-by: Dan Mihai <>
2 years ago[IOT-2843] remove SVR restore behavior 03/23003/3
Nathan Heldt-Sheller [Thu, 26 Oct 2017 03:06:56 +0000 (20:06 -0700)]
[IOT-2843] remove SVR restore behavior

These functions were applied at incorrect times (e.g. if a normal
Update was rejected due to read-only properties during OTM, the entire
system would "restore" to a wrong state).  They were also wrong,
in that they restored some values, left others unchanged, and set
others to wrong values (e.g. presumed JustWorks OTM).

Also, the duplicate message logic was not being used to any consistent
effect and causing warnings.  It's also completely optional and so was

Change-Id: I23d23f946fbafe02cdc2d2ac6ac46abcedd1f149
Signed-off-by: Nathan Heldt-Sheller <>
2 years agoIOT-2838 Fix javadoc warnings 77/22977/3
George Nash [Mon, 23 Oct 2017 23:31:59 +0000 (16:31 -0700)]
IOT-2838 Fix javadoc warnings

Documented all the functions referencing the native code.

Note the OcProvisioning setPinType method had a return value
int. The was returning the return value of the native call
that was the status. Due to the way the code was writen the
only value that could be returned was when things worked as
expected. All other values were thrown so the return value
was un-needed. The function was changed to have a return type
of void.

Change-Id: I3b5955a336661574dde9f70c87b6ead3dcd5ea7b
Signed-off-by: George Nash <>
2 years agoIOT-2539 Enable the -Werror build flag 11/22811/16
George Nash [Thu, 12 Oct 2017 23:08:53 +0000 (16:08 -0700)]
IOT-2539 Enable the -Werror build flag

The coding standard states:
Code must compile with no warnings. Without flags
forcing warnings off.

Its possible that using an untested version of gcc could
result in build warings that are not yet fixed. For this
reason the build option ERROR_ON_WARN was added to make
it possible to turn off the -Werror flag. This should
only be used locally an not changed on the CI build.

Due to some bugs in older version of gcc some warnings
are forced off when using an older version of gcc.

This change will force code to follow the coding
standard of building with no warnings.

The coapHttpParser code produces a build warning
that currently is not solved. When building the
coap_http_proxy library the -Werror build flag is

Don't use the -Werror build option for extlib yaml

Don't use the -Werror build option for coap library

Change-Id: Ifcc25ed7e5b8637ac4383a7bfa51ace105ed9458
Signed-off-by: George Nash <>
2 years ago[IOT-2830] add PSK callback logging 53/22953/6
Nathan Heldt-Sheller [Mon, 23 Oct 2017 06:48:32 +0000 (23:48 -0700)]
[IOT-2830] add PSK callback logging

See JIRA IOT-2830 for more information.

Change-Id: If043f6705ccdede4630b469c13e1933a2b53af16
Signed-off-by: Nathan Heldt-Sheller <>
2 years agoIOT-2455 Add missing files to javadoc 75/22975/3
George Nash [Mon, 23 Oct 2017 22:03:55 +0000 (15:03 -0700)]
IOT-2455 Add missing files to javadoc

Change-Id: I1415ec047ebc8ce4f2679b8789a104c627ec2db4
Signed-off-by: George Nash <>
2 years ago[IOT-2837] Enable IoTivity build on Raspbery pi 79/22979/2
Rami Alshafi [Mon, 23 Oct 2017 22:53:01 +0000 (15:53 -0700)]
[IOT-2837] Enable IoTivity build on Raspbery pi

The default arch for the raspberry pi board is either armv6l or
armv7l depending on board hardware version. Neither of them are
included in the valid values for the TARGET_ARCH build option.
The current workaround is to pass TARGET_ARCH=arm to the build
command. This change will enable the default arch.

Change-Id: I7f07734f5e06d79d13275254fb01f924227e229a
Signed-off-by: Rami Alshafi <>
2 years agoBuild and print fix 33/22033/17
Oleh Vasyliev [Tue, 10 Oct 2017 11:02:52 +0000 (07:02 -0400)]
Build and print fix

Change-Id: Ie7b0a00963b22ee1189918ed67ed64ae05f500cf
Signed-off-by: Oleh Vasyliev <>
2 years ago[IOT-2821] Fix /doxm Update handling 51/22951/7
Nathan Heldt-Sheller [Sun, 22 Oct 2017 23:27:25 +0000 (16:27 -0700)]
[IOT-2821] Fix /doxm Update handling

The Update handler is still doing things such as
self-updating /doxm.rowneruuid or /doxm.owned.  Also, the
logic for determining OTM start/stop is wrong.  This patch
cleans up the JustWorks flow as a template, and the same
fix will be applied to Random PIN and Cert-based once
verified and reviewed.

Change-Id: Ieb68911de87cf816597352aec760b3ef85baa87d
Signed-off-by: Nathan Heldt-Sheller <>
2 years ago[IOT-2835] reset /cred.rowneruuid 73/22973/2
Nathan Heldt-Sheller [Mon, 23 Oct 2017 15:54:19 +0000 (08:54 -0700)]
[IOT-2835] reset /cred.rowneruuid

The fix to /cred.rowneruuid (from many to one) means we have to reset the
single global rowneruuid also.

Change-Id: I309e5bfe9926290785d4943d2b9358fc06448a20
Signed-off-by: Nathan Heldt-Sheller <>
2 years ago[IOT-2827] Fix For OCProvisionACL Bug 29/22929/2
imtiaz.h [Fri, 20 Oct 2017 06:00:00 +0000 (12:00 +0600)]
[IOT-2827] Fix For OCProvisionACL Bug

1. for selectedDeviceInfo = NULL api returns OC_STACK_INVALID_PARAM

Change-Id: Idb316438a76d70fcc7a91a2e119aadd0c771bde7
Signed-off-by: imtiaz.h <>
2 years ago[IOT-2833]Sync java ESResult with C++ one. 65/22965/1 1.3.1-RC4
Harry [Mon, 23 Oct 2017 12:23:03 +0000 (17:53 +0530)]
[IOT-2833]Sync java ESResult with C++ one.

Java ESResult is not in sync with C++ SDK ESResult
enum values.

Change-Id: I0ab0e1ba88858fc8c511a56d046d40c1708760cd
Signed-off-by: Harry <>
2 years ago[IOT-2806] patch 22855 overwritten mistakenly 49/22949/3
Nathan Heldt-Sheller [Fri, 20 Oct 2017 23:54:15 +0000 (16:54 -0700)]
[IOT-2806] patch 22855 overwritten mistakenly

A recent patch over-wrote the fix to 2806 (patch 22855)
so this is just a re-creation of 22855.  However gerrit
can't figure out how to re-apply 22855, and I don't know how to
force it, so I'm just creating a new patch.

Change-Id: I5c4b67a3cdfa1f9a4368fc8f7b24203da1644524
Signed-off-by: Nathan Heldt-Sheller <>
2 years agoIOT-2539 clean unused-result warnings 23/22923/3
George Nash [Thu, 19 Oct 2017 20:35:05 +0000 (13:35 -0700)]
IOT-2539 clean unused-result warnings

the -Werror=unused-result is due to not checking the return
value when using scanf. This error is specific to certan
versions of the compiler and may not occure on all systems.

Change-Id: Ifcaa05f7f7df69da84bd3a514ad3f29a63955b02
Signed-off-by: George Nash <>
2 years agoSync CACloneResponseInfo with CAResponseResult_t. 81/22881/2
Todd Malsbary [Tue, 17 Oct 2017 21:21:50 +0000 (14:21 -0700)]
Sync CACloneResponseInfo with CAResponseResult_t.

Change-Id: I43631fe750b529b6e90dd625c160717c854a2100
Signed-off-by: Todd Malsbary <>
2 years agoresource: Enable OCRepresentationSubscript test 25/21825/11
Ziran Sun [Tue, 23 Aug 2016 15:05:50 +0000 (16:05 +0100)]
resource: Enable OCRepresentationSubscript test

Retest OCRepresentationSubscript.Boolean unit test.

Change-Id: Ibe291d4b0f6371235ba7397b186a87ef8939beab
Signed-off-by: Ziran Sun <>
Reviewed-by: Phil Coval <>
Tested-by: jenkins-iotivity <>
Reviewed-by: Ashok Babu Channa <>
(cherry picked from commit fa632fb35a6670da9ffd4cdfd1bc2da5592cd629)

2 years agoIOT-2539 Fix warnings in routing code 35/22935/2
George Nash [Fri, 20 Oct 2017 20:04:01 +0000 (13:04 -0700)]
IOT-2539 Fix warnings in routing code

Fixed -Werror=unused-const-variable= found in
routingtablemanager.c the USECS_PER_SEC was not
used anywhere and was removed.

Fixed -Werror=format= found in routingmanager.c
current time is a uint64 from inttypes.h
%llu is long long unsigned.

C99 spec suggests the type long long int should
be at least 64 bits but may be more.  On some
platfroms it might be 128-bits. In printf %lld
could be interpreted as 64-bits or 128-bits which
could result in undefined behavior.

The PRIu64 macro from inttypes will always be interpreted
as 64-bits by printf.

Change-Id: Iaf45d5a8382c4af8f3db973700db1d90b4472cc1
Signed-off-by: George Nash <>
2 years agoIOT-2539 clean unused-function in caleadapter.c 33/22933/1
George Nash [Fri, 20 Oct 2017 19:46:07 +0000 (12:46 -0700)]
IOT-2539 clean unused-function in caleadapter.c

The static functions:

Are all only called if both ROUTING_GATWAY and
SINGLE_THREAD are not defined. When the are not
called gcc will produce the -Werror=unused-function

Rather than spatering the macros all over the file
I moved all of the functions into a single block

The code in the functions are not modified.

Change-Id: Ic15e4e91028b87fb8d2680f2e64c724d1fae25cc
Signed-off-by: George Nash <>
2 years ago[IOT-2821] implicit access for DOXS, AMS and CMS 21/22921/4
Nathan Heldt-Sheller [Thu, 19 Oct 2017 20:23:07 +0000 (13:23 -0700)]
[IOT-2821] implicit access for DOXS, AMS and CMS

There are a few cases of missing implicit access that are
added by this patch:
1) DOXS has access to all SVRs
2) AMS and CMS have access to /pstat

Change-Id: I7eebc86c88b392dc2a6447c64f3a216afee70b19
Signed-off-by: Nathan Heldt-Sheller <>
2 years agoRelocate rd-mode-dependent functions in .def files 05/21505/8
Gabriel Schulhof [Tue, 11 Jul 2017 20:52:25 +0000 (23:52 +0300)]
Relocate rd-mode-dependent functions in .def files

OCBindResourceInsToResource and OCGetResourceIns are only defined if
RD_MODE is either "client" or "server", but not if it is "none". Thus,
octbstack_product.def must not include those functions.

Change-Id: I88bbf033006e82d1655d39d7f3127a1e40a1d4e7
Signed-off-by: Gabriel Schulhof <>
Reviewed-by: Alex Kelley <>
Tested-by: jenkins-iotivity <>
Reviewed-by: Dan Mihai <>
(cherry picked from commit f4fb7430a9b9a6601b80634d96b8a08fed42802b)