Jon A. Cruz [Wed, 30 Sep 2015 18:57:36 +0000 (18:57 +0000)]
Merge "Merge Resource Directory into the master"
Mandeep Shetty [Fri, 25 Sep 2015 20:52:54 +0000 (13:52 -0700)]
Fix duplicate observer registrations due to slow server or network.
This fixes IOT-720 and IOT-612.
The client retransmits a confirmable request before the 1st timeout for
un-acknowledged confirmable request. The server is occasionally too slow
to respond or the network is slow sometimes.
In case of OBSERVE registrations, a retransmit means two or more observers will
be added for one observe request the client sent.
This leads to lot's of extra notifications being sent out and only one
of observers from the multiple clones are deleted if the client
de-registers.
Fix is to check with the token if observer was already added and ignore
the request if it was as the client was likely already ACKED for the
first request the server fully processed.
This should be cherrypicked to 1.0.0-dev.
Change-Id: I7ecfe1a6e8009606a9430515cbcedef2516507d7
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Habib Virji [Wed, 30 Sep 2015 09:58:37 +0000 (10:58 +0100)]
Merge Resource Directory into the master
Resource Directory Server:
• Hosting of RD (Server side)
• Respond to discovery request with the bias factor.
• Response after receiving publish resource and payload handling (Server side)
• Storage of resources at RD (Server side)
• /oic/res querying support with a response in collection format.
Resource Directory Clients:
• API to initiate discovery of RD
• Publish resources to RD using the collection format.
• Stop Multicast API suport
Sample Applications:
• Server side application to start resource directory
• Thin-client side application to discover and publish resources to resource directory.
• Client to query resource published at the resource directory.
Change-Id: Iecd03cb26b231dc58ae1f5c30353c5a2514260bf
Signed-off-by: Habib Virji <habib.virji@samsung.com>
arya.k [Wed, 30 Sep 2015 10:52:19 +0000 (16:22 +0530)]
[TIZEN] RE NestedAttributes Sample Application discovery fix.
Change-Id: I4f184d42f60ba3baacfde3aea4feec890e17b260
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Wed, 30 Sep 2015 07:45:24 +0000 (16:45 +0900)]
change location of resource container directory
- relocate the directory of resource container out of resource-encapsulation directory
- change sconscript for changed directory location
Change-Id: I912149cb7f3fe6b640b07108570c2fe9dd78fd1d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Tue, 29 Sep 2015 10:11:27 +0000 (15:41 +0530)]
Correcting the INPUT in Doxygen file.
Changed to include the relevant header files as per the updated
source code structure.
Change-Id: I2ceb54f2f7d7614008a4d0073b7964a8a44c27a5
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hauke Mehrtens [Tue, 22 Sep 2015 09:46:53 +0000 (11:46 +0200)]
tinydtls: add android logging support
This patch forwards the logging messages form tinydtls to the normal
android logging system instead of writing them to stdout and stderr.
This is activated in non release builds.
Change-Id: I56cf6752267dc512bf8252dfaaf957d0f87e5bf1
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
vimala.v [Tue, 29 Sep 2015 11:49:37 +0000 (17:19 +0530)]
Klockwork fixes for Routing Manager and CA
If accepted, this changeset should be cherrypicked to 1.0.0-dev.
Change-Id: I2bfaa017c3fafc5a5cd8d4c248564aa4eff88f76
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Habib Virji [Fri, 25 Sep 2015 01:25:39 +0000 (02:25 +0100)]
OCMulticast start and stop APIs
APIs to start and stop multicast traffic. For stopping and staring multicast traffic
it manipulates multicast fd and IP_DROP_MEMBERSHIP.
OCStopMulticastTraffic interface is called from rd_client. It stops the multicast traffic.
OCStartMulticastTraffic is implemented but it is not called as this functionality is
not yet implemented.
Change-Id: If56c7af074cbba097b7b23d1abd787093872418a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2387
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ravi Nanjundappa [Mon, 28 Sep 2015 07:14:00 +0000 (12:44 +0530)]
Update the OC_SPEC_VERSION macro
Updated the spec version from 0.9.0 to 0.9.2 in octypes.h file.
Change-Id: I9a92017864c1c3ae1cd5b8671f65901b2fb2bc7f
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Mon, 28 Sep 2015 05:05:23 +0000 (10:35 +0530)]
Add unit test for OCSetPlatformInfo()
Unit tests exercise code paths to check OCSetPlatformInfo()
for Client Mode.
Change-Id: I5b4fda023fd91826117cc27a1eb8f1578f94b958
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3173
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Rahul Rahul [Fri, 25 Sep 2015 16:58:50 +0000 (09:58 -0700)]
Added APK generation to build scripts
Updated android_api SConscript and Gradle files to generate
the APK of android examples with the existing scons command.
If trying to build examples from android studio, the user might
need to update the default TARGET_ARCH, RELEASE and SECURED flags
in <iotivity>/android/examples/gradle.properties
Updated the gradle versions to 1.3.0 in all gradle files.
Change-Id: Id9da3594ac83a4d27b3b1272a5aef6d893b305f9
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3135
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>
arya.k [Tue, 29 Sep 2015 09:40:09 +0000 (15:10 +0530)]
[TIZEN] RESampleClient application resource discovery fix.
Change-Id: I80c2e436bbfac92420cb67fc405e2786c081b432
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3265
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Tue, 29 Sep 2015 09:42:52 +0000 (15:12 +0530)]
Change file permission of RCSResourceObject.h file
Removed the execute permission for the RCSResourceObject.h file
in resource-encapsulation dir.
Change-Id: Ic4a3e1f3ab2766e461c7308ee1d0bf16a4eedbf2
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jyong2.kim [Tue, 29 Sep 2015 08:49:01 +0000 (17:49 +0900)]
Fix for resource type name of resource hosting.
resource type name is modified to follow naming convention.
Change-Id: I121bc75e627db58332778ff249f7f8fb512a23d2
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Tue, 29 Sep 2015 06:59:05 +0000 (15:59 +0900)]
modify timing issue and add test case for DiscoveryManagerUnitTest
- default waiting time is 3sec as each test.
- change discovery checking way from using sleep method to condition_variable.
: just unlock waiting mutex when is called callback function.
- request multiple discovery that have equal contents, and just one canceled.
other request will be received callback function.
modify createId's logic for RCSDiscoveryManagerImpl.
modify Sconscript
- directory location for DiscoveryMaanger' unittest code is changed.
Change-Id: I3dfd5b1440959eac200746eba098ebd1ff93b69b
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 29 Sep 2015 07:03:35 +0000 (12:33 +0530)]
[resource-hosting] Updated the Java SDK as per new folder structure.
- Updated SDK.
- Updated Android Sample Applications.
Change-Id: Ifea8bb81528dceea0879729b06bf0f90fe9beb05
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3251
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Abhishek Pandey [Tue, 29 Sep 2015 06:44:41 +0000 (12:14 +0530)]
Updated Tizen GBS build script to fix tinycbor clone error
During Jenkins build, tinycbor library is copied as a soft link in extlibs folder.
For Tizen build, we copy from this location to tmp folder, which in turn
is copied to GBS-ROOT during build. While copying from extlibs/tinycbor
which is present as a soft link, error appear during jenkins build.
Fixed the error by giving -L option during in copy command.
Also, added error return clause in gbs build script to enable
jenkins catch the error in case of build break.
Change-Id: I24c149dabd3ac3c382adf8aa11a60b0adae38a68
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hemant Mahsky [Tue, 29 Sep 2015 08:32:21 +0000 (14:02 +0530)]
Fixed an issue found in internal testing
Change-Id: I5a0bf9e5782765e72c2cc7528a66d241728db07e
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Tue, 29 Sep 2015 06:16:34 +0000 (11:46 +0530)]
Tizen build fix. Resource Hosting library name changed.
Change-Id: I7bdc05b230ecf807a36823ed6a9a7ca3f0d0040e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3245
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Habib Virji [Fri, 18 Sep 2015 22:15:25 +0000 (23:15 +0100)]
/oic/res response based on the collection response structure
This is based on the new strucutre of the /oic/res as currently being defined
by Ravi. This is useful for the resource directory as it needs to include
multiple links maps inside links array.
It differs with the current /oic/res response as it includes links array with
multiple links map object.
The strucutre of the payload appears in this format:
Array
TagsObject
di
baseURI
bitmap
ins
LinksArray
LinkMapObject
href
rt
itf
ins
Change-Id: Ifc61a70ede1fc44e9b2321604907d99961eea13b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jyong2.kim [Mon, 28 Sep 2015 09:29:32 +0000 (18:29 +0900)]
rename to resource-hosting from notification-manager.
notification manager is only provide resource hosting feature.
and resource hosting feature break off notifcation manager.
Change-Id: I96a0a60df60e60c44ecb9935cb73250949993fb6
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3205
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>
Sachin Agrawal [Wed, 23 Sep 2015 21:28:53 +0000 (14:28 -0700)]
Add check for expired symmetric keys
Iotivity should refuse DTLS session formation with devices whose
credentials have been expired.
Change-Id: Ic4708fbdd50ebc59e57f09c37211e7f36dbcf931
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Sachin Agrawal [Fri, 25 Sep 2015 18:20:29 +0000 (11:20 -0700)]
Refactor PSK Credential retrieval interface
When CA requests PSK credentials during DTLS handshake, SRM retrieves
credential for all devices and provides it to CA. This is un-necessary
and is in-efficient approach. Updated code to only provide credential
which has been requested by tinydtls.
Change-Id: Ie9bdc0ff1236b9f1f198215d211a682df416e731
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3009
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
vimala.v [Tue, 22 Sep 2015 11:36:33 +0000 (17:06 +0530)]
Integration of Tizen RI layer and Routing Manager build in Jenkins
1) Added Tizen scons for csdk libs and sample for IP transport
in auto build.
2) Updated Tizen, Linux and android scons to build ROUTING=GW
option in auto build.
3) Updated Tizen CSDK build script to return error on failure.
4) Added README for build procedure and execution of CSDK samples.
Change-Id: I6c9eb8fad8cb441658d8bdd5852ce5b50575f5ea
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Hemant Mahsky [Mon, 28 Sep 2015 16:54:14 +0000 (22:24 +0530)]
Added Multi PHY EasySetup Service
Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Updated SConscript to build EasySetup
Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sachin Agrawal [Mon, 28 Sep 2015 19:15:55 +0000 (19:15 +0000)]
Merge "Merge branch 'security-CKM' into 'master'"
koushik.girijala [Mon, 28 Sep 2015 09:11:13 +0000 (14:41 +0530)]
Fix for Jira issues IOT-733,739 and 727
Fixed double free corruptions and errors in freeing static memory
If accepted, this changeset should be cherrypicked to 1.0.0-dev.
Change-Id: I5b37f5090b68b45156b5965f715b68daebfe9e37
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3191
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@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>
Sachin Agrawal [Mon, 28 Sep 2015 16:38:19 +0000 (09:38 -0700)]
Merge branch 'security-CKM' into 'master'
* security-CKM:
Removed automatic switching to X.509 in CA
implement unit tests for CK manager
Add sample of PKIX provisioning
Conflicts:
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
Change-Id: If1e8367e3729b152602d1585bc433f083354c5e1
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
arya.k [Mon, 28 Sep 2015 11:38:15 +0000 (17:08 +0530)]
Fix for bug IOT-758
Change-Id: I7f9300a9a10d3f2d5bb774fc51ea51c62bdaf49a
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3203
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Mon, 28 Sep 2015 10:26:25 +0000 (15:56 +0530)]
things-manager: change file permission of .h files
Removed the execute permission for the .h files from things-manager.
Change-Id: I4ebedbcc84114edcacc67dcaf373d6563f465bc1
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3209
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Fri, 25 Sep 2015 14:29:58 +0000 (19:59 +0530)]
[Things-Manager]Fixed junit testcases issues and jira IOT-745
- Updated Java SDK
- Updated sample Application
Change-Id: Ife6e1d3a00ff76d4c68f96949787fab1724092dc
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3115
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Mon, 28 Sep 2015 08:21:41 +0000 (01:21 -0700)]
Refine comments for android apis of resource-encapsulation.
Incorrect tags are fixed.
Links for types and methods in comments are added for convenience.
Change-Id: I8f4bbc31dfb4ead6b4b5fd0f80046002f8e80589
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Mon, 28 Sep 2015 07:49:29 +0000 (00:49 -0700)]
Fix a possible segmentation fault of ExpiryTimer.
The thread for ExpiryTimer might be started before members are initialized.
Change-Id: I2d83a60bb84422e033f6165aef3cb0136edbeae7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Fri, 25 Sep 2015 04:29:39 +0000 (13:29 +0900)]
Align resource container Java bundle APIs with new naming scheme
Updating Java bundle resource to follow the new naming scheme (handleSetAttributeRequest,
handleGetAttributeRequest). Latest changes in the resource container APIs
are now also updated in the Java related code.
Change-Id: I7b28c830c2dc6f2dd1c7ad31405851b6d94def54
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3031
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>
jyong2.kim [Fri, 25 Sep 2015 04:25:32 +0000 (13:25 +0900)]
Remove delete request of notification sampleconsumer.
notification manager(resource hosting) is not service for delete request.
notification manager use to resource-encapsulation APIs.
but resource encapsulation APIs is not service for delete request to remote resource.
so, unsupported function about delete request is removed in sample application.
Change-Id: I1280b1fa647b57eadc80ff064d121593fdc88526
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3079
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>
ChaJiwon [Fri, 25 Sep 2015 12:10:13 +0000 (21:10 +0900)]
Modify directory location and code refactoring "RCSDiscoveryManager"
- change directory location for "RCSDiscoveryManager.h" into resource-encapsulation/src/resourceClient
- code refactoring about RCSDiscoveryManager and RCSDiscoveryManagerImpl
Change-Id: I6790e5aec8cb80a1b62c8767e71256fb582c58bf
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Shilpa Sodani [Fri, 25 Sep 2015 20:21:58 +0000 (13:21 -0700)]
Fix for bug IOT-759
Fixed the seg fault when no recurrence rule corresponding to period
rule was present.
Change-Id: I69989819d17ef7edf644a0efa512b051b18b7307
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Thuyen Tran [Sat, 26 Sep 2015 18:45:19 +0000 (11:45 -0700)]
Added function to config terminal for read/write.
Change-Id: I816c23cfd68bd85ff32bf4dbc5cadba5a4c708c8
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3065
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sandeep Sharma [Tue, 22 Sep 2015 12:43:35 +0000 (18:13 +0530)]
Add validation of parameters at JNI level.
Updated client json db file for 'sct'.
Few fixes in provisioning client sample.
Patch #1 Fix Review comments and device status enum fix.
Change-Id: Ib4d63619d730d2d350214d8fed6d3817b14eaa2c
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Fri, 25 Sep 2015 15:36:48 +0000 (08:36 -0700)]
Removed the filter to add 'identity' info on selective connections
Ir-respective of the end-point being a SERVER or CLIENT, it may be
useful for RI and upper layers to know the true identity of the sender
of the message. Therefore, removed the filter which was checking for
'SERVER' only mode.
Change-Id: I21cda0a645d79df6df3a3a4113cccbac4a7ae8d6
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2949
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Sachin Agrawal [Fri, 25 Sep 2015 05:27:49 +0000 (22:27 -0700)]
Fix issue w.r.t URI comparison when querystring is used
If a query string is attached to URI, URI comparison fails
and packets are dropped. Updated the code to only compare the
URI part excluding querystring.
Change-Id: Iee81e6fb7851d3a3ce5b8410fecd14645e134713
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3081
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Mandeep Shetty [Thu, 24 Sep 2015 20:42:39 +0000 (13:42 -0700)]
Fix segfault when calling OCCancel ()
This fixes the client side crash in IOT-733.
OCCancel () allocates a pointer that is free'd in routingutility.c.
Although the pointer was passed in as reference into routingutility and
is re-assigned with a new malloc'ed pointer, OCCancel() free's the old
pointer.
This is because there two structs that are being passed around. The
pointer that is double free'd is free'd twice as part of two DIFFERENT
structs. Got rid of the extra struct to keep things consistent and
resolve the crash.
If accepted, this changeset should be cherrypicked to 1.0.0-dev.
Change-Id: I8c961776406c02dbe7706a787bb19db53ba83853
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3055
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>
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ashok Channa [Fri, 25 Sep 2015 01:01:16 +0000 (10:01 +0900)]
Fixed the start adapter bug in ip/tcp adapter. (IOT-753/ IOT-453)
After multiple terminate initialization, CASendRequest API
is not working. because we didn't set the start flag with false
after stopping adapter. Both JIRA issues are related.
Change-Id: If855c4f689ce6979ae13591f2d4048113148d150
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
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>
Dmitrii Zhuravlev [Thu, 24 Sep 2015 16:50:10 +0000 (19:50 +0300)]
Removed automatic switching to X.509 in CA
Selecting TLS suite should be performed from the application layer
Change-Id: Id4b4fa0973585b3edc57895d788fb4b7fe061601
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3051
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.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>
i.pazderskyy [Thu, 24 Sep 2015 15:58:14 +0000 (18:58 +0300)]
implement unit tests for CK manager
Change-Id: If85d166912925c1bc9e5ea62c9872816a29eef30
Signed-off-by: Oleksii Udod <o.udod@samsung.com>
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
i.pazderskyy [Thu, 24 Sep 2015 14:36:25 +0000 (17:36 +0300)]
Add sample of PKIX provisioning
Includes provisioning client, door and light samples
Change-Id: I1457076f665ff8226a779bfe683e5a7536cabe83
Signed-off-by: Dmytro Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2480
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.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>
Habib Virji [Thu, 17 Sep 2015 10:54:19 +0000 (11:54 +0100)]
Move OCGetServerInstanceId in OCStack
Server instance id is needed by Resource Directory as it is a required field.
Currently getting Device Id is present in ocstackinternal.h but is needed to be accessible across.
This does not change any code but just moves API from ocstackinternal to ocstack.
Change-Id: I4f424a0fa498f3793933cd94294d9d8f991d4258
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2635
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.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>
projects / contrib / iotivity.git / log