Tim Kourt [Wed, 9 Sep 2015 20:47:46 +0000 (13:47 -0700)]
Android: Adding PresenceClient\PresenceServer examples
PS2: adding modified settings.gradle
Change-Id: Iedba236264ab2b58bb55e11e8f4ea7f8b3871603
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Harish Kumara Marappa [Sat, 19 Sep 2015 11:06:55 +0000 (16:36 +0530)]
Merge branch 'simulator'
OC::ObservationInfo is modified only as per the requirement of simulator module.
Please refer this change set for more information https://gerrit.iotivity.org/gerrit/#/c/2323/.
Change-Id: Ib4d762348f250697642d417798780e37cf62bdb0
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 09:09:56 +0000 (18:09 +0900)]
Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
Change-Id: I56e84e31987766e5fc97cf3dafa7882f55ae1ef4
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Jay Sharma [Fri, 18 Sep 2015 20:02:48 +0000 (01:32 +0530)]
OSLV fixes for RE layer.
- Updated Android sample apps.
Change-Id: I6df99717227d1515e40a08560550b3cb2c82d54c
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2723
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Harish Kumara Marappa [Fri, 18 Sep 2015 18:43:35 +0000 (00:13 +0530)]
Fix for prevent tool reported defects.
Change details:
1. Prevent issues fix.
2. Removal of white spaces from Java files.
3. Simulator tool UI changes.
4. Fix for issues observed during regression testing.
Change-Id: I4141541587421bc3de7ee321e8124a0444f37dd5
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 08:23:47 +0000 (17:23 +0900)]
Merge branch 'master' into resource-encapsulation
Change-Id: Ib07cb15d2b953ac870166383fe51fc7a26aaf73b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 06:26:32 +0000 (15:26 +0900)]
Modify Notification Manager for updating resource encapsulation
- Modify Notification Manager files
- Add UnitTest codes
Change-Id: I7b3ac0931a77935fc26a9c060a96200f13de27ca
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 18 Sep 2015 11:02:46 +0000 (04:02 -0700)]
Eliminate result code from RCSGetResponse and RCSSetResponse.
It turned out there is no reason for users to set the result code.
The only scenario that RCSResponses have not OK for the result is that there is an error occurred
and in that case it should be an exception on resource-encapsulation layer.
Change-Id: Icef409ea5e224f9f02e12e174231baa4e11c5a33
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 05:21:27 +0000 (14:21 +0900)]
Modify resourceContainer code files for active discovery manager
- add variable for RCSDiscoveryTask.
Change-Id: Ic26daafcb70c8c59242debcddcbd1307e84aae01
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Fri, 18 Sep 2015 08:10:01 +0000 (17:10 +0900)]
Code formatting for RCSDiscovery implementation.
Change-Id: I2734731b8c467204e9382a08b185f6f9b9a7797e
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 18 Sep 2015 09:50:35 +0000 (02:50 -0700)]
Refactoring the android api for resorce-encapsulation.
SConscript is added to conform to scons build.
JNI files are renamed to conform to the style.
JNI files are restructureed to make folder hierarchy simple.
android apis are refined to follow java convention.
Comments for apis are updated.
Change-Id: I1bef70c9468d767b1694f29165704a70370bbe90
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Madan Lanka [Fri, 18 Sep 2015 22:21:36 +0000 (22:21 +0000)]
Merge "Merge branch 'master' into simulator" into simulator
arya.k [Fri, 18 Sep 2015 13:50:09 +0000 (19:20 +0530)]
[ANDROID] Remove GroupSynchronization in things manager.
Change-Id: I3d3324636ee7642cdba7657cba3c92105831159b
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2713
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Fri, 18 Sep 2015 11:47:09 +0000 (20:47 +0900)]
Modify initialization for non-static class member.
- Non-static class member m_timerHandle is initialized in this constructor.
Change-Id: I6fa35c75f529b13f9c312e298b6536bca5dbd64b
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hunje.yeon [Fri, 18 Sep 2015 11:13:28 +0000 (20:13 +0900)]
Remove SSM and PPM service foler
The SSM and PPM service in IoTivity is supported by Resource Container
as Protocol Bridge and Soft Sensor Template. Therefore, the exsisting
SSM and PPM folder is not required anymore.
This commit deletes both service folders and update service/SConscript.
Change-Id: I0864db18a6141b345fc883ae4740c152dbe868ab
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2695
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Fri, 18 Sep 2015 10:13:08 +0000 (15:43 +0530)]
[TIZEN] Resource Encapsulation Tizen build fixes.
Change-Id: I0ada98200f182992326c2fd448730f47b30da2be
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Mon, 14 Sep 2015 13:42:31 +0000 (19:12 +0530)]
resource: Add test for ConstructResourceObject without coap scheme
Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with no "coap" scheme in the the host value
Change-Id: Iaec6f6f0038a049b969d08685cc057e6bae80455
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2517
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Fri, 4 Sep 2015 10:55:09 +0000 (16:25 +0530)]
Add iotivity.pc.in file and generate iotivity.pc file
This patch addresses the second part of IOT-524. The current
changes include adding a new iotivity.pc.in file and generating
the iotivity.pc file using .pc.in file.
Making the relevant changes in gbsbuild.sh files to include iotivity.pc.in
file during tizen builds.
Change-Id: Ie3ed7ccdf6e29d427362d0bb2b85439508997b6b
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2378
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Fri, 18 Sep 2015 07:01:58 +0000 (16:01 +0900)]
Fixed android local reference overflow
Delete JNI local reference
Change-Id: I1b0b54ec775be075a3fe9e127d57fe0bc882c9a8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
hyuna0213.jo [Mon, 14 Sep 2015 09:32:49 +0000 (18:32 +0900)]
optimization to use the existing buffer in blockwise-transfer.
if we have to update payload data, we always allocate new memory.
so we modified the code to use the existing memory if one exists.
This patch addresses the first part of IOT-690.
Change-Id: I04ca551273caf02f783c62a76f11f7e07409d8dd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Thiago Macieira [Thu, 17 Sep 2015 23:44:13 +0000 (16:44 -0700)]
Remove unnecessary include.
syscall(3) is not used, so <sys/syscall.h> is not required. It's a
Linux-specific header anyway, so it should never have been on this file.
Change-Id: I42e7ef1a481840699a8dffff1404e8e982839caf
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2651
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwanseo [Wed, 16 Sep 2015 11:55:46 +0000 (20:55 +0900)]
fixed the prevent issues for CA android platform.
-remove the logically dead code
-memory leak
-dereferencing null pointer
Change-Id: Ided9d1fc0a909f10309df47e23b04d7f1ca8db22
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
sandipan.p [Mon, 14 Sep 2015 12:51:55 +0000 (18:21 +0530)]
Upload command update for Arduino DUE
With the previous implementation, CA and RI binaries were trying to get uploaded
on DUE board during SConscript parsing.
Change-Id: I12955a09e5695192b6cb756f2252b12bc62c0726
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2515
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Harish Kumara Marappa [Fri, 18 Sep 2015 14:37:25 +0000 (20:07 +0530)]
Merge branch 'master' into simulator
Change-Id: I76a7d8c501e2122a3c4eddd73ede9f7195fe1055
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Abitha Shankar [Fri, 18 Sep 2015 07:14:43 +0000 (12:44 +0530)]
Adding Raml and JsonSchema Parser changes for
1. Doxygen comments.
2. Klocwork fixes.
3 prevent issue fixes.
4. added smart pointer implemetation for JsonSchema Parser.
Change-Id: I8a6ff026fb9b03932ab7c15a19631143e0c653fa
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2563
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Fri, 18 Sep 2015 05:44:50 +0000 (14:44 +0900)]
Modify RCSBundleInfo API, make constructor and destructor of the container protected.
- remove RCSBundleInfo APIs to build bundleinfo and set bundle information, since bundleinfo only can be created and set only by the container internally
- make constructor and destructor of the container protected to make container exists as singleton
Change-Id: I677ec510f046a3f5b7d2be584c0d42a915d17082
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2671
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Madan Lanka [Fri, 18 Sep 2015 09:44:02 +0000 (09:44 +0000)]
Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
ChaJiwon [Fri, 18 Sep 2015 08:24:41 +0000 (17:24 +0900)]
Adding scope to RCSDiscoveryTask
- adding scope 'RCSDiscoveryManager' to RCSDiscoveryTask in resource-encapsulation sample client
- modify DiscoveryTask name
Change-Id: Id2140350a54e2f2089322a57a9307572fb8746cb
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2687
Reviewed-by: kwon doil <doil.kwon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Fri, 18 Sep 2015 04:51:15 +0000 (13:51 +0900)]
Modify empty parameter handling in RCSDiscoveryManager
and tranfer "RCSDiscoveryTask"'s location into "RCSDiscoveryMananger".
- if input value(relativeUri) is empty, will be discovered after be changed into "OC_RSRVD_WELL_KNOWN_URI".
- delete white space.
- According to move "RCSDiscoveryTask" into "RCSDiscoveryManager", changed name from "RCSDiscoveryTask" to "DiscoverTask".
Change-Id: I544d001e5b3a2f0fda75452f86430aceee2b46e5
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2663
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
Markus Jung [Fri, 18 Sep 2015 05:51:23 +0000 (14:51 +0900)]
Execute bundle activation in separate thread
This change executes the bundle activation in a separate thread. The calling thread waits
a defined time for the bundle activation to be completed before continuing the program flow.
Change-Id: I07dbb2e7b87658f5a0b1de827b458c2d55c5d16c
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2669
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ChaJiwon [Fri, 18 Sep 2015 05:46:30 +0000 (14:46 +0900)]
modify resouce-encapsulation sample server and client
sampleResourceClient
- add the function that discover resouce
- add the function that cancel discover resource
sampleResourceServer
- select presence mode
- select resource type
Change-Id: I9e5867569be687fc25a9d1eca7a2cdff585b2963
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Heewon Park [Fri, 18 Sep 2015 05:43:55 +0000 (14:43 +0900)]
modify doxygen comment
-RCSResourceObject.h
Change-Id: I958572760b25d100ed2e8f4aaf6252a1625cad0b
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Thu, 17 Sep 2015 12:15:33 +0000 (17:45 +0530)]
Updated Java SDK of RE layer
- Updated the RCSResourceAttributes class to support Nested Attributes.
- Updated the JNI Layer.
Change-Id: Ief1fe17a2d497a1167d4b6cc3bc727b0dfe62096
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hunje.yeon [Fri, 18 Sep 2015 06:22:18 +0000 (15:22 +0900)]
Merge branch 'master' into resource-encapsulation
Update the changes of master branch into resource-encapsulation branch.
Change-Id: Ie553d5813809f0f7d686e074b95ff330eb82bc88
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Jihun Ha [Fri, 18 Sep 2015 04:31:13 +0000 (13:31 +0900)]
Remove GroupSynchronization class in things manager
We've decided to remove the GroupSynchronization class because the current
implementation of the class is not clear to be used and does not provide
any useful functionalities to developers.
We will re-design this features more concretely and re-summit it in the future.
For Android and Tizen platform, we will summit patchsets soon.
Change-Id: Icd8116c69f9078af275aa91216c0f28db4378d32
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Markus Jung [Wed, 16 Sep 2015 10:54:51 +0000 (19:54 +0900)]
Prefix for bundle activation function
This patch introduces a prefix for the activator functions of C++ bundles.
Multiple bundles can now be linked into one application.
Change-Id: I7f345bf1a81eac9616adbf9b975a7f8565c8c172
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2581
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>
Hauke Mehrtens [Tue, 15 Sep 2015 16:53:35 +0000 (18:53 +0200)]
tinydtls: remove certificate_list length field for raw public keys
This fixes https://jira.iotivity.org/browse/IOT-715
This patch introduces an API incompatible change, old IoTivity clients
using Raw Public key will not be able to communicate with clients
with this change.
backport of tinydtls upstream commit:
From
71d5f5c9247bbdb5ae1f43533f94c13be1153160 Mon Sep 17 00:00:00 2001
From: Olaf Bergmann <bergmann@tzi.org>
Date: Wed, 26 Aug 2015 21:35:26 +0200
Subject: [PATCH] dtls.c: remove certificate_list length field for raw public
keys
RFC 7250 has changed the format of the Certificate structure from
RFC 5246 to the following:
opaque ASN.1Cert<1..2^24-1>;
struct {
select(certificate_type) {
// certificate type defined in RFC 7250
case RawPublicKey:
opaque ASN.1_subjectPublicKeyInfo<1..2^24-1>;
// X.509 certificate defined in RFC 5246
case X.509:
ASN.1Cert certificate_list<0..2^24-1>;
};
} Certificate;
Thus, there must be no additional length field indicating a
certificate list in case the message contains a raw public key.
Change-Id: I3887fe962548e8e9d0c5bbb9f450073b9f95d1cb
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
jihwan.seo [Thu, 17 Sep 2015 00:31:20 +0000 (09:31 +0900)]
updated CA sample app related to removed CA_SUCCESS
https://gerrit.iotivity.org/gerrit/#/c/2549/
Change-Id: I625b24978e7d4b418dbcb311f04ad683e1990bf2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
hyuna0213.jo [Thu, 17 Sep 2015 04:22:10 +0000 (13:22 +0900)]
Modified the argument in CAAddBlockOption()
In CAAddBlockOption1 and CAAddBlockOption2 the second argument
is a CAInfo_t. but This is a large array. so we have to use pointer.
This patch addresses the first part of IOT-690.
Change-Id: I78ce8799a6db1a4a378bca016dd27c3529109e2e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2613
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Jaehong Jo [Thu, 17 Sep 2015 02:26:45 +0000 (11:26 +0900)]
Merge remote-tracking branch 'origin/routing-manager'
Implementation for Routing Manager.
1) Gateway resource Hosting and exchange of routing tables.
2) Linklist implemenation.
3) Routing table manager to add, remove, get next hop etc.
4) Routing message parser using cbor parser funtions.
5) Dynamic route updates on addition/removal of gateways.
6) Support for Endpoint
Please refer to below links for wiki and jira updates.
https://wiki.iotivity.org/routing_through_heterogeneous_transports
https://jira.iotivity.org/browse/IOT-565
Change-Id: I228b59ef922f55552386fb0b0e1b2bb2343b1adb
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2301
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>
jihwan.seo [Wed, 16 Sep 2015 08:23:21 +0000 (17:23 +0900)]
Fixed a session problem related to BT off/on for Android BLE.
when BT turn off/on while device is connected,
BLE is not connected again.
so i have modified something like in below
- when BLE Disconnect event is called
server have to start advertising again.
- the dataList of server/client have to destroy, when BT turn off.
- client have to start device scan again, when BT turn on.
Change-Id: I97b75d349a0e3205e221e1347d3f24ca23f4e139
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jnashok [Mon, 14 Sep 2015 06:30:47 +0000 (15:30 +0900)]
Fixed wrong update of ip information
interface name is assigned instead of ip address
port is assigned with 0 instead of correct port number
This patch fixes both
Change-Id: Id88e02d37bfb7a83c59100b997a021782f67099a
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Sachin Agrawal [Thu, 17 Sep 2015 15:56:04 +0000 (15:56 +0000)]
Merge "Merge branch 'security-summit' into 'master'"
Minji Park [Wed, 16 Sep 2015 11:32:10 +0000 (20:32 +0900)]
modify bundle resource and request handler to update multiple attributes
- modify set, get request handler in the container
- add setAttributes in bundle resource to update multiple attributes
- modify protocol bridge, softsensor resource template and samples
Change-Id: I361c0b2a8d01f3a783e2a22bb2469aee0445a9e0
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2585
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Madan Lanka [Thu, 17 Sep 2015 00:50:16 +0000 (20:50 -0400)]
Removed Eesysetup implementation for validation
Removed Easysetup implementation due to pending internal code validation step.
The support will be added after validation is completed
Change-Id: I8cc1499a1d033ed0eeb5cfff1ceb0c729e2968d4
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2611
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
doil.kwon [Thu, 17 Sep 2015 06:11:05 +0000 (15:11 +0900)]
Add unitTest for RCSDiscoveryManager.
Change the class name "DiscoveryTask" to "RCSDiscoveryTask".
Add handling about move operator and copy operator and move constructor and copy constructor for "RCSDiscoveryTask" class.
Modify Sconscript to build RCSDiscoveryManager UnitTest.
Change-Id: If409727bab435f38dd1ef4846880bf1a0bab827a
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Thu, 17 Sep 2015 05:20:14 +0000 (14:20 +0900)]
Modify permissions for files in Things Manager
All files with "Excutable bit" has been changed into "Non-executable bit"
(755 -> 664)
And, I've modified typo strings in con-client and con-server applications
Change-Id: I6498d22b96fadd078e0ae9a05e782dfccb84bb07
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2615
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sachin Agrawal [Thu, 17 Sep 2015 05:36:46 +0000 (22:36 -0700)]
Merge branch 'security-summit' into 'master'
* security-summit:
Add assignment of newly introduced member in OCProvisionDev_t - AddDevice() and PMCloneOCProvisionDev() are changed. Since change 2333 introduced DeviceStatus memeber in OCProvisionDev_t, Add and Clone functions should handle this new member properly.
Add C++ API for OCUnlink / OCRemove CAPI to Provisioning Manager
Add 'sct' (Supported Credential Types) in doxm resource. - Implements madatory property 'sct' in doxm resource.
Updated ACL & DOXM entity handler to process GET query
Fix 2 warnings in C Provisioning Module - Comparision between size_t and int type incurs warning. Add typecast of int when int is zero or positive value.
Refactored provisioning client sample on C-level API
Added Device dashboard OC APIs
Remove unnecessary data type in PM - OTMStates is not used/required in current version.
Added C++ API for Provisioning Manager
Add OCUnlink / OCRemove API to Provisioning Manager
Check PDM Initialization before excuting exposed PDM APIs - There is a case that user might call PDM API without initialization. This patch could prevent this case by checking initialized status of sqlite DB.
Remove unnecessary OC API in Provisioning Manager - OCDeleteProvisionResults() is not required any more because OCProvisionResult_t is freed after user callback is hitted.
Removed global variables from OTM
Add filter to Owned Device Discovery. - Previous version discovers devices with condition 'owned=true'. This patch adds one more condition that 'owned=true' and 'owner=myself' This filter is required to screen out devices that are out of control.
Added PDM Module to Provisioning APIs
Bug-fix & Internal API name change
1. Change OCDeleteProvisionResults() parameters - double pointer -> single pointer
Updated provisioning API to cater different connectivity type.
Conflicts:
resource/csdk/security/provisioning/src/pmutility.c
Change-Id: Idcfcc236f1a0f7a6c8c40dbfe21914eb2a935393
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
doil.kwon [Fri, 11 Sep 2015 06:14:51 +0000 (15:14 +0900)]
RCSDiscovermanager's discovery feature extension for active discovery
- Previous Versions of RCSDiscoveryManager can discover only things that is available during discovery.
Now RCSDisvoveryManger's Function is extended for active discovery. It can discover things that is incoming after discovering, andcan discover resource what is not supported presence function.
- RCSDiscoveryManagerImpl codes(.h file and .cpp file) are included.so also added its path in Sconscript.
- RCSDiscoveryManagerImpl Constructor is not setting about default.
- when DiscoveryTask's deconstructor is called, called cancel() API.
- delete white spaces and tabs to spaces.
- modify polling interval time 5sec -> 1min
- modify limited line.
Change-Id: I324d5be818655e258cdd2118ace7cabffae97d36
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Harish Kumara Marappa [Wed, 16 Sep 2015 15:14:29 +0000 (20:44 +0530)]
Updated URI parsing code in server and added code to keep observed resources list in client
Change set include below given changes:
1. Updating Javadoc comments
2. Eclipse plugin UI fixes.
3. Updated sample RAML file without OIC related information.
4. Handling exceptions.
Change-Id: I13d51876fdf6df72e09b74277dd4a813aa7ed8c9
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2599
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Wed, 16 Sep 2015 11:37:01 +0000 (17:07 +0530)]
[TIZEN] Enriched RE Sample Application with nested resource attribute.
Change-Id: I2b32519b1f107421c834e4bd8ac22467cd3b1c7f
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2587
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Younghyun Joo [Wed, 16 Sep 2015 11:20:36 +0000 (20:20 +0900)]
Modify ResourceContainer UnitTest code for including Resource RCS Client module
- add UnitTest case for DiscoverResourceUnit
- add UnitTest case for RemoteResourceUnit
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Change-Id: I789db92d51ece367ff42babcf599b4d4c1093874
Reviewed-on: https://gerrit.iotivity.org/gerrit/2583
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Wed, 16 Sep 2015 11:07:46 +0000 (16:37 +0530)]
RE - Enriched Linux sample application with nested resource attributes.
Change-Id: Ieea592f3d490f56de6ab058078dbc1a7f1910a12
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2575
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
vimala.v [Wed, 16 Sep 2015 11:48:21 +0000 (17:18 +0530)]
Changed from c++11 to c++0x in Tizen csdk samples.
Change-Id: Ic95783e7227f8bebb3b279fc9938013155feae0c
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2589
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Wed, 16 Sep 2015 13:28:36 +0000 (22:28 +0900)]
removed unneccessary code to check sending data in BLE
although data is sending,
error message is calling from unnecessary spot.
it have to modify
Change-Id: I4172da1ec18707a12bd02775bd78ee68511a4a52
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2595
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Tue, 15 Sep 2015 17:29:29 +0000 (02:29 +0900)]
replace meaningless comment with detail comment.
OC is not available name as layer or module
Change-Id: Iba4cd83a3b59d3b82e720bcdb65930e7544f1a7a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2573
Reviewed-by: Erich Keane <erich.keane@intel.com>
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>
jihwan.seo [Tue, 15 Sep 2015 08:47:27 +0000 (17:47 +0900)]
Updated a code value of CAResponseResult_t.
since there is no code in CoAP Spec.
I have removed CA_SUCCESS code from CA.
According to CoAP Spec, 2.05 Content code is like HTTP 200 "OK"
thur 2.05 will be used instead of 2.00.
---------------------------------------------------------
5.9.1.5. 2.05 Content
This Response Code is like HTTP 200 "OK" but only used
in response to GET requests.
---------------------------------------------------------
Change-Id: I9f4d3c09661c4dec967f2bb91f51941b93084a93
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2549
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>
Patrick Lankswert [Wed, 16 Sep 2015 19:44:50 +0000 (19:44 +0000)]
Merge "Merge easysetup branch into master"
Sakthivel Samidurai [Tue, 15 Sep 2015 01:54:00 +0000 (18:54 -0700)]
Add security payload type to a request/response
After removing the OCPayloadType from the payload, the stack has to
fill the appropriate payload type for security and non-security
payload type. Added PAYLOAD_TYPE_SECURITY as a payload type for
security resource request in HandleResourceWithEntityHandler
and response in HandleCAResponses.
Change-Id: I3007a1e79ad25b4e557ab15edb038a22cb9e85c3
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2539
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Mon, 14 Sep 2015 12:29:03 +0000 (21:29 +0900)]
Clean up the stack code of csdk to check NULL
Change-Id: I71cbfc835d1710a472d3089c2686e4e980a05ce4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Tue, 15 Sep 2015 16:16:13 +0000 (01:16 +0900)]
Cloud Interface Feature base on CoAP over TCP in CA Layer
- modified libcoap library to support coap over tcp
- added new transport adapter and flag in CA
- linux platform can be supported
- TLS, IPv6, Keep alive and so on will be support 2nd phase
- https://wiki.iotivity.org/proposal_for_cloud_interface_in_iotivity
Change-Id: Ifcc0f78c1a5ca9d11e41498f712c0039213bd3d0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2298
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Erich Keane [Fri, 11 Sep 2015 16:30:09 +0000 (09:30 -0700)]
Added unit tests for OCRepresentation to CBOR and back
These unit tests validate the conversion of OCRepresentation objects
through OCRepPayload and into CBOR, then brings them back. This
validates all data types, including jagged arrays.
Change-Id: I6c74a29f51febcff8553ac194c5ae57eaa50a460
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Erich Keane [Thu, 10 Sep 2015 21:51:32 +0000 (14:51 -0700)]
Removed the OCPayloadType from the payload
Previously, the CBOR container included the type of the message to make
parsing of the CBOR items easier. This is unfortunately against the
spec, so this patch removes it and requires the caller to ensure that
the expected message type is sent. Incorrectly formatted messages will
result in the message not passed back via the callback.
Change-Id: If1ca9eed65b5274239b670e8a2bd6cadce763c19
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2482
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Erich Keane [Mon, 14 Sep 2015 17:18:09 +0000 (10:18 -0700)]
Changed CBOR array format
Previously, a CBOR array was predicated by its type and dimensions.
In order to be closer to spec compliant, this fix removes these two, and
encodes by using recursive arrays.
Change-Id: Ib644d59c44e0897479ff1473f6b57eacfc9b4da3
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Wed, 2 Sep 2015 17:46:00 +0000 (10:46 -0700)]
Android: Removing cancelObserve in OcResource destr.
It also resets the event listeners to nullptr.
In addition it replaces all occurrences of NULL with nullptr
Change-Id: Ie0d80cc2e2312c6886e168ce7b0e4eaa9f84eac3
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2356
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Sachin Agrawal [Wed, 16 Sep 2015 19:11:45 +0000 (12:11 -0700)]
Merge branch 'master' into security-summit
* master: (50 commits)
Update the stack to use the new CoAP return code 2.04/2.05 values.
resolve memory leak of ip monitor
removed warning message for CA
Add frag/defrag logic in EDR
Add support for and handle presence of the coap ACCEPT option.
Addressed endpoint pointer type mismatches in LE adapter.
modify the OCTransportAdapter structure in RI
apply smack rule and make resource samples package
[Resource-Encapsulation] Updated Java SDK and RE Android Samples
Enable error responses to be sent back to the client.
Updated Android Sample App for block-wise transfer
Enabled CoAP over TCP in RI Layer.
[TIZEN] Updated properties of Configuration resource in Things manager.
resource: Add test for ConstructResourceObject with InvalidUri
[Services - Things Manager] Removed Things Manager class and exposed its component classes for SDK
[Things-Manager] Updated Things Manager Sample Applications
Fixed pointer-type arrays with NULL values
Remove ifaddr files
replaced some ERROR tag with DEBUG
[TIZEN] Removed things manager class dependency from TIZEN SDK and used its component class.
...
Conflicts:
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/doxmresource.c
resource/src/SConscript
Change-Id: I615c48ee6066873b9a5bb1dc27fff7e2490fb68f
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Woochul Shim [Tue, 15 Sep 2015 00:24:46 +0000 (09:24 +0900)]
Add assignment of newly introduced member in OCProvisionDev_t
- AddDevice() and PMCloneOCProvisionDev() are changed.
Since change 2333 introduced DeviceStatus memeber in OCProvisionDev_t,
Add and Clone functions should handle this new member properly.
Change-Id: I1b227b8d70ca43730b098bc1bfc5837706c78ea7
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2535
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jay Sharma [Tue, 15 Sep 2015 12:35:05 +0000 (18:05 +0530)]
Notification-Manager changes for Android platform
- Updated Resource Hosting (JavaSDK)
- Updated Sample Applications
Change-Id: I3a9edff3a6152d6558c91b3f213ccde0b53a0917
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2561
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ashwini Kumar [Mon, 14 Sep 2015 04:40:16 +0000 (10:10 +0530)]
Add C++ API for OCUnlink / OCRemove CAPI to Provisioning Manager
- Based on changeset #2407
[Patch #2]: Addressed review comments, removed warnings,
updated to changeset #2333
[Patch #3]: Solve build issues
Change-Id: I1e0088c214154c643fd790fdc8fe61741657cf4c
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2497
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Rami Jung [Tue, 15 Sep 2015 10:49:56 +0000 (19:49 +0900)]
add a test case of nested vector attributes.
Given that OCRepresentation supports 3 depths of attributes, RE has extended its functionality to 3 depths of attributes like OCRepresentation
It means developers are able to make the following structure
{
"key" : [
[ [0, 1], [4, 5] ],
[ [4, 5], [7, 8] ]
]
}
This test case checks whether it works correct or not
Change-Id: Id9380faf61ecfb3c43465e2b040a83f1225daa0f
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
G S Senthil Kumar [Mon, 14 Sep 2015 17:10:13 +0000 (22:40 +0530)]
Java SDK and Eclipse plugin for simulator.
1. Java APIs for service provider and client controller.
2. Added client controller eclipse plug-in.
3. Minor changes in service provider eclipse plug-in for
config file handling.
4. Included RAML configuration file for light resource in plug-in.
5. Handled exceptions till plug-ins.
6. Included license header and javadoc comments in plug-ins.
7. Updated the java sdk method names in platform and device info classes.
8. Handled review comments [Added license header and included comments in all
the source files of plug-in, and updated comments in Java APIs]
Change-Id: I17181691a48b2f54cf3b9f46435fe7f09f8076cb
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 15 Sep 2015 11:39:59 +0000 (17:09 +0530)]
Updated REServer Andriod application.
- Updated REServer application for the new bundles : BMI and DI bundles.
- Updated the .xml file for the bundles.
Change-Id: I924f1a17bd2c3f5368e3275b5a019cc2759da7a2
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2519
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
lankamadan [Fri, 11 Sep 2015 13:34:33 +0000 (22:34 +0900)]
Merge easysetup branch into master
Conflicts:
resource/csdk/connectivity/SConscript
resource/csdk/stack/src/ocstack.c
service/SConscript
Change-Id: I1c850a63fe8b10162a8861dc1f9e79269a7d0824
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Madan Lanka [Wed, 16 Sep 2015 00:26:19 +0000 (00:26 +0000)]
Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
Ashwini Kumar [Tue, 15 Sep 2015 07:26:29 +0000 (12:56 +0530)]
Add 'sct' (Supported Credential Types) in doxm resource.
- Implements madatory property 'sct' in doxm resource.
1. Modify marshalling/Unmarshalling functions in doxmresource.c.
2. Modify all SVR databases that have 'doxm' resource.
[Patch #2] Modify property(attribute ID) and wrong usage of a type for sct.
[Patch #3] Rebase & Fix Arduino build error
[Patch #4] Fix Provisioning C++ Sample build error
[Patch #5] Add 'sct' to resource/provisioning/example/xxx.json
[Patch #6] Updated xxx_client.json acl perms
Change-Id: I4340de22a138437f4307639a2e05dbe8a5affb8b
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2470
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Mon, 14 Sep 2015 23:55:15 +0000 (16:55 -0700)]
Updated ACL & DOXM entity handler to process GET query
Updated ACL resource entity handler to process GET query
and DOXM resource entity handler to process GET query for
device ID.
Change-Id: Ia293fd633e0ce4f70202a6f80a04bd0f283510fa
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2411
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Stephane Lejeune [Fri, 4 Sep 2015 20:06:45 +0000 (22:06 +0200)]
Update the stack to use the new CoAP return code 2.04/2.05 values.
Since draft-ietf-core-observe-02 (September 16, 2011),
the result value "2.00" was depricated and replaced with "2.05"
for GET a method and "2.04" for POST and PUT methods.
Change-Id: I8061089469609d5ad801fa0456fda326cbc1fc33
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2396
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Myungchul Kwak [Mon, 14 Sep 2015 07:48:36 +0000 (16:48 +0900)]
resolve memory leak of ip monitor
Resolve memory leak in the IP network monitor of Android & Tizen app.
Calloc'd memory (32bytes) in CANewInterfaceItem(...) fuction is not freed,
and this function is continously called in network monitor thread.
So gradual memory leak is occurred.
Our Android sample app for blockwise-transfer test freezes,
if the app transfers some large data over 10 mins.
(I suppose that this time can be different by device spec.)
Change-Id: Ic6e85acb7c70376c125450c0641b557cc147d39c
Signed-off-by: Myungchul Kwak <minus2k@hotmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2505
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Tue, 15 Sep 2015 10:57:07 +0000 (19:57 +0900)]
removed warning message for CA
Change-Id: I6823ba9ca9a27deab03e4f8ea3d155c62445704e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2557
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
vimala.v [Fri, 4 Sep 2015 06:42:12 +0000 (15:42 +0900)]
Add frag/defrag logic in EDR
As data is clubbed into single packet when we use EDR adapter in android,
it is necessary to use the fragmentation, defragmentation logic.
As its platforms limitation, to have interoperability
it needs to be handled at EDR adapter.
https://jira.iotivity.org/browse/IOT-692
This code to fix the above Jira issue.
Change-Id: I84d9592775a6a638917e5574a2d8425027f5a26f
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2375
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Woochul Shim [Tue, 15 Sep 2015 00:11:51 +0000 (09:11 +0900)]
Fix 2 warnings in C Provisioning Module
- Comparision between size_t and int type incurs warning.
Add typecast of int when int is zero or positive value.
Change-Id: I967c673fdc12e0ac8028477a4ff4573cf4596172
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Woochul Shim [Tue, 15 Sep 2015 07:40:50 +0000 (16:40 +0900)]
Refactored provisioning client sample on C-level API
[Patch #1] submitted initial patch set
[Patch #2] fixed minor variable initialization
[Patch #3] fixed minor typo bugs
[Patch #4] updated enough callback timeout
[Patch #5,6] Rebase
[Patch #10] Rebase, DeleteACL is exposed by Provisioning Manager
[patch #11] Remove DeleteACLLit() prototype in srmutility.h
Change-Id: Ifa929b37eae410605285aaeb66ac5385f08f94dc
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Stephane Lejeune [Thu, 10 Sep 2015 23:58:19 +0000 (01:58 +0200)]
Add support for and handle presence of the coap ACCEPT option.
This commit adds the CBOR accept option to all requests.
When a request comes in with an accept option, the option is evaluated
against the supported encoding formats. If the format is undefined or
when CBOR is requested, CBOR will be used to encod the payload.
When the response does not carry a payload, the accept option is
ignored and the response will proceed irrespective whether the accept
format was supported or not. This allowsi for example a device that
performs a delet operation proceed first working out which format is
supported by the server.
Change-Id: I7ae3430d11f1481a91413088a959f105b216ffea
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2492
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ossama Othman [Fri, 11 Sep 2015 22:53:46 +0000 (15:53 -0700)]
Addressed endpoint pointer type mismatches in LE adapter.
Corrected a pointer type mismatch in the BLE adapter implementation
introduced by commit
6c0321f5 where the endpoint parameter of the
network packet received callback was changed from CAEndpoint_t* to
CASecureEndpoint_t*.
Change-Id: Id7413f2085fe7e230be811723ff0392bb11efd33
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2488
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
arya.k [Tue, 15 Sep 2015 10:25:50 +0000 (15:55 +0530)]
[TIZEN] Notification Manager Sample Application update for RE libraries.
Change-Id: I68ad801d64f1736b244b12a8d8a4f8a620ae64f5
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2553
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hunje.yeon [Tue, 15 Sep 2015 11:13:28 +0000 (20:13 +0900)]
Merge branch 'master' into resource-encapsulation
Update the recent changes of 15th Sep. from 'master' branch into 'resource-encapsulation'
Change-Id: I35359c7f596ce5c9d8db9a02f04835863b5a0635
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
arya.k [Tue, 15 Sep 2015 05:59:40 +0000 (11:29 +0530)]
[TIZEN] Added BMI bundle features in RE Sample Server Application.
Change-Id: I6d0ac5b6535d4fb41c800fbe95a3cf27929fe4a6
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2545
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Harish Kumara Marappa [Tue, 15 Sep 2015 05:43:33 +0000 (11:13 +0530)]
Code cleanup of client controller and service provider in C++ and JNI.
Change set has below mentioned changes.
1. Folder restructure in simulator "src" folder.
2. Adding exception support.
3. Implementation of new APIs like getDeviceInfo, getPlatformInfo.. etc
Change-Id: I565ec2ed2469b919c7050cce05601ec4f8f7ee38
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2494
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Tue, 15 Sep 2015 06:15:22 +0000 (15:15 +0900)]
Add logic in container to get notification when bundle resource updated
- add logic to get notification when bundle resource attributes are updated, and enable to notify observers using server builder
Change-Id: I0e2b5c3d72d383b919ab7a7f0a6bbc6403f3ac9e
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2547
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Mon, 14 Sep 2015 05:37:59 +0000 (11:07 +0530)]
[TIZEN] Added Resource Container Discovery in Sample client application.
Resolved build errors for Sample Server application.
Change-Id: I96065e2b9eb8a85cb5936fb55e769bb33a25e252
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2474
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Mon, 14 Sep 2015 12:45:25 +0000 (21:45 +0900)]
Modify logs in resource container using OC_LOG
- add error logs in container
- modify existing logs using OC_LOG
- define common strings for bundle configuration in seperate header
Change-Id: Ib702cab1c62fe0d9038f86d99ca8f278eb4a19ed
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hyuna0213.jo [Mon, 14 Sep 2015 08:20:25 +0000 (17:20 +0900)]
modify the OCTransportAdapter structure in RI
currently if RA and TCP are together used, there is a compile issue.
so I fixed the issue to build iotivity.
Change-Id: I844deb28afc1556d7faa9c33ac4062550d9e223c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Randeep Singh [Wed, 9 Sep 2015 09:10:16 +0000 (18:10 +0900)]
Added Device dashboard OC APIs
The apis in this change will be used to get complete state of
all the devices like owned/unowned status,device link status
and power on/off status.
[Patch 2] Updated code according to review comments.
[Patch 7] Rebase
Change-Id: If29a73646a4f77e4c6305de9ab4f3088a69a6eb7
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Minchul Lee [Thu, 10 Sep 2015 07:30:42 +0000 (16:30 +0900)]
apply smack rule and make resource samples package
Change-Id: Ib98fa2130700ce8dc33c9216c0c9a82147ff8dde
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2442
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Harish Kumara Marappa [Fri, 4 Sep 2015 05:43:17 +0000 (11:13 +0530)]
Including observer endpoint information in ObservationInfo structure.
Observation ID is not enough to differentiate between multiple
observers from application point of view in the cases of application
needs to notify specific observers. This patch has changes making
ObservationInfo structure to hold connectivity type, address and port information too.
Change-Id: I4f2aa81bf60366d208f0c06a1694ac2bc70665f3
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2323
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Jay Sharma [Mon, 14 Sep 2015 09:53:44 +0000 (15:23 +0530)]
[Resource-Encapsulation] Updated Java SDK and RE Android Samples
- Renamed Applications to REServer and REClient
- Fixed sample app issues.
- FIxed issues in JNI.
- Added separate Listener for set and get attributes.
- Updated Doxygen comments
Change-Id: I86f186b1153f02b15064177ac4b41ffcf6d6ddfe
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2485
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Abitha Shankar [Sun, 13 Sep 2015 14:21:16 +0000 (19:51 +0530)]
Adding JsonSchema parser implementation for simulator and Updating Raml Parser.
1. source code for Json Schema parsing logic.
2. updating Raml Parser to read all child resources, types and Traits.
3. added smart pointer implemetation for Raml Parser.
Change-Id: I3565b97e8d8ef78f98841469a17230e64112370f
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jay Sharma [Mon, 14 Sep 2015 06:10:20 +0000 (11:40 +0530)]
[Resource-Encapsulation] Updated Java SDK and RE Android Samples
- Renamed Applications to REServer and REClient
- Fixed sample app issues.
- FIxed issues in JNI.
- Added separate Listener for set and get attributes.
- Updated Doxygen comments
Change-Id: I86f186b1153f02b15064177ac4b41ffcf6d6ddfe
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2484
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Woochul Shim [Fri, 11 Sep 2015 10:20:13 +0000 (19:20 +0900)]
Remove unnecessary data type in PM
- OTMStates is not used/required in current version.
Change-Id: I74d88ab1ea38f41afb4523b302d15df2201f3e29
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2471
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ashwini Kumar [Mon, 31 Aug 2015 12:03:20 +0000 (17:33 +0530)]
Added C++ API for Provisioning Manager
- Unowned/Owned device discovery, ACL, Credential provisioning
- Ownership transfer
- Sample client.
[Patch#4]: Addressed review comments from Sakthivel
[Patch#5]: Added API for Unlink, device revocation, Dashboard
[Patch#6]: Rebase
[Patch#7]: Addressed review comments from Randeep & Woochul
[Patch#8]: removed extra env Clone from SConscript
Change-Id: I4fcca4d5efdc6f46514b1e2456aba2c7761fbc32
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2320
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>