Jon A. Cruz [Fri, 25 Sep 2015 17:54:53 +0000 (17:54 +0000)]
Merge "Merge branch 'remote-access2'"
js126.lee [Wed, 23 Sep 2015 14:06:02 +0000 (23:06 +0900)]
Fixed Tizen build error with SECURED=1
[Patch-1] Initial
[Patch-2,3] Fixed build error in case of CA partially.
Note : The purpose of this patch is to fix build error
when building full tizen with security.
The change required in jenkins configuration is out of this patch.
Change-Id: I2ec95c13d6c7d7978662e7ef69f7a02cd8188df0
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2997
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jon A. Cruz [Thu, 24 Sep 2015 21:24:30 +0000 (14:24 -0700)]
Fixed code that would only compile on buggy compilers.
Corrected lambda capture of member. Caused compilation to fail
on gcc newer than 4.6.
Corrected order of GTest assert macro parameters.
Change-Id: I04f653fb70d9e68ee97df2f68bbaa965513c621f
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hyuna0213.jo [Thu, 24 Sep 2015 11:20:28 +0000 (20:20 +0900)]
fixed the jira IOT-712 issue in blockwise-transfer
if request data is bulk data with block option1 and
response data is not bulk data, response data will
be sent with only block option1. this case we have to
add the received data to receive queue.
This patch addresses the first part of IOT-712.
Change-Id: I62645ae9592f59ed16758e4ff4a2b635cb834e04
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tim Kourt [Thu, 24 Sep 2015 23:47:08 +0000 (16:47 -0700)]
Android: fix for IOT-755
1. Moved a number of function implementations from OCResource.h into OCResource.cpp to make Android happy
2. Updated android smoke tests
Change-Id: I0bf0edfae7490204d2f4ca44052066fc2dd9af12
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nagabharan Nagendran <nagabharan.nagendran@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Thu, 24 Sep 2015 11:31:13 +0000 (20:31 +0900)]
[JIRA IOT-737] fixed to prevent send coap pdu for no uri
if some case is need it to check. the case have to check it.
pdu have to be passed even though there is no uri.
Change-Id: I95ba9b2bb64f7733fcfb3d06b896032c0e3feeef
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3041
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Mandeep Shetty [Thu, 24 Sep 2015 22:15:24 +0000 (15:15 -0700)]
Increase delay in ocserver.cpp sample to avoid missed notifications.
This fixes IOT-726.
The sever started sending out presence notifications too quickly causing some
notifications to be missed.
Increased delay before notifications are sent out to make it convenient
for TE.
Change-Id: Ia6c92992f1000119a8f4dccde1de6bae4abeef5a
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3061
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Mandeep Shetty [Thu, 24 Sep 2015 21:52:23 +0000 (14:52 -0700)]
Fix crash when discovering devices & platforms.
This fixes IOT-714
Iotivity does not currently enforce the mandatory fields of device and
platform be set by applications.
As a result, servers that do NOT set device and platform info segfault
when encoding device and platform info into CBOR as CBOR expects the
fields to be present.
Modified cbor payload to work with NULL fields in device and platform
payloads.
This changed also needs to go into 1.0.0-dev.
Change-Id: Ia626422bd441069febd47a5f44dd12aa42b1d46e
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Fri, 18 Sep 2015 17:35:49 +0000 (10:35 -0700)]
Android: Refactored SimpleClient
The app was refactored with the emphasis to readability
and cleanness. The theme has been modified to include IoTivity
logo and small android icons.
It also exercises the newly created features form the stack
such as OcResourceIdentifier.
Implemented hashCode() in OcResourceIdentifier to allow it to be
used as a key in the dictionary objects
PS 2: Removed unnecessary module reference
Change-Id: Ib1c9a56d97fa52ffe7d17c156ed228cf6e8946ef
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2719
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Sat, 19 Sep 2015 02:10:59 +0000 (19:10 -0700)]
Android: Refactored SimpleServer
The app was refactored with the emphasis to readability
and cleanness. The theme has been modified to include IoTivity
logo and small android icons.
Change-Id: Ife421a83b5f23a8b903a76b4a89edcb0c558f8ef
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Thu, 24 Sep 2015 19:24:02 +0000 (12:24 -0700)]
Android: Adding GroupServer/Client examples
Change-Id: I2604a8dfccf6f55b37949e8ff0eda6b1b49d7713
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Heewon Park [Fri, 25 Sep 2015 07:13:55 +0000 (16:13 +0900)]
Refactoring ResourceEncapsulation Sample App.
Fixed logic for discovery manager.
#resolved : jira Isuue(IOT-740)
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Change-Id: I664b58d0873fabfe4a2f245ea2859d4ff58418be
Reviewed-on: https://gerrit.iotivity.org/gerrit/3091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 25 Sep 2015 04:16:26 +0000 (21:16 -0700)]
In resource-encapsulation android api, ResourceContainer related files are removed.
It is not part of service api any more.
And manifest is modified to eliminate lint issues.
Change-Id: I80adb6784bd3a1667aa1b71f6f6b978c1148988c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 25 Sep 2015 04:20:09 +0000 (21:20 -0700)]
Code formatting for unit tests for resource-encapsulation android api.
It is to conform with java code style for iotivity.
Change-Id: I70c824606b76025d2b7ddb517c426ebef2faf740
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
K.J. Kao [Thu, 24 Sep 2015 02:14:29 +0000 (10:14 +0800)]
Merge branch 'remote-access2'
Signed-off-by: K.J. Kao <jeremyk@workssys.com>
Conflicts:
build_common/SConscript
resource/csdk/SConscript
Change Set 4:
print build libstrophe and wksxmppxep messages.
Change Set 5:
update wksxmppxep, 'add build flag -Wno-unused'
Change Set 6:
correct check path
Change-Id: I73960aba41495c5ef6f0f227d093fb1cb4f3bf92
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Signed-off-by: K.J. Kao <jeremyk@workssys.com>
Jihun Ha [Thu, 24 Sep 2015 10:05:51 +0000 (19:05 +0900)]
Remove a wrong memory free in oicgroup
Schedule information for scheduled group action should be not freed until
it is canceled.
Change-Id: I9c92908b4425795603a98d649f6be2d48d96645e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3035
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ChaJiwon [Fri, 25 Sep 2015 04:24:08 +0000 (13:24 +0900)]
fixed the jira IOT-742 Temperature Resource Creation Fail
- modify temperature resourceType
(core.TemperatrueSensor -> oic.r.temperaturesensor)
Change-Id: Icbb9402055ae09e2e732a85a31ef1e1a81c46b44
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Wed, 23 Sep 2015 14:31:12 +0000 (07:31 -0700)]
Convert android examples of resource-encapsulation into android-studio project.
Additionally source is modified to align with new version of apis.
Project names are changed as well to align with tizen samples.
ResourceContainer examples are removed because it will be excluded from service api.
JIRA issue : https://jira.iotivity.org/i#browse/IOT-744
Change-Id: Ie26dcef2ba373cde796099c4f6e5c32fbcf8aa03
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Thu, 24 Sep 2015 07:15:44 +0000 (16:15 +0900)]
Update comments for documents of resource-encapsulation
Add missing file descriptions.
Update comments that were incorrect or unclear.
Change-Id: If2b2ff50d35e52a07e2ff66055801fd0658865b7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3025
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Thu, 24 Sep 2015 08:20:12 +0000 (17:20 +0900)]
Modify discoveryMap's cancel logic in order to keep data intergrity.
- lock guard mutex before erasing data in discoveryMap.
Change-Id: I71f2a63797e417148a670a1d9e880d0c2a6515d4
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Rami Jung [Thu, 24 Sep 2015 04:36:28 +0000 (13:36 +0900)]
Extend the coverage of building Tizen
Given that the former area of Tizen cannot cover up all the Tizen build,
sometimes it missed the compile errors in Tizen.
Therefore it allows Iotivity to run the whole Tizen build
to avoid the mistakes
Change-Id: I026746f0850fe96186f044ac375176276d80a53e
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Thu, 24 Sep 2015 08:18:03 +0000 (17:18 +0900)]
modify BundleResource template api for handling attributes update
- remove set,get request handle apis for handling single attribute in bundle resource template to make template simple
- reorder the apis
- modify samples due to the change of resource template apis
- modify bundle resource to make container and bundle use shared pointer
Change-Id: I7b87ffc2e405aedd290a13b3b392063d785f8814
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3027
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ChaJiwon [Thu, 24 Sep 2015 06:29:41 +0000 (15:29 +0900)]
Add API explained comments for RCSDiscoveryManager and RCSDiscoveryManagerImpl
- Modify return type (void -> unique_ptr<DiscoveryTask>) in RCSDiscoveryManager
- Add new API in RCSDiscoveryManagerImpl
Need to be cherry picked master branch into 1.0.0-dev branch
Change-Id: I69c90a7448efa325941c2aef53ea4a252e2ab6c8
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Randeep Singh [Fri, 18 Sep 2015 10:36:25 +0000 (19:36 +0900)]
Fixed wrong return type in PDM
PDMIsDuplicateDevice API declaration returns null but function defination
have conditions which returns other values.
Change-Id: I3bab66243fb03908072d16dbc64cc4e8823755ad
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
jihwan.seo [Wed, 23 Sep 2015 07:59:36 +0000 (16:59 +0900)]
[JIRA IOT-738] fixed to calculate message length for option
message length in Header is wrong
for long option number and value for CoAP over TCP
Change-Id: I72452c07e2b5ffe43749cae5c3a4bae6d7c2f3f2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ravi Nanjundappa [Wed, 23 Sep 2015 03:14:35 +0000 (08:44 +0530)]
resource: check for valid pointers
This is patch is in continuation of the patchset
As mentioned by Madhan, this patch checks for the validity of
the pointers before their dereferences.
Change-Id: I9c1cd15bbcbd0a77bb34898ce3bc55c7d87b05f4
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2971
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
vimala.v [Mon, 21 Sep 2015 13:40:41 +0000 (19:10 +0530)]
Prevent fixes in Routing Manager and CA.
Change-Id: I770c3bea4bbff8ddaf9d17f7fcb79274d2e85a34
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
hyuna0213.jo [Mon, 21 Sep 2015 11:43:09 +0000 (20:43 +0900)]
Updated the code related to Blockwise Transfer in CA
- Added to check RESET message for BlockWise Transfer.
- clean up blockID when multicast is ran.
Change-Id: I432bda9577db294722892ff164ffdc6f66673fbb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Sachin Agrawal [Tue, 22 Sep 2015 22:10:02 +0000 (15:10 -0700)]
Destroy Secure resources during system shut-down
Secure resources which were recently added were not being
destroyed during system shutdown. Added API calls to enable
proper de-allocation.
Change-Id: I1fcaf2218d8957138a87e1ffab14d07c78bebe5c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Sachin Agrawal [Tue, 22 Sep 2015 21:48:43 +0000 (14:48 -0700)]
Updated log level of log messages in SRM module
Many of the log messages had in-correct level of INFO, whereas they
were actually DEBUG messages.
Change-Id: I0e47e1b19b20a15f7d4b539e55995137270c75fa
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Randeep Singh [Tue, 22 Sep 2015 01:44:31 +0000 (10:44 +0900)]
Added support for proactive link checking
In current implementation whenever user tries to add link between two devices
which already exists apis logs error and doesn't return callback.
In this change, link api first checks that link between two intended devices
exists or not, if it exists then api return error and doesn't move ahead.
Change-Id: Iac02a44542235b962de2fe965f45548d96f9c625
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2899
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
leechul [Tue, 22 Sep 2015 01:23:05 +0000 (10:23 +0900)]
Fix the size calculation bugs while calling memset in secureresourceprovider.c
1. Fix the 'sizeof(sizeof(...))' whiling calling memset().
2. Change the 'OICMalloc + memset' to 'OICCalloc'.
Change-Id: Idbb14de5a3d4517bc55324f7a8a58d2079bf12e8
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Dmitrii Zhuravlev [Wed, 23 Sep 2015 19:36:20 +0000 (22:36 +0300)]
Add CRL resource URI to SRM checking
Enables CRL resource URI to be secure while SRM checking
Change-Id: Ie0e5bfc0a08e16730ff9a1f9ff1b52525545ca86
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tim Kourt [Wed, 23 Sep 2015 17:09:28 +0000 (10:09 -0700)]
Android: Removed a null entity handler initializer from OcPlatform
This should have been removed as a part of the
https://gerrit.iotivity.org/gerrit/#/c/2346/
Change-Id: I3fd6de963b21174a41627ffdfe6b4e822bf313ee
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ravi Nanjundappa [Tue, 22 Sep 2015 04:48:32 +0000 (10:18 +0530)]
android_api: Fix cppcheck issues in android/android_api/base/jni/ dir
This patch fixes the "(error) Possible null pointer dereference:" issues
reported by cppcheck tool in android/android_api/base/jni/ directory.
Change-Id: I92a629df583cec5ec083c1427bd6cdc08ca9dc6b
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2909
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Mon, 21 Sep 2015 05:53:39 +0000 (14:53 +0900)]
rearranged unnecessary logs in android BLE
Change-Id: I2ce73710bde700ab5fccfa7ee0f479099b2a5dfb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2811
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Hauke Mehrtens [Tue, 15 Sep 2015 13:47:44 +0000 (15:47 +0200)]
ca: fix android KitKat 4.4 support
pthread_condattr_setclock() was added in Android 5.0 and IoTivity used
it unconditionally which cause linkage errors on older android versions.
With this patch pthread_condattr_setclock() is only accessed when it is
available with a weak reference. In addition android < 5.0 provides a
private function __pthread_cond_timedwait_relative() which is similar
to pthread_cond_timedwait() use that when available instead.
This should make IoTivity compatible with KitKat devices.
This was tested backported to IoTivity 0.9.2 on an Intel based Android
4.4 Phone and an Arm based Android 5.0 Phone.
Change-Id: Ibae6613a4ae52e230b7850ef1a2bad0b5fd530df
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Hauke Mehrtens [Tue, 22 Sep 2015 14:40:58 +0000 (16:40 +0200)]
logging: add format checks for printf input
This patch makes gcc aware that this is a function formating a string,
this way gcc is able to check if the format string is correct and warn
the user otherwise. This should make it possible to find some more
problems in the code.
Change-Id: I27058eb1d5c3352e6f872e4013eedb94d42d757a
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Minji Park [Wed, 23 Sep 2015 07:51:02 +0000 (16:51 +0900)]
Add class description of container bundle API
- add class and file description of container bundle API
- remove '-' for parameter description in comments for APIs
Change-Id: Iaca3db8d948657381fdf80350e45b7d783a5672a
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2983
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Markus Jung [Wed, 23 Sep 2015 05:53:36 +0000 (14:53 +0900)]
Renaming of BundleResource APIs
Renamed the BundleResource APIs from simple setAttribute and getAttribute to
handleSetAttributeRequest and handleGetAttributeRequest. The maintainer
of the primitive services prefers these names in order to avoid
confusion with other resource encapsulation APIs.
The plain setters and getters are just for basic data structure manipulation and
do not handle any bundle resource specific logic any more.
Change-Id: Ie8f486269694ca7ee2a44f2e2390cdb2b27ba45b
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Wed, 23 Sep 2015 05:14:13 +0000 (14:14 +0900)]
Add brief descriptions to several classes in things manager feature
GroupManager, ThingsConfiguration, and ThingsMaintenance has been added with
brief descriptions.
Change-Id: Ic2f884affa1754ff2b897eda171715624641b58b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Tue, 22 Sep 2015 04:38:19 +0000 (10:08 +0530)]
resource: Fix cppcheck issues in resource/csdk/security/ dir
This patch fixes the "(error) Possible null pointer dereference:" issues
reported by cppcheck tool in resource/csdk/security/ directory.
Change-Id: I36c41312fe3d78edd43c6c505b875ecbb6ba0dfa
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Tue, 22 Sep 2015 23:48:36 +0000 (16:48 -0700)]
Fix invoking attribute updated listener of RCSResourceObject.
There was a possible deadlock issue when the callback is invoked.
The mutex should be unlocked when the control is passed by invoking a callback to the users so that an object of the class can be used for the users without any concern regarding deadlock.
Change-Id: Iea35ab16858c7a8be67b87726b0e25ea6e94d73c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2959
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Erich Keane [Thu, 10 Sep 2015 21:48:40 +0000 (14:48 -0700)]
Fixed error on Host copying
The test for the host length only matters for a specific part of the
host string, not the whole thing. Previously, this would incorrectly
error out in situations where the host was the proper size.
This patch moves the test to the correct location.
Change-Id: I7239ea37e05f17703632a4ab0682fabd88d13f1e
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Mandeep Shetty [Tue, 22 Sep 2015 18:27:00 +0000 (11:27 -0700)]
Make zigbee client use OCDevAddr struct instead of a char string.
Sticking the ip and port into a char string with resource uri opens up
potential errors due to incorrect parsing. Use OCDevAddr struct instead
as it is meant to be used for cleaner and less fragile code.
Change-Id: I31eb7c4d39d55f7163cffbf85bc12ccb7cf77a0d
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2939
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Dmitrii Zhuravlev [Tue, 22 Sep 2015 13:18:32 +0000 (16:18 +0300)]
Disable checking parameters for non symmetric key
Disables the second device and key length checking,
in the case of credential provisioning based on the types
that are different from SYMMETRIC_PAIR_WISE_KEY.
Change-Id: I8dc8581e7af7ef104e7e2dd473c53d60acc1c9d9
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ravi Nanjundappa [Mon, 21 Sep 2015 11:42:12 +0000 (17:12 +0530)]
Updated README files to refer to usage of scons
Changed README file in resource/csdk/stack/test directory to refer to usage
of scons instead of make commands.
Change-Id: I3b51026ef0bacd9859ce2542eb7a4660c30e8b64
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Mon, 21 Sep 2015 06:57:33 +0000 (12:27 +0530)]
resource:Add test for ConstructResourceObject with Long Host Address
Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with long host address value.
Change-Id: I56d3970d8b0b9cc8f1d6cb1c4c54b488ddddc458
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
vimala.v [Mon, 21 Sep 2015 05:20:57 +0000 (10:50 +0530)]
Resolved Compilation issues in Routing Manager
Change-Id: Ibc911824538e2d2b12e346fad802d9b6ecbd7060
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Jaehong Jo [Mon, 21 Sep 2015 07:44:56 +0000 (16:44 +0900)]
Modify Improper deletion of ArrayList
As array list member is not created in runtime, deletion causes memory crash.
Change-Id: Idc15349b70ff77a8446e76488ff3ca13c055e475
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2829
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Hauke Mehrtens [Thu, 17 Sep 2015 16:51:33 +0000 (18:51 +0200)]
android: add misssing error codes to stackResultToStr()
The OC_STACK_UNAUTHORIZED_REQ error code and some others were missing in
the method for translating them into strings.
Without this patch it resulted in this exception:
org.iotivity.base.OcException: stack error in onObserveCallback JNI_INVALID_VALUE
Change-Id: I739dfecafff55c035702a27a9b5d8dcb925993f4
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2643
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
hyuna0213.jo [Fri, 18 Sep 2015 07:23:29 +0000 (16:23 +0900)]
fixed the prevent issues for CA linux platform.
-remove the build warning
-memory free logic
-changed the structure initialization
Change-Id: Iab788102c0ea259fac54ae43c01fcb504ba8eec3
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2679
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Jay Sharma [Tue, 22 Sep 2015 11:38:45 +0000 (17:08 +0530)]
Updated java doc comments for services : TM and RE layer
- updated comments for bundle-java-api of Resurce Container module
- updated comments of Things Manager.
Change-Id: I39970e0cce8920488ac034d3b110421dce2fc0de
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2923
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Tue, 22 Sep 2015 08:51:29 +0000 (01:51 -0700)]
Fix a build failure issue of resource-encapsulation for android-debug mode.
Change-Id: I8bc556913b9582814144ef05fd5a9484b857a241
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jyong2.kim [Tue, 22 Sep 2015 06:58:28 +0000 (15:58 +0900)]
Update unittest of notification-manager.
Adding unittest for HostingObject Class,
and fixing release of smart pointer.
Change-Id: Ia27070b5908c5b42348a430dc602e136b70a9217
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Tue, 22 Sep 2015 07:36:48 +0000 (00:36 -0700)]
Fix handler setters of RcsResourceObject of resource-encapsulation android api.
Handler setters should accept null to erase one set earlier.
It is to make apis consistent between c++ and android.
Additionally an issue caused by using old exception class name is fixed.
Change-Id: I273755b6d2ab48a489d1829aa932b2f675332db6
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Tue, 22 Sep 2015 04:21:38 +0000 (21:21 -0700)]
Fix broken tests of resource-encapsulation.
DiscoveryManagerTest is moved.
ResourceClientTest is modified to conform to the modified discovery manager.
Change-Id: I55b1fcfa00e4a606796f44ee4c84351dfaebc4c7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Mon, 21 Sep 2015 06:24:35 +0000 (11:54 +0530)]
[Resource-Encapsulation] Prevent fixes for Linux Sample applications.
Change-Id: Ibd2ec1c4af6994a7022526f5afb8c2c274f20ec8
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2815
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Rami Jung [Mon, 21 Sep 2015 23:59:16 +0000 (08:59 +0900)]
correct the comment about mis-definition of class "RCSResourceContainer" for doxygen
The mismatch between the real name of a class RCSResourceContainer and it's comment resulted in the wrong doxygen description .
It means that Doxygen had two seperate definitions like RCSResourceContainer and ResourceContainer.
Change-Id: I3a3647ace72b641862cd05b7d4ee2c8d98aeaf75
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2885
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Mon, 21 Sep 2015 11:18:31 +0000 (20:18 +0900)]
change resource type names of resource container samples
- modify container sample bundles, unittest and bundle configfiles
- change resource types of sample input sensors
Change-Id: I2738a8c2ad1f5e28ea5a3dd2d6c48739b7be9a5b
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hunje.yeon [Mon, 21 Sep 2015 14:24:52 +0000 (23:24 +0900)]
Update SConscript in service
Cleans SConscript in service folder by removing soft-sensor and
protocol plugin SConscript
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Change-Id: Iccc880151f6b77a43f6f956eb6a7a40da25547ee
Reviewed-on: https://gerrit.iotivity.org/gerrit/2869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
vimala.v [Mon, 21 Sep 2015 13:24:22 +0000 (18:54 +0530)]
Fixed bug in SRMIsSecurityResourceURI()
SRMIsSecurityResourceURI() API was returning "TRUE" for all resources with
URI starting with "/oic". sizeof() char * is always 4. Changed to strlen().
Change-Id: I2287ee29c677bf7229a80779fa150c73abb7db19
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2863
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jyong2.kim [Mon, 21 Sep 2015 11:33:05 +0000 (20:33 +0900)]
Update Sconscript of notification-manager.
Samples exclude from the install target,
and library header include to the install target.
Change-Id: I06c7a2b8302c8d43d00cf2884098af97eb75bddf
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Mon, 21 Sep 2015 10:22:01 +0000 (03:22 -0700)]
Add missing copyright
Change-Id: Ib376f468e060920ce0315ab36d582c365f7aea1e
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2845
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Mon, 21 Sep 2015 10:10:51 +0000 (19:10 +0900)]
Fix bugs in things manager reported as defects
CIDs: 65815, 65820, 65838, 65877, 77411, 77412, 81301, 81305, 81306, 81584
Additionally, modify resource type to be compatible to RFC 6690 guideline
for factory set resource.
Change-Id: Ia598cc00f8b3810a14a6341e941f20b11e3c4bfd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Woochul Shim [Mon, 21 Sep 2015 07:44:59 +0000 (16:44 +0900)]
Remove wrapping '(' and ')' in OC_LOG arguments to resolve Tizen Build error.
Change-Id: I5ca0849bcde655c6eb8962c28bc5c4320f4bf925
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2827
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Mon, 21 Sep 2015 06:25:15 +0000 (23:25 -0700)]
Rename resource-encapsulation exception classes.
It is to make class names consistent.
All exposed classes in resource-encapsultion layer as the API must start with RCS.
Change-Id: I64280bc959a60d368cfabab731196e35a7383a94
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Younghyun Joo [Mon, 21 Sep 2015 08:43:49 +0000 (17:43 +0900)]
Modify NotificationManager code to change resource type
- change the capital of resource type into the small letter
Change-Id: I85d34e25c903a826f2b4a16781991ee61b75b16b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Harish Kumara Marappa [Mon, 21 Sep 2015 07:09:11 +0000 (12:39 +0530)]
Making simulator build optional through scons command line argument "SIMULATOR".
simulator module will be built only if scons command passed with SIMULATOR
argument having one of the case insensitive value from "True", "Yes", "Y" and "1".
Example: scons SIMULATOR=1
Change-Id: Ie5dcd839d8770d219de1d623d60c23be0133bb1c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2823
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Mon, 21 Sep 2015 05:33:15 +0000 (11:03 +0530)]
Fix the build failures on Ubuntu 12.04 32-bit machine.
Changes incorporate inclusion of "condition_variable" header file
in notification-manager dir.
Change-Id: I8dcf2a54579d8c5a1ce9f60a6498007eb7fe2c37
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Mon, 21 Sep 2015 06:46:03 +0000 (12:16 +0530)]
[Resource-Encapsulation] Tizen build fixes. Removal of SSM and PPM library references.
Change-Id: I038be50d750333696fcc1ee111fb7fc53bf7729e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Joseph Morrow [Sun, 20 Sep 2015 22:06:56 +0000 (15:06 -0700)]
Merge branch 'plugin-interface' into master
Change-Id: Idb58ff366694797d8bc433e974faf2c6124091aa
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Joseph Morrow [Sun, 20 Sep 2015 20:57:00 +0000 (13:57 -0700)]
Added Telegesis & Zigbee Wrappers, mapping logic, and plugin interface.
These additions encompass the first pre-release of the plugin
interface.
A unit test, server, client application are also included.
Change-Id: Ia61a01223f611ffc1e38e79b8e3a8317fb3f34cd
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Joseph Morrow [Sat, 19 Sep 2015 03:27:03 +0000 (20:27 -0700)]
Changed zigbee sample to use signal-atomic
The signal atomic type is more reliable than bool, since it is
guaranteed to enforce thread safety. Also fixed the logic in the 'while'
loop so that this will function properly when the calls work.
Change-Id: I1ef4713f9e894592b1b25c874327bce810c83352
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2769
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Joseph Morrow [Sat, 19 Sep 2015 03:24:55 +0000 (20:24 -0700)]
Adding an IoTivity/Zigbee sample server
Added functionality for the IoTivity/Zigbee server. Added file
for addition of the client. Changed the PluginStart to have the correct
parameters. Corrected SConscript to properly include the IoTivity
logger and CSDK.
Change-Id: I20aca3403c6a0a1e198fdb337a6affe13c389417
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2122
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Joseph Morrow [Sat, 19 Sep 2015 19:40:05 +0000 (12:40 -0700)]
Do not build the Plugin Interface for unsupported platforms (ie. !linux).
This will ensure the Plugin Interface is only run on the Linux platform
as this is the only validated platform for the Plugin Interface thus far.
Change-Id: I14507336d54a47cc32102c76cd1d4f1891cb3687
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2785
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Mandeep Shetty [Thu, 17 Sep 2015 23:47:21 +0000 (16:47 -0700)]
Fix broken observe requests and GETs being treated as OBSERVEs
args to some functions were validated for NULL to return error codes even though
NULLs were legal for the args.
For eg. it is legal for options to be NULL.
These incorrect validations caused early returns and observation actions
were not set to OC_OBSERVE_NO_OPTION which is 2. The field in the struct
instead defaulted to OC_OBSERVE_REGISTER = 0 due to default inits.
Fixed both by removing or replacing the incorrect validations with more
appropriate ones.
Change-Id: Ia7453227a668bb26971b2b7d84381f64151b88f9
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Sun, 20 Sep 2015 02:14:42 +0000 (19:14 -0700)]
Merge branch 'security-summit' into 'master'
* security-summit:
Added AMS functionality to support on-demand ACL provisioning.
Added Android support for Provisioning APIs
Quick fix on getting secure port information
Conflicts:
android/android_api/base/jni/JniOcStack.cpp
android/examples/settings.gradle
resource/csdk/security/include/internal/secureresourcemanager.h
resource/csdk/security/src/secureresourcemanager.c
Change-Id: I57d1157e4c1e74425fe27757e7dfa8a4ef8d427a
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Sun, 20 Sep 2015 00:31:39 +0000 (17:31 -0700)]
Added AMS functionality to support on-demand ACL provisioning.
This change includes the new "AMS Manager" (amsmgr.c) module, as well
as modifications to the SRM proper, policy engine, and doxmresource,
which are required to enable Access Management Service functionality in
the SRM.
Change-Id: Ibf10e00bebeeafd238ac083c7d45c1bbf7a46dd3
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2486
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Sat, 19 Sep 2015 03:24:11 +0000 (20:24 -0700)]
Initial commit of "Plugin Interface" & supporting directory structure.
This commit will allow follow-up contributions between contributors to
this new feature to IoTivity.
Change-Id: I41b812c048e44dded31a7fefa75f1e3830fc8daf
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2091
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2765
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tested-by: Patrick Lankswert <patrick.lankswert@intel.com>
Erich Keane [Thu, 17 Sep 2015 22:48:18 +0000 (15:48 -0700)]
Changed if/rt to be space-delimited strings in CBOR encoding
The Spec says that if/rt should be space-delimited values rather than
just an array of strings, so this changes all encodings of if and rt to
be space-delimited.
Also adds some unit tests to validate the defensive nature of this
reading.
Change-Id: Iebd1d5a215a06abb023bb1b33112dac1df3511a1
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2645
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Fri, 11 Sep 2015 22:47:12 +0000 (15:47 -0700)]
Android: Added Device/Platform discovery client/server examples.
In addition it also modifies the respective functions in the base
Note: this commit depends on gerrit.iotivity.org/gerrit/#/c/2433/
Set 3: Changed the tests to be in accordance with the modified API
Change-Id: I1a91166a54ef7f277d95c4d62961888c782383c5
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Sachin Agrawal [Sat, 19 Sep 2015 16:28:51 +0000 (16:28 +0000)]
Merge "Merge branch 'security-CKM' into 'master'"
Dmitrii Zhuravlev [Sat, 19 Sep 2015 14:01:27 +0000 (17:01 +0300)]
Merge branch 'security-CKM' into 'master'
* security-CKM:
Add PKIX build
implement certificate key manager
CA retrieve PKIX resource from SRM using callbacks
Add PKIX provisioning
Add PKIX resources
Add PKIX API for CA
add support of X.509 into tinyDTLS external library
Add certificate verification
Add ASN.1 for PKIX
Conflicts:
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/include/ocprovisioningmanager.h
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c
Change-Id: I7ec588eeec8e04e0bf9de84ebf520023a3f97dfe
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>
jihwan.seo [Fri, 18 Sep 2015 11:09:55 +0000 (20:09 +0900)]
clean up RoutingManager codes in here and there.
Change-Id: Ib4ac2c34033f594c8d2821898d4831e18869a3d3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Erich Keane [Wed, 16 Sep 2015 21:33:19 +0000 (14:33 -0700)]
Add validation to resource type/interface addition
The functions that add resource type/interfaces to the resources were
not correctly validating them to the RFC. This commit adds validation
to these such that RFC6690 is enforced, and gives the developer
immediate/early warning of invalid values.
Change-Id: If04f72c1aa69ec2f9fbc83d849a503c2ee86f502
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Wed, 9 Sep 2015 20:47:46 +0000 (13:47 -0700)]
Android: Adding PresenceClient\PresenceServer examples
PS2: adding modified settings.gradle
Change-Id: Iedba236264ab2b58bb55e11e8f4ea7f8b3871603
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Harish Kumara Marappa [Sat, 19 Sep 2015 11:06:55 +0000 (16:36 +0530)]
Merge branch 'simulator'
OC::ObservationInfo is modified only as per the requirement of simulator module.
Please refer this change set for more information https://gerrit.iotivity.org/gerrit/#/c/2323/.
Change-Id: Ib4d762348f250697642d417798780e37cf62bdb0
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 09:09:56 +0000 (18:09 +0900)]
Merge "Merge branch 'master' into resource-encapsulation" into resource-encapsulation
Change-Id: I56e84e31987766e5fc97cf3dafa7882f55ae1ef4
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Jay Sharma [Fri, 18 Sep 2015 20:02:48 +0000 (01:32 +0530)]
OSLV fixes for RE layer.
- Updated Android sample apps.
Change-Id: I6df99717227d1515e40a08560550b3cb2c82d54c
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2723
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Harish Kumara Marappa [Fri, 18 Sep 2015 18:43:35 +0000 (00:13 +0530)]
Fix for prevent tool reported defects.
Change details:
1. Prevent issues fix.
2. Removal of white spaces from Java files.
3. Simulator tool UI changes.
4. Fix for issues observed during regression testing.
Change-Id: I4141541587421bc3de7ee321e8124a0444f37dd5
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 08:23:47 +0000 (17:23 +0900)]
Merge branch 'master' into resource-encapsulation
Change-Id: Ib07cb15d2b953ac870166383fe51fc7a26aaf73b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 06:26:32 +0000 (15:26 +0900)]
Modify Notification Manager for updating resource encapsulation
- Modify Notification Manager files
- Add UnitTest codes
Change-Id: I7b3ac0931a77935fc26a9c060a96200f13de27ca
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 18 Sep 2015 11:02:46 +0000 (04:02 -0700)]
Eliminate result code from RCSGetResponse and RCSSetResponse.
It turned out there is no reason for users to set the result code.
The only scenario that RCSResponses have not OK for the result is that there is an error occurred
and in that case it should be an exception on resource-encapsulation layer.
Change-Id: Icef409ea5e224f9f02e12e174231baa4e11c5a33
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Younghyun Joo [Sat, 19 Sep 2015 05:21:27 +0000 (14:21 +0900)]
Modify resourceContainer code files for active discovery manager
- add variable for RCSDiscoveryTask.
Change-Id: Ic26daafcb70c8c59242debcddcbd1307e84aae01
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Fri, 18 Sep 2015 08:10:01 +0000 (17:10 +0900)]
Code formatting for RCSDiscovery implementation.
Change-Id: I2734731b8c467204e9382a08b185f6f9b9a7797e
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 18 Sep 2015 09:50:35 +0000 (02:50 -0700)]
Refactoring the android api for resorce-encapsulation.
SConscript is added to conform to scons build.
JNI files are renamed to conform to the style.
JNI files are restructureed to make folder hierarchy simple.
android apis are refined to follow java convention.
Comments for apis are updated.
Change-Id: I1bef70c9468d767b1694f29165704a70370bbe90
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sachin Agrawal [Fri, 18 Sep 2015 23:47:56 +0000 (16:47 -0700)]
Add PKIX build
To build with X.509 support:
scons SECURED=1 DTLS_WITH_X509=1
Change-Id: I63f0b9e4b1efa6f5871ee23d30ed5975424366ef
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2491
Oleksii Udod [Mon, 14 Sep 2015 14:11:13 +0000 (17:11 +0300)]
implement certificate key manager
Change-Id: Ie77bc7f7cffe9536a0ca7a24625af17d01bf63ed
Signed-off-by: Oleksii Udod <o.udod@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2447
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Madan Lanka [Fri, 18 Sep 2015 22:21:36 +0000 (22:21 +0000)]
Merge "Merge branch 'master' into simulator" into simulator
projects / contrib / iotivity.git / log