platform/upstream/iotivity.git
8 years agoRemove duplicated statements in sceneclient application
Jihun Ha [Sun, 6 Mar 2016 03:22:31 +0000 (12:22 +0900)]
Remove duplicated statements in sceneclient application

Change-Id: Ia67bdc441a162be1578f334b3e4932f79b09ef93
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix Tizen Repo URL
jyong2.kim [Fri, 4 Mar 2016 01:06:48 +0000 (17:06 -0800)]
Fix Tizen Repo URL

The Tizen repo URL should point to a version that exists. 'latest' is
designated to track current releases.

Change-Id: I2408f8ca46c3baf1f244df4953770be52b73f7ab
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit cc097a1890195d3611ae413a2501fb29fd136e07)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5405
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd API doxygen and Code Refactoring of SceneManager Local-side Interface
jyong2.kim [Thu, 3 Mar 2016 11:58:14 +0000 (20:58 +0900)]
Add API doxygen and Code Refactoring of SceneManager Local-side Interface

- add API doxygen
- change API name in SceneAction (resetExecutionParameter)
- change getSceneAction logic for modifying resource handling module

Change-Id: I35a44b8c67ceb69c1a0728ba9ca4e2303b577ef1
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5359
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoadd doxygen comments for scene manager remote apis, and change interface name of...
jyong2.kim [Thu, 3 Mar 2016 05:43:23 +0000 (14:43 +0900)]
add doxygen comments for scene manager remote apis, and change interface name of remote scene action

- add doxygen comments for scene manager remote apis
- remove unsupported apis(apis for collection, scene, action remove)
- change api name in RemoteSceneAction
 (setExecutionParameter-> resetExecutionParameter)

Change-Id: I74fae9164a5a081cc17cefd59b8d2b2713dbb27a
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5319
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoImprove some components for simple and performance.
jyong2.kim [Thu, 3 Mar 2016 07:47:30 +0000 (16:47 +0900)]
Improve some components for simple and performance.

This patch is for apply offline code review comments by JungHo.

several method is made by duplicated code.
unnecessary valiable is removed.
lamda functions is used instead std::bind for reduce std::bind.
logic simplify for performance and readable.

Change-Id: Iefb0f4b3ee5ae99201127cd3343ea819f9f7fd3d
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5335
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoEnrich a sceneclient sample application for executing an existing scene at remote...
Jihun Ha [Thu, 3 Mar 2016 06:12:54 +0000 (15:12 +0900)]
Enrich a sceneclient sample application for executing an existing scene at remote device

Add one more scenario in a sceneclient sample, which executes an existing
scene created by sceneserver sample application.

Step1: Construct a SceneCollection with light and fan resources with
sceneserver application
Step2: Discover its SceneList resource
Step3: Check the exsiting SceneCollection resource and Scenes
Step4: Execute one of the Scenes

Change-Id: I58bd8eb5b3913c8a180de509b56605051d54ecc0
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd API doxygen to SceneManager Local-side interface
wonny [Wed, 2 Mar 2016 13:51:21 +0000 (22:51 +0900)]
Add API doxygen to SceneManager Local-side interface

- SceneList/SceneCollection/Scene/SceneAction

Change-Id: I555fc6f92ca097cb0c982fd374aa47f31a79d1c1
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agomodify scene manager(remote) for exception handling
Minji Park [Wed, 2 Mar 2016 14:10:52 +0000 (23:10 +0900)]
modify scene manager(remote) for exception handling

- add exception handling for callback null check
- add mutex for name of scenelist, scenecollection
- remove unused code

Change-Id: Ib2c1c260cc9efc8372393dd08331be435d2c5c7e
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModified query interface on request for resource creations.
jyong2.kim [Mon, 29 Feb 2016 10:17:57 +0000 (19:17 +0900)]
Modified query interface on request for resource creations.

When request resource creation, it will send by LINK_BATCH interface.
but as of now, LINK_BATCH dose not define by Stack.
So, LINK-BATCH is defined in SceneCommons.h
and query interface is changed to LINK_BATCH from OC::BATCH_INTERFACE.

Apply sceneValues in query Attributes at creation of scene collcention resource.

Change-Id: I887456a85e33c05c515859f4acd52bbad957f3d5
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5269
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 Scene Utils/Samples.
jyong2.kim [Mon, 29 Feb 2016 09:21:40 +0000 (18:21 +0900)]
Fix for defects detected by static analysis in Scene Utils/Samples.

Check to allocated memory using OICMalloc().
Fix execution with path of system command.
Catch exception in Sample app'.

Change-Id: I313d5a3fadf473f6cac355cb0b8cc5e49248dea0
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5265
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFixed bug for execution of scene with empty scene member.
jyong2.kim [Mon, 29 Feb 2016 00:57:40 +0000 (09:57 +0900)]
Fixed bug for execution of scene with empty scene member.

When the execution of scene with empty scene member,
Execute callback was not call to app.
In this patch, Error handle is added for execution of scene with empty scene member.

Change-Id: I001a3183d79ea3c54822eebb28967b7c47c80637
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5247
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoModify Scene Manager Local-side Interface Logic
jyong2.kim [Fri, 26 Feb 2016 06:44:25 +0000 (15:44 +0900)]
Modify Scene Manager Local-side Interface Logic

- SceneCollection : change map to unordered_map
- Scene : modify logic of addNewSceneAction API

Change-Id: Idb420fb44d1eb3ed36261db1d4357de403ba225a
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5213
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix initializing logic of remote scene list
Minji Park [Fri, 26 Feb 2016 07:04:02 +0000 (16:04 +0900)]
Fix initializing logic of remote scene list

- modify initialization of existing remote scenes
(get scene information from member resource -> from collection resource)

Change-Id: I0dfde1199950ef799ba620ed392608eeb5ae4a35
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5219
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix for defects detected by static analysis in Group-manager.
jyong2.kim [Sun, 28 Feb 2016 23:17:15 +0000 (08:17 +0900)]
Fix for defects detected by static analysis in Group-manager.

sceneserver sample is fixed for excetpion catch.
memory deallocate with OICFree() in SceneUtil class.

Change-Id: I258e60a504052a59225cac2506553beaf1a1bd29
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Scene Manager Remote-side unittests
Minji Park [Fri, 26 Feb 2016 13:23:42 +0000 (22:23 +0900)]
Add Scene Manager Remote-side unittests

Change-Id: Iba00a577962442529b51943f77617edc3a027cc0
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Scene Manager Local-side Unittest & Fixed Logic Bug
ChaJiwon [Fri, 26 Feb 2016 12:33:37 +0000 (21:33 +0900)]
Add Scene Manager Local-side Unittest & Fixed Logic Bug

- Add Unittest
- Scene : fix addNewSceneActon logic

Change-Id: Ib687abf3852652b6a57cabaedb5cd9ebe9fb7c39
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate Scene Manager Sample Application
wonny [Fri, 26 Feb 2016 07:40:15 +0000 (16:40 +0900)]
Update Scene Manager Sample Application

- Update Menu UI
- Exception Handling

Change-Id: I3dd672625af08377ecffcb4d1b6d5a8d2168299a
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5221
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoAdd Scene manager - remote linux sample application
Minji Park [Fri, 26 Feb 2016 06:24:02 +0000 (15:24 +0900)]
Add Scene manager - remote linux sample application

add scene manager remote linux sample and update sample sconscript

Change-Id: I096562e02fbee1df009e9463f8ad5e6023c5008c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5211
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFixed bug of sending empty child attribute at Scene List Resource response.
jyong2.kim [Fri, 26 Feb 2016 06:44:58 +0000 (15:44 +0900)]
Fixed bug of sending empty child attribute at Scene List Resource response.

If Scene resource has not children, these attribute's value is empty.
But CBOR parser can not parsing empty attribute.
This patch, attribute remove when the attribute's value is empty.

Change-Id: Iaa0be2cf0df19211b2b2598ec47da94286068e4c
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5215
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFixed error handling at function of AddScene.
jyong2.kim [Wed, 24 Feb 2016 11:50:25 +0000 (20:50 +0900)]
Fixed error handling at function of AddScene.

Fixed bug of exception handling to Add Same Scene.
If add scene as already exist value, It is ignored now.
When the patch is merged, throw exception.

Added get function of target resource uri of Scene member resource.
Fixed bug of call CA function before initialize Stack at Scene Collection Resource Class.

Change-Id: I7f72d7dfef541ae680a47d2d386a39ec674c4871
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate Scene manager remote-side interface and logic
Minji Park [Thu, 25 Feb 2016 05:38:50 +0000 (14:38 +0900)]
Update Scene manager remote-side interface and logic

- modify initializing logic of remote scene list instance
 (interface for GET Request change : batch interface -> baseline interface)
- add exception handling
- API name change in RemoteSceneAction

Change-Id: I3f267c6b947c4e289d0f1f78329eefeaa1b51140
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModified Scene Manager Local-side Interface
jyong2.kim [Wed, 24 Feb 2016 14:22:40 +0000 (23:22 +0900)]
Modified Scene Manager Local-side Interface

- SceneList / SceneCollection / Scene / SceneAction
- Add getScenes() Logic in Scene
- Some API name is changed in SceneAction

Change-Id: I00e1652f164119901688fd0e4210b6d10dd50366
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5183
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge "Merge branch 'master' into group-manager" into group-manager
Madan Lanka [Thu, 25 Feb 2016 00:45:05 +0000 (00:45 +0000)]
Merge "Merge branch 'master' into group-manager" into group-manager

8 years agoUpdated control logic of Scene Resource.
jyong2.kim [Wed, 24 Feb 2016 01:13:38 +0000 (10:13 +0900)]
Updated control logic of Scene Resource.

Resource management logic is updated.
 (scene execution, scene resource creation, attributes setting)
Getting method of scene values is added in Scene Collection Resource class.
Setting method of resource name is added in Scene Resource class.
Get response of remote side request is added in Scene List class.
Callback of scene execution is called separated thread for prevent recursive function call.

Change-Id: Id7d66bc3216d51a46015b9653e254f93a0e68380
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'master' into group-manager
Jihun Ha [Wed, 24 Feb 2016 09:02:12 +0000 (18:02 +0900)]
Merge branch 'master' into group-manager

Change-Id: I0116d6c7867e20b04007f820d8b936ef30150223
Signed-off-by: Jihun Ha <jihun.ha@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 agoRenamed Scene resource class.
jyong2.kim [Tue, 23 Feb 2016 04:48:05 +0000 (13:48 +0900)]
Renamed Scene resource class.

Scene List / Collection / Member Class is renamed to Scene Resource from Scene Resource Object.

Change-Id: I31d43a7b9d11ba31bd003a89771e206cacfb50ab
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5129
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoadd functions to requestor classes for GET request
minjiipark [Mon, 22 Feb 2016 02:15:45 +0000 (11:15 +0900)]
add functions to requestor classes for GET request

add requestGet function to scene list/collection/member requestors
to get attributes

Change-Id: I9be7e28686ab882b7f8a1562f9767983f586bba5
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoadd scene manager remote interface class implementation
Minji Park [Mon, 22 Feb 2016 02:40:39 +0000 (11:40 +0900)]
add scene manager remote interface class implementation

- interfaces to create/update scene collection, scene and scene action
- logic for initialization of remote scene list with discovered scene list resource (with getting attributes with batch interface)

Change-Id: I78e24d0c87e71d56db6541975d7a6cc61e7f612b
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5099
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoAdd Scene Manager remote-side interfaces
Minji Park [Thu, 4 Feb 2016 13:45:21 +0000 (22:45 +0900)]
Add Scene Manager remote-side interfaces

: send requests to local scene manager from remote side

- RemoteSceneList
 creates new scene collection in remote scene list
- RemoteSceneCollection
 add new scene in remote scene collection
- RemoteScene
 add scene action in remote scene and request for scene execution
- RemoteSceneAction
 represents certain action of each scene member

Change-Id: Id9573fb0b7d2c56d4e0e15e17ab87dec2495c56b
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4945
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Scene Collection Resource Requestor class for scene manager client
Minji Park [Thu, 4 Feb 2016 11:15:33 +0000 (20:15 +0900)]
Add Scene Collection Resource Requestor class for scene manager client

It is the scene manager remote-side requestor class
which sends request for scenemember/scene creation and scene execution to local-side scene collection resource object.

Change-Id: Idbccdb7548e1f50025ddf650ea5d31520f6e0313
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4939
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Scene List Resource Requestor class for scene manager client
Minji Park [Thu, 4 Feb 2016 11:22:40 +0000 (20:22 +0900)]
Add Scene List Resource Requestor class for scene manager client

It is the scene manager remote-side requestor class
which sends request for scene collection creation to local-side scene list resource object.

Change-Id: I2c11cc635417feb1c97b81812a7659f7189b8269
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4941
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd SceneMemberResourceRequestor class for scene manager client
Minji Park [Thu, 4 Feb 2016 11:12:49 +0000 (20:12 +0900)]
Add SceneMemberResourceRequestor class for scene manager client

It is the scene manager remote-side requestor class
which sends request for scene action creation to local-side scene member resource object.

Change-Id: I2798131286cc675889958d9dc68bdd9bde6f7b17
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoMerge "Merge branch 'master' into group-manager" into group-manager
Madan Lanka [Thu, 18 Feb 2016 07:57:50 +0000 (07:57 +0000)]
Merge "Merge branch 'master' into group-manager" into group-manager

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 agoModified Scene Manager Interface
ChaJiwon [Thu, 4 Feb 2016 04:52:48 +0000 (13:52 +0900)]
Modified Scene Manager Interface

- SceneList, SceneCollection, Scene, SceneAction
- Apply interface to sceneserver sample

Change-Id: I7573566b568a6edad82b72da3866ede7b9589309
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4931
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'master' into group-manager
Jihun Ha [Thu, 18 Feb 2016 00:37:01 +0000 (09:37 +0900)]
Merge branch 'master' into group-manager

Change-Id: Ie505ac9538275c70578f50d491a29a2d54064c42
Signed-off-by: Jihun Ha <jihun.ha@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 agoAdd Manager class of Scene Member Resource.
jyong2.kim [Wed, 3 Feb 2016 12:33:14 +0000 (21:33 +0900)]
Add Manager class of Scene Member Resource.

SceneMemberResourceObject class is manager of Scene Member resource.
and it has handler of request from remote side.
This commit is included constants and common functions(SceneCommon.h).

Change-Id: Ic754acf02ed7d4564d2be6709e70090a2928d9c1
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoAdd Manager class of Scene List Resource.
jyong2.kim [Wed, 3 Feb 2016 12:52:56 +0000 (21:52 +0900)]
Add Manager class of Scene List Resource.

SceneListResourceObject class is manager of Scene List resource.
and it has handler of request from remote side.

Change-Id: I6a5abbda6967b46f75cd6f3e8407187ace382e7d
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Manager class of Scene Collection Resource.
jyong2.kim [Wed, 3 Feb 2016 12:48:31 +0000 (21:48 +0900)]
Add Manager class of Scene Collection Resource.

SceneCollectionResourceObject class is manager of Scene Collection resource.
It has handler of request from remote side,
and also has hander of response(execute response) from remote resource.

Change-Id: I20bef133a16adf433fd34f21b03a3b961169918a
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4919
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'master' into group-manager
Jihun Ha [Mon, 15 Feb 2016 01:48:44 +0000 (10:48 +0900)]
Merge branch 'master' into group-manager

Change-Id: Ib338db12ec1ebf1fe5db365f998270200954481e
Signed-off-by: Jihun Ha <jihun.ha@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 agoMerge branch 'master' into group-manager
Jihun Ha [Wed, 3 Feb 2016 11:04:04 +0000 (20:04 +0900)]
Merge branch 'master' into group-manager

Change-Id: I7479a8a9f2da2a5e80693d7ee8c4b03622f78a84
Signed-off-by: Jihun Ha <jihun.ha@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 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 agoSceneManager init Code
ChaJiwon [Tue, 26 Jan 2016 05:17:18 +0000 (14:17 +0900)]
SceneManager init Code

Adds SceneManager creation features and sample

- SceneList : makes scenelist resource and creates scenecollection
- SceneCollection : makes scenecollection resource and creates scenemember and scene
- SceneMemberObject : makes scenemember resource and get scenemember list
- Scene : creates sceneaction to scene
- SceneAction : executes sceneaction

Change-Id: I791ec6d5f31b387eb684919d1fc36cc45df38182
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4843
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>
8 years agoWait for Linux BLE event loop to start before stopping.
Ossama Othman [Fri, 22 Jan 2016 19:26:51 +0000 (11:26 -0800)]
Wait for Linux BLE event loop to start before stopping.

This addresses a corner case where the LE transport is stopped before
it has fully started.  In that case, the thread running the GLib event
loop never exited since the event loop itself was still running.  That
ultimately caused the CA layer termination to block indefinitely on a
pthread_join().

Change-Id: I521c7a66c6541cb14df7d4ba098899f303e50999
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded RCSRepresentation class and get function with params in PrimitiveResource.
coderhyme [Wed, 27 Jan 2016 03:03:41 +0000 (19:03 -0800)]
Added RCSRepresentation class and get function with params in PrimitiveResource.

The class is to represesnt resource information in a form of hierarchy.
It replaces ResponseStatement which was a class used internally.
Addtionially broken tests in PrimitiveResource related with Set operation are fixed.

Change-Id: I0b1bcc97b0b210a5a2c3da6e6219de1ff3fc727c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoReplaced current TAG with 'OIC_xxx' in c_common and routing
Jaehong Jo [Thu, 21 Jan 2016 07:53:51 +0000 (16:53 +0900)]
Replaced current TAG with 'OIC_xxx' in c_common and routing

To make easy debugging,
I have modified TAG in c_common and routing.
It is better to add common string 'OIC_' + current TAG name.

Change-Id: I1965db71f58f0ab4dfe3e0bacdd243098d2baf77
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4845
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agomodified the initialize/deinitialize logic in CA
hyuna0213.jo [Wed, 20 Jan 2016 08:53:58 +0000 (17:53 +0900)]
modified the initialize/deinitialize logic in CA

I changed the initialize/deinitialize logic in CA adapter
and removed the unnecessary code.

Change-Id: Ia9d3dd503f25a393a4053c95c508d1166c574b73
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>