hunje.yeon [Fri, 11 Sep 2015 11:53:24 +0000 (20:53 +0900)]
Merge branch 'master' into resource-encapsulation
Conflicts:
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSAddress.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSDiscoveryManager.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSRemoteResourceObject.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/common/RCSResourceAttributes.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/Builder.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSGetResponse.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSResourceObject.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSSetResponse.java
service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/utils/DiscoveryType.java
service/resource-encapsulation/src/resourceContainer/SConscript
Change-Id: I477f9106a4baaa8609635eab9782adbdf26c4b6a
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
arya.k [Thu, 10 Sep 2015 11:58:54 +0000 (17:28 +0530)]
[TIZEN] Updated properties of Configuration resource in Things manager.
"Device Name" and "Location Name" properties are added and "SystemTime" property
is removed.
diagnosticsresource file is renamed to maintenanceresource.
Change-Id: I4fab4b7989a714d2aa1089f22f8adde674597bab
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2445
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Wed, 9 Sep 2015 10:05:39 +0000 (15:35 +0530)]
resource: Add test for ConstructResourceObject with InvalidUri
Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with uri having of not having "/" as its prefix.
Change-Id: Iadfc60fa67e3f5d0d2653720f5557c4a0e5279dd
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2418
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Markus Jung [Wed, 9 Sep 2015 06:17:29 +0000 (15:17 +0900)]
Bundle isolation - use separate threads for activation
The bundle activation is now triggered in a separate thread. If one bundle
fails at activation other bundles can still succeed. When the resource
container is started and the bundles are activated, the execution flow
waits up to 10 secs to join the activators. If a bundle blocks its
activation is not completed, but other bundles are not affected.
Change-Id: Ie3f44639a4ae965941fcd1120497006830952987
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Thu, 10 Sep 2015 16:28:14 +0000 (21:58 +0530)]
[Services - Things Manager] Removed Things Manager class and exposed its component classes for SDK
- Updated Java SDK
- Updated JNI layer
Change-Id: I910b9990c9d60865519af152cf8057302d713547
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2425
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Thu, 10 Sep 2015 12:19:06 +0000 (17:49 +0530)]
[Things-Manager] Updated Things Manager Sample Applications
- Updated TMSampleApp and con-server app as per new Java SDK
Change-Id: Ic699461a1c0e31fff01366ba41bc758836b60da9
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2426
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Erich Keane [Thu, 10 Sep 2015 17:24:53 +0000 (10:24 -0700)]
Fixed pointer-type arrays with NULL values
NULL values for OCRepresentation and string types in an array would
cause a variety of seg-faults. This patch corrects the behavior to
allow for NULLs in these arrays.
This is necessary because the CSDK enforces rectangular arrays, but
the C++ stack does NOT, so it compiles with those dimensions.
Change-Id: Ie0ddc5faea980ccb37f0ac8f6b73027b965b7257
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2452
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tim Kourt [Fri, 4 Sep 2015 21:54:56 +0000 (14:54 -0700)]
Remove ifaddr files
No need for ifaddr files and removed them.
Change-Id: I2250edf4feb3950b7354858e5f1cf3ae91330274
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2384
Reviewed-by: John Light <john.j.light@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Thu, 10 Sep 2015 01:45:36 +0000 (10:45 +0900)]
replaced some ERROR tag with DEBUG
this log is giving some confusion.
Change-Id: I9a31bdc287bd8742213e1bcee26f19edabfeea97
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2437
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
arya.k [Thu, 10 Sep 2015 04:54:06 +0000 (10:24 +0530)]
[TIZEN] Removed things manager class dependency from TIZEN SDK and used its component class.
Updated tizen sample applications to removed things manager class dependency.
Enabled things manager library build for tizen.
Change-Id: I30db7102d6598103c46b3044fff1e218acded6c5
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 1 Sep 2015 08:10:58 +0000 (13:40 +0530)]
[Resource-Encapsulation] Added Resource Container in Java SDK
- Updated Java sdk for resource Container
- updated client and server jni files for exceptions.
Change-Id: I7406be52e1cb596a27a9b8d130e029f30075fffe
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2332
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit
fc35cee12e5d2b301a934d94e1f2539efe1c018a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2429
Jay Sharma [Fri, 4 Sep 2015 04:45:06 +0000 (10:15 +0530)]
[Resource-Encapsulation] Updated Android SampleResorceClient App
- Added Resource Container part.
- updated comments
Change-Id: If6821f26cd9d39dd13f0ff8e13e1ab050b7e993b
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit
efbf6296829a1394908e40b74743f179c7087179)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2428
Jay Sharma [Wed, 9 Sep 2015 16:03:14 +0000 (21:33 +0530)]
[Resource-Encapsulation] Enabled Sample bundle build for Android platform
- [Resource Container] Soft Sensor Bundle build for android
Change-Id: I56104b8f738da175ff1c424532bad26bcfd37403
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2427
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sachin Agrawal [Wed, 9 Sep 2015 16:16:59 +0000 (09:16 -0700)]
Removed unused defines from ocstackconfig header file
Since OIC stack now supports Block wise transfer and payload check
is done in CA layer for MAX PDU size, there is no need for max request
and max response variables. MAx Dev address size is defined in cacommon
header file.
Change-Id: I77de6aba4664d8675b559abe4d220a0ce722ff51
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2430
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Erich Keane [Wed, 9 Sep 2015 16:40:58 +0000 (09:40 -0700)]
Fixed intialization of 3-deep arrays in CPP
The C++ 3 deep arrays were seg-faulting, since the initial vector
was not initialized correctly with the size. This patch ensures
that this happens correctly.
I've validated that the 3 deep array of Ints works correctly after
this patch.
Change-Id: I55166105d2a6a9ee97d88e287b54705a8f175cb6
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2432
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
hyuna0213.jo [Tue, 8 Sep 2015 07:33:06 +0000 (16:33 +0900)]
Removed memory leaks in CA Layer
These memory leaks are reported by Valgrind.
The blockwise-transfer was not properly free the memory
that was allocated.
Change-Id: Ibfefc94879fc31f562139e0bc68b53b4a3b34ff8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2400
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Stephane Lejeune [Tue, 8 Sep 2015 10:07:05 +0000 (12:07 +0200)]
Fix regression on confirm-able messages.
MessageID should not be updated with the BlockID when the transfer is
not using the block-tranfer mechanism. This unnecessary update was
causing an error that prevented the pdu to be transmited normally.
Change-Id: I5927a636fb05f77fb2aa085e92b6f362e6e2a69e
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2402
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Minchul Lee [Wed, 26 Aug 2015 07:00:50 +0000 (16:00 +0900)]
Modify specification for Tizen build
Change-Id: Id036ce3f4e779fbba829aff16e959a7854bba9ee
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2278
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Erich Keane [Tue, 8 Sep 2015 22:03:46 +0000 (15:03 -0700)]
Made the AttributeItem nullptr_t enabled only for direct conversions
This will fix the GCC5.0 and CLANG 3.5 and newer compile issues.
Change-Id: Ib9c6b69c29e4c6ac70f0d04a2c791a60eae004f9
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2414
Reviewed-by: Kevron Rees <tripzero.kev@gmail.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Erich Keane [Tue, 8 Sep 2015 20:21:14 +0000 (13:21 -0700)]
Fixed CPP Conversion of nested array types
The CPP array type was incorrectly using reserve instead of
resize for the smaller vectors. This resulted in the index-assignment
of each element to not work properly. This patch fixes this, so that
the arrays are properly loaded.
Change-Id: I29eb78a1dc69602087ba9861a378f478d611b0f0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2412
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Fri, 4 Sep 2015 18:33:53 +0000 (11:33 -0700)]
Changed arraylist implementation to avoid floating point.
Updated calculation of u_arraylist growth to no longer use
floating point. This helps for limited platforms that might
not have native FP support, such as some Arduino boards.
Change-Id: I7d8923786ac31cab8eb3004c8a956d36d884ec29
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2382
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Ravi Nanjundappa [Mon, 7 Sep 2015 08:35:25 +0000 (14:05 +0530)]
Fix for IOT-686
Replaced "tiny-cbor" with "tinycbor".
Change-Id: I923cb348fdfda3afa7de97b7323c5e4275210127
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2395
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Wed, 2 Sep 2015 07:16:09 +0000 (12:46 +0530)]
resource-encapsulation: Updated doxygen comments
Updated and fixed some issues w.r.t doxygen comments in resource-encapsulation dir.
Change-Id: I95f61c9d0b99a89a8d72812eb5e2c8c7ff7fe170
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Ravi Nanjundappa [Wed, 2 Sep 2015 08:24:22 +0000 (13:54 +0530)]
soft-sensor-manager: Updated doxygen comments
Updated and fixed some issues w.r.t doxygen comments in soft-sensor-manager dir.
Change-Id: I8996af3eff49eed1f8696c5c8ba02cd641588692
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2345
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
koushik.girijala [Thu, 3 Sep 2015 11:01:42 +0000 (16:31 +0530)]
[RI] Fix for out of memory issue in Arduino Mega
OC log and OC log V used almost 3500bytes of RAM in Mega board because of improper log usage.
Updated code using PCF properly in OC logging to save almost 3500 bytes of RAM memory.
Verfied changes on both Arduino Due and Mega boards and found Working fine.
Change-Id: I9ca134d5cff9c8a91707a18bd9279089533a9b99
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Doug Hudson [Tue, 8 Sep 2015 16:58:18 +0000 (09:58 -0700)]
Clean up structure allocation to follow best practices.
Change-Id: Ia10b74926fce44cf0b55ed4964ea5f634e1c73d3
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2340
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Stephane Lejeune [Mon, 24 Aug 2015 14:15:30 +0000 (16:15 +0200)]
Added support for CBOR content format option.
Added a new option defining content format for CBOR encoded payloads.
This will allow a more robust interpretation of incomming payloads
and will also permit generic stacks that have no apriori knowledge
about OIC to interpret the payloads going accross the network.
Change-Id: I34feb4e305458fcef4e7343cda313d9a52d12046
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2262
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jyong2.kim [Sun, 6 Sep 2015 08:08:49 +0000 (17:08 +0900)]
Include RCS client module in Resource Container.
Soft-sensor using resource-container needs client functionality.
but it is not supported on resource-container.
so, resource container includes the RCS-client-module, and enable to use client-function at soft-sensor.
This commit is initial version for resource container including client module.
Update discover logic,
and prevent multiple access to callback function.
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Change-Id: I3ba81ed185b82ee05a95de493a6ff560838e1054
Reviewed-on: https://gerrit.iotivity.org/gerrit/2388
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Tue, 8 Sep 2015 01:03:05 +0000 (10:03 +0900)]
Modify the term "Diagnostics" to "Maintenance" in file names
ThingsDignostics and DiagnosticsCollection files are renamed to
ThingsMaintenance and MaintenanceCollection files.
Update properties of Configuration resource
"Device Name" and "Location Name" properties are added and "SystemTime" property
is removed.
Change-Id: I0f4028aea14997a6a35ae5660671e47aedb2b67b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2394
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Mon, 7 Sep 2015 15:43:42 +0000 (21:13 +0530)]
[Resource-Encapsulation] Java SDK for resource-encapsulation layer
- SDK for client side [updated as per review comments]
- SDK for server side [updated as per review comments]
Change-Id: Ie13656f263d39377269dd2479c43ef2a3efaeac0
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2372
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Mon, 7 Sep 2015 10:18:37 +0000 (15:48 +0530)]
Tizen sample application updated for resource container and review comment changes.
Change-Id: I64ddbfc24dc884af993efbfef86de3c9dd10f323
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2380
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Mon, 7 Sep 2015 10:48:50 +0000 (16:18 +0530)]
[Resource-Encapsulation]Build service container sample bundle for tizen Platform.
Change-Id: I8dfc06685fc719bb88ed0a98f87aec1c3dcde0ad
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2397
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Wed, 2 Sep 2015 05:13:38 +0000 (10:43 +0530)]
[Resource-Encapsulation] Android Sample Application for Server side
- For Server Builder APIs
- For Resource Container APIs
Change-Id: Ia15bbfdadddc82ca45ebee8e58e579b5db399e0d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2342
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit
431309817995f5b5fdddf2054f40bed2ffbd67b6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2374
hunje.yeon [Mon, 7 Sep 2015 01:42:31 +0000 (10:42 +0900)]
Replace the old version of service document to v.9.2
Remove the old version, v0.9.1, of NM, PPM, SSM documents from service/docs/ folder.
Add the programmer's guide for resource encapsulation for v0.9.2
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Change-Id: Id1512d124bdfe78337756f9f22f0401124375b25
Reviewed-on: https://gerrit.iotivity.org/gerrit/2389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Fri, 4 Sep 2015 07:20:39 +0000 (16:20 +0900)]
Remove a Things Manager class and expose its component classes for SDK
Previously, there was a single Thing Manager class for SDK which comprises
ThingsConfiguration, ThingsDiagnostics, GroupManager, and GroupSynchronization
classes. Now, we've decided to keep the components seperately for more
efficient maintenance for each component.
Additionally, to be aligned with OIC spec, a class name of "DiagnosticsCollection" has
been changed into "MaintenanceCollection".
Change-Id: I2b5cbf832abca3ac3ecfcab88e2153cca91a67f6
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jihwan.seo [Thu, 3 Sep 2015 14:08:00 +0000 (23:08 +0900)]
realigned some preprocess to the left.
it can be gaven some confusion.
Change-Id: If3b228b404e830fad23ce793334723d0e0f92e89
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2366
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Cosmin Petrisor [Wed, 2 Sep 2015 08:19:41 +0000 (11:19 +0300)]
Android: Allow "null" entityHandler to be passed to registerResource in order to use the defaultEntityHandler (see Collections usage)
Change-Id: I0e685311c70a297d76a1a7a908a4470610c47b7f
Signed-off-by: Cosmin Petrisor <cosmin.petrisor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2346
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Stephane Lejeune [Wed, 2 Sep 2015 11:45:55 +0000 (13:45 +0200)]
Fixes the observe option size to the legal max value of 3.
The options that have variable byte length are now being
encoded to their minimal value. This patch also truncates the
option data to their maximum value allowed per the spec. One specific
example is the observer data option which receives 4 bytes of data from
the OC stack. When encoding in CoAP, the maximum value is 3 bytes.
Consequently, the CA layer which is aware of the CoAP encoding truncates
the value back to 3 bytes. Also when registering an observe, the data
length is now set to 0 using the CoAP var byte encoding which saves the
4 bytes that were just carying zero's before thsi fix.
Change-Id: I033969b407aa3426df8c85c3836206c9366fb0a2
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Thu, 3 Sep 2015 08:35:04 +0000 (14:05 +0530)]
Fix for the Jira issue IOT-524
This patch addresses the first part of IOT-524. This patch is a continuation of
the changes submitted at https://gerrit.iotivity.org/gerrit/#/c/1439/.
The current changes include installing the public header files inside PREFIX/include/
directory.
For ex: /home/XYZ/BUILD_IOT_PREFIX/include/resource/ocstack.h
Change-Id: I40be9cfe112a81263fb22acf494fa7f8fd8dc549
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2362
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jay Sharma [Fri, 4 Sep 2015 04:45:06 +0000 (10:15 +0530)]
[Resource-Encapsulation] Updated Android SampleResorceClient App
- Added Resource Container part.
- updated comments
Change-Id: If6821f26cd9d39dd13f0ff8e13e1ab050b7e993b
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 1 Sep 2015 08:10:58 +0000 (13:40 +0530)]
[Resource-Encapsulation] Added Resource Container in Java SDK
- Updated Java sdk for resource Container
- updated client and server jni files for exceptions.
Change-Id: I7406be52e1cb596a27a9b8d130e029f30075fffe
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2332
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Wed, 2 Sep 2015 05:13:38 +0000 (10:43 +0530)]
[Resource-Encapsulation] Android Sample Application for Server side
- For Server Builder APIs
- For Resource Container APIs
Change-Id: Ia15bbfdadddc82ca45ebee8e58e579b5db399e0d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2342
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 1 Sep 2015 04:33:20 +0000 (10:03 +0530)]
[Resource-Encapsulation] Enabled Sample bundle build for Android platform
- [Resource Container] Soft Sensor Bundle build for android
- Added Exception to RCSRemoteResourceObject API
Change-Id: I98e3711857a6339efc09e146c2e6fb399e654b44
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2329
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
vimala.v [Mon, 31 Aug 2015 10:08:15 +0000 (15:38 +0530)]
Resolved Tizen crash while printing FATAL errors.
Temp fix for https://jira.iotivity.org/browse/IOT-704.
This fix will be reverted back when Tizen binary issue is resolved.
Change-Id: I38cdff511c61ac74912a45763be9b7dc3b7e9e4e
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2319
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Cosmin Petrisor [Mon, 31 Aug 2015 16:10:09 +0000 (19:10 +0300)]
Fix DefaultCollectionEntityHandler in csdk/stack/src/occollection.c to handle POST requests
Change-Id: Icd1d5c5a960d21525bca363956fbbad0c6c65efd
Signed-off-by: Cosmin Petrisor <cosmin.petrisor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2322
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
hyuna0213.jo [Tue, 1 Sep 2015 02:07:46 +0000 (11:07 +0900)]
code refactoring for blockwise-transfer
the code refactoring for blockwise-transfer.
- add null check logic
- changed coding style
- fixed minor bugs
Change-Id: I42eea430765c5dc1cac9ea7f18cca3311b465b38
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2328
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
vimala.v [Wed, 2 Sep 2015 09:04:25 +0000 (14:34 +0530)]
Enabled occlient to communicate over EDR adapter on Tizen.
The wait/re-try logic is added in CAEDRClientSendMulticastData() to make sure
atleast one connection is established before sending the data.
Change-Id: I2ea9fdab45bef800f05ade65296d3c4014037dea
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2348
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
arya.k [Wed, 2 Sep 2015 09:25:01 +0000 (14:55 +0530)]
[Resource Encapsulation] Android unittest crash fix.
Change-Id: I3a71aa30e7521c96a32bf5eb2de76a7189320525
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jon A. Cruz [Tue, 1 Sep 2015 22:42:38 +0000 (15:42 -0700)]
Fixed bug in u_arraylist_contains caused by poor member naming.
Corrected a bug in u_arraylist_contains caused by the member names
'size' and 'length' being too similar and hiding a logic problem.
Fixed by changing 'size' to the more common 'capacity'.
The base fix (without any of the name change) was pulled from
Vimala's revision 10 submission of change 2301.
https://gerrit.iotivity.org/gerrit/#/c/2301/10/
Change-Id: I22ac6fc159669ad58212b145f70cb559187fa999
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Vimala Vishwanathan <vimala.v@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Randeep Singh [Tue, 1 Sep 2015 12:29:06 +0000 (21:29 +0900)]
Resolved doxm issue
SVR db is not not getting updated with owned as true and owner
information, in case of JUST_WORKS case.
Change-Id: Icbbd19171d0177c5fadae429dc54b8626af57a75
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2336
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jay Sharma [Mon, 31 Aug 2015 17:27:21 +0000 (22:57 +0530)]
[Resource-Encapsulation] Java SDK for resource-encapsulation layer
- SDK for client side [updated as per review comments]
- SDK for server side [updated as per review comments]
Change-Id: Ie13656f263d39377269dd2479c43ef2a3efaeac0
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2266
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Sat, 29 Aug 2015 05:58:03 +0000 (14:58 +0900)]
Add sequence types to ResourceAttributes
There are sequence types supported by OCRepresentation, for ResourceAttributes to support perfect compatibility with OCRepresentation these types are added.
Change-Id: I260f4363e07e72220a2424c700d12dbef1d10e54
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2314
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
leechul [Thu, 27 Aug 2015 07:07:31 +0000 (16:07 +0900)]
Updated provisioning API to cater different connectivity type.
- PMGenerateQuery() will make a proper query
based on connectivity type of endpoint.
[Patch #1] Intial upload
[Patch #2] Update according to comments.
[Patch #3] Modify the buffer size which is request query is stored.
[Patch #4] Update according to comments.
[Patch #5] Update according to Jon's comment.
Fixed a buffer size for writing queries.
Change-Id: I996888faec20614736907dc7c17300eb8d1550cf
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2300
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tim Kourt [Fri, 28 Aug 2015 18:54:12 +0000 (11:54 -0700)]
Android: Mimics stack behavior and allows "null" entityHandler to be passed into the registerResource API
Change-Id: Ic7d11043e2b5a18e832e06ef1c71865d6a912530
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tim Kourt [Thu, 27 Aug 2015 21:27:06 +0000 (14:27 -0700)]
Android: Allows to destroy OcResource java object before all of the C++ callbacks have been received.
Change-Id: Idc77b12f7ad6aa3dd8d4cea6e4555eac3f776ab7
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2306
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Fri, 28 Aug 2015 07:07:27 +0000 (00:07 -0700)]
Fixed android build to work multithreaded.
Previously the android build was missing proper dependencies
so could only be built if multithreading was disabled. This change
adds minimal dependencies to get gradle to be executed after the
native parts are built, and re-enables threaded builds.
This could reduce build times by roughly 75% on average systems.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Change-Id: Iccecd7cc976855592d3375027a4de1f9fd2dbe98
Reviewed-on: https://gerrit.iotivity.org/gerrit/2310
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Shilpa Sodani [Fri, 28 Aug 2015 07:37:05 +0000 (00:37 -0700)]
Fixed IOT-674 bug
Updated doxm resource to set it's oxmSel field to selected ownership
transfer method during onboarding process.
Change-Id: I518e69e9f92b5dbbb8bb7fb83c2489a272c950b8
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ravi Nanjundappa [Thu, 27 Aug 2015 06:07:33 +0000 (11:37 +0530)]
Updated doxygen comments for OCResource.h
Updated and fixed some issues w.r.t doxygen comments in OCResource.h file
Change-Id: Ia89553197b32aad5ae1c8fa6482c03783e70baed
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Shilpa Sodani [Wed, 26 Aug 2015 07:17:23 +0000 (00:17 -0700)]
Fixed the IsRequestWithinValidTimeTest unit tests.
Fixed IsRequestWithinValidTimeTest unit tests so that they don't failing on boundary
conditions.
Change-Id: Ie52e3e75d8fc2ee052f43a532681cb2091545fbb
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jay Sharma [Tue, 25 Aug 2015 15:59:42 +0000 (21:29 +0530)]
[Resource-Encapsulation] Android Sample Application for client side APIs.
Change-Id: I1605fe00027c8bd6d2182a70e3dbb35f2d6c2b2d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2267
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Rami Jung [Thu, 27 Aug 2015 07:58:34 +0000 (16:58 +0900)]
update comments of RCSResourceObject.h for doxygen
-straighten up lines
-typedef AttributeUpdatedListener
-class LockGuard
Change-Id: Idfbad3ade7fcedc6870835bff32b966d574bc8b5
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2302
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sakthivel Samidurai [Thu, 27 Aug 2015 20:25:54 +0000 (13:25 -0700)]
Generate device ID from Secure Virtual Resource
SRM should generate the device ID for the resource server
Change-Id: Ic4f83f63a59827bf5cfb412afc34e1d955ee69e2
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2162
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jaehong Jo [Thu, 27 Aug 2015 15:15:18 +0000 (00:15 +0900)]
Fix Android EDR Client memory leak
Delete JNI local reference
Change-Id: Iee79cdf5adac2a8d2f1bac67fd1ac34757d974d8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Hauke Mehrtens [Wed, 26 Aug 2015 13:36:58 +0000 (15:36 +0200)]
OCRepresentation: fix segmentation fault by initializing memory
dimensions was not fully initialized, but used by the code, so it could
contain arbitrary memory. If this memory was a big number this code
could allocate very much memory as this was used to create a 2 or 3
dimensional arrays.
This fixes a Segmentation fault seen in normal operation of the
garageserver and a invalid memory read and a following segmentation
fault seen with valgrind in the garageserver
Change-Id: Ifbab3d48b00bd2e3559ca3a8d79336ecf5feef6e
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Thu, 27 Aug 2015 11:45:33 +0000 (20:45 +0900)]
Variable declaration incorporated in for() loop itself.
https://gerrit.iotivity.org/gerrit/#/c/2277/
Change-Id: I83c03bdba83109b9a313dee977efd13b6e65aa55
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2303
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
js126.lee [Wed, 26 Aug 2015 07:41:50 +0000 (16:41 +0900)]
Change build option about provisioning
Now, provision manager is working on linux only.
So, build condition is changed to SECURED=1 and linux.
Change-Id: I310ccffcd911ec925b9c9725909d22d24062603d
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2280
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jihun Ha [Thu, 27 Aug 2015 06:33:08 +0000 (15:33 +0900)]
Modify a group management implementation with CBOR conversion in c stack
Previously, oicgroup.c file dealt with processing group action requests and
constructing the corresponding responses and it was strongly related with
json encoding/decoding. With this commit, all json-based codes in the file
have been updated to use CBOR instead of json.
Change-Id: I2f0953fab9c77024435d389538a4f43b600d7864
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Rami Jung [Wed, 26 Aug 2015 12:05:37 +0000 (21:05 +0900)]
add a gtest case into serverBuilder unittest of resource-encapsulation for testing nested attributes
new case of unittest : SettingNestedAttributesIsSameToGettingNestedAttributes
A RCSResourceAttributes, itself could be value of a key-value pair like int, double, string and so on.
That means developers are able to nested structure when they make key-value pairs and it is possible to set up the following hierachy in attributes.
{
"type": "Living Colors",
"name": "LC 1",
"modelid": "LC0015",
"swversion": "1.0.3",
"state": {
"hue": 50000,
"on": true,
"effect": "none",
"alert": "none",
"bri": 200,
"sat": 200,
"ct": 500,
"reachable": true,
"colormode": "hs"
}
}
Change-Id: Ifdf2fb41860ad7227753677741bf79c6709fbaa6
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2284
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sakthivel Samidurai [Wed, 26 Aug 2015 21:17:10 +0000 (14:17 -0700)]
Fix resource sample and unit test warnings
Change-Id: Ieced950f54f7ce9997852a455fd5f9b5e89afbc1
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tim Kourt [Wed, 26 Aug 2015 22:56:08 +0000 (15:56 -0700)]
Re-enabled some of the Android smoke tests
Change-Id: If90118088be6f4663196bd1dd05cdd5c7d1ec161
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2294
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Sat, 15 Aug 2015 07:09:17 +0000 (00:09 -0700)]
Fixed u_arraylist to correct performance and missing calls.
Corrected poor memory management to not realloc() on each remove
call, use a normal approach to growth of the backing store, and
some general cleanup. Added calls for reserving space and for
requesting reduction of the backing store.
These were all issues called out in the intial code review.
Simple cleanup improved performance of the contains function
reducing its time by 40%-50% (~ 36ms down to 21ms-19ms).
With the backing store corrections, repeted add/remove testing was
improved with its time being cut by 75% (36.8ms down to 9.4ms).
(Times should be taking as very rough, since runs were done using
valgrind to slow things enough to actually measure.)
Change-Id: I81e42f2fdbec8fb7fb18f16f09cfa5008640a2d4
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2293
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jay Sharma [Wed, 26 Aug 2015 06:47:14 +0000 (12:17 +0530)]
[TIZEN] Enabled Resource Encapsulation build for Tizen platform with sample applications.
Change-Id: I1cdd77f53c959ac4825bafe1d31cfcb39aff4975
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tim Kourt [Wed, 26 Aug 2015 21:07:57 +0000 (14:07 -0700)]
Fix for the incorrect payload size conversion in the stack
Change-Id: I928170769799b4c9ca5c466680e9103956a35a53
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2290
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Sat, 15 Aug 2015 00:28:43 +0000 (17:28 -0700)]
Add unit tests for u_arraylist_t in preparation for subsequent changes.
Change-Id: I489398da1bb5455977b8bbb0d302a889f130b04f
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2214
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Ravi Nanjundappa [Wed, 26 Aug 2015 06:01:31 +0000 (11:31 +0530)]
things-manager: Updated doxygen comments for ThingsManager.h
Updated and fixed some issues w.r.t doxygen comments in ThingsManager.h file
Change-Id: Icafdaa0bd00b275b1e7423ea25d22601bcab9323
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2276
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Hauke Mehrtens [Mon, 8 Jun 2015 21:28:21 +0000 (23:28 +0200)]
android: fix location of sdk
The file android-sdk_r24.2-linux.tgz contains a directory named android-
sdk-linux and the macos and windows version use similar directory names.
This fixes the following error message:
/iotivity/extlibs/android/gradle/gradle-2.2.1/bin/gradle build -b/iotivity/android/android_api/build.gradle -PTARGET_ARCH=armeabi -PRELEASE=release
FAILURE: Build failed with an exception.
* What went wrong:
A problem occurred configuring project ':base'.
> The SDK directory '/iotivity/extlibs/android/sdk/android-sdk_r24.2' does not exist.
This was only tested under Linux and not tested under windows or macos.
Change-Id: Ia316ed65dc22f653a297b6423d4e1b47a24c8dbe
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1222
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Wed, 26 Aug 2015 06:16:42 +0000 (15:16 +0900)]
Remove sleep in Android EDR.
It is no longer necessary.
Change-Id: I8d2e0f741830f659edee7b977f24d32f8e93b8c1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sakthivel Samidurai [Tue, 25 Aug 2015 21:55:53 +0000 (14:55 -0700)]
Fix Secure sample build warnings
Change-Id: I0993913a67fdebf7717d513e9760b048f44ee59d
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2271
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sakthivel Samidurai [Tue, 25 Aug 2015 22:05:02 +0000 (15:05 -0700)]
Fix C sample build warnings
Change-Id: Icbe7e6f5a2ef136628ccad3986641d2bb492188e
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2272
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sakthivel Samidurai [Tue, 25 Aug 2015 23:04:01 +0000 (16:04 -0700)]
Fix C++ unit test build warnings
Change-Id: Ic018b9d6fda988031761ba23b43d8a93231e00f4
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sakthivel Samidurai [Tue, 25 Aug 2015 22:39:11 +0000 (15:39 -0700)]
Fix C++ sample build warnings
Change-Id: Ib79a9ba3f251169a17bbe809a00ccca05a206a92
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2274
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sakthivel Samidurai [Tue, 25 Aug 2015 21:31:04 +0000 (14:31 -0700)]
Fix C++ stack build warnings
Change-Id: Ib653a245e4b4301dd68970c613bcd1252fbae5ec
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2270
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tim Kourt [Wed, 19 Aug 2015 23:17:59 +0000 (16:17 -0700)]
Enables SimpleClient/SimpleServer to communicate over the BLE on Android.
The wait/re-try logic was introduced into CALEClientSendMulticastMessageImpl
to make sure that there is at least one connections established before
the send call is made.
Change-Id: I5ad52321fc316005dbc48e4e323205a661293f3e
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2248
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
minus2k [Mon, 24 Aug 2015 01:44:27 +0000 (10:44 +0900)]
support blockwise-transfer on RI layer
Change-Id: I5bb08b94bf3cf4cab3ff5878260c845bee5592a5
Signed-off-by: Myungchul Kwak <minus2k@hotmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2256
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Shilpa Sodani [Thu, 20 Aug 2015 09:45:54 +0000 (02:45 -0700)]
Resolved bug IOT-685
Resolved bug IOT-685. Due to unintialized value of field "interface" of
struct CAEndpoint_t and changed return value type of method u_arraylist_add()
broke the security apps.
The unintailzed value of interface gave it random value
which inturn set the wrong value for ipv6 sockaddr_in6 struct field
"sin6_scope_id" causing "Network unreachable" error.
The return value of methode "u_arraylist_add()" was recently changed
from CAResult_t to bool. This caused seg fault.
Change-Id: I23fea80a0d6e12dd4122f2e032497a72496a4745
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Sat, 22 Aug 2015 02:14:51 +0000 (11:14 +0900)]
replaced LOG type with other thing.
when this logic is worked,
the log is giving some confusion now.
Change-Id: I7ca43eb16d211b75975a27d07aaf841f0ecb91cf
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Trevor Bramwell [Wed, 19 Aug 2015 15:30:03 +0000 (08:30 -0700)]
Split up Android builds by architecture
With the additional option of building Android for the x86_64
architecture builds can reach upwards of 3 hours. This change sets the
groundwork for adding the x86_64 arch as a build target by splitting up
the android build by architecture.
Change-Id: I8d6837c3187e871543c0841638d1cc50600f75a9
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Fri, 21 Aug 2015 22:16:33 +0000 (22:16 +0000)]
Merge "Merge branch 'security-basecamp' into master"
Omkar Hegde [Thu, 20 Aug 2015 17:59:11 +0000 (10:59 -0700)]
Fix presence with ipv6 changes
Previously, the CA layer code was assuming that
all responses are always sent as unicast messages. But, in
the case of presence, it is always multicast. As a result,
the server sent presence notifications only to the ipv4
address and the clients subscribed to server's ipv6 address ignored
the notification. Adding isMulticast flag to the CAResponseInfo_t
structure and changing camessagehandler to handle multicast responses.
Change-Id: I4a0991aca6cf60b4b1ad3f0dfcda683284680adc
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2252
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Tue, 18 Aug 2015 11:36:16 +0000 (20:36 +0900)]
Fix Android EDR crash issues.
CAEDRServerStop is called twice.
So occure reference to invalid global.
Change-Id: I5652b53cf78257a8c59a9ffcf67cfe58879855a1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sachin Agrawal [Fri, 21 Aug 2015 19:28:37 +0000 (12:28 -0700)]
Merge branch 'security-basecamp' into master
Conflicts:
resource/csdk/connectivity/api/cainterface.h
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
Change-Id: I3f49aaa0a1e23f1e361f9f2aa3ceaa5a2acd6aef
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
jihwan.seo [Tue, 18 Aug 2015 15:31:37 +0000 (00:31 +0900)]
to check max token length by coap spec
token lengths 9~15 are reserved.
it must be preocessed as a message format error.
Change-Id: I84b2e51b7364fef4e4dae0d60b1b5010fd059ad2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2235
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sachin Agrawal [Thu, 20 Aug 2015 18:21:57 +0000 (11:21 -0700)]
Removed some warnings from security code.
Removed warnings related to missing-field-initializers.
Change-Id: If4af332ba8f7995c5657dc052763e1bd4089682c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Sachin Agrawal [Fri, 21 Aug 2015 16:00:42 +0000 (09:00 -0700)]
Removed warnings from provisioning module
Removed all unused variable warnings coming from provisioning module
Change-Id: I6183c9413ea495d2969d0e94aa6152a53eeb4b38
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2226
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
coderhyme [Wed, 19 Aug 2015 15:34:59 +0000 (00:34 +0900)]
Refine codes using an enum with std atomic in DevicePresence
DevicePresence::state, a variable to keep the state of the class, is an enum type. It needs to be declared as an atomic to make it thread-safe.
std::atomic with user-defined type is not available on GCC 4.6.3, therefore std::atomic_int is used instead. The enum is scoped enum, which means it is enum class. It means it is not interchangeable with int implictly.
That's why a separate method is declared to set the value from int value. Plus, the values is controlled in the class, so it is safe to cast to int and vice versa.
Change-Id: I2689c550af293c41a9757646924f210e7fccab74
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2244
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sakari Poussa [Tue, 18 Aug 2015 10:46:37 +0000 (13:46 +0300)]
Enable resource/connnectivity logging for osx/ios
Change-Id: I31d065cf3d35fe5b94fbdd9a6d10b65c07a1fc2d
Signed-off-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
koushik.girijala [Wed, 5 Aug 2015 06:58:29 +0000 (12:28 +0530)]
[CA] Fix Get Network Information for Tizen
Added network monitor for CAIpnwmonitor
Had Fix for tizen RI sample build error
Change-Id: If049ccde21a3233ed4d4bebe7c81e32cd8f94d7c
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Tue, 11 Aug 2015 10:44:53 +0000 (16:14 +0530)]
Updated doxygen comments for OCPlatform.h and OCPlatform_impl.h files
Updated and fixed some issues w.r.t doxygen comments in both
OCPlatform.h and OCPlatform_impl.h files
Change-Id: I0b3e72c60c1b99aa6147823854757dce8148488a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Tue, 18 Aug 2015 04:13:08 +0000 (13:13 +0900)]
removed unnecessary codes in CA
- removed unnecessary method
- to check Null parameter
Change-Id: I31133e5f50b488830c4e39026862cd451bd98dd9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Mon, 17 Aug 2015 23:15:04 +0000 (16:15 -0700)]
Fix size error, lack of safety check, and type warning.
- Fixed a problem where the length of a different string was being
used after concatenating a different one.
- Added in missing size checks to avoid buffer overruns.
- Corrected to size_t for proper tracking.
- Changed assumed remaining size to instead be compile-time safe.
Change-Id: I314effbdc14d725e5b16a5e655552c6a817cb3b2
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
projects / contrib / iotivity.git / log