platform/upstream/iotivity.git
8 years agoFix to resolve discovery issue when built with "scons"
vimala.v [Mon, 29 Feb 2016 11:37:30 +0000 (17:07 +0530)]
Fix to resolve discovery issue when built with "scons"

TARGET_TRANSPORT=ALL is the default value and TCP support is
enabled in this case.  As currently multicast is not supported via TCP,
Discovery is not working.  This patch resolves the issue by sending UDP based
packet via IP adapter while TCP based packet via other adapters.

Change-Id: I6fb7556c2d5053c4c14c8fc21892b23c06602608
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5271
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoNFC Adapter initialization error
Ashok Babu Channa [Tue, 1 Mar 2016 13:55:03 +0000 (19:25 +0530)]
NFC Adapter initialization error

NFC Adapter is not able to initialize during selection of network. It is modified to initialize on
NFC_ADAPTER definition during build for all target transport or individual selection

Change-Id: I19f716b4f3ab20b267f38e8585e418e501be7a72
Signed-off-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix in Tizen 2.4 BLE client to discover services when the remote device is already...
vimala.v [Wed, 24 Feb 2016 04:27:41 +0000 (09:57 +0530)]
Fix in Tizen 2.4 BLE client to discover services when the remote device is already connected via GATT profile.

Change-Id: I834c110425beaec330368eb6a5a1b1e79213213f
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoadded the logic to clean receive buffer when disconnected
jihwanseo [Mon, 29 Feb 2016 06:26:35 +0000 (15:26 +0900)]
added the logic to clean receive buffer when disconnected

when connection state is disconnected,
received data has to be removed.

Change-Id: I05c5a0142549e3c3fac2fb83d6fd038487ec70c2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoto add error checker for gatt connection state
jihwan.seo [Thu, 25 Feb 2016 06:25:40 +0000 (15:25 +0900)]
to add error checker for gatt connection state

- it handles to process retry as per states for gatt connection state.
- to add code which waiting for target device for unicast.

Change-Id: Idc558154895792027a9535bb61558d483fb04148
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoadded CA interface to monitoring network status for android ble.
jihwan.seo [Wed, 17 Feb 2016 22:50:15 +0000 (07:50 +0900)]
added CA interface to monitoring network status for android ble.

add new CA interface for network status changes delivery to android
for ble connection manager

Change-Id: I21d5e1d134fc09fc38cb7e3706fc628f6e18a039
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BLE support for arduino
vimala.v [Fri, 26 Feb 2016 08:46:15 +0000 (14:16 +0530)]
CoAP over TCP transmission over BLE support for arduino

Change-Id: I5b7a775a85fab47c04c8dbbf45b064e796985209
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoUpdated api description for response classes of RE.
coderhyme [Mon, 29 Feb 2016 02:12:12 +0000 (18:12 -0800)]
Updated api description for response classes of RE.

Change-Id: I3bf6047ebe7f9b84f83438ce8093ce31e173c443
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5251
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix for issues reported on SVACE tool for CA
koushik.girijala [Mon, 29 Feb 2016 13:08:05 +0000 (18:38 +0530)]
Fix for issues reported on SVACE tool for CA

Fixed issues reported on running svace analysis to CA

Change-Id: I761aeccd576744c179da2042917cacf57d6e473b
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoRC Configuration: fixing potential dereference of null pointers
Markus Jung [Mon, 29 Feb 2016 08:17:12 +0000 (17:17 +0900)]
RC Configuration: fixing potential dereference of null pointers

Checks to make sure if certain configuration values are not
provided no null dereferenciation happens.

Issues reported by SVACE tool.

Change-Id: If4b7466dc2faca9447457784fb54d9990c3a15e4
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFix svace defects in things manager
Jihun Ha [Mon, 29 Feb 2016 11:32:57 +0000 (20:32 +0900)]
Fix svace defects in things manager

DeleteActionSets function is removed because it is unused anywhere.
Null checking logic is added in timer.c
Initialization for OCResourceHandle is added.

Change-Id: I22bf044e270cc4c31b15f5b6b8c682c10d4733ec
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5259
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix for Tizen EDR issues
koushik.girijala [Thu, 25 Feb 2016 11:21:36 +0000 (16:51 +0530)]
Fix for Tizen EDR issues

Blocked Server from doing device discovery
Handled Data send result handlig for socket disconnect case

Change-Id: I5ce49c218f9a4947875b385196ade80909cf371c
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5203
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agocheck if send request is sucessful or not.
jihwan.seo [Mon, 29 Feb 2016 06:08:29 +0000 (15:08 +0900)]
check if send request is sucessful or not.

Change-Id: I67a7fc8f9a956889019bdfe01e08284b015b5688
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoRemove a sample application for group-manager
Jihun Ha [Mon, 29 Feb 2016 08:25:53 +0000 (17:25 +0900)]
Remove a sample application for group-manager

APIs for the existing group manager are going to be deprecated and
a functionality to control multiple resources is replaced with one of
scene manager.
Due to this, a sample application for the group manager should be removed.

Change-Id: I3882ab6c2e699d1872154cef5dd25dea73cef89c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoUpdated api description for the client side of RE.
coderhyme [Mon, 29 Feb 2016 00:30:29 +0000 (16:30 -0800)]
Updated api description for the client side of RE.

Change-Id: I52babb04f0568dfcac22f176774111dc5033284a
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd example for separate response of RE.
coderhyme [Mon, 29 Feb 2016 00:27:20 +0000 (16:27 -0800)]
Add example for separate response of RE.

Change-Id: I36668f406b589863bcc87abbadfe37daf3f14b3d
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5243
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge "Merge branch 'resource-container'"
JungHo Kim [Mon, 29 Feb 2016 06:54:17 +0000 (06:54 +0000)]
Merge "Merge branch 'resource-container'"

8 years agoRefine RequestHandler in RE.
coderhyme [Mon, 29 Feb 2016 00:24:36 +0000 (16:24 -0800)]
Refine RequestHandler in RE.

Eliminate useless codes and add unittests.

Change-Id: I95ca4493b0d2ea3d121503336bb6bf94c484fe89
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5241
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix for defects detected by static analysis in Resource Broker.
jyong2.kim [Mon, 29 Feb 2016 04:14:25 +0000 (13:14 +0900)]
Fix for defects detected by static analysis in Resource Broker.

fix double time of deallocated memory.

Change-Id: I8905f1b85199c8bf0f26203f78b5abb755d2f425
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5253
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoMerge branch 'resource-container'
Markus Jung [Mon, 29 Feb 2016 00:23:09 +0000 (09:23 +0900)]
Merge branch 'resource-container'

Conflicts:
service/resource-container/examples/ContainerSample.cpp
service/resource-container/include/RCSBundleInfo.h
service/resource-container/src/BundleResource.cpp
service/resource-container/src/ResourceContainerImpl.cpp
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp

Change-Id: I84024311d8285a0356bcdccfec20bb38d41a9d98
Signed-off-by: Markus Jung <markus.jung@samsung.com>
8 years agoUpdated api description for RCSRepresentation.
coderhyme [Fri, 26 Feb 2016 06:50:49 +0000 (22:50 -0800)]
Updated api description for RCSRepresentation.

Change-Id: I68570997978e83d60f0c0ccd66274aac52ee5989
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5217
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
8 years agoRC android: load bundle classes from library
Markus Jung [Tue, 16 Feb 2016 09:37:32 +0000 (18:37 +0900)]
RC android: load bundle classes from library

This change enables the resource container to load
bundle classes from a .jar dynamically at runtime.
It extends the startContainer method in order to
return the status of a bundle, if it has been
succesfully activated or not.

Removed unnecessary white spaces.

Change-Id: I158889e4366b89b0ac825d789d476d7330894926
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5011
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
8 years agoChange iotivity.com to .org
Thiago Macieira [Fri, 26 Feb 2016 21:11:22 +0000 (13:11 -0800)]
Change iotivity.com to .org

We don't own the .com domain.

Change-Id: I0c94a5c2846b48c8aea7ffff14369a38afefd7ce
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5235
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP Transmission handling for CA_DEFAULT_ADAPTER type
vimala.v [Fri, 26 Feb 2016 08:26:45 +0000 (13:56 +0530)]
CoAP over TCP Transmission handling for CA_DEFAULT_ADAPTER type

Change-Id: I7416ade294e726a8c87ccf6aa3c966cb642d5685
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5223
Reviewed-by: koushik girijala <g.koushik@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoPrevent macro error
Jaehong Jo [Fri, 26 Feb 2016 01:31:26 +0000 (10:31 +0900)]
Prevent macro error

Change-Id: I8a08cf76a18663b6086a5aa84779587c3049b0b1
error: macro names must be identifiers
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoremoved buffer size defined previously in android edr server
jihwan.seo [Wed, 24 Feb 2016 07:28:45 +0000 (16:28 +0900)]
removed buffer size defined previously in android edr server

also some incorrect log message was modified.

Change-Id: I982f90a292971e4b4cb9fbc1dd0413aa09465665
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFixed memory leak issue in CA common logic
hyuna0213.jo [Wed, 24 Feb 2016 07:05:22 +0000 (16:05 +0900)]
Fixed memory leak issue in CA common logic

These memory leaks are reported by Valgrind.
The CA common logic was not properly free the memory
that was allocated.

Change-Id: I63c46e7208378fd7430772dd91b4f67ef35f9684
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5169
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCatching OIC::Service::ResourceCacheManager::InvalidParameterException
Markus Jung [Thu, 25 Feb 2016 08:35:31 +0000 (17:35 +0900)]
Catching OIC::Service::ResourceCacheManager::InvalidParameterException

The functions stopCaching and stopMonitoring of the RCSRemoteResourceObject throw
a OIC::Service::ResourceCacheManager::InvalidParameterException which is not catched.
Using the more generic RCSException solves the issue.

Change-Id: I42bf29b54278b0993a77c57718cd0dae2cea1a4b
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5197
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed Svace issues in NestedAttributes samples.
coderhyme [Thu, 25 Feb 2016 09:48:32 +0000 (01:48 -0800)]
Fixed Svace issues in NestedAttributes samples.

Some ugly codes are also fixed.

Change-Id: I057e6e8967019277fb54c2eab588a47c0ab09aea
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agomodified RCSResourceObject to generate responses according to the interface of requests.
jaesick.shin [Thu, 25 Feb 2016 05:54:55 +0000 (14:54 +0900)]
modified RCSResourceObject to generate responses according to the interface of requests.

Generate response for each of interface. (supported interfaces - oic.if.baseline, oic.if.a, oic.if.s, oic.if.b)
User can setting the default Interface.
If user not setting the default interface -> RE setting The default interface "oic.if.baseline"

Change-Id: If4faa93bb97850587bc44c7df5e6495796544c18
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5195
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Tested-by: JungHo Kim <jhyo.kim@samsung.com>
8 years agoUpdated api description for RCSSeparateResponse.
coderhyme [Thu, 25 Feb 2016 04:15:36 +0000 (20:15 -0800)]
Updated api description for RCSSeparateResponse.

Change-Id: I6592491e76a9976b847879a7cd0c05fd2c99fd47
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated api description for RCSRequest.
coderhyme [Thu, 25 Feb 2016 04:11:53 +0000 (20:11 -0800)]
Updated api description for RCSRequest.

Change-Id: Ie2997c1aa3a33853f335630a98662c8783182486
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModified unit test of Resource Hosting.
jyong2.kim [Tue, 23 Feb 2016 08:04:04 +0000 (17:04 +0900)]
Modified unit test of Resource Hosting.

When build with TEST keyword, unit test of RH is executed.
Fixed bug about late timing of resource discovery.

Change-Id: I43bba1a80cd20e78126887fd5dbd232458ada971
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5177
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded unit test cases for CA Util interface API
hyuna0213.jo [Mon, 22 Feb 2016 05:23:02 +0000 (14:23 +0900)]
Added unit test cases for CA Util interface API

Implemented unit test cases for testing added CA util API

Change-Id: I2a5632abb85744e29dde7dbb81568be38392e1c1
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5103
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoadded the cpp interface to monitoring network status.
hyuna0213.jo [Fri, 19 Feb 2016 00:27:25 +0000 (09:27 +0900)]
added the cpp interface to monitoring network status.

add new cpp interface to pass the changed network status
to application layer from CA.

Change-Id: Ib2867d22c7e65b223a0f39ce170bf259defa2719
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5051
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for defects detected by static analysis in Resource Broker/Cache/Hosting.
jyong2.kim [Wed, 24 Feb 2016 05:24:04 +0000 (14:24 +0900)]
Fix for defects detected by static analysis in Resource Broker/Cache/Hosting.

fix memory leak.
define copy constructor.
catch exception at destructor.

Change-Id: I52ed517449603b58f0fc04619e02757e67abf55d
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoremoved warning for provisioning.
jihwan.seo [Wed, 24 Feb 2016 05:38:22 +0000 (14:38 +0900)]
removed warning for provisioning.

an union variable of OCRepPayloadValue has int64_t.
since remove warning from logger,
i replaced long int with long long int type.

Change-Id: I6c53279f83c133b1ac73800ec0483f0f608a3da0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoTo add connection manager for Tizen BLE Server
hyuna0213.jo [Mon, 22 Feb 2016 08:42:55 +0000 (17:42 +0900)]
To add connection manager for Tizen BLE Server

Implemented connection manager for Tizen 2.4 BLE Server

Change-Id: I4237288aadb16036b848589687ddf50f428f9b74
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5111
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFixed issues reported by Static analysis tool
Sandipan Patra [Fri, 18 Dec 2015 04:37:59 +0000 (10:07 +0530)]
Fixed issues reported by Static analysis tool

Change-Id: Ide1887b36b7cc292a7bc400be7200ed0bf80037b
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agofixed build warning for tizen edr/le adapter
hyuna0213.jo [Fri, 19 Feb 2016 01:07:45 +0000 (10:07 +0900)]
fixed build warning for tizen edr/le adapter

Change-Id: I84d2fd276fe2a9549b49fa9cb5d9a9b80004998c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5173
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoChanged client keepalive logic to use the dynamic interval value
hyuna0213.jo [Wed, 23 Dec 2015 08:18:50 +0000 (17:18 +0900)]
Changed client keepalive logic to use the dynamic interval value

According to the OIC Spec, keepalive interval of D2D start from
2 minutes and increases in multiples of 2 up to a maximum of 64
minutes. but the interval value for D2S can be defined by the
cloud server. so if response message includes the interval array
property, Device use the interval value received from remote device.

Change-Id: I6dea8a082f1c221667c61985f28678bf310e66f2
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4719
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for Tizen Build error
koushik.girijala [Wed, 24 Feb 2016 06:00:07 +0000 (11:30 +0530)]
Fix for Tizen Build error

Fixed tizen build error because of change in build directory

Change-Id: Iffd130fd8b12020b0910369b4dd884e5d8db2e93
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5167
Reviewed-by: Vimala Vishwanathan <vimala.v@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoResolved function description gaps.
saurabh.s9 [Fri, 19 Feb 2016 06:12:55 +0000 (11:42 +0530)]
Resolved function description gaps.

For C++ layer (Provisioning manager)

Change-Id: I5b6d5e040bfc06e7b6d289b8cbc999245afa1249
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5065
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFixed tests in resource-encapsulation
coderhyme [Wed, 24 Feb 2016 05:30:28 +0000 (21:30 -0800)]
Fixed tests in resource-encapsulation

Unit-tests for DiscoveryManager are re-designed.
A bug that discovery tasks created in ResourceClientTask were not finished correctly is fixed.

Change-Id: If8adc4fd20b7183134811a52bb8b13276d59ea2f
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed a bug in RCSDiscoveryManager and some minor issues.
coderhyme [Tue, 23 Feb 2016 03:03:46 +0000 (19:03 -0800)]
Fixed a bug in RCSDiscoveryManager and some minor issues.

An empty resource type must be allowed only when there is no other requested types,
because an empty resource type means all resource types, which means other types are meaningless.

Change-Id: I51be73a3a21c3e84151b12333ab86aed656c2a3c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoApply to Resource Hosting to RE resource server added feature.
jyong2.kim [Mon, 15 Feb 2016 06:45:35 +0000 (15:45 +0900)]
Apply to Resource Hosting to RE resource server added feature.

Resource Hosting(RH) feature updated for mirrored resource functionality.
When this patch merged, RH will support seperate response, bind multiple resource types and interface names.

Change-Id: Ie448f915466c413fa2ddec8a2fb159ca1740a35e
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5003
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix for defects detected by static analysis in ca common logic
hyuna0213.jo [Tue, 23 Feb 2016 09:41:42 +0000 (18:41 +0900)]
Fix for defects detected by static analysis in ca common logic

return value of 'OICCalloc' function is dereferenced
at cainterfacecontroller.c

Change-Id: I7c6513c72fe0e0f4ec24121cdc9e3e78ffa0cb41
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5143
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agorevise build scripts and spec file for Tizen
Youngjae Shin [Fri, 19 Feb 2016 07:51:42 +0000 (16:51 +0900)]
revise build scripts and spec file for Tizen

Change-Id: I33e03cd1a0bbfcdd635d14077a67aff680cf88d5
Signed-off-by: Youngjae Shin <yj99.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoadded the CA interface to monitoring network status.
jihwanseo [Wed, 17 Feb 2016 10:29:44 +0000 (19:29 +0900)]
added the CA interface to monitoring network status.

add new CA interface for network status changes delivery
to upper layer.

Change-Id: I2819b7dd0a31364554d6b90be4fe5b2dabf24d14
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/5019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoupdate description in cainterface.h
Jaewook Jung [Tue, 23 Feb 2016 11:44:50 +0000 (20:44 +0900)]
update description in cainterface.h

There are some lack of information in cainterface.h, so I updated.

Change-Id: I5003b0568aa08da613d93ae27e6da7ccbd488c4d
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5145
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoput the iotivity version info in CA
Jaewook Jung [Tue, 23 Feb 2016 03:12:02 +0000 (12:12 +0900)]
put the iotivity version info in CA

put the iotivity version info in CA for convenience in debugging
because CA is the lowest module which is always included when iotivity is built.

Change-Id: I54451358f16540aba914ebdd67fdbf7ee762f931
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5125
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoRemoved warning for RI
Jaehong Jo [Tue, 23 Feb 2016 08:45:25 +0000 (17:45 +0900)]
Removed warning for RI

Change-Id: Ib18f3479475fe3f05893d8a0a199f02bfedb1c60
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoRemoved warning for BT, NFC
Jaehong Jo [Tue, 23 Feb 2016 08:07:28 +0000 (17:07 +0900)]
Removed warning for BT, NFC

Change-Id: I6347d278ccbf0bd6874ea39ef7f313fe74721b9e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5139
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix android build error with ALL
Jaehong Jo [Sun, 21 Feb 2016 06:39:07 +0000 (15:39 +0900)]
Fix android build error with ALL

Add nfc adapter

Change-Id: Ia113b01d198f0c6f10e6df1ce1af779ad823ecaa
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoBLE Server support for Tizen 2.4
vimala.v [Mon, 1 Feb 2016 05:05:31 +0000 (10:35 +0530)]
BLE Server support for Tizen 2.4

Change-Id: Id85ef1b321d428780a47d07f76433d3a6884b27a
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoGBS conf for tizen 2.4 public url
koushik.girijala [Mon, 22 Feb 2016 10:19:05 +0000 (15:49 +0530)]
GBS conf for tizen 2.4 public url

GBS Conf for Tizen 2.4 BLE server build to work

Change-Id: Ie1df48cc33e164bc6e8ce60b8f938647bee9a2e8
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded send logic to check write/notify in Tizen 2.4 BLE Client
koushik.girijala [Fri, 29 Jan 2016 12:57:28 +0000 (18:27 +0530)]
Added send logic to check write/notify in Tizen 2.4 BLE Client

I have modified transmission logic for BLE.
when there is a big message to sent,
next segmentation data has to wait for
callback write/notify Characteristic for previous sent data.

Change-Id: I8ad967955926d9ebd710dbb0571220d7c39b7668
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4891
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix a limitation of the maximum number of child resources of a collection
Jihun Ha [Mon, 22 Feb 2016 02:01:45 +0000 (11:01 +0900)]
Fix a limitation of the maximum number of child resources of a collection

We found that there is the maximum number of child resource able to be
registered to a collection resource which is 5. This commit is to eliminate
the limitation by using link-list rather than static array allocation
(refer to ocresource.h in csdk folder).

Change-Id: I23e9d200ae39b33497d8fd9863adb9dbadfb3c70
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5037
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agofixed the ca android sample crash issue
hyuna0213.jo [Fri, 19 Feb 2016 08:45:01 +0000 (17:45 +0900)]
fixed the ca android sample crash issue

after nfc transport was submitted, the crash happens
in the ca android sample. so I modified the array size to
resolve the crash issue.

Change-Id: I515cbdba1de880e4d3ffee89e15f951db4a0ea87
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFollow-up for build breakage due to 3dec7176200a1e8f125226f22b9471374dd7ace1
Jon A. Cruz [Tue, 23 Feb 2016 21:42:39 +0000 (13:42 -0800)]
Follow-up for build breakage due to 3dec7176200a1e8f125226f22b9471374dd7ace1

A few instances of OC_LOG were left in.

Change-Id: I36eee4bc27c2b0d559b8de21181a59278b5c7cef
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoremoved warning for connectivity abstraction.
jihwan.seo [Mon, 22 Feb 2016 05:33:18 +0000 (14:33 +0900)]
removed warning for connectivity abstraction.

Change-Id: I188d6c588abb8057a6ab4bac8403a1f6dc060148
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5105
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agomodified transport type check logic for coap over tcp
hyuna0213.jo [Mon, 22 Feb 2016 08:02:56 +0000 (17:02 +0900)]
modified transport type check logic for coap over tcp

coap over tcp format can be used to send TCP, BT, LE message.
If user selects the several tranports to send message,
CAIsSupportedCoAPOverTCP() function is not working.
because it use '==' operator to compare the transport type.

Change-Id: I03183794ff34f3052b91b87c51c5de1171f6cd36
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5109
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BT support for Tizen
koushik.girijala [Wed, 30 Dec 2015 05:37:57 +0000 (11:07 +0530)]
CoAP over TCP transmission over BT support for Tizen

currently, CoAP/UDP message format is used over BT-RFCOMM.
but BT-RFCOMM data transmission requires dedicated session
between devices and guarantees reliable data transmission
by its MAC & PHY layer. So, CoAP/TCP message format might
be more efficient for Bluetooth

Change-Id: Ifd4e47174734cf21de7245d3e6a055f8952ce730
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4739
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix tizen build issue.
Jaehong Jo [Fri, 19 Feb 2016 02:43:57 +0000 (11:43 +0900)]
Fix tizen build issue.

Duplicate define GMainLoopThread in EDR, LE.

Change-Id: Ie6757412d8741be801e30b7f29744dc33bd68d51
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5059
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>
8 years agoremoved duplicated OC_LOG and replace it with OIC_LOG
jihwan.seo [Fri, 19 Feb 2016 07:22:22 +0000 (16:22 +0900)]
removed duplicated OC_LOG and replace it with OIC_LOG

Change-Id: I9294ccb4da022ac845d54a215ea157bfedd3cce2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoEMPTY ACK/RESET message Handling by Routing Manager
vimala.v [Mon, 8 Feb 2016 11:11:30 +0000 (16:41 +0530)]
EMPTY ACK/RESET message Handling by Routing Manager

In case of EMPTY message, according to CoAP spec it can have only 4 bytes containing
Version, Message type, Token Length as 0, Response result as CA_EMPTY and
Message ID.  However Route Option is required for routing the message via multihop.
In order to resolve this issue, we defined a MSGType in the RouteOption which is set
to 0 for normal messages while ACK for Empty acknowledgement and RST for Empty
Reset messages.
When a client sends Empty acknowledgement for a Response received, a POST message
carries the MSGType via multiple hops and the border gateway translates it to Empty ACK

Change-Id: I9550d1ad76f4b6a83a90ee2f06cef1899a3e7564
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4649
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for IOT-927 resource container attribute update/notify race condition
Markus Jung [Tue, 2 Feb 2016 12:34:13 +0000 (21:34 +0900)]
Fix for IOT-927 resource container attribute update/notify race condition

- Asynchronous notification of observing clients
- Mutex for access on RCSResourceAttributes
- returning RCSResourceAttributes by value
- reference to const RCSResourceAttributes for handleSetAttributeRequest API

Note: The change breaks backward compatibility with previous APIs

Change-Id: I2f84353aa993772e7a1a908c766c77786fe7c3ea
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoupgrade gatt connection performence
jihwan.seo [Fri, 19 Feb 2016 11:54:10 +0000 (20:54 +0900)]
upgrade gatt connection performence

when autoconnect flag is used in connectGatt(..),
connection speed is better than another flag true
so only first gatt connection will be requested as autoconnect flag false.

and next connect will be requested as auto connect flag true.
so, background connect will be supported by BT platform.

Change-Id: I73425eb61b3411b242845b0e5f86b9f4b726d4d4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5079
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoModified edrinterface for initiaize and terminate
Jaehong Jo [Tue, 12 Jan 2016 02:45:21 +0000 (11:45 +0900)]
Modified edrinterface for initiaize and terminate

I Modified edrinterface header file for initiaize and terminate
it will be worked more commonly

Change-Id: I20d40db3110d35d27259713453fbf0ec47599f62
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-953] coap message is not sent in android ble
jihwan.seo [Fri, 19 Feb 2016 01:02:57 +0000 (10:02 +0900)]
[IOT-953] coap message is not sent in android ble

when message is sent, deadlock is happened.
so send flag that whether send is finished or not
has to be covered mutex lock.

Change-Id: I97698fa67df1bc6dcd04a3e5ef607d02050d1e69
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoMerge branch 'nfc-transport'
Ashok Channa [Thu, 19 Nov 2015 09:55:23 +0000 (18:55 +0900)]
Merge branch 'nfc-transport'

Change-Id: I9e850b4347ef0027a28dc646f2deb119f1b3f116
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for defects detected by static analysis in ca android
hyuna0213.jo [Thu, 18 Feb 2016 03:08:41 +0000 (12:08 +0900)]
Fix for defects detected by static analysis in ca android

modify ca android ble client/server to fix defects detected
by static code analysis

Change-Id: I5b48824b03a00b373e07ccc311b7b77f32dd5b77
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5035
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoclean up android ble implement code
jihwan.seo [Wed, 17 Feb 2016 06:27:18 +0000 (15:27 +0900)]
clean up android ble implement code

Change-Id: I0123497c72b28d78e208da013267b6f0e949396c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BT
hyuna0213.jo [Thu, 21 Jan 2016 06:11:12 +0000 (15:11 +0900)]
CoAP over TCP transmission over BT

currently, CoAP/UDP message format is used over BT-RFCOMM.
but BT-RFCOMM data transmission requires dedicated session
between devices and guarantees reliable data transmission
by its MAC & PHY layer. So, CoAP/TCP message format might
be more efficient for Bluetooth

Change-Id: I0b7752a1146efd1abbe74eb613c72346b99039e9
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/4447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agokeepalive for coap over tcp
hyuna0213.jo [Mon, 18 Jan 2016 11:08:25 +0000 (20:08 +0900)]
keepalive for coap over tcp

In order to ensure that the connection between an OIC Devices,
OIC Device should send application layer keepalive messages.

Change-Id: I630b186db58317f28cdfbd99a66e6bf75970ae3e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-946] To support Resource Discovery on unicast for Android BLE.
jihwan.seo [Mon, 15 Feb 2016 05:01:52 +0000 (14:01 +0900)]
[IOT-946] To support Resource Discovery on unicast for Android BLE.

I have updated resource discovery on unicast for BLE.
it will waiting for connected callback
before send message like multicast.

Change-Id: I06f05d0212f04fc4c0cff8bb81229fcbf95006a3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BLE
jihwan.seo [Wed, 10 Feb 2016 23:56:24 +0000 (08:56 +0900)]
CoAP over TCP transmission over BLE

there is another header for fragmentation is added in CoAP PDU.
since CoAP over TCP has message length field,
it is better to apply to BLE

Change-Id: I35f174f85a114abc5521c42cd6b25eda02cd9f6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoBLE Client support for Tizen 2.4
jihwanseo [Mon, 18 Jan 2016 11:47:57 +0000 (17:17 +0530)]
BLE Client support for Tizen 2.4

Change-Id: I687d57eae2b89e414b39a45aaebf9a8b5333c3b4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFixed a bug regarding the batch interface in RCSResourceObject.
coderhyme [Mon, 15 Feb 2016 05:00:51 +0000 (21:00 -0800)]
Fixed a bug regarding the batch interface in RCSResourceObject.

There was a problem that RCSResourceObject didn't handle the batch interface.
The response format also was wrong.

Change-Id: I9e55779ceec70fcb7d7140f5b21e03107e65e56b
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded SeparateResponse class for the RCSResourceObject in RE.
coderhyme [Fri, 5 Feb 2016 02:42:12 +0000 (18:42 -0800)]
Added SeparateResponse class for the RCSResourceObject in RE.

The class is to support the SLOW response concept of the base.
For it, the RCSRequest now holds its owner resource object.

- how to use

RCSSeparateResponse separateResponse;

...

server->setSetRequestHandler([](const RCSRequest& r, RCSResourceAttributes& attrs){
    // make separate response to set result later
    separateResponse = RCSSeparateResponse(r);

    return RCSSetResponse::separate();
});

...

// the set method will throw an exception when the operation is failed.
separateResponse.set();

Change-Id: I054ee3948d7742b5c45f821f3fec48216915f273
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify DiscoveryManager and DiscoveryManagerTest
ChaJiwon [Mon, 1 Feb 2016 08:18:39 +0000 (17:18 +0900)]
Modify DiscoveryManager and DiscoveryManagerTest

- Discovery Test using multiple resource types
- Check the size of vector that contains resource types

Change-Id: Ia5c8db2413d787ead4490cc2b128fcc2c2a5bbe6
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed EDR problem related to BT on/off for Android.
Jaehong Jo [Thu, 10 Dec 2015 07:03:25 +0000 (16:03 +0900)]
Fixed EDR problem related to BT on/off for Android.

When BT turn off, call Stop EDR Server,
and when BT turn on, call Start EDR Server.

Change-Id: Ife12956568fd631140209472912d3e0fef62f13d
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-931] Added send logic to check write/notify in BLE
jihwan.seo [Thu, 21 Jan 2016 06:13:22 +0000 (15:13 +0900)]
[IOT-931] Added send logic to check write/notify in BLE

according to android BLE guide,
I have modified transmission logic for BLE.
when there is a big message to sent,
next segmentation data has to wait for
callback write/notify Characteristic for previous sent data.

Change-Id: Idf543504d634ab4dfbc2fbd4bb90aa7e2ad1831e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoTo separate receive data in caleadapter as per adapter type
jihwan.seo [Mon, 18 Jan 2016 03:19:54 +0000 (12:19 +0900)]
To separate receive data in caleadapter as per adapter type

since there is SERVER_CLIENT type in base API.
BLE address will be same to each other for BOTH type.
so it is need to access each data as per adapter type.

Change-Id: I7f446166765bfa2391e49a80b62f4878cc6d8b7f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[Arduino BLE]Property of Read characteristic is changed to Write
vimala.v [Mon, 1 Feb 2016 11:07:58 +0000 (16:37 +0530)]
[Arduino BLE]Property of Read characteristic is changed to Write

Read characteristic property is changed from WriteWithoutResponse to Write.
The changes required in RBL library for enabling Write property will be applied as patch.

Change-Id: I686eabee6ac956e44446b17b520d75a18bd00d40
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded get/set apis with query params in RCSRemoteResourceObject.
coderhyme [Mon, 1 Feb 2016 09:03:14 +0000 (01:03 -0800)]
Added get/set apis with query params in RCSRemoteResourceObject.

These apis work with callbacks taking the RCSRepresentation.
An operation retrieving the interface of a request added in the RCSRequest.
An operation to create the RCSRemoteResourceObject from the OCResource added.

Change-Id: I630727e61068326c262dc0fe4ae6c19f324adcc5
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUnit tests for android extension of resource contianer
Markus Jung [Tue, 2 Feb 2016 00:48:36 +0000 (09:48 +0900)]
Unit tests for android extension of resource contianer

Added simple unit tests that have to be executed manually.

Change-Id: I03759a8c8ba865a26488508899991e24686df64b
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4909
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd cloning of identity to CACloneInfo
Tobias Rauter [Thu, 7 Jan 2016 15:42:51 +0000 (16:42 +0100)]
Add cloning of identity to CACloneInfo

In block-transfer mode, the identity was not set
in the resulting CARequestInfo. Therefore, ACLs did not
work properly.

Change-Id: Ie47ee8f18bc3c914c0a662656b42cbf03cadc0fc
Signed-off-by: Tobias Rauter <tobias.rauter@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoreplaced OC_LOG with OIC_LOG in stack
jihwan.seo [Wed, 23 Dec 2015 01:22:48 +0000 (10:22 +0900)]
replaced OC_LOG with OIC_LOG in stack

Change-Id: Ice2639c3bc09e9a7fe2452ab9fbb1593b07bdb9c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoSpecified the missing inclusion of standard library file.
G S Senthil Kumar [Thu, 28 Jan 2016 12:13:19 +0000 (17:43 +0530)]
Specified the missing inclusion of standard library file.

Included algorithm standard library file in RAML source file to avoid build failure.

Change-Id: Idf858145d3eede3b8bbaa2f39e6c5d7e910ed210
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoreplaced current TAG with 'OIC_xxx' commonly in CA
jihwan.seo [Thu, 21 Jan 2016 02:12:09 +0000 (11:12 +0900)]
replaced current TAG with 'OIC_xxx' commonly in CA

To make easy debugging,
i have modified TAG in CA once.
it is better to add common string 'OIC_' + current TAG name.

Change-Id: I9d497608ec9ecd30c8577609a8775e4189fae0e0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4837
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoReverting back to Android-21 as the move to Android-23 causes Android
Rahul Rahul [Wed, 27 Jan 2016 18:42:13 +0000 (10:42 -0800)]
Reverting back to Android-21 as the move to Android-23 causes Android
to crash on M devices. The current build scripts will need to be updated
to generate shared libs with soname.
Till the scripts are updated, Android-21 will be used as it works even
on M devices.

Change-Id: I33e0ccc19fb406b3508d888f7b04617c7d6e0868
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoreplaced current TAG with 'OIC_xxx' commonly in RI Layer
hyuna0213.jo [Thu, 21 Jan 2016 06:00:23 +0000 (15:00 +0900)]
replaced current TAG with 'OIC_xxx' commonly in RI Layer

The current TAG doesn't have a rule.
i have modified TAG in RI Layer to make easy debugging.
it is better to add common string 'OIC_' + current TAG name.

Change-Id: I722c1944e9ba89d901d93d6ba208e931c9094028
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoreplaced OC_LOG with OIC_LOG in security
jihwan.seo [Mon, 25 Jan 2016 23:24:54 +0000 (08:24 +0900)]
replaced OC_LOG with OIC_LOG in security

Change-Id: I38ba90586d9ea5fb978c2a1cc8a925dbf1e59f9c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded bind apis to RCSResourceObject
coderhyme [Fri, 29 Jan 2016 02:11:55 +0000 (18:11 -0800)]
Added bind apis to RCSResourceObject

Bind apis are required for some specific use-cases.
An auto-interface handler for BATCH, which builds the response conforming with the OIC-spec, is added.

Change-Id: I9dd7c822bfb1ec06ed9176b20d3dcd06c8cb1f44
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd discovery by multiple resource types.
ChaJiwon [Fri, 15 Jan 2016 04:39:03 +0000 (13:39 +0900)]
Add discovery by multiple resource types.

Change-Id: I9e95a0488880b10fce744a2dd4eed464297bedc6
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4805
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoPartially Revert OC_LOG -> OIC_LOG for service layer
Trevor Bramwell [Tue, 26 Jan 2016 20:08:16 +0000 (12:08 -0800)]
Partially Revert OC_LOG -> OIC_LOG for service layer

There is currently no OIC_LOG_PAYLOAD function

Change-Id: Ie6e349f85a96fd9267fcd563385a0f9e1a3b93cd
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agomodified target transport type related blockwise transfer.
jihwan.seo [Fri, 8 Jan 2016 10:38:06 +0000 (19:38 +0900)]
modified target transport type related blockwise transfer.

since EDR is not support BWT anymore,
I removed the build script related that.

Change-Id: I105bf0d9d4d921ca760808b2aff8776a3973ebf1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoModify RCSRequest to wrap OCResourceRequest
coderhyme [Tue, 26 Jan 2016 07:09:51 +0000 (23:09 -0800)]
Modify RCSRequest to wrap OCResourceRequest

RCSRequest just wraps OCResourceRequest and it exposes OCResourceRequest for users who want to get information from oc request.

Change-Id: I12d2210e672c6d1a49d4766e07a0d648a7982773
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated documentation for BundleActivator::destroyResource
George Nash [Fri, 22 Jan 2016 17:36:23 +0000 (09:36 -0800)]
Updated documentation for BundleActivator::destroyResource

The documentation said that the destroyResource destroys and registers
the the resource.

It should unregister the resource then destroy.

Change-Id: Ib9f628097a89f87bbb8e20f4ba562dc687d4cebe
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>