Uze Choi [Mon, 7 Mar 2016 05:49:37 +0000 (05:49 +0000)]
Merge "Merge branch 'group-manager'"
Philippe Coval [Sun, 6 Mar 2016 10:50:19 +0000 (11:50 +0100)]
Fixed build issue by implicitly capture by value (of RCSResourceObjectTest)
I assume this what the author meant, with the previous version it failed to build from source.
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:\
In member function 'virtual void ResourceObjectInterfaceHandlerTest_GetResponseForBaselineContainsAllPropertiesOfServer_Test::TestBody()':
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:613:18:\
error: capture of non-variable 'ResourceObjectTest::server'
[server](const shared_ptr<OCResourceResponse> response)
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:134:28:\
note: 'OIC::Service::RCSResourceObject::Ptr ResourceObjectTest::server' declared here
RCSResourceObject::Ptr server;
(...)
Change-Id: I30f905bc983bbfad5e54ce60f5ccce4573cb2f78
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Markus Jung [Wed, 2 Mar 2016 08:04:04 +0000 (17:04 +0900)]
Fixed unit tests for resource container
Change-Id: Ib8d25140d08b538cb9d376f3e76bb390c8d0758e
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Habib Virji [Sun, 6 Mar 2016 20:29:17 +0000 (20:29 +0000)]
Update ocstack.c cbData comments
C API cbData currently implies response is only when whole process is completed.
C++ API OCPlatform.h holds the details correctly for resourceHandler.
Jira Issue: IOT-678
Change-Id: I5ce19a03fe44189679ae05346fdfcb21f72d1b37
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
vimala.v [Thu, 3 Mar 2016 08:32:29 +0000 (14:02 +0530)]
Fix to notify connected state to Tizen LE client from network monitor
Change-Id: I6d0c0cbf1c6c48f07c39b1d01c48ac0f29396eaa
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Manoj Gupta [Fri, 4 Mar 2016 04:11:34 +0000 (09:41 +0530)]
corrected spelling mistakes
Change-Id: Ia4e0f2fe476760f9050648726281ab8899509215
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5389
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 4 Mar 2016 12:20:52 +0000 (21:20 +0900)]
modified timing issue associated with data transmission.
when gatt is disconnected during data transmittion.
there is some crash since some global variable was available.
Change-Id: I65cbedea1f1646c4636b507171a98c35dea76d4e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jihun Ha [Mon, 7 Mar 2016 01:27:55 +0000 (10:27 +0900)]
Merge branch 'group-manager'
Conflicts:
service/SConscript
Change-Id: I583ef696a20ee406c2d6c17a79daabb0cbbf83d5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Philippe Coval [Sun, 6 Mar 2016 11:57:06 +0000 (12:57 +0100)]
Fixed build issue caused by merge of 2 similar changes on DiscoveryManagerTest
Revert "Fixed a compilation error in DiscoveryManagerTest.cpp."
This reverts commit
d3f7b087e2d272dfbfba4f1114fd030c9d7219a2.
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2)
Change-Id: I374236826587d67a07a0dd1ba39ac977b1943d29
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Thu, 3 Mar 2016 17:25:47 +0000 (18:25 +0100)]
Fixed tests in resource-encapsulation by using move ctor
DiscoveryTaskPtr is a unique_ptr, therefore it is a move-only object,
which is why ScopeTask's copy constructor is deleted.
This change Fix FTBFS by declaring move constructor (C++11 &&) in Task class
and also use it also in instance declaration to avoid copies.
Issue appeared with g++-4.9.2 on Tizen:Common and probably other setup
Reported error message is in this form :
service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp: \
In member function 'virtual void DiscoveryManagerTest_CallbackWouldNotBeCalledForSameRemoteResource_Test::TestBody()':
service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp:139:33: \
error: use of deleted function 'ScopedTask::ScopedTask(const ScopedTask&)'
onResourceDiscovered);
^
Change-Id: I0fe6d5c4037ddf90e83185d96f99c9378c56caa7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
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>
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>
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>
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>
js126.lee [Thu, 3 Mar 2016 06:20:30 +0000 (15:20 +0900)]
Fix issue related SVACE in C provisioningclient sample
- Patch 1; Init.
- Patch 2,3: Applying Chul's review comment.
- Patch 4: Modify file permission
Change-Id: I15f914ef000ac95ca33bdb80ea16a25d15bd14bf
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5325
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
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>
jaesick.shin [Fri, 4 Mar 2016 08:52:48 +0000 (17:52 +0900)]
Added Unittests for RE InterfaceHandler
About generate response according to the interface of requests.
Check the resource property(uri, resource type, resource interface) and attributes.
Change-Id: Icbc13f2b8a24ca56d887115d9f0e355caafbef28
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Habib Virji [Fri, 13 Nov 2015 14:40:24 +0000 (14:40 +0000)]
Error handling for the cbor handling in ocpayload
Defines a macro for error handling cbor load.
Any error leads to freeing and error details.
Some common functions has been created to ease
in freeing of memory in case of error.
OCDiscoveryCollectionPayloadAddResource is updated to
pass one parameter OCCollectionPayload instead of two
parameter. This is to ease passing param to MACRO.
Change-Id: I58e6c843fcacd8d952dad7b3a14c6327befcf77d
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 4 Mar 2016 02:21:21 +0000 (11:21 +0900)]
removed warning in connectivity abstraction.
there are many warning unused parameter.
Change-Id: Icabfcc5cd31ed24a4c6e8fdd8628212f89565f4c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5379
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
lankamadan [Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)]
Merge "Merge branch 'easysetup'"
coderhyme [Fri, 4 Mar 2016 08:45:47 +0000 (00:45 -0800)]
Add new operations to RCSResourceAttributes
A new public function, erase with iterator, is added. This is fundamental operation for using iterator.
A new feature is added, which is a new visitor with rvalue.
Change-Id: If2d5db51badfc3821f3b74a547c1f7251fb39126
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5419
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
coderhyme [Fri, 4 Mar 2016 08:48:41 +0000 (00:48 -0800)]
Fixed a compilation error in DiscoveryManagerTest.cpp.
The issue occurs when compiled with the newer compiler(i.e. gcc 4.8)
Change-Id: Ia36ebc705f29085d794910714cf24cc6999a85da
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5421
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Fri, 4 Mar 2016 08:45:28 +0000 (17:45 +0900)]
Remove group manager APIs from Doxygen and JavaDoc
The current group manager APIs will be replaced with scene manager APIs.
So I just hide group manager APIs from API document.
Removing the codes for the replacement will be planed in the future.
Change-Id: Ie2086a974d50bb7b46ac40fa85e99ad85bfc8409
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5417
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Andrii Shtompel [Wed, 2 Mar 2016 12:43:04 +0000 (14:43 +0200)]
Fix issues reported by SVACE tool in Security module
Change-Id: I04966f191eb8d0c1a11c7b51b9f209688874a047
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5303
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Dmitriy Zhuravlev [Wed, 2 Mar 2016 11:42:41 +0000 (13:42 +0200)]
Fix for issues reported on SVACE tool for PKIX
Fixed issues reported on running svace analysis to PKIX
Change-Id: I84af37b59c45061371ead13a5adc990aa8e8a755
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
lankamadan [Fri, 4 Mar 2016 09:41:03 +0000 (18:41 +0900)]
Merge branch 'easysetup'
Conflicts:
android/android_api/base/jni/Android.mk
resource/csdk/security/provisioning/SConscript
tools/tizen/iotivity.spec
Change-Id: I85b5e3daad5055a1f1c36f3951476e84d0a05285
Signed-off-by: lankamadan <lanka.madan@samsung.com>
coderhyme [Wed, 2 Mar 2016 04:08:57 +0000 (20:08 -0800)]
Modified RCSSeparateResponse to send the response built by interface handlers.
RCSResourceObject has interface handlers in order to build proper responses by the interfaces of the requests.
Separate response should use them to build the response.
Change-Id: Ic2b9af279acbecf025a06b493347d6d5cbdea20c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Trevor Bramwell [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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
lankamadan [Thu, 3 Mar 2016 10:27:00 +0000 (19:27 +0900)]
Changed PUT to POST, fix for not sending SSID/PWD in the get response & added a trigger for network connection
- Changed PUT to POST
- Fix for not sending SSID/PWD in the get response
- Added a trigger for making Enrollee connect to network
Change-Id: I4e041bb1ea3543c595f37a6b59dbc55b420ae838
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jihwan.seo [Thu, 3 Mar 2016 07:59:29 +0000 (16:59 +0900)]
To add "coap+tcp://" header to url for EDR and BLE
since CoAP over TCP was applied to EDR and BLE transport type,
coap+tcp:// header has to be used.
Change-Id: I682d7b4adcb9be51fa811461b8eb24bc7522c211
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Thu, 3 Mar 2016 07:43:12 +0000 (16:43 +0900)]
Change iotivity.com to iotivity.org
We don't own the .com domain.
Change-Id: I03ab8ddf82988b2d764cb472270593543e8d6ac7
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Thu, 3 Mar 2016 06:16:12 +0000 (15:16 +0900)]
Change file mode.
Remove execute permission from source code.
Change-Id: Ib40693012c88952c069381e4361a9ef63cc0905a
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5323
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Wed, 2 Mar 2016 08:42:39 +0000 (17:42 +0900)]
modified connection state callback for cleaing recv buffer.
and removed wrong callback logic for bond state.
Change-Id: I6dbfe286a10b644fb180dd4b5a8e62b309946d42
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5295
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
lankamadan [Thu, 3 Mar 2016 06:55:03 +0000 (15:55 +0900)]
Resolved build error for SECURED=1 in Android
- Added missed security library for android when building with SECURED=1
Change-Id: I3282c1b0ec40d825c0c1cafd8528582b8b157ce4
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5327
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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>
coderhyme [Thu, 3 Mar 2016 03:00:58 +0000 (19:00 -0800)]
Modified util functions to call oc functions.
This is to prevent oc function from being called after the instances of oc apis are destroyed.
It happens when the process is in termination state.
Change-Id: I4c87a62e15a8b909c6aa21c408575e84fcd52470
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5315
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
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>
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>
Habib Virji [Tue, 23 Feb 2016 00:45:29 +0000 (00:45 +0000)]
Add collection payload to include each resource information separately
- Each resource information is stored separately.
[{"href":"", "rt": "", "if":"", <property>}, .. ]
- Compared to previous approach where all resource where stored together.
- It fixes issue related to checking map before finding value, duplicated information in the payload of rt and if.
- Adds unit test when empty array is passed as a parameter.
- Adds unit test for checking values not containing rt and itf.
Jira-Issue: 923, 950, 962
Change-Id: I0692018c13d295d6a28d289819835c525dc08cf5
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
vimala.v [Wed, 2 Mar 2016 11:52:08 +0000 (17:22 +0530)]
Fix for send failure via Non-IP adapters
Change-Id: I16338d4ba55b8dfb21957ec0084fc731cfd02c3a
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Sun, 21 Feb 2016 07:17:18 +0000 (16:17 +0900)]
[IOT-955] To separate of pairing BT
If there were a number of BT devices near the user device,
user device will try to request pairing key exchange regardless
BT device owner.
it can cause very serious user experience problem.
so. i have added BT pairing from discovery procedure.
then the iotivity tries to find resources from
already paired BT devices provided each platform.
Change-Id: I8adee751c8e66e87a54ccc1b27ec0800c1c1edb3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Wed, 2 Mar 2016 07:31:14 +0000 (16:31 +0900)]
To support autoconnect flag of connectGatt(..) for multi-connection.
suitable autoconnect flag will be suppored as per devices
for backgound connection and first connection.
Change-Id: Ib8b3bb7ab6cedd8553d2b3ed51ea15dbc8caff68
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Fri, 19 Feb 2016 03:03:33 +0000 (12:03 +0900)]
To add connection manager for client for android BLE.
Change-Id: I54557c69c58d4f3dd4a1434d492d40c1d25a5ffa
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
sahil bansal [Wed, 2 Mar 2016 04:58:15 +0000 (10:28 +0530)]
Fixing error return type of OTMDoOwnershipTransfer API in case of NULL callback
Change-Id: I832c4c8e5b2361cb122473b1cd9b0c0b8c24a8da
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5287
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
leechul [Wed, 24 Feb 2016 00:29:35 +0000 (09:29 +0900)]
Modify OTM & SRM to resolve gap in ownership transfer sequence.
According to OIC security spec B,
Current IoTivity security module(OTM/SRM) has gap in ownership transfer sequence.
This patch includes the following modifications to remove the gap :
1. Modify to update the 'Owned' as TRUE after owner credential is determined.
2. In case of PIN based OxM, We should not create a temporal credential.
It will be handled directly in dtls layer.
It means we should use another get_psk_info callback
instead of GetDtlsPskCredentials during PIN based OxM.
3. The PT(OBT) transmits the owner credential(OwnerPSK) directly to the client.
The client will only need to verify recevied OwnerPSK.
4. Modify to include the 'cm' when update pstat in end of security provisioning.
NOTE1 : Please refer to the Figure 9, Table 3 and Figure 10, Table 4 in Spec B.
NOTE2 : IMHO, The current spec B document is not perfect in implementation perspective.
So we've proposed a updated ownership transfer sequence in details through CR document.
And it is expected to be accepted.
We should be update again when spec document is released or CR codument is accepted.
Please keep this in mind.
[Patch #1] : Initial upload.
[Patch #2~#4] : Remove the compile errors and warnings.
[Patch #5] : Retrigger
[Patch #6] : Remove the compile error in doxmresource for arduino
[Patch #7] : Modify according to review comments.
[Patch #8~#9] : Retrigger
Change-Id: If88e7028b55d830d21643a915444a81dc912a948
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5149
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
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>
jyong2.kim [Mon, 29 Feb 2016 09:31:49 +0000 (18:31 +0900)]
Updated unit test for Resource Hosting.
a couple of unit test is added at RH unit test.
disable install of unit test file to build root path.
Change-Id: I1882973addf5eb3a86132dd9d0ccfda6fc10199c
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5267
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
saurabh.s9 [Mon, 29 Feb 2016 08:10:52 +0000 (13:40 +0530)]
IoTivity Security bug fix and enable security api usage in easysetup Android app
- IoTivity bug is fixed by changing IoTivity security libraries from static to dynamic
https://jira.iotivity.org/browse/IOT-956
- Enabled Security api usage in Easysetup Android app
Change-Id: Id4296c724968cdfe52c673e5ea1696afa0346238
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5181
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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>
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>
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>
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>
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>
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>
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>
JungHo Kim [Mon, 29 Feb 2016 06:54:17 +0000 (06:54 +0000)]
Merge "Merge branch 'resource-container'"
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>
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>
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>
lankamadan [Mon, 29 Feb 2016 02:03:50 +0000 (11:03 +0900)]
SVACE issue fix and renaming of files as per naming standards
- Fixed SVACE analysis issues
- Renaming of files
Change-Id: Ibcc0fe8f8ec91b2d41b1199660e9bf18885342c6
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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>
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>
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>
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>
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>
Sandipan Patra [Wed, 24 Feb 2016 04:20:32 +0000 (09:50 +0530)]
[Enrollee] Unit Test case implementation for linux enrollee
Change-Id: I5f5a2c7424d643f755af32d5485a2a1858c1f1a8
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Madan Lanka [Thu, 25 Feb 2016 00:45:05 +0000 (00:45 +0000)]
Merge "Merge branch 'master' into group-manager" into group-manager
projects / platform / upstream / iotivity.git / log