Peter Rafaj [Fri, 7 Sep 2018 12:06:33 +0000 (14:06 +0200)]
IOT-3214 rd mongo query optimalisation - reverify
Change-Id: I5f30ae3625463bf3bc6760c80447b481e6f1d4e2
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej [Wed, 5 Sep 2018 08:39:53 +0000 (10:39 +0200)]
IOT-3213 Handle reset code properly
Change-Id: I728588ab5852da4cefa7a8a5b565875522d6ccc4
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej [Mon, 3 Sep 2018 11:31:24 +0000 (13:31 +0200)]
IOT-3211 healthcheck for components
Change-Id: I07a0f2e0d68d77a2cb0603ccc708d8e2b59a373c
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej [Wed, 5 Sep 2018 08:34:53 +0000 (10:34 +0200)]
IOT-3210 fix exception in keep alive
periodic task
Change-Id: I4a2799fbfb7bdf7d741fef0aaaaea20ce0552377
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Rap [Fri, 13 Jul 2018 13:34:50 +0000 (15:34 +0200)]
IOT-3210 filter inactive channel
Change-Id: Ib251b691164b41e614a527d8857362268a9639ab
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Rap [Tue, 10 Jul 2018 07:17:21 +0000 (09:17 +0200)]
IOT-3164
Change-Id: Iaa850c1f8ad7eb824bdd62ed623b0717c797d60f
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Rap [Mon, 21 May 2018 10:02:50 +0000 (12:02 +0200)]
iotivity docker build via maven
Change-Id: I1a4884d673da29db40042524d49e390ebfc97f00
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Rap [Fri, 27 Apr 2018 12:06:33 +0000 (14:06 +0200)]
observe state of full presence table
Change-Id: I17386998c025115f015a1b92e4e27f19bdf65f8c
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Tue, 10 Apr 2018 08:06:57 +0000 (10:06 +0200)]
Add ability to change HTTP proxy port
Change-Id: I249eaeb4102e397bd872a9093a9947912fc2815d
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Rap [Tue, 3 Apr 2018 12:04:46 +0000 (14:04 +0200)]
IOT-3161 reverify2
Change-Id: I452e82f134341f247a296534f1d4f4c7e1d0d51e
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Fri, 23 Feb 2018 06:01:26 +0000 (07:01 +0100)]
IOT-3160
Change-Id: Ie9da1b7ea7ac70dcca094eba45cc51a59779eb34
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Mon, 26 Mar 2018 09:11:25 +0000 (11:11 +0200)]
IOT-3159
Change-Id: Idc5979942cbd7e2cba56c5bb07cdcfd6cddf069b
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Tue, 13 Feb 2018 08:34:09 +0000 (09:34 +0100)]
IOT-3158 reverify
Change-Id: I030da7132be1d2a13d999b21b4cb0a51108f23e2
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Tue, 20 Feb 2018 16:30:28 +0000 (17:30 +0100)]
IOT-3143
Change-Id: I14790c66e51b3f7ef955085a91db525d6107460b
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Rap [Tue, 30 Jan 2018 09:44:08 +0000 (10:44 +0100)]
IOT-3142 reverify4
Change-Id: Icc4cbb5795051c910f866983fed554d9f46311d5
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Mon, 29 Jan 2018 09:12:35 +0000 (10:12 +0100)]
Refactor logging to use slf4j
Change-Id: I46abd4650fbca5d9d6f0f2b5278ce14d850e2549
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Ondrej Tomcik [Wed, 10 Jan 2018 09:13:29 +0000 (10:13 +0100)]
Fix concurrent problem during observation
Change-Id: I4a26ba76d27ef8a0f6d4e9b23027acd670649b7e
Signed-off-by: Peter Rafaj <peter.rafaj@kistler.com>
Mats Wichmann [Thu, 5 Jul 2018 13:34:38 +0000 (07:34 -0600)]
Import less of environment for Android/gradle
[In development pending answers to some of the below]
As noted in IOT-2559, the Gradle builder fails unless some of the
environment is passed. Since we didn't know what it needed, the whole env
was passed. This change trims that down to just two environment variables,
JAVA_HOME and ANDROID_HOME, which seems to be sufficient (but see
question following).
This change was only for the top-level java/SConscript, and works for
files which Import('jdk_env'). Note the script under service/ do not do
that import, and set up their own environment using these steps:
os.environ['ANDROID_HOME'] = env.get('ANDROID_HOME')
os.environ['ANDROID_NDK_HOME'] = env.get('ANDROID_NDK')
...
jdk_env = Environment(ENV=os.environ)
So this leaves two questions: should ANDROID_NDK_HOME also be set in the
main java SConscript (android case)? should these scripts in service/
be modified in a similar way to to also set less env?
That list of scripts is:
service/easy-setup/mediator/richsdk/android/SConscript
service/easy-setup/sampleapp/mediator/android/SConscript
service/notification/android/SConscript
service/notification/examples/android/NotiConsumerExample/SConscript
service/notification/examples/android/NotiProviderExample/SConscript
service/resource-container/android/SConscript
service/resource-encapsulation/android/SConscript
Another question not directly part of this patch but noticed while looking
at it: in java/SConscript the Gradle builder is defined, then redefined
using a different syntax. The first is for building library/API code,
the second for examples. Since other scripts import the environment
which defines this builder, that doesn't seem like a really great idea
although it works as things are currently structures. Wouldn't it
be better to define two distinct builders?
Bug: https://jira.iotivity.org/browse/IOT-2559
Change-Id: Ib7bafb1ef2b24491718020e497ddeabcc87b44b2
Signed-off-by: Mats Wichmann <mats@linux.com>
Nathan Heldt-Sheller [Sun, 15 Jul 2018 17:52:45 +0000 (17:52 +0000)]
Merge "Merge branch '1.4-rel' (
2116f2d)"
Mats Wichmann [Thu, 5 Jul 2018 12:44:39 +0000 (06:44 -0600)]
Fix SCons double target in cloud
The cloud scsonscript was called twice, once in normal flow
and once from the example dir. This led to complaints that
targets were multiply defined. The call from the example
dir is not needed, since the scons run is just one big
collection anyway, so removed.
Change-Id: Iefd57680a8921dedac741ef73c8d67cf0caa3876
Signed-off-by: Mats Wichmann <mats@linux.com>
Mats Wichmann [Sat, 30 Jun 2018 23:41:33 +0000 (17:41 -0600)]
[IOT-2234] Fix libcoap configure for Windows UWP
The libcoap sconscript has a special case for Windows UWP because it
did not configure right. The problem is the list of libraries set by the
Windows build_common script is cleared before running the configure test,
and that is not the right answer for UWP, which needs one particular
library in order to access the standard Windows library functions.
Rather than building the exact knowledge into this script, the required
list is saved in the Windows build script, and retrieved here for use
for the UWP platform.
Bugs: https://jira.iotivity.org/browse/IOT-2234
Change-Id: I70016d81c5d51c7454b1794280e12f5574a5fd41
Signed-off-by: Mats Wichmann <mats@linux.com>
Philippe Coval [Mon, 9 Jul 2018 15:59:43 +0000 (17:59 +0200)]
Merge branch '1.4-rel' (
2116f2d)
Relate-to:
I2c9e39600e4d336b5a01dacf50aef8d79caac1e0
I560830d62bad76447bf1c4acaf004cc779fbcdfb
If23e5c258e61298e6b10996402b0961b2ebcd672
Change-Id: I2116f2d2d86ef45f7d5eca8074279c7c935c6b0d
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Philippe Coval [Thu, 14 Jun 2018 00:39:04 +0000 (02:39 +0200)]
tinycbor: Remove .git after prepared for tizen
Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I2d7c4cba8408c97f2c8eb959fb3c69473e9f117a
Origin: https://gerrit.iotivity.org/gerrit/#/c/26075/
Signed-off-by: Philippe Coval <p.coval@samsung.com>
Mats Wichmann [Fri, 6 Jul 2018 13:27:51 +0000 (07:27 -0600)]
Fix and clean up libcoap build
Most signficant change: when upstream libcoap is used (always true for
Windows), do "git checkout" even if the desired tag is already in the
repo, this should fix the case where the checkout is not up to date but
the repo is, so no checkout is done.
Minor changes:
* The forked-coap case is moved to the top of if clauses for readability
(before there might have been dozens of lines, then else: followed by
two lines)
* A bug where PREFIX rather than LIBPREFIX was fetched from the
construction environment is fixed.
* One of the config file names was simplified a bit.
* The Glob call to determine source files to build is now wrapped in a
try block, the current Tizen SCons is so old it does not support the
"exclude" attribute.
* A check for the Tizen case ("don't use git commands in sconscript")
is added.
* Comment updates
Change-Id: Icec0d1a9c5cbf20f0adbc32745486333766234e7
Signed-off-by: Mats Wichmann <mats@linux.com>
Philippe Coval [Fri, 24 Nov 2017 22:08:00 +0000 (23:08 +0100)]
build: Remove RPATH on install using chrpath
Note to system admin please install the package on infrastructure
This is useful for ARTIK7 support on fedora-24
Bug: https://jira.iotivity.org/browse/IOT-524
Change-Id: I8e046da345b18e5731939c9cb5e5832fa33786b6
Origin: https://gerrit.iotivity.org/gerrit/#/c/23449/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Oleksandr Andrieiev [Mon, 25 Jun 2018 12:15:45 +0000 (15:15 +0300)]
[CR2392] Security Profile Purple
Updated cred entries check condition, because Purple
profile currently requires mfg cert to be used. Updated
tests and sample application to recognize the profile.
Bug: https://jira.iotivity.org/browse/IOT-3104
Change-Id: I02cb12592c112783d48fd4d5c09b91ec96af5d72
Signed-off-by: Oleksandr Andrieiev <o.andrieiev@samsung.com>
Oleksandr Andrieiev [Tue, 26 Jun 2018 12:25:44 +0000 (15:25 +0300)]
[IOT-3106] Memory leak when converting PEM to DER
Bug: https://jira.iotivity.org/browse/IOT-3106
Change-Id: I560830d62bad76447bf1c4acaf004cc779fbcdfb
Signed-off-by: Oleksandr Andrieiev <o.andrieiev@samsung.com>
Nathan Heldt-Sheller [Thu, 28 Jun 2018 16:54:57 +0000 (09:54 -0700)]
Update IoTivity version in octypes.h
At OSWG meeting we agreed to change version 1.4 to 2.0. I won't
rename the branch but I'm going to change the final tag name to
2.0.0 instead of 1.4.0, and I'm going to change the version
reported by IoTivity itself (this patch).
Change-Id: If23e5c258e61298e6b10996402b0961b2ebcd672
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Mats Wichmann [Thu, 28 Jun 2018 13:18:35 +0000 (13:18 +0000)]
Merge "Merge branch '1.4-rel' (
ca39b98)"
Philippe Coval [Thu, 14 Jun 2018 07:21:37 +0000 (09:21 +0200)]
mbedtls: remove .git after prepared for tizen
Change-Id: Ifff1cb0c043d3ea089bfef5e1568c57edfa86c89
Origin: https://gerrit.iotivity.org/gerrit/#/c/25835/
Signed-off-by: Philippe Coval <p.coval@samsung.com>
Philippe Coval [Tue, 26 Jun 2018 14:03:59 +0000 (16:03 +0200)]
Merge branch '1.4-rel' (
ca39b98)
Relate-to:
I98182500474f82e9c83a0419f8ddc8e9f0ee1579
I7be3da0c09b41516d57c02cef98a6815dd1950bb
If26baa6a2e994184cc829919fb1a5f0303d78f31
I331ef9ed19d128ff975d150f6c0058eff64b59ff
I547f9936d09d4fcfb0a6d84b075bd30252852d6e
If6a51416f90be533ebdd70096781c3d094512752
Id52c8acaf5a76e727bedf28288c08472255a988a
Change-Id: Ica39b98ef89daa030ceb4794c08cc137cd980ac0
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Ondrej Tomcik [Wed, 30 May 2018 05:55:04 +0000 (07:55 +0200)]
Extend cloud components configuration - reverify
Change-Id: Icc70ed42fb622e5f133aa0874427489ddcf05c2b
Signed-off-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
Ondrej Tomcik [Tue, 24 Apr 2018 12:01:21 +0000 (14:01 +0200)]
Introduce master pom for cloud project
Change-Id: Ic59d6045e74767f1caf5160afccdfe0f6a654124
Signed-off-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
koushik.girijala [Mon, 14 May 2018 10:12:03 +0000 (15:42 +0530)]
[IOT-3044]Adding token to empty signaling message
Support for adding token to empty signaling message
Draft changes in coap and IoTivity
Change-Id: I7be3da0c09b41516d57c02cef98a6815dd1950bb
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Vitalii Irkha [Thu, 21 Jun 2018 10:58:29 +0000 (13:58 +0300)]
[IOT-3094] Cloud deregister does not work properly
Refactoring SignOut Cloud API
Change-Id: If26baa6a2e994184cc829919fb1a5f0303d78f31
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Mats Wichmann [Sun, 24 Jun 2018 14:09:20 +0000 (08:09 -0600)]
Update upstream-libcoap to IoTivity-1.4 tag
New coap code is needed so update the tag to look for. Fixes the
failed Windows CI builds in https://gerrit.iotivity.org/gerrit/#/c/25491/
Other changes:
* The SConscript adds the WITH_WS definition to the build
* Quiet the windows warning on size mismatches (W4267)
- Note these two indicate problems introduced by iotivity patches to
the dthaler libcoap fork, and the problems themselves should be fixed
(WITH_WS is correct, but the logic in the case statement is not, so the
absence of the flag caused build failures which are now covered up -
this one is IOT-3103)
* libcoap script checked tag in last line of commit log, that's fragile,
so changed to use git log instead.
* The standard check for the alternate way the code may be populated
is added. This is used for Tizen builds.
* A little restructuring for readability (message strings defined away
from the code so we can read the code), and the "git checkout" is now
actually error-checked.
Bug: https://jira.iotivity.org/browse/IOT-3044
Change-Id: I331ef9ed19d128ff975d150f6c0058eff64b59ff
Signed-off-by: Mats Wichmann <mats@linux.com>
Nathan Heldt-Sheller [Wed, 20 Jun 2018 16:22:01 +0000 (09:22 -0700)]
[IOT-3097] change sct from 1 back to 9
Since CTT Devs are using oic_svr_db_server_justworks.json/.dat for testing,
and they depend on sct 9, it doesn't hurt to use sct 9 (even though this
particular example is to demonstrate justworks). Changing to prevent CTT
Devs from having to workaround.
Change-Id: I547f9936d09d4fcfb0a6d84b075bd30252852d6e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
koushik.girijala [Fri, 25 May 2018 10:12:34 +0000 (15:42 +0530)]
[IOT-3075] Aborting TCP connect operation
Aborting TCP connect operation during IP disconnect and Adapter stop
Change-Id: If6a51416f90be533ebdd70096781c3d094512752
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Nathan Heldt-Sheller [Sun, 17 Jun 2018 02:27:37 +0000 (19:27 -0700)]
[IOT-3090] disable /sp Resource
/sp Resource must be temporarily disabled until CTT is updated to recognize
it (~Bangkok point release) else it causes CTT failures.
Change-Id: Id52c8acaf5a76e727bedf28288c08472255a988a
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Philippe Coval [Mon, 18 Jun 2018 09:11:49 +0000 (11:11 +0200)]
Merge branch '1.4-rel' (
0bba2f8)
Relate-to:
I2704ed9c7c6fa3b234f49b50ff7cdd53f2d1f737
I69ca3d5a0fe59626b545047530b68fd0cfdd27ad
I20333c980226dc6a0c257dc36aab1502202993d9
Ibd33bf931322a58e3efac1ccfebd5ea5cb6a1330
I95ea9ae239336c7b602d55569d2c2f9b5b2976d3
I85e0b6a1585eac4d0f90154c261103ce58343fd7
Change-Id: I0bba2f80fe940271fe32e4c34dd4f54deb0f2dc6
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
koushik.girijala [Fri, 25 May 2018 10:12:34 +0000 (15:42 +0530)]
[IOT-3075] Aborting TCP connect operation
Aborting TCP connect operation during IP disconnect and Adapter stop
Change-Id: If6a51416f90be533ebdd70096781c3d094512752
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
sungmok.shin [Mon, 15 Jan 2018 09:52:29 +0000 (18:52 +0900)]
Add 'webos' into the target OS list
- TARGET_OS "webos" is added
- IP adapter for network monitoring is implemented
- Introduce PmLog for IoTivity over webos
- Provisioning library is included
- Crash with iotivity-node application is fixed
- Build error due to RD_MODE=all is fixed
- ACG (Access Control Group) configuration file for
sample application is added
- Procedure for registering/Unregistering luna service
is implemented
- Internal function for getting LSHandle is implemented
- ocserverbasicops & occlientbasicops for webos
is implemented (built from separate folder)
- IoTivity sampler(iotivity-node) for webOS is implemented
- Set native application path to /usr/palm/services
Bug: https://jira.iotivity.org/browse/IOT-2967
Change-Id: I3f4f143e7f528e873e5758410e226d98b2679151
Signed-off-by: sungmok.shin <sungmok.shin@lge.com>
Biman Paul [Fri, 8 Jun 2018 10:25:03 +0000 (15:55 +0530)]
[IOT-3083] IUT crash while batch update by href
IUT crash occured while executing CTT Server Testcase 1.2.13
Batch update by href. Double free occured for server request
handle. Once in HandleSingleResponse() and another in
HandleAggregateResponse().
6 0x00007ffff705f452 in OICFree (ptr=0x7fffd400d6f0)
at resource/c_common/oic_malloc/src/oic_malloc.c:150
7 0x00007ffff729da8e in DeleteServerRequest (serverRequest=0x7fffd40008c0)
at resource/csdk/stack/src/ocserverrequest.c:412
8 0x00007ffff729eaf1 in HandleAggregateResponse (ehResponse=0x7fffe8dcc450)
at resource/csdk/stack/src/ocserverrequest.c:892
Change-Id: I69ca3d5a0fe59626b545047530b68fd0cfdd27ad
Signed-off-by: Biman Paul <biman.paul@samsung.com>
Biman Paul [Fri, 8 Jun 2018 10:25:03 +0000 (15:55 +0530)]
[IOT-3083] IUT crash while batch update by href
IUT crash occured while executing CTT Server Testcase 1.2.13
Batch update by href. Double free occured for server request
handle. Once in HandleSingleResponse() and another in
HandleAggregateResponse().
6 0x00007ffff705f452 in OICFree (ptr=0x7fffd400d6f0)
at resource/c_common/oic_malloc/src/oic_malloc.c:150
7 0x00007ffff729da8e in DeleteServerRequest (serverRequest=0x7fffd40008c0)
at resource/csdk/stack/src/ocserverrequest.c:412
8 0x00007ffff729eaf1 in HandleAggregateResponse (ehResponse=0x7fffe8dcc450)
at resource/csdk/stack/src/ocserverrequest.c:892
Change-Id: I69ca3d5a0fe59626b545047530b68fd0cfdd27ad
Signed-off-by: Biman Paul <biman.paul@samsung.com>
Oleksandr Andrieiev [Fri, 8 Jun 2018 13:54:23 +0000 (16:54 +0300)]
[CR2390] Identity spoofing/privelege escalation
For secure connections that use certificates the SubjectUUID
is retrieved from leaf certificate's CN. However, there is
no binding mechanism between Root CA and Device Id that it
can generate certificates for. Root CAs can issue certificates
with arbitrary UUIDs, which can be used to impersonate another
Device.
The fix adds callback to the certificate chain validation
function. This callback collects single-linked list of all
UUIDs associated with the certificate in cred entries.
When leaf certificate is reached, UUID of Device is retrieved
and matched against static list. If no matching UUID is
found, connection should be rejected.
Bug: https://jira.iotivity.org/browse/IOT-3087
Change-Id: I20333c980226dc6a0c257dc36aab1502202993d9
Signed-off-by: Oleksandr Andrieiev <o.andrieiev@samsung.com>
Sanjay Kumar [Fri, 23 Mar 2018 08:59:55 +0000 (14:29 +0530)]
Fix:Added default target_os for tizen
Change-Id: I9599855e1e88d0c4af95d822373ddf4352ec1265
Signed-off-by: Sanjay Kumar <sanjay@graniteriverlabs.in>
Mats Wichmann [Tue, 12 Jun 2018 14:25:04 +0000 (08:25 -0600)]
Update java/scons version check
Java 9/10 still not supported in scons 3, but at least
print more updated information.
Change-Id: Ic4948540fa0a9aaa7ef0c98b4a3774d8ea557972
Signed-off-by: Mats Wichmann <mats@linux.com>
Ricky He [Mon, 4 Sep 2017 08:26:42 +0000 (01:26 -0700)]
Fix PATH not append to env on windows.
Change-Id: I26688494a209cbc320fbb79eb18a957ec3ce8999
Signed-off-by: Ricky He <timemanager.rick@gmail.com>
Mats Wichmann [Thu, 7 Jun 2018 15:00:15 +0000 (09:00 -0600)]
Fix rapidjson build for gcc8 another way
Uplifiting rapidjson version apparently not sufficient,
so do a temporary fix to disable Werror.
Also changed link to point to official github location.
Change-Id: I762636f3185c3d75b28aad237da69ba9cf0c6884
Signed-off-by: Mats Wichmann <mats@linux.com>
George Nash [Fri, 25 May 2018 22:02:33 +0000 (15:02 -0700)]
fix compilation failure on VS2017
In the latest build of Visual Studio 2017 will
produce a build waring when encountering any code
in the str::tr1 namespace. The warning is produced
when headers from the external googletest framework
are included in the build.
Adding the _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
macro will cause the build to ignore the build warning.
The googletest project is aware of the issue. See the
actual commit for a link to the ticket for the google
test project.
Change-Id: I9be616498df95b8dd9aa165717bd178c53f3221b
Signed-off-by: George Nash <george.nash@intel.com>
Vitalii Irkha [Wed, 23 May 2018 08:24:59 +0000 (11:24 +0300)]
[IOT-3022] Build CNC as standalone lib
SConscript for cloud build
Cloud Reset is also was added
Change-Id: Ibd33bf931322a58e3efac1ccfebd5ea5cb6a1330
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
George Nash [Wed, 2 May 2018 18:45:10 +0000 (11:45 -0700)]
update NSAcceptedProviders copy/assign operators
This addresses an iterator missmatch error that is reported by
static analysis tool. This changes the code to use the built in
map assignment operator as well as grab locks before copying the
map to prevent the map being modified while the copy is
occuring.
Bug: https://jira.iotivity.org/browse/IOT-1742
Change-Id: Id7d8eeed91d587db7d2b0f8ca6a8d5b3d98f90fe
Signed-off-by: George Nash <george.nash@intel.com>
Mats Wichmann [Sat, 19 May 2018 14:25:47 +0000 (08:25 -0600)]
Fix double free in bridging curl client
A recent change added a destructor for _MemoryChunk, to
fix a problem where something was not being freed.
However, this left another location freeing memory
twice - once explicitly, once when the destructor runs.
Change-Id: Ie10829334238a359e38c55df789d3e69425f67b3
Signed-off-by: Mats Wichmann <mats@linux.com>
Inho Oh [Fri, 1 Dec 2017 07:06:06 +0000 (16:06 +0900)]
Fix memory leak
This patch fix critical memory leak. When I run CTT with CT1.2.3 test
case, memory is increased every time.
Change-Id: Idee5e3ed9b043a21d55ba5dc752c537156d99d8e
Signed-off-by: Inho Oh <webispy@gmail.com>
Vitalii Irkha [Wed, 6 Jun 2018 16:43:51 +0000 (19:43 +0300)]
[IOT-3022] Fix ResetClouds() api
Fixed minor issues
Change-Id: I95ea9ae239336c7b602d55569d2c2f9b5b2976d3
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
George Nash [Wed, 23 May 2018 18:16:11 +0000 (11:16 -0700)]
Generate introspection data for coaps+tcp endpoint
Bug: https://jira.iotivity.org/browse/IOT-3056
Change-Id: I85e0b6a1585eac4d0f90154c261103ce58343fd7
Signed-off-by: George Nash <george.nash@intel.com>
Phil Coval [Mon, 4 Jun 2018 08:08:57 +0000 (08:08 +0000)]
Merge "Merge branch '1.4-rel' (
01fd9ec)"
Larry Sachs [Mon, 21 May 2018 21:24:26 +0000 (14:24 -0700)]
[IOT-3012] Update JniOcProvisioning API usage
Use of deprecated functions in JniOcProvisioning.cpp has been updated
to use their replacements.
Java example ProvisioningClient.java has also been updated.
Change-Id: Ie46dccffc714b47109100dbd8c70aa3598d94190
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Philippe Coval [Thu, 31 May 2018 08:22:26 +0000 (10:22 +0200)]
Merge branch '1.4-rel' (
01fd9ec)
Relate-to:
I25836d20803e82764b8f9dbc30ddfde80810518f
I40a9b3c3f89894e92c75c798e918f1713e9e6740
I44bd904f13cdd7b44e34e47a69ce403248e550b9
Idbe257c1baa90a7cabce6fe6113ab09fb5644eab
I1cfad27fcfd5cf3a42510412e6555b84ea905259
Change-Id: I01fd9ecd719dbb68b74712b058a50d768f90624d
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Aleksey Volkov [Fri, 11 May 2018 10:01:07 +0000 (13:01 +0300)]
[IOT-3022] Add cloud reset api
Change-Id: I40a9b3c3f89894e92c75c798e918f1713e9e6740
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Aleksey Volkov [Wed, 23 May 2018 14:04:41 +0000 (17:04 +0300)]
[IOT-3022] Session delete fix
Do not delete session in case if token refresh thread stops
Change-Id: I44bd904f13cdd7b44e34e47a69ce403248e550b9
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Mats Wichmann [Wed, 4 Apr 2018 13:56:13 +0000 (07:56 -0600)]
Add SECURED flag to SimpleClientServer build
The code in this sample contains #ifdef SECURED,
but the flag is not set during building even if
SECURED mode is selected.
Change-Id: Ied64c34db0437736aaaac4c88d0b53037639a34a
Signed-off-by: Mats Wichmann <mats@linux.com>
Koushik Girijala [Mon, 26 Mar 2018 12:53:15 +0000 (18:23 +0530)]
Add csdk API to send COAP ping messages over TCP
Add csdk API in ocstack to send COAP ping messages
over tcp.
Change-Id: Idbe257c1baa90a7cabce6fe6113ab09fb5644eab
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: koushik girijala <g.koushik@samsung.com>
(cherry picked from commit
bfbac92c38ba2ae9280ff8694e0862610423b43f)
Phil Coval [Fri, 25 May 2018 19:35:38 +0000 (19:35 +0000)]
Merge "Merge branch '1.4-rel'"
Mats Wichmann [Fri, 25 May 2018 13:16:34 +0000 (07:16 -0600)]
Merge branch '1.4-rel'
Includes:
e6f2764e1 Cloud resource fix
b08cb060d tizen: Only support IP transport by default
718227d3f [IOT-3022] Code style and fix minor issues.
456bc2189 [IOT-3047] Request to csr creates a new credential
e8671983e [IOT-3022] CNC fixes for CTT
9204d7826 [IOT-3022] cloud fix #2
dbf736917 mbedtls: Install Static libs
b6744aca4 tinycbor: Update to v0.5.1
ee6a853cb Merge branch '1.3-rel' into 1.4-rel
Change-Id: I832157c55f2ea18654a021d2579a461c48a5220e
Signed-off-by: Mats Wichmann <mats@linux.com>
Jeonghwan Kim [Thu, 24 May 2018 01:09:49 +0000 (10:09 +0900)]
IOT-3079 Fix change port number issue
When using provisioning tool, this code change to target dev's port number.
reproduction case is below in provisioning tol.
1. Discovery All devices or unowned devices.
2. do Ownership transfers.
3. hard reset device.
4. Discovery All devices
5. Do Ownership transfer.
it happens to error in provisioning tool because of changing to target's port number
Conflicts:
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
Change-Id: Ie5bcc1be58bc11609dd3bcc0b674d64202ed4573
Signed-off-by: Jeonghwan Kim <addy.kim@lge.com>
Mats Wichmann [Thu, 24 May 2018 13:19:02 +0000 (07:19 -0600)]
Removing arduino files that came back in merge
A merge commit unintentionally brought back previously deleted arduino
sample code. Removing again.
Change-Id: I77284bea5ba0bec2c0ee8e065a831727d624b742
Signed-off-by: Mats Wichmann <mats@linux.com>
Veeraj Khokale [Thu, 5 Apr 2018 09:35:54 +0000 (15:05 +0530)]
[IOT-3044] No response for Ping message
TCP adapter disconnects the session whenever
the data to be sent has an empty payload.
Since ping messages and signaling messages
need to have an empty payload they are dropped.
Fix this by checking if the message is a signaling
message before dropping it.
Change-Id: I1cfad27fcfd5cf3a42510412e6555b84ea905259
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
(cherry picked from commit
c7dce6b522604e2c6b99847c88a00f7da275c08d)
Philippe Coval [Tue, 24 Apr 2018 13:57:57 +0000 (15:57 +0200)]
tizen: Only support IP transport by default
It looks like BLE support has been dropped,
while some bits are remaining, check for:
CA_BLE_NORMAL_SEGMENT_PAYLOAD_SIZE
Bug: https://jira.iotivity.org/browse/IOT-2030
Change-Id: Idb99ebfbd721c6abb5ce6cfcf2c381ece195ffc8
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
b08cb060de3421b9277c097c18d369c3eb682248)
koushik.girijala [Fri, 18 May 2018 05:16:34 +0000 (10:46 +0530)]
Cloud resource fix
fixed resource uri for issue [IOT- 3069]
removed unsecure enpoints from cloud payload [IOT-3071]
adding oic.if.rw interface to cloud resource [IOT-3070]
Change-Id: I719d54bd846f77a5cf2905ccc130ab0434005491
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Philippe Coval [Fri, 24 Nov 2017 17:31:47 +0000 (18:31 +0100)]
tizen: Add dockerfile to rebuild package
Usage:
docker build -f tools/tizen/Dockerfile .
Reference:
docker 17.12.1-ce
gbs 0.25.2
Bug: https://jira.iotivity.org/browse/IOT-524
Change-Id: I5feec4f3b0e70831c6069e78473e1374b45aeadf
Forwarded: https://gerrit.iotivity.org/gerrit/#/c/23451/
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/on/master/fedora
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Philippe Coval [Tue, 24 Apr 2018 13:57:57 +0000 (15:57 +0200)]
tizen: Only support IP transport by default
It looks like BLE support has been dropped,
while some bits are remaining, check for:
CA_BLE_NORMAL_SEGMENT_PAYLOAD_SIZE
Bug: https://jira.iotivity.org/browse/IOT-2030
Change-Id: Idb99ebfbd721c6abb5ce6cfcf2c381ece195ffc8
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Mats Wichmann [Wed, 16 May 2018 16:32:27 +0000 (10:32 -0600)]
Fix recently introduced python2-ism
print statement needs to be a function
Change-Id: Iaa163903749e64156a2cbbb9a97f4dd1da9ff901
Signed-off-by: Mats Wichmann <mats@linux.com>
Mats Wichmann [Sun, 25 Mar 2018 18:07:27 +0000 (12:07 -0600)]
Documentation improvements to layout and grouping
All four doxyfiles are updated to current template
(newer doxygen version) by running doxygen -u
iotivity logo is added, doxyfiles point to it
C SDK adds individual listings for (some) libraries
xml template for C SDK displays library page
doxygen thinks these are "modules", but mostly ok
xml template also displays "pages", which causes a
a list of deprecated elements to be displayed
Some headers are marked up for their inclusion
in libraries (work in progress). Libraries are
"defined" in guides/Home.txt, so far with only
minimal definitions - need improving.
An iotivity-specific css file is added, so far
includes markup for two new elements (aliases)
Two aliases are defined, @experimental prints a section
indicating the feature is experimental; @sideeffect
takes one argument and prints a section with that
argument as the body. Intended as a way to be able
to note e.g. if a function causes allocations that need to
be tracked - there are no current users of this alias.
Some minor doc cleanup is included.
Cloud auth.h emits errors on processing, those were
fixed, some doc wording added, and the prototype
for CloudStart was removed as there is no implementation.
Change-Id: I8a434bb3cb51523129ec8e478ac45ac196cf41b5
Signed-off-by: Mats Wichmann <mats@linux.com>
Vitalii Irkha [Tue, 15 May 2018 15:09:02 +0000 (18:09 +0300)]
[IOT-3022] Code style and fix minor issues.
Fixed some negligible issues.
Change-Id: If6ef5b77514a2b4cccea90e609da340c75083ac6
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Larry Sachs [Wed, 16 May 2018 20:56:06 +0000 (13:56 -0700)]
[IOT-3011] Deprecate PlatformConfig to match C++
In OCApi.h constructors for PlatformConfig that take ipAddress and port
as parameters have been deprecated. These deprecated constructors are
now similarly removed from the JNI code and deprecated in the Java code.
Non-deprecated constructors are now available.
Sample code has been changed to use the new constructors.
Change-Id: I3daa9c4eac0480c8fd8d3be7a5d0a80dada8c902
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Vitalii Irkha [Thu, 26 Apr 2018 16:15:39 +0000 (19:15 +0300)]
[IOT-3047] Request to csr creates a new credential
Request to /oic/sec/csr creates itself a new credential
Get PrimarySertKey for appropriated Primary Certificate.
Change-Id: Ie09a186fb03c3cc0006a583fc6ea03c5aa739790
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Mats Wichmann [Tue, 15 May 2018 14:37:38 +0000 (08:37 -0600)]
Uplift rapidjson version to follow upstream
This is one of a series of patches to accomodate building
with gcc8. rapidjson fails to build (line broken to quiet
gerrit line-length complaint)
extlibs/rapidjson/rapidjson/include/rapidjson/document.h:1635:24:
error: 'void* memcpy(void*, const void*, size_t)'
writing to an object of type
'class rapidjson::GenericValue<rapidjson::UTF8<> >'
with no trivial copy-assignment; use copy-assignment or
copy-initialization instead [-Werror=class-memaccess]
std::memcpy(data_.a.elements, values, count * sizeof(GenericValue));
~~~~~~~~~~~^~~~~~~~~~~
Fortunately, the current upstream version builds fine.
Change-Id: Ib64fd73bb4d16487db951823adcfcca7f57e435c
Signed-off-by: Mats Wichmann <mats@linux.com>
Aleksey Volkov [Tue, 24 Apr 2018 13:03:13 +0000 (16:03 +0300)]
[IOT-3022] CNC fixes for CTT
- fixed clec
- disable multiple cloud support
- add more logging
- fix apn & redirectUri errors
- freeCloud fix
- cloud refresh fix
Change-Id: I7898e2c704320a84d441ffc4a3dae6de03eb8a7e
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Aleksey Volkov [Tue, 24 Apr 2018 12:59:54 +0000 (15:59 +0300)]
[IOT-3022] cloud fix #2
a) sample server justwork: added key press check
b) fixed apn check
c) signout in delete cloudconfig
d) delete cloud
e) use redirect uri
f) update cloud if not working
g) token refresh timeout
Change-Id: Iefe5e0d0c37359a5699f021364a0aa82e8799f68
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>
Pawel Winogrodzki [Sat, 8 Jul 2017 00:28:37 +0000 (17:28 -0700)]
notification: Enable SECURED build of unit tests.
The notification consumer and provider tests didn't include
the "SECURED" macros for builds with security turned on, even
though it seems clear from the code, that it expected that macro
to be present in some cases.
Bug: https://jira.iotivity.org/browse/IOT-1583
Change-Id: I1166a60c2ad821a7d6002e22a8c9e8bda7321800
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21329
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
e3968b9a84ac1e577feac2924980a0ffc6846f21)
Rami Alshafi [Fri, 15 Sep 2017 18:12:05 +0000 (11:12 -0700)]
Added OCF secure apps in examples/OCFSecure
Added OCF secure server sample application in C++.
Added OCF secure client sample application in C.
Added supporting json and dat files putting the applications in RFNOP state.
Added README file descriping how to use the sample applications.
Added utilities file containing utility functions used by the server
and client applications.
Added SConscript to build the secure samples and modified the SConscipt in
the root directory to include the new SConscript.
Change-Id: I9e1cd4647b55b3e95d1455d7939f13bf3451fd1b
Signed-off-by: Rami Alshafi <ralshafi@vprime.com>
(cherry picked from commit
3974e003fb14a6269ab93d3c2c865e7cb65ce11a)
Philippe Coval [Tue, 4 Oct 2016 08:37:48 +0000 (10:37 +0200)]
tizen: Enable TCP
This change was applied downstream,
so for tracking it is shared upstream,
but I feel that if this feature should be turned on
It should be done globally in build_common
Change-Id: I56b8abcea1a3397f546ef0b8edc42711ff62b9d8
Origin: https://gerrit.iotivity.org/gerrit/#/c/14655/
Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15193/
Veeraj Khokale [Thu, 5 Apr 2018 09:35:54 +0000 (15:05 +0530)]
[IOT-3044] No response for Ping message
TCP adapter disconnects the session whenever
the data to be sent has an empty payload.
Since ping messages and signaling messages
need to have an empty payload they are dropped.
Fix this by checking if the message is a signaling
message before dropping it.
Change-Id: I1cfad27fcfd5cf3a42510412e6555b84ea905259
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Koushik Girijala [Mon, 26 Mar 2018 12:53:15 +0000 (18:23 +0530)]
Add csdk API to send COAP ping messages over TCP
Add csdk API in ocstack to send COAP ping messages
over tcp.
Change-Id: Idbe257c1baa90a7cabce6fe6113ab09fb5644eab
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Signed-off-by: koushik girijala <g.koushik@samsung.com>
Philippe Coval [Tue, 24 Apr 2018 09:16:30 +0000 (11:16 +0200)]
mbedtls: Install Static libs
Change-Id: Ia69fc0a9d7b0624a13c7d3ef2ba6a0e921ea4ba3
Bug: https://jira.iotivity.org/browse/IOT-3027
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
cca779a39cc587460d2793f58897a277f0e93e00)
Philippe Coval [Wed, 18 Apr 2018 13:04:40 +0000 (15:04 +0200)]
tinycbor: Update to v0.5.1
Bug: https://jira.iotivity.org/browse/IOT-1600
Change-Id: I1f59d7d0dc13e00d041d6feb465a359cd7388282
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
5c16320f2fee0194a1285e35ffe189bb082d6732)
George Nash [Tue, 1 May 2018 22:11:09 +0000 (15:11 -0700)]
Remove unimplemented single thread headers
the headers caedradapter_singlethread.h and
cainterfacecontroller_singlethread.h have no
implementation associated with these headers.
The implementation was most likely removed when
arduino support was removed.
Change-Id: Idef573722c51f465d8b83378b5751244ef78ffc6
Signed-off-by: George Nash <george.nash@intel.com>
Philippe Coval [Tue, 24 Apr 2018 09:16:30 +0000 (11:16 +0200)]
mbedtls: Install Static libs
Change-Id: Ia69fc0a9d7b0624a13c7d3ef2ba6a0e921ea4ba3
Bug: https://jira.iotivity.org/browse/IOT-3027
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Philippe Coval [Wed, 25 Apr 2018 08:20:59 +0000 (10:20 +0200)]
Merge branch '1.4-rel' (
811a49a)
Relate-to:
I37adc9b039e1ab9377b8024552eee4fb1e3ed1ab
I615432439a68600f00d7335d3641c7d7499c8955
Change-Id: I811a49a882b09f00a8e6729fe855142b1400a0a7
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
George Nash [Sat, 7 Apr 2018 00:19:49 +0000 (17:19 -0700)]
Fix Memory Leaks (valgrind)
This fixes memory leaks reported by valgrind
Change-Id: I99fe0b69e2c466e495f19bffd2226ebcd019cc85
Signed-off-by: George Nash <george.nash@intel.com>
Mats Wichmann [Sat, 21 Apr 2018 12:55:39 +0000 (06:55 -0600)]
Uninitialized payload pointer mey be freed
initialize response on declaration; don't free if pointer is null.
Change-Id: I9936a4f24c4ab6f8c322a2493ab5a1c303cd97cb
Signed-off-by: Mats Wichmann <mats@linux.com>
George Nash [Fri, 6 Apr 2018 21:38:47 +0000 (14:38 -0700)]
Fix uninitialized value (valgrind)
Valgrind reported that the buffer was not initilized
before being used for a conditional jump. This change
zero ('/0') intilizes the buffer.
Change-Id: I51d1716167f3da628783bef6bd733ab06e24de1e
Signed-off-by: George Nash <george.nash@intel.com>
Mats Wichmann [Tue, 5 Dec 2017 14:52:07 +0000 (07:52 -0700)]
Drop unneeded libcoap references
We know they're unneeded because they are malformed: LIBS will be
turned into -l calls, which prepends 'lib', which means these three
are actually references to liblibcoap, which does not exist.
Change-Id: I4cacbbdf81651a768d6a1840e7c67fbcac48bfeb
Signed-off-by: Mats Wichmann <mats@linux.com>
Mats Wichmann [Mon, 23 Apr 2018 16:18:47 +0000 (10:18 -0600)]
Add unused markers if MULTIPLE_OWNER is undefined
Several functions in one source file have code which is bracketed
by #ifdef MULTIPLE_OWNER. If not defined, these trigger warnings
about unused parameters; since warnings now cause error, this is
fatal. Add OC_UNUSED() wrappings for these.
Change-Id: I6b6320e8a6444a43c6400527f2f982a39a3d9128
Signed-off-by: Mats Wichmann <mats@linux.com>
Mats Wichmann [Mon, 23 Apr 2018 15:48:55 +0000 (09:48 -0600)]
Add python version to build output
For diagnostic purposes, also include the Python version
Change-Id: Idfceca024d3e9c18acd9e72fa637a94128e97ea4
Signed-off-by: Mats Wichmann <mats@linux.com>
Gregg Reynolds [Tue, 7 Jun 2016 06:13:38 +0000 (01:13 -0500)]
resource: prevents copy elision
eliminate warning: moving a local object in a return statement prevents copy elision
Change-Id: I8a2bc85fb2d8f6e31d04e067a4476970d7d657c6
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Mats Wichmann [Wed, 18 Apr 2018 21:48:11 +0000 (15:48 -0600)]
Static analysis: add dtor in bridging curl-client
Coverity analysis points out _MemoryChunk struct has a ctor which
malloc's memory, but no dtor to free it. It's one byte, not going
to lead to memory exhaustion (!) but let's keep to good practices.
Change-Id: I3dccb8b6355b6cdee0110653074f748abf9a2c16
Signed-off-by: Mats Wichmann <mats@linux.com>
Harry [Mon, 27 Nov 2017 10:46:30 +0000 (16:16 +0530)]
[IOT-2908] Build fail for option WITH_CLOUD.
Printing int64_t value as "%ld" triggered build
failure as int64_t is "long long int" in 32 bit linux
environment. Using "PRId64" so that compiler chooses
"long int" or "long long int" based on it's architecture.
Change-Id: I92c22a312465875cfd0b077c85d215ac9aa4d0d1
Signed-off-by: Harry <h.marappa@samsung.com>
Philippe Coval [Mon, 17 Jul 2017 17:17:11 +0000 (19:17 +0200)]
build: Disable MOT by default to align spec
An extra build job might be requiered to turn on all features
Bug: https://jira.iotivity.org/browse/IOT-2241
Change-Id: I9bed4ade3fb12747e35d390b4a4e0339288ff564
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/21493/