summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-01-18easy-setup: Rename header to EasySetup.hppPhilippe Coval7-10/+10
Prevent potential name clash on case insensitive filesystems: ./service/easy-setup/mediator/richsdk/inc/EasySetup.h ./service/easy-setup/enrollee/inc/easysetup.h Mediator one is C++ so we rename it to .hpp Change-Id: I6d784378b5065b162d06abb2338bf70e0147d864 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16479 Reviewed-by: George Nash <george.nash@intel.com> Tested-by: jenkins-iotivity <jenkins@iotivity.org> Reviewed-by: Uze Choi <uzchoi@samsung.com> (cherry picked from commit 98b92dae54a9244e1947937fcf7432ac38956659) Origin: https://gerrit.iotivity.org/gerrit/#/c/16481/ pp
2017-01-18build: Ship provisionning headersPhilippe Coval1-0/+2
New headers should be installed if part of public API: - OCProvisionningManager.hpp - OCCloudProvisioning.hpp Change-Id: I29a322f2dae9b0d978cdd05d4ca3ad71729d1923 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Origin: https://gerrit.iotivity.org/gerrit/#/c/16531/
2017-01-17fix the build error when appcliation build resource encapsulationJooseok Park1-0/+2
- add the missing header file in installed target header Change-Id: I71b65d6df422bd758e543118c2580ac770213399 Signed-off-by: JooseokPark <jooseok.park@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16461 Reviewed-by: Uze Choi <uzchoi@samsung.com> Tested-by: Uze Choi <uzchoi@samsung.com>
2017-01-17revise the spec file for ESJooseok Park1-3/+0
- tizen: avoid to duplicate headers - Rely on pkg-config instead. Change-Id: I5944d59bb08d8aeeda617f0af5ba95ae9e76e9cc
2017-01-17tizen: avoid to duplicate headersPhilippe Coval1-3/+0
Rely on pkg-config instead. Change-Id: Ieff754b33a21015a17fc9a8d107ee29f1376dfa1 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16449 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2017-01-17build: Add ES NS paths to pkg-configPhilippe Coval1-0/+2
Public easy-setup and notification headers, are copied in 2 level depths directory. Change-Id: I7c9fd3a4bd1143c5ea05e7902292af23cf5e8934 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16447 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2017-01-17build: Install easy-setup headersPhilippe Coval3-7/+13
It look like project public headers are installed to 2 level depth subdirectories (service/$domain/*.h*) Change-Id: Ia7a66caf5381d24b56f0c5ac1a91929eff9ba7d7 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16445 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2017-01-17build: Install notification headersPhilippe Coval4-0/+42
It look like project public headers are installed to 2 level depth subdirectories (service/$domain/*.h*) Change-Id: I36ab613ff6aaf7d960e6ba1e94263f8cfdf7c559 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16443 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2017-01-17Fix the notification service SConscriptJooseok Park1-0/+3
- when application use the notification service, build error occurs. - i.e) /usr/include/service/notification/NSConsumerInterface.h:35:22: fatal error: NSCommon.h: No such file or directory - Although NSConsumerInterface.h includes NSCommon.h, NSCommon.h file is not installed in SConscript. - So, need to add NSCommon.h in installed header Change-Id: I2f28f84504d68c5506c89513d74adcdf32d2bbfc Signed-off-by: JooseokPark <jooseok.park@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/16427 Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com> Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com> (cherry picked from commit e4eca38246a40013530b7df74c1b369960c88897) Reviewed-on: https://gerrit.iotivity.org/gerrit/16459 Tested-by: Uze Choi <uzchoi@samsung.com>
2017-01-10merge tizen_3.0 to tizen branchsubmit/tizen/20170110.045728accepted/tizen/wearable/20170110.081414accepted/tizen/tv/20170110.081348accepted/tizen/mobile/20170110.081323accepted/tizen/ivi/20170110.081445accepted/tizen/common/20170110.155003Jooseok Park1-1/+1
Change-Id: Ib7f30f0231385d4f6c2d2cee8ff430ad6ed6b6ac
2016-12-19tizen: Replace speedpython by python-accelPhilippe Coval1-9/+3
Tizen toolchain provide same functionality with python-accel's macro Also Chan Lee from Tizen toolchain project reported: { Speedpython macro sometimes cause some build problem Speedpython macro is parsed when spec parsing time and it includes other macro in its own. (I mean, %{build_hostarch} macro) And when the OBS project config updates, OBS sometimes cannot sync-up the changes perfectly. It this case, build error occurs when we use speedpython macro. It seems OBS limitation but, we can avoid this problem by using other macro which provides same functionality. } Change-Id: I265220b5e1f2dcb1956ef546a799a94eb460dd88 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-19[Tizen]change flag which used for detect ip changedsubmit/tizen_3.0/20161219.033311accepted/tizen/3.0/wearable/20161219.091122accepted/tizen/3.0/tv/20161219.095715accepted/tizen/3.0/mobile/20161219.091514accepted/tizen/3.0/ivi/20161219.095709accepted/tizen/3.0/common/20161219.113747bg.chun2-4/+6
change netlink interface flags to addr flags which used for detect network IPv4/6 changed Change-Id: I827db082879aafdc3e8bd688917180af09531ab2 Signed-off-by: bg.chun <bg.chun@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15595 Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com> Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com> Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com> Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com> Reviewed-by: jihwan seo <jihwan.seo@samsung.com> Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2016-12-15[IOT-1671] Fixed base layer terminate logicsubmit/tizen_3.0/20161215.040308accepted/tizen/3.0/wearable/20161216.083338accepted/tizen/3.0/tv/20161216.083332accepted/tizen/3.0/mobile/20161216.083319accepted/tizen/3.0/ivi/20161216.083348accepted/tizen/3.0/common/20161215.164648hyuna0213.jo5-21/+71
- ObserverList should be removed before destroying ResourceList to avoid the error of dangling pointer. because ResourceObserver object includes a resource handle which is memory address allocated when resource is created. - Add function to unset network monitoring callback when OCStop() is called. bug: https://jira.iotivity.org/browse/IOT-1671 Change-Id: I8a367a24a2100c97bf612db26bc41db5f47f2feb Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15499 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com> Reviewed-by: jihwan seo <jihwan.seo@samsung.com> Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2016-12-08fix package install errorsubmit/tizen_3.0/20161209.001010submit/tizen/20161213.050408accepted/tizen/3.0/wearable/20161209.103456accepted/tizen/3.0/tv/20161209.103437accepted/tizen/3.0/mobile/20161209.103425accepted/tizen/3.0/ivi/20161209.103525accepted/tizen/3.0/common/20161209.160941Jooseok Park1-8/+1
- install error is caused by no manifest in the package (wrong path) - remove manifest redefinition Change-Id: If5ef103231509addb50b5d62a59c27fc8692a2b4
2016-12-07tizen: use tag as base even if not in upstream branchPhilippe Coval1-0/+3
Change-Id: I53e451092168b9469090b888c12e53ee118a0395 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tizen: Adapt to support other buildsystemPhilippe Coval4-4/+352
Some build system does not support .gbs.conf so we rely on default packging folder This change is use by other build systems (MCD auto-sync?) Note, Any suggestion to align to gbs is welcome. Change-Id: I59a9bc4d67a683dd22e7dbbb9aae67fb6ec5c570 Credit-to: Jooseok Park <jooseok.park@samsung.com> Origin: https://review.tizen.org/gerrit/#/c/102824/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tizen: relocate all liboc*.so to resource subpackagePhilippe Coval1-5/+5
iotivity.pc bring those libs so they should come along. This was observed while porting Tizen's iotcon to iotivity-1.2.1 Change-Id: I82e7121520c1a7ed8d79e7b85089bec2b0b5012b Origin: https://gerrit.iotivity.org/gerrit/#/c/15195/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07build: Fix to also support SECURED=0Philippe Coval1-2/+2
Note, for later it would be nice to test booleans instead of strings. Change-Id: I069d865c6e2cc6a80a812e60ab278af15b7eaa85 Origin: https://gerrit.iotivity.org/gerrit/#/c/15163/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tizen: Ship more security headers if enabledPhilippe Coval1-1/+1
[youngman] - Add header files related to security [Philippe Coval] - If built with security on, ships all headers or none - To be used by iotcon - Only ship them if usable (with security flag on) Change-Id: I9c8edccddec5626119cb3adb39959437ab350413 Signed-off-by: youngman <yman.jung@samsung.com> Credit-to: youngman <yman.jung@samsung.com> Origin: https://gerrit.iotivity.org/gerrit/#/c/13047/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tizen: Enable TCPPhilippe Coval1-1/+1
Change-Id: I56b8abcea1a3397f546ef0b8edc42711ff62b9d8 Origin: https://gerrit.iotivity.org/gerrit/#/c/15193/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tizen: Enable SECUREDPhilippe Coval1-1/+1
Change-Id: Id88b113bc256a51f97f5d1772df323d7bf244bd7 Origin: https://gerrit.iotivity.org/gerrit/#/c/14675/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07mbedtls: Apply OCF patch (20161125)Philippe Coval12-59/+188
To provide TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256 feature. It is strongly recommended to rely on scons instead, if not possible, this change workaround this. For more details about building IoTivity please check: https://wiki.iotivity.org/build Bug: https://jira.iotivity.org/browse/IOT-820 Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861 Change-Id: I638ec0c0a45e855dcee711c8321039b7489d7e5a Origin: https://gerrit.iotivity.org/gerrit/#/c/12429/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07mbedtls: Update to mbedtls-2.4.0Philippe Coval134-978/+4280
t is strongly recommended to rely on scons instead, if not possible, this change workaround this. For more details about building IoTivity please check: https://wiki.iotivity.org/build Bug: https://jira.iotivity.org/browse/IOT-820 Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861 Change-Id: I29c0d7c6b0d1bb50b82e9bcbeba38cfe1daa9857 Origin: https://gerrit.iotivity.org/gerrit/#/c/14677/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07mbedtls: Import mbedtls-2.3.0Philippe Coval701-0/+170058
It is strongly recommended to rely on scons instead, if not possible, this change workaround this. For more details about building IoTivity please check: https://wiki.iotivity.org/build Bug: https://jira.iotivity.org/browse/IOT-820 Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861 Change-Id: I97e8f34408dde1c95bd0587cb74834df966d2463 Origin: https://gerrit.iotivity.org/gerrit/#/c/12423/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tinycbor: Update import to v0.4Philippe Coval18-39/+183
git "module" was converted to patch this way: git clone https://github.com/01org/tinycbor.git -b v0.4 extlibs/tinycbor/tinycbor rm -rf extlibs/tinycbor/tinycbor/.git git add -f extlibs/tinycbor/tinycbor/ git commit -sm 'tinycbor: Update import to v0.4' extlibs/tinycbor/tinycbor/ It is strongly recommended to rely on scons instead, if not possible, this change workaround this. For more details about building IoTivity please check: https://wiki.iotivity.org/build Change-Id: I5492732be93e2b0fdf5e1c3eabcdc949b420e4fb Bug: https://jira.iotivity.org/browse/IOT-820 Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861 Origin: https://gerrit.iotivity.org/gerrit/#/c/14679/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tinycbor: Update to v0.3.2Philippe Coval28-335/+4228
Needed for IoTivity 1.2.0 and later It is strongly recommended to rely on scons instead, if not possible, this change workaround this. For more details about building IoTivity please check: https://wiki.iotivity.org/build Bug: https://jira.iotivity.org/browse/IOT-820 Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861 Change-Id: I9b33b8dd7a97b48b6fd3157b1ef25dadb79f11e2 Origin: https://gerrit.iotivity.org/gerrit/#/c/12705/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-07tinycbor: Import v0.2.1Philippe Coval45-0/+7168
Needed for Iotivity-1.1.1 and lower It is strongly recommended to rely on scons instead, if not possible, this change workaround this. For more details about building IoTivity please check: https://wiki.iotivity.org/build Bug: https://jira.iotivity.org/browse/IOT-820 Bug-Tizen: https://bugs.tizen.org/jira/browse/TINF-861 Change-Id: I0a622b8c7c47cfc4ea7afd8a3cf82720a50618bd Origin: https://gerrit.iotivity.org/gerrit/#/c/12703/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
2016-12-02tizen: Remove deprecated libresource_hosting.soupstream/1.2.11.2.1Philippe Coval1-2/+0
To be squashed into: https://gerrit.iotivity.org/gerrit/15003 Change-Id: I512cc51a9ad53929a57d30034cb70f1d153789ea Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15029 Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
2016-12-02android: Fix resource_directory build issuePhilippe Coval1-0/+1
Adding resource_directory to notification like in master branch, then this lib will be found by Android.mk, while building on jenkins: gradle build -bservice/resource-container/android/build.gradle \ -PTARGET_ARCH=armeabi -PRELEASE=debug --stacktrace Android NDK: ERROR:jni/Android.mk:android-rd: \ LOCAL_SRC_FILES points to a missing file Android NDK: Check that ibresource_directory.so \ exists or that its path is correct https://build.iotivity.org/ci/job/iotivity-verify-android/3761/console To be squashed into: https://gerrit.iotivity.org/gerrit/15031 Change-Id: I18af0742fc4e76eda33bd89f721b8fef59f6f490 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15039 Reviewed-by: Chihyun Cho <ch79.cho@samsung.com> Reviewed-by: JungYong KIM <jyong2.kim@samsung.com> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2016-12-02[IOT-1627][Android]resolve ipadapter memory leak issuebg.chun1-8/+26
On android ipadapter there is memory leak issue since the function which used for free pointer of structure does not free all pointer member Change-Id: If44dd9dc7562f851fa3f38526830aa84e4b35491 Signed-off-by: bg.chun <bg.chun@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14995 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com> Reviewed-by: Larry Sachs <larry.j.sachs@intel.com> Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com> Reviewed-by: Uze Choi <uzchoi@samsung.com> Tested-by: Uze Choi <uzchoi@samsung.com>
2016-12-02Add links and rep in the response for the collectionHabib Virji10-502/+299
- Use common ExtractParamFromQuery in ocresource and occollection to extract query parameters. - Added links tag to the oic.if.ll and oic.if.baseline. - Added rts tag in the payload for the baseline. - Added rep tag for oic.if.b response. - occollection was using extra structure to differentiate ll, baseline, batch and group. Simplified the code to use a simpler code and removed unwanted structure. - oic.wk.col added in the types. - OCStackIfTypes is removed as it was used only internally. This is not needed due to usage of ExtractParamFromQuery. - BuildResponseRepresentation is updated as it is used in collection. For inner payload, these values were not being used by ocpayloadconvert. - oic.if.ll has been updated to give response in form of {links:[{href:"", rt:[""], if:[""]}]} - oic.if.baseline has been updated to give response in form of {rt:[], if:[], rts:[], links:[{href:"", rt:[""], if:[""]}]} - oic.if.b has been to response in form of [{"href": "", "rep": {""}}] - in case of wrong query it will respond with error message. Change-Id: I98489ac9923ab3c63012ddfe6b55c2b3064c3f28 Signed-off-by: Habib Virji <habib.virji@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14621 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com> Tested-by: Uze Choi <uzchoi@samsung.com>
2016-12-02Fix Android SetPropertyValue function callHabib Virji1-4/+4
setPropertyValue call in the Android was swapped, compared to function call how it was in the JNI layer. setPropertyValue0 is for passing string array and setPropertyValue1 is passing string. Change-Id: I91c480f162cc53712a68bef078371559fd2eff21 Signed-off-by: Habib Virji <habib.virji@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15025 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2016-12-01android: Fix resource_directory build issuePhilippe Coval2-187/+187
jni/../../../../out/android/armeabi/debug/libresource_directory.so exists or that its path is correct In https://gerrit.iotivity.org/gerrit/#/c/14731, resource_directory was added in the resource-container. It is not needed and break android build. Change-Id: I05a1b422f6561102c641cc50cd68baa58768b11a Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15031 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Habib Virji <habib.virji@samsung.com>
2016-12-01tizen: resource-encapsulation prevent to import tools.scons.RunTestPhilippe Coval1-1/+1
As unit tests are not enabled on tizen, there is no need to import it. A smarter way would be to follow other tests patterns and have them separated and included in supported platforms. Bug: https://jira.iotivity.org/browse/IOT-1486 Change-Id: I2a925a251480c35d90bab6b2661c4da60f959b6f Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15027 Reviewed-by: Uze Choi <uzchoi@samsung.com>
2016-12-01service: [IOT-1562] Fix for unittest with SECURED at RE/RCKIM JungYong6-19/+158
When IoTivity was built with SECURED and TEST, some of test case at RE and RC occurring crash. because RE and RC has not set the precondition of security. In this patch, added the security flow and persistence storage files at RE. related security test case is disabled at RC. Change-Id: I4094bd01cba84d395c408a56f4c57d4ebcb45b44 Signed-off-by: KIM JungYong <jyong2.kim@samsung.com> Bug: https://jira.iotivity.org/browse/IOT-1562 Reviewed-on: https://gerrit.iotivity.org/gerrit/14837 Tested-by: Phil Coval <philippe.coval@osg.samsung.com> Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com> Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2016-12-01connectivity: Enable resource/csdk/connectivity testPhilippe Coval1-3/+1
Bug: https://jira.iotivity.org/browse/IOT-1486 Change-Id: I6b47f7b3439b923ec12f26b0e159e3b7a1144658 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/12721 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
2016-12-01Remove resource-hosting service which is deprecated.KIM JungYong77-7537/+0
Current resource-hosting service is deprecated because concept of resource proxy can cover with functionality of cloud or relay server. And this service would not handled for previous releases. So this service can't cover for recent basic protocols. If needs is arised for this concept, will be develop on the new service. Change-Id: Ie14482924b7ccbebbd2512f017ad4b6039d72dd2 Signed-off-by: KIM JungYong <jyong2.kim@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15003 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2016-12-01Correct callback function for security provisioning in easy setupParkhi1-1/+1
Change-Id: Id7d1deb6371d49e4810c191bc52979693ce16e8d Signed-off-by: Parkhi <h_w.park@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15013 Reviewed-by: Uze Choi <uzchoi@samsung.com> Tested-by: Uze Choi <uzchoi@samsung.com>
2016-12-01Fix defects detected by static analysisParkhi1-1/+0
Change-Id: I9eba31f8f716f8d3b5b04b803bc4c9ecdf035e10 Signed-off-by: Parkhi <h_w.park@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/15009 Reviewed-by: Uze Choi <uzchoi@samsung.com> Tested-by: Uze Choi <uzchoi@samsung.com>
2016-12-01Handle Error during Ownership TransferJongmin Choi1-0/+10
If an error is returned during ownership transfer, on-boarding tool needs to remove the server's information from PDM DB and close secure connection with the server. Patch #1: Initial patch Patch #2: Change Log Level Change-Id: I641529552de0e25438bd94da9b2ec45320428a61 Signed-off-by: Jongmin Choi <jminl.choi@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14999 Reviewed-by: Chul Lee <chuls.lee@samsung.com> Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Jongsung Lee <js126.lee@samsung.com> Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2016-12-01build: Bypass and/or fix suspicious tests (workaround)Philippe Coval16-36/+83
- Run tests using tools.scons.RunTest - Add a file parameter to enable valgrind check - Disable failed test, to make verifier sane again To be tracked at: http://wiki.iotivity.org/1.2-rel Bug: https://jira.iotivity.org/browse/IOT-1486 Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f27487f4e Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/ Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14967 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
2016-12-01build: Bypass non finishing security test (workaround)Philippe Coval1-1/+1
Occured when SECURED=1 This change is temporary to make QA verifier sane again, with this change: https://gerrit.iotivity.org/gerrit/#/c/14903/ If merged I will raise bugs for each bypassed testcase related to https://gerrit.iotivity.org/gerrit/#/q/topic:IOT-1486 Bug: https://jira.iotivity.org/browse/IOT-1486 Origin: https://gerrit.iotivity.org/gerrit/#/c/14925/ Change-Id: I574f92375703bf8a82cad7be6948d46c10776360 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14925 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2016-12-01Removed href from device and platform payloadHabib Virji8-15/+78
- Created a separate function to handle Device and Platform payload. - rt, if and attribute information are the only included in the payload. - BuildResponseRepresentation updated to avoid information about device and platform payload. - Updated dmv value from res.1.1.0,sh.1.2.0 to res.1.1.0,sh.1.1.0. Change-Id: I59059997f170d177663e87eddea9df32275ca882 Signed-off-by: Habib Virji <habib.virji@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14979 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com> Tested-by: Uze Choi <uzchoi@samsung.com>
2016-12-01build: Enable unit testing in SECURED=1 mode for resourcePhilippe Coval1-1/+6
Bug: https://jira.iotivity.org/browse/IOT-1486 Change-Id: I38e593d49401f7e14bfa26dd980938d36e66ac68 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14903 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2016-12-01Update a payload format to be compatible to OIC spec in easysetupParkhi7-64/+339
1. In a response for get/post request with batch interface, "rep" keyword should be included for containing child resource's properties for each child resource. 2. Provisioning resource is a collection resource so it should have a "oic.wk.col" resource type. 3. "links" property for baseline and linklist interfaces should include a "p"(i.e. policy) property. e.g. response for baseline: { "rt":[ "oic.wk.prov", "oic.wk.col" ], "if":[ "oic.if.baseline", "oic.if.ll", "oic.if.b" ], "ps":0, "lec":0, "links":[ { "href":"/WiFiProvisioningResURI", "rt":[ "oic.wk.wifi" ], "if":[ "oic.if.baseline" ], "p":{ "bm":3 } }, { "href":"/DevConfProvisioningResURI", "rt":[ "oic.wk.devconf" ], "if":[ "oic.if.baseline" ], "p":{ "bm":3 } }, { "href":"/CloudServerProvisioningResURI", "rt":[ "oic.wk.cloudserver" ], "if":[ "oic.if.baseline" ], "p":{ "bm":3 } } ] } e.g. response for linklist: { "links":[ { "href":"/WiFiProvisioningResURI", "rt":[ "oic.wk.wifi" ], "if":[ "oic.if.baseline" ], "p":{ "bm":3 } }, { "href":"/DevConfProvisioningResURI", "rt":[ "oic.wk.devconf" ], "if":[ "oic.if.baseline" ], "p":{ "bm":3 } }, { "href":"/CloudServerProvisioningResURI", "rt":[ "oic.wk.cloudserver" ], "if":[ "oic.if.baseline" ], "p":{ "bm":3 } } ] } e.g. response for batch: [ { "href":"/ProvisioningResURI", "rep":{ "if":[ "oic.if.baseline", "oic.if.ll", "oic.if.b" ], "rt":[ "oic.wk.prov", "oic.wk.col" ], "ps":0, "lec":0 } }, { "href":"/WiFiProvisioningResURI", "rep":{ "if":[ "oic.if.baseline" ], "rt":[ "oic.wk.wifi" ], "swmt":[ 2, 3, 4 ], "swf":1, "tnn":"", "cd":"", "wat":0, "wet":0 } }, { "href":"/CloudServerProvisioningResURI", "rep":{ "if":[ "oic.if.baseline" ], "rt":[ "oic.wk.cloudserver" ], "ac":"", "apn":"", "cis":"" } }, { "href":"/DevConfProvisioningResURI", "rep":{ "if":[ "oic.if.baseline" ], "rt":[ "oic.wk.devconf" ], "dn":"Test Device", "mnmo":"Test Model Number", "loc":"", "lang":"", "ctry":"" } } ] Change-Id: I13ccda6fedb7c628dc77cc13e84c1c10c0e1b487 Signed-off-by: Jihun Ha <jihun.ha@samsung.com> Signed-off-by: Parkhi <h_w.park@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14855 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
2016-11-30build: use tools.scons.RunTest for provisioning testsPhilippe Coval1-2/+4
To avoid race conditions Bug: https://jira.iotivity.org/browse/IOT-1526 Change-Id: I8f1e4823a7c4642b4b03fb4dca924447079d7e39 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14913 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: George Nash <george.nash@intel.com>
2016-11-30build: use tools.scons.RunTest for csdk security testsPhilippe Coval1-2/+4
To avoid race conditions. Bug: https://jira.iotivity.org/browse/IOT-1526 Change-Id: I1c525d58b7c220dd8043b65bf873e0d1d294a020 Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14915 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Ziran Sun <ziran.sun@samsung.com> Reviewed-by: George Nash <george.nash@intel.com>
2016-11-30Fix static analysis issue in ocresourceJaehong Jo1-3/+3
- add initial value and null checking Change-Id: I50731d23865c72d2c03cb3b149b19bf4236bf587 Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14955 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Ziran Sun <ziran.sun@samsung.com> Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com> Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2016-11-30Fix static analysis issue in keepaliveMinji Park1-0/+20
- add return value checking logic after memory allocation Change-Id: I1c28e13e01c2dd7bf4b78585adf0ffdc0e6ecdfd Signed-off-by: Minji Park <minjii.park@samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14935 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com> Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com> Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com> Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2016-11-30build: Fix easy-setup unittestsPhilippe Coval1-3/+5
Need to add a parameter to enable valgrind check Without this change, a race condition may occur and complain like: service/easy-setup/enrollee/unittests/easysetup_enrollee_test: not found Bug: https://jira.iotivity.org/browse/IOT-1526 Change-Id: If927c9a2f6e00b18ab92664f014f4f85f34209aa Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/14957 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Uze Choi <uzchoi@samsung.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 13:35:37 +0000