hyuna0213.jo [Tue, 15 Mar 2016 05:58:46 +0000 (14:58 +0900)]
fixed the bug related to coap over tcp pdu creation.
The first nibble of the frame is used to indecate the length of
the options/payload. and if a value is 13, an 8-bit unsigned integer
follows the initial byte and indicates the length of options/payload
minus 13. even in case the length of options/payload is 13, an 8-bit
unsigned interger has to be used to indicate 0.
Change-Id: I580e126755ae4b3018fe7eb11eae34035b0efa6c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5901
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jee Hyeok Kim [Mon, 14 Mar 2016 08:40:16 +0000 (17:40 +0900)]
Fix PUT and Observe relay on cloud stack
1. Fix PUT and Observe relay
2. Add PUT and Observe scenario for native sample client
3. Add Testcases for cloud stack
4. Remove Net Utility for logging local IP address
Change-Id: I03c0bd9afc553e1705c67f24db0d4420405fdf1d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5847
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jee Hyeok Kim [Wed, 16 Mar 2016 07:34:46 +0000 (16:34 +0900)]
Fix buildscript on tizen build
Change-Id: I07365483238951bde700b25893f2b060511cf567
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5949
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jaewook Jung [Tue, 15 Mar 2016 10:44:32 +0000 (19:44 +0900)]
Fix error in cablockwisetransfer.c
In CACheckBlockDataValidation(), crash error occurs when sending response
as CACreateBlockDatablockId() tries to refer requestInfo only for sendData.
Change-Id: I2a7fc7ec17500f1c71e59d7181af81a77ac93705
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5923
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Manoj Gupta [Mon, 14 Mar 2016 14:12:57 +0000 (19:42 +0530)]
Static Analysis tool errro resolved
Change-Id: I27373ad264716f7a6b3b834f794e66b9a7f64b71
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5883
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
G S Senthil Kumar [Mon, 14 Mar 2016 09:53:16 +0000 (15:23 +0530)]
Resolved simulator build failure issue.
Included a necessary header file(algorithm) to prevent build failures
when using boost version(1.46).
Change-Id: I4c6e9829d6b1a59f7c6f745551ef92ee6514df26
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Mon, 14 Mar 2016 10:27:23 +0000 (15:57 +0530)]
[Easy-setup] Updated Doxygen comments
- [Enrollee] Moved files from inc to src folder
(which are not exposed to developers)
Change-Id: I93c3703c39556a2673e034ede4890d1f4ef10b71
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Mon, 14 Mar 2016 16:16:41 +0000 (21:46 +0530)]
[Easy-setup] Updated Unittest cases file
- Updated the UnitTest cases for Mediator RichSDK.
Change-Id: I1cb137ba826ca9681faaa9e81856bc74a10bc173
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5887
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ashwini Kumar [Mon, 14 Mar 2016 14:38:01 +0000 (20:08 +0530)]
Fix android run time to load ocprovision
- ocprovision has moved from static to shared lib
- build dependecncy for include file
Change-Id: I5d2ba0ecd506c3e3dfd15ff2670d2eb322de61e3
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5885
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Sandipan Patra [Mon, 14 Mar 2016 08:49:51 +0000 (14:19 +0530)]
[Arduino Due] Arduino wifi multicast defalut return value changed to CA_STATUS_OK
Change-Id: If7b28c30af4093771aee724356114ca5d4929cd4
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5849
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jay Sharma [Mon, 14 Mar 2016 12:21:05 +0000 (17:51 +0530)]
[Easy-Setup] Updated Doxygen and javadoc
- Updated Doxygen and javadoc updates for easysetup service based
on latest folder structure
Change-Id: I4a3d888fb30a6a334aba3d7cd5fe4ed019b2ed75
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
G S Senthil Kumar [Fri, 11 Mar 2016 16:29:28 +0000 (21:59 +0530)]
Fix for klocwork issues.
This change includes fix for all klocwork reported issues
in native and java layer.
Change-Id: Ibba5d478e64251636c8ef514c52b9e9bd6f36442
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
leechul [Tue, 15 Mar 2016 05:34:34 +0000 (14:34 +0900)]
Revert back cbor related patches.
[Patch #1] Intial upload.
[Patch #2] Modify provisionig sample's SConscript to ignore sample codes in case of tizen.
* The json file will be copied in case of tizen.
[Patch #3] Remove the segmentation fault in debug mode.
[Patch #4] Modify the build script to not include security samples in case of tizen build.
[Patch #5] Revmoe the printf
Change-Id: I88b9b5b68bc641f219bcf0c26dbf1dd4c61ae177
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5897
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Fri, 4 Mar 2016 23:51:05 +0000 (00:51 +0100)]
Fixed build issue by adding Builder contructor with const args
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):
libresource_hosting.so: undefined reference to \
`OIC::Service::RCSResourceObject::Builder::Builder(std::string const&, std::string const&, std::string const&)'
This message appeared while building RHSampleApp using tizen-sdk 2.4.0 Rev4
with imported libs (built with gbs from Tizen:2.4:Mobile repo)
Change-Id: I3064b9e7234edcabbefe40b5e469413e72127fae
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5575
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Jaewook Jung [Fri, 11 Mar 2016 08:00:22 +0000 (17:00 +0900)]
code clean up in caedrserver.c
In CAEDRNativeReadData(), getting a address string of the device is unnecessary
unless inputstream is available.
Change-Id: Ic1d363bc42eaeb948fe8f6ee5f4fddcec3d35086
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5721
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaewook Jung [Fri, 4 Mar 2016 05:35:27 +0000 (14:35 +0900)]
removed warning in CA layer
Change-Id: Id7b89929a8497a041590b60e91f2ad33d51ce0c1
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaewook Jung [Thu, 10 Mar 2016 05:03:27 +0000 (14:03 +0900)]
code clean up in cablockwisetransfer
code clean up and remove unnecessary code in cablockwisetransfer
Change-Id: I92836df67c3b5ec128915baad9936aedad176b53
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Thu, 10 Mar 2016 08:29:14 +0000 (17:29 +0900)]
To get device name from scanned device for Android BLE.
Device name has to be included in advertise packet
after Android API 23.
Change-Id: I0379e1fc1d7675088739f07a47b0d0171e9f57eb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Randeep Singh [Fri, 4 Mar 2016 07:07:26 +0000 (12:37 +0530)]
Updated Address max size
Max array of size 40 is not adequate for storing address ipv6 address.
Thus increased the value from 40 to 56.
Change-Id: Icd63c11365cefc2576043c87ef54802b5028c971
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5411
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit
0185651214559e46eea4bc357332c296856789e5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5899
Philippe Coval [Mon, 7 Mar 2016 11:19:05 +0000 (12:19 +0100)]
Fixed build issue by including condition_variable header
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):
error: 'condition_variable' in namespace 'std' does not name a type
std::condition_variable cond;
Change-Id: I03b03af4693738c6a852b0d03b6d6a2744a87109
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5577
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
jihwan.seo [Wed, 9 Mar 2016 12:28:12 +0000 (21:28 +0900)]
fixed initialization issue for connection state.
Change-Id: I16b02d35ae36feacb6472a73796cb1b9e24636bb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5631
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
hyuna0213.jo [Tue, 8 Mar 2016 22:45:51 +0000 (07:45 +0900)]
Changed tcp adapter logic to process the received data directly.
Currently If new connection is created with remote device, received
first data from remote device can be processed after select timeout.
because select() is blocking function. so I added connection file
descriptor to update read file descriptor list after receiving
connection event.
Change-Id: I26d1ee95b3c252194c38d47490b972193e693e77
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5731
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jihun Ha [Fri, 11 Mar 2016 01:48:28 +0000 (10:48 +0900)]
Update a resource type of SceneMember resource
The current public OIC spec.(v0.9.9) has introduced the resource type,
wrongly. It would be "oic.wk.scenemember".
Change-Id: I768c086f75f0bf281558e582cdee264ddc16709c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5697
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Mon, 7 Mar 2016 11:05:12 +0000 (12:05 +0100)]
Fixed build issue by including condition_variable header
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):
error: 'condition_variable' in namespace 'std' does not name a type
std::condition_variable cond;
Change-Id: Ieaff9bb24e0dd44e6660c7e2ac2d5d718e4270e2
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Sanjeev BA <as2902.b@samsung.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Jihun Ha [Fri, 11 Mar 2016 07:47:13 +0000 (16:47 +0900)]
Add required header file in sceneserver and sceneclient
I've added condition_variable header file because it is required
for some compilers.
Change-Id: I68655e613a10b3c8941fd743651d304999272160
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5715
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
jaesick.shin [Thu, 10 Mar 2016 01:56:45 +0000 (10:56 +0900)]
Added Unittests and Added LICENSE
Generate response test(Actuator Interface, Custom Interface)
InterfaceHandler.cpp file not contains LICENSE
Added LICENSE
Change-Id: I034f43f6524ed630ed806173ffa3db267308dec5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5657
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Jee Hyeok Kim [Fri, 11 Mar 2016 07:57:26 +0000 (16:57 +0900)]
Remove broken validation check logic
If requestUri contains host string like 'coap+tcp://127.0.0.1:5683',
This function also adds host length to validate
regardless it is not affect packet size.
Change-Id: Id053ba6959181311d36d26a4b1a2853fb2e1af7d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5717
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Sandipan Patra [Wed, 9 Mar 2016 08:34:31 +0000 (14:04 +0530)]
[Tizen Secure Mode] Tizen enrollee build using security mode enabled
Change-Id: I5a4d91e5e56863a9a859f681202f52828207a00a
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5611
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jee Hyeok Kim [Fri, 11 Mar 2016 07:41:30 +0000 (16:41 +0900)]
Update cloud project
1. Add Testcases for each projects.
2. Fix coap encoder to correctly reference accept flag
3. Modify native sample application to use csdk
Change-Id: I0697341fe6e927c679d8d4b4f0e07275f28e86fb
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5713
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jee Hyeok Kim [Thu, 10 Mar 2016 05:43:33 +0000 (14:43 +0900)]
Fix main buildscript build order
1. Current plugins project changes main global env variable.
So switch Cloud sample build order prior to plugins project
2. Change Cloud sample output not to copied to main output folder.
Change-Id: If9a5d66e5606bdbc4a37864e7ff1cc001877489d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Habib Virji [Sun, 21 Feb 2016 20:26:04 +0000 (20:26 +0000)]
Doxm payload conversion from JSON to CBOR
- Updates return type to OCStackResult and parameters as part of the conversion function.
- Changes in ownership transfer to return uint8_t instead of chari for payload conversion.
- security_internals includes function which are used in the testing.
- Unit test is updated to match the changes in conversion.
Change-Id: I088d75d67d8520e853db9b14fc802e3b31481e8b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5096
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5797
Habib Virji [Tue, 16 Feb 2016 16:07:11 +0000 (16:07 +0000)]
Security code comments which are doxygen compliant
Some file using comments similar to doxygen changed.
Comments has been updated to used return instead of retval.
Comments having in/out tags has been updated.
Some functions missing space after keyword has been updated.
Change-Id: I0e9b75d2f75576f992d0ff4bafeaf5ba16917cc6
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5027
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5757
Habib Virji [Mon, 22 Feb 2016 16:04:11 +0000 (16:04 +0000)]
CRED payload conversion from JSON to CBOR
Converts CRED payload from JSON to CBOR directly using tinycbor library.
- CRED unit test has been updated to handle the changes.
- Unit test related functions are defined in security_internals.
- Parameter which were passed as char * has been converted to uint8_t as they were later converted to base64.
- All the usage and base64 has been removed.
Change-Id: I159d46f8500c1880b49a3acbcfc59cfa0c6da4f0
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5117
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5793
Philippe Coval [Mon, 7 Mar 2016 14:48:13 +0000 (15:48 +0100)]
Fixed build issue by Installing missing header OCUtilities.h
Change-Id: Icc5313c48ef95b322526eea169c4b23eab3758a6
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5581
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Habib Virji [Fri, 19 Feb 2016 00:42:03 +0000 (00:42 +0000)]
AMACL payload conversion from JSON to CBOR
Converts AMACL payload conversion from JSON to CBOR directly using tinycbor library.
- Amacl unit test is updated to match new changes.
- Data file are updated to handle new format.
Change-Id: I80e56f182f3f516025977e26fa5d719058832fd8
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5777
Habib Virji [Thu, 18 Feb 2016 15:24:29 +0000 (15:24 +0000)]
Pstat payload conversion from JSON to CBOR
Converts Pstat payload conversion from JSON to CBOR directly using tinycbor library.
- Pstat unit test is updated to match new changes.
- Fixes bug in psinterface to move to the next element.
- ocpayloadparse.c, is updated to include bytestring or cjson depending on the message contents.
- Pstat format: {"isop": <0/1>, "deviceid":<bytestring>, "ch": <int>, "cm": <int>, "om": <int>, "tm": <int>, sm:[<int>, <int>] }.
- Persistant storage format: { "acl": <aclcbor>, "pstat": <pstatcbor> }
Change-Id: I29a92bbf0f24d82612b8795b86119863c4a1905b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5045
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5775
Randeep Singh [Sat, 12 Mar 2016 12:58:38 +0000 (18:28 +0530)]
Resolved Arduino build error
Change-Id: Id517f81c8a01db9e873c330b9449fa1e77afae95
Jira: https://jira.iotivity.org/browse/IOT-985
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Habib Virji [Thu, 18 Feb 2016 20:18:33 +0000 (20:18 +0000)]
SVC payload conversion from JSON to CBOR
Converts SVC payload conversion from JSON to CBOR directly using tinycbor library.
- SVC unit test is updated to match new changes.
- Persistant storage format: { "acl": <aclcbor>, "svc": <svccbor> }
Change-Id: I1a5b5600260b8965e468844636f6d77274688d29
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5047
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5771
Habib Virji [Sun, 20 Dec 2015 23:44:41 +0000 (23:44 +0000)]
ACL payload conversion from JSON to CBOR
Converts ACL payload conversion from JSON to CBOR directly using tinycbor library.
- It includes a new interface for psinterface to update persistant storage to write CBOR instead of JSON.
- Includes a new interface to read file from cbor and pass to Init functions.
- Also removes base64 conversion for device id field.
- OCConvert payload is updated to send uint8_t payload instead of JSON payload string.
- ACL Unit test is updated to match new changes.
- New file unittest.h is added to pass functions from testing purpose.
- Data file are updated to handle new format.
- ACL format: [{"sub": <byteString>, "rsrc":[<string>, ..], prms: <uint64_t>, ownrs: [<byteString>,..]}. ..]
- Persistant storage format: { "acl": <aclcbor>, ... }
Change-Id: I125eb3291342c49cc4335ee3a1327a02b88952ba
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4669
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5755
hekra [Thu, 10 Mar 2016 01:58:19 +0000 (17:58 -0800)]
[IOT-972] add type and interface to platform representation
Change-Id: Ie02a201507ffcc0c6a640846dc57341832ea3158
Signed-off-by: Hugues Ekra <hekra@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Habib Virji [Thu, 10 Mar 2016 17:59:51 +0000 (17:59 +0000)]
[IOT-914] Change format of the device id as text string
DI field was being sent as a byte string over ther wire.
This patch update it to be sent as a string.
ocpayloadparse.c can handle both byte string and text string.
But ocpayloadconvert.c will be sending in text string.
Jira Issue: IOT-914
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Change-Id: I049bf4cff5f2b390e589eb5cf55966e8034838b1
Reviewed-on: https://gerrit.iotivity.org/gerrit/5691
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Habib Virji [Thu, 10 Mar 2016 12:03:42 +0000 (12:03 +0000)]
[IOT-979] Correct /oic/d icv field
Currently icv [Spec Version] field was being set as lcv instead of icv.
Change-Id: I3e4930cba42f5474f90f622b28c031a03331053e
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5685
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joonghwan Lee [Thu, 10 Mar 2016 05:57:03 +0000 (14:57 +0900)]
Add direct-pairing feature
<contents of modification/addition>
: Added direct-pairing resouces and related types
: Added direct-pairing provisioning feature for provisioning tool
: Added D2D pairing operation feature(discovery, pairing) for client
: Added RI layer APIs and data types for direct-pairing client
: Modified provisioning tool for direct-pairing feature and created new sample client
-Patch 1: Initial
-Patch 2: Fix OSX build error.
-Patch 3: Add DPC(Direct Pairing Capability) resource and processing logic
-Patch 4: Fix dpc parse error when loading svr db
-Patch 5: Fix unnormal processing when duplicated request on dpairing resource & Change DPC default value as true
-Patch 6: Fix SVACE warning & Divide pconf and dpairing resource into another ACL entry in svr db
-Patch 7: Fix SVACE warning's positive false
-Patch 8: Fix device list management
Change-Id: I461626fe041a5927c0e27e78e63e74e215d61cd5
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5673
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
leechul [Fri, 11 Mar 2016 04:21:27 +0000 (13:21 +0900)]
Remove the compile errors for arduino.
If we use 'goto' on arduino.
We should initialize variable before the 'goto'.
Change-Id: I06bc47dcfece26ad5d5bde7e71e0f57473310d5a
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5705
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
jihwan.seo [Thu, 10 Mar 2016 13:19:15 +0000 (22:19 +0900)]
fixed wrong waiting for scanned device.
when scanning is waiting for target device for unicast.
there is no delay time in previous logic.
so send was failed
Change-Id: I8b7d3b71e462434d1f31f273c5b2dcbb5e0e9f28
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
koushik.girijala [Tue, 8 Mar 2016 06:03:29 +0000 (11:33 +0530)]
Fix for Klockwork issues
Fixed issues reported in Klockwork run
Change-Id: Icc1fb0d2d0e3aa9662fa50e17d2d821e8407c4a4
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Mon, 7 Mar 2016 10:58:19 +0000 (11:58 +0100)]
Fixed build issue by implicitly capture by reference (of Scene)
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):
error: capture of non-variable 'OIC::Service::Scene::m_name'
[&actions, &m_name](const SceneMemberResource::Ptr& member)
Futher explanation from Thiago Macieira <thiago.macieira@intel.com> :
Looking up the C++ standard, it says that :
"An entity that is designated by a simple-capture [...]
shall be this or a variable with automatic storage duration".
That means you cannot capture non-static members by name and you
have to capture the whole object.
Using [&] accomplishes capturing of "this".
Change-Id: Id9db9ca55b858b5c39cee48a5eb9b25ad9e59b41
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5573
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jaewook Jung [Mon, 7 Mar 2016 10:40:28 +0000 (19:40 +0900)]
fixed an issue there is no check null for connection manager.
Change-Id: I6cdde605bce31634cb80073ec28239edf4f72ceb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Wed, 9 Mar 2016 00:58:18 +0000 (09:58 +0900)]
clean up for android BLE client
- release variable related to JNI
- terminate Glabal variable
- add some comment
Change-Id: I342a7fd9a8550d0a3c2bf139254e5a147e2dd4dc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Thu, 10 Mar 2016 05:18:47 +0000 (14:18 +0900)]
clean global variables for connection manager
Change-Id: I595d2fc6c92939a4b4d048e0f0eb97db3d903db1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5669
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Wed, 9 Mar 2016 05:25:23 +0000 (14:25 +0900)]
Removed unnecessary/duplicated code in connectivity abstraction
remove unnecessary/duplicated code in connectivity abstraction
to increase unit tc coverage
Change-Id: I3ddb28ed1f0a319a2e2f6ff0bb1de7fa95cf2741
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5607
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jaesick.shin [Tue, 8 Mar 2016 03:09:48 +0000 (12:09 +0900)]
RE ServerBuilder always included "oic.if.baseline" interface.
If User don't setting "oic.if.baseline" interface.
but, RE ServerBuilder always support "oic.if.baseline" interface.
setDefaultInterface API(Modified comment of header) and Modified Initialize of Builder Constructor
If it is not called, the interface passed to the constructor is the default.
Added, Duplicate check the resource property of interface and resourcetype.
Change-Id: Ie25f1135cc7c99fbf5fe1b04f3121b9e2707be21
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
6768956d2bdbf81f1180caf137e246d877ef1992)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5647
Minji Park [Tue, 8 Mar 2016 08:55:59 +0000 (17:55 +0900)]
add doxygen comments for exceptions in Scene-manager remote apis
- add doxygen comments in scene-manager remote apis
- change to use const variable in scenecommons with get request in RemoteSceneList class
Change-Id: I3354b7c271962be8d22f226a663e5cc415c8f211
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5545
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit
5f95d30eb6f7e7a00675a74ac2dd348e5d5c53e4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5649
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Markus Jung [Wed, 9 Mar 2016 09:53:06 +0000 (18:53 +0900)]
IOT-945: Fixing segmentation fault issue
- Using smart pointers for managing bundles
- Changing APIs to use smart pointers
NOTE: this patch breaks backward compatibility with previous APIs
Change-Id: Ibeb833c3a0381856ca96747404302ae4bc308a39
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5661
Reviewed-by: Inga Stotland <inga.stotland@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
leechul [Wed, 9 Mar 2016 09:57:28 +0000 (18:57 +0900)]
Modify to update default ACL of security resource
after ownership transfer is successfully completed.
Current default ACL of security resource can make a access permission issues.
If we do not update defualt ACL, anonymous user can access security resource.
For this reason, If ownership trnasfer is successfully completed,
the securiy resource ACL should be updated as follows:
{
"sub":"Kg==",
"rsrc":[
"/oic/sec/doxm",
"/oic/sec/pstat"
],
"perms":2,
"ownrs":[
"cmFuZG9tUGluRGV2VVVJRA=="
]
},
In order to resolve this issues,
I've modified SRM to update security resource ACL
when 'owned' property of doxm is changed as 'true'.
[Patch #1] Intial upload
[Patch #2] Remove compile errors
[Patch #3] Update comments in source code.
[Patch #4] Update comment in source code.
[Patch #5] Retrigger
[Patch #6] Fix the bug which is occurred due to operator precedence.
[Patch #7] Remove default ACL provisioning step in ownership transfer.
Change-Id: Ia5eb62693168788cf1a607bb95ce97a44ce5b15d
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5625
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
hyuna0213.jo [Mon, 7 Mar 2016 06:35:36 +0000 (15:35 +0900)]
Changed the /oic/ping resource registration condition
In order to register /oic/ping resource in case host is not client,
I modified the keepalive init/terminate logic.
Change-Id: I29c42249b5af9363517bde971b74e8f80e8fbaa4
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5571
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
HyunJun Kim [Tue, 8 Mar 2016 23:16:49 +0000 (08:16 +0900)]
Add collection payload to send a request
for including each resource information(attributes).
- Client side can send a message
which each resource information is stored in one message.
Change-Id: I45a65dc66dfcec9288b858864b6c83906d341756
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5583
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jee Hyeok Kim [Thu, 10 Mar 2016 06:07:33 +0000 (15:07 +0900)]
Fix rdpayload initial condition.
If rdpayload contains no variable of each attribute,
This function always returns fail.
So change that accepts empty variable.
Change-Id: Ic2827396d6894f00ce9de94b7924614b9f605f6b
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5671
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jihun Ha [Wed, 9 Mar 2016 05:15:28 +0000 (14:15 +0900)]
Update a CBOR parser logic for well-known keywords to OIC
I've updated a CBOR parsing logic When CBOR parser encounters a well-known
keyword like "href" as an attribute.
If the attribute is *NOT* on the outermost representation bracket, it is
treated as a normal attribute.
Change-Id: I1f1c28dd59ae09e1f3f8ab0188c59a1b9fc3b950
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5623
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
js126.lee [Thu, 10 Mar 2016 02:03:02 +0000 (11:03 +0900)]
Fixed defects reported by svace in SRM
- Patch #1 : Init patch
- Patch #2 : Modify file permission
- Patch #3 : Update doxmresource.c
- Patch #4 : fix defects
- Patch #5 : Apply the review comment of Mr. Cho
- Patch #6 : Apply the review comment of Mr. Chul Lee.
Change-Id: I7c1ffb65bed604adbee60ee55456f230b83a759c
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5653
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
leechul [Wed, 9 Mar 2016 08:55:52 +0000 (17:55 +0900)]
Modify CBOR parser and convertor to handle security payload correctly.
[Patch #1] Intial upload.
[Patch #2] Update according to review comments.
[Patch #3] Fix typo
[Patch #4] Retrigger
[Patch #5] Remove the invalid type conversion.
Change-Id: I7b1d59d16a48a083d589715ec876d3eb860b921d
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5613
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Dmitriy Zhuravlev [Wed, 9 Mar 2016 17:22:09 +0000 (19:22 +0200)]
Fix defects reported by SVACE in ckm unittests
Change-Id: I68d86ed516dad5492d8b0028d28f460612b8775e
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5437
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
755ef54828f4e7744b121219b4c259293e748665)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5677
Tested-by: Randeep Singh <randeep.s@samsung.com>
Ashwini Kumar [Thu, 3 Mar 2016 11:05:16 +0000 (16:35 +0530)]
Fix static analysis issues in PM
Change-Id: I1a079333d7636b52f8ae9d4ab0609656a5395278
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
ec7970e13558ba77a7df89830c95969c3155e261)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5665
Tested-by: Randeep Singh <randeep.s@samsung.com>
i.pazderskyy [Wed, 9 Mar 2016 11:59:12 +0000 (13:59 +0200)]
Fix issues reported by SVACE tool in CKM module 2
Change-Id: Ied98d297287e3e1dad6bc51b19889c6647e097b9
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5627
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
f4a9bcabc5e28cbc63ff1dfb4fb727afc3949703)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5639
Kyungsun Cho [Wed, 9 Mar 2016 09:41:41 +0000 (18:41 +0900)]
Fixed bugs reported SVase checking on |provisioningclient|
Change-Id: I7f0c7fc2ecd6f1fa410f40fbe96dc3226531e92c
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5621
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
a88c448621f464b32fec5cf6cb14a3ed383eb76a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5637
Dmitriy Zhuravlev [Wed, 9 Mar 2016 12:40:59 +0000 (14:40 +0200)]
Fix initialization in PKIX
Change-Id: I752659624cba73d138936d1038913dd7ba19825d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5633
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
2506e7409d77db6617450aac41339462a9d93774)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5635
leechul [Thu, 3 Mar 2016 08:36:08 +0000 (17:36 +0900)]
Modify OTM & SRM according to spec CR document.
NOTE : This patch is modified based on ownership transfer CR document.
Please refer to https://workspace.openinterconnect.org/apps/org/workgroup/security_tg/download.php/4703/STG008_OIC%20CR%20Ownership%20Transfer%20sequence%20diagram%20v2.docx
This CR document seems to be applied to next spec.
I'd like to apply CR to save time for prepare 1.1.0 release.
This patch includes the following modifications :
1. Modify not to include private data when OBT sends owner credential.
- Please see the step 19 of CR document.
2. Modify to re-establish secure session using owner credential
when owner credential was successfully exchanged.
- We can verify owner credential through re-establish secure session.
- Please see the step 38,39 of CR docuemnt.
3. Add logic to handle errors that occurred during ownership transfer.
[Patch #1] Initial upload.
[Patch #2] Add logic to handle errors
[Patch #3] Remove the compile errors and warnings.
[Patch #4] Retrigger
[Patch #5] Retrigger
[Patch #6] Rebase
[Patch #7] Rebase
[Patch #8] Update based on self-review.
[Patch #9] Rebase
[Patch #10] Retrigger
[Patch #11] Modify according to Mr.JongSung Lee's comment.
Change-Id: If3d8f21ef686db86dbfcc1b15382eeebaa232a9d
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5341
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
7315a6b41ed6a0965128f1846af54b7f7285c107)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5617
Ivan Pazderskyy [Wed, 2 Mar 2016 15:19:49 +0000 (17:19 +0200)]
Fix issues reported by SVACE tool in CKM module.
Change-Id: I995b4b6f0f58f9db0be2eb9703a80052b69523b2
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
862f950c2548e138c2f2aab0678032ed8d21f4f5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5603
Tested-by: Randeep Singh <randeep.s@samsung.com>
hekra [Tue, 8 Mar 2016 14:26:03 +0000 (06:26 -0800)]
IOT-970: Handle get requests on oic/p and oic/d resources
Change-Id: I6a96e188f7dcb839467c4285c3b4a57871669b78
Signed-off-by: Hugues Ekra <hekra@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5553
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jihun Ha [Mon, 7 Mar 2016 08:00:42 +0000 (17:00 +0900)]
Fix a problem in SceneCollectionResource.cpp file for 64bit environment
I found when a capture paramter in LAMDA operation is a reference type, an unexpected error happens.
So I've changed it to the parameter to be copied.
Change-Id: Id4b7ef68d85d0800df84331210c85fa035441229
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5483
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jyong2.kim [Tue, 8 Mar 2016 04:10:24 +0000 (13:10 +0900)]
Modified const variable of baseline interface and excetion class.
When adding already has scene and scene member,
throw exception class is changed to RE layer exception class.
And const variable of baseline interface is changed at create RCSResourceObject.
Change-Id: I94c9d48e6d7dc9843d028130360c42fabb931191
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5531
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
wonny [Tue, 8 Mar 2016 01:41:21 +0000 (10:41 +0900)]
Modified Exception and Doxygen in SceneManager Local-side Excepiton
- InvalidAddMemberRequestException -> RCSBadRequestException
- Adds API doxygen of excepiton
Change-Id: Ie520f84bc6895c57e0bef9ed0ee6adb97154681d
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Minji Park [Tue, 8 Mar 2016 04:38:54 +0000 (13:38 +0900)]
remove build warnings for resource container
Change-Id: Ic2216bb76bcd16ac410e78a321b1d92cb3241596
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5533
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
hyuna0213.jo [Mon, 7 Mar 2016 07:40:39 +0000 (16:40 +0900)]
removed unnecessary cafragmentation files
because fragmentation was not used, I deleted related code
Change-Id: Ic5bbfdc731a3157235c2ca59d061e54575916c78
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Dmitriy Zhuravlev [Mon, 7 Mar 2016 13:49:21 +0000 (15:49 +0200)]
Fix CKM build error
Fix build error with "scons SECURED=1 DTLS_WITH_X509=1"
Change-Id: I317427bd8818e6f7f28edcdf7ff7957a9b78022d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5501
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Fri, 4 Mar 2016 23:50:05 +0000 (00:50 +0100)]
Fixed build issue by generating ~DiscoveryTask code
If declared as default (and not defined), this function will be inlined,
but in some cases (using shared libraries?) inlining is not appropriate,
so it's preferred to make a regular declaration and still use the default
capabilities for definition.
Problem was observed while building using tizen-sdk :
libresource_hosting.so: undefined reference to \
`OIC::Service::RCSDiscoveryManager::DiscoveryTask::~DiscoveryTask()'
This message apeared while building RHSampleApp using tizen-sdk 2.4.0 Rev4
with imported libs (built with gbs from Tizen:2.4:Mobile repo)
Used toolchain for Tizen:2.4:Mobile is arm-linux-gnueabi-g++ (GCC) 4.9.2
Change-Id: I708812404b01c35f09e8aa68afad962c7d6e0df3
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5445
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Habib Virji [Mon, 7 Mar 2016 11:15:32 +0000 (11:15 +0000)]
OCPayloadConvert cbor payload size
CBOR payload conversion by default is set to 255. When memory failure occurs it
uses encoder->ptr - encoder->end to increase the payload size.
The recent error checking resulted in returning immediately and that result in
encoder->end having a wrong value set. Close container results in setting end
encoder->value correctly.
Changes include to not exit immediately if it fails. It fails after close container
call.
It also introduces the max size of the payload. It is set of 1530, which is based on
6 times of default paylaod size.
Change-Id: I9448a5beea9d3f906dd5f5647d0b6adcbea2cb37
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5491
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
lankamadan [Mon, 7 Mar 2016 04:46:53 +0000 (13:46 +0900)]
[Mediator] Removed hard-coded Secure Flag from android application
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5441
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit
815da513484596845e08fb0ac80346930b662343)
Change-Id: Ifa96ff1d2a2a3e11a2916755495af2c32106d79e
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Madan Lanka [Mon, 7 Mar 2016 14:20:09 +0000 (14:20 +0000)]
Merge "Merge branch 'simulator'."
Harish Kumara Marappa [Mon, 7 Mar 2016 10:30:52 +0000 (16:00 +0530)]
Merge branch 'simulator'.
Change-Id: I7566052325446e1887fa531af4e6f47c4f4089db
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Jee Hyeok Kim [Mon, 7 Mar 2016 10:06:57 +0000 (10:06 +0000)]
Merge "Merge branch 'cloud-interface'"
Markus Jung [Thu, 3 Mar 2016 09:19:05 +0000 (18:19 +0900)]
Additional unit tests for the resource container component
Change-Id: I90b7b8c6dcc2075bdf30aad2b7fd6395deb1c328
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5347
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
coderhyme [Thu, 3 Mar 2016 08:02:47 +0000 (00:02 -0800)]
Modified RCSResourceObject to eliminate its inheritance from enable_shared_from_this.
Change-Id: I7950249ad1ad132693ee93cb11794bf3b90c6e48
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5337
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jee Hyeok Kim [Mon, 7 Mar 2016 07:02:32 +0000 (16:02 +0900)]
Merge branch 'cloud-interface'
Change-Id: Icc8c35a45a75ab2e1703db95a9312fbdce746b44
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
G S Senthil Kumar [Thu, 3 Mar 2016 20:24:50 +0000 (01:54 +0530)]
Resolved issues and concerns found during overall functionality testing.
1. Handled the array type value validation.
2. Handled the redundant resource discovery callbacks.
3. Added more information in UI to show the array properties
when updating array type values.
4. Added more log messages.
Change-Id: I95bf65ad4bd7b9cfcfe02141832b281065bd0f99
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
G S Senthil Kumar [Wed, 2 Mar 2016 12:48:15 +0000 (18:18 +0530)]
Added UI Support for updating model arrays.
Implemented changes in ServiceProvider and ClientController simulator
plug-ins for adding/removing items to/from array of complex attribute
value types.
Change-Id: I0f590fbbcf8dca7cbfaf9ca68eaecf55fd0a5626
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jee Hyeok Kim [Mon, 7 Mar 2016 06:31:39 +0000 (06:31 +0000)]
Merge "Merge branch 'master' into cloud-interface" into cloud-interface
Uze Choi [Mon, 7 Mar 2016 05:49:37 +0000 (05:49 +0000)]
Merge "Merge branch 'group-manager'"
Philippe Coval [Sun, 6 Mar 2016 10:50:19 +0000 (11:50 +0100)]
Fixed build issue by implicitly capture by value (of RCSResourceObjectTest)
I assume this what the author meant, with the previous version it failed to build from source.
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:\
In member function 'virtual void ResourceObjectInterfaceHandlerTest_GetResponseForBaselineContainsAllPropertiesOfServer_Test::TestBody()':
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:613:18:\
error: capture of non-variable 'ResourceObjectTest::server'
[server](const shared_ptr<OCResourceResponse> response)
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:134:28:\
note: 'OIC::Service::RCSResourceObject::Ptr ResourceObjectTest::server' declared here
RCSResourceObject::Ptr server;
(...)
Change-Id: I30f905bc983bbfad5e54ce60f5ccce4573cb2f78
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Markus Jung [Wed, 2 Mar 2016 08:04:04 +0000 (17:04 +0900)]
Fixed unit tests for resource container
Change-Id: Ib8d25140d08b538cb9d376f3e76bb390c8d0758e
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Habib Virji [Sun, 6 Mar 2016 20:29:17 +0000 (20:29 +0000)]
Update ocstack.c cbData comments
C API cbData currently implies response is only when whole process is completed.
C++ API OCPlatform.h holds the details correctly for resourceHandler.
Jira Issue: IOT-678
Change-Id: I5ce19a03fe44189679ae05346fdfcb21f72d1b37
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
vimala.v [Thu, 3 Mar 2016 08:32:29 +0000 (14:02 +0530)]
Fix to notify connected state to Tizen LE client from network monitor
Change-Id: I6d0c0cbf1c6c48f07c39b1d01c48ac0f29396eaa
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Manoj Gupta [Fri, 4 Mar 2016 04:11:34 +0000 (09:41 +0530)]
corrected spelling mistakes
Change-Id: Ia4e0f2fe476760f9050648726281ab8899509215
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5389
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 4 Mar 2016 12:20:52 +0000 (21:20 +0900)]
modified timing issue associated with data transmission.
when gatt is disconnected during data transmittion.
there is some crash since some global variable was available.
Change-Id: I65cbedea1f1646c4636b507171a98c35dea76d4e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jee Hyeok Kim [Mon, 7 Mar 2016 02:01:34 +0000 (11:01 +0900)]
Merge branch 'master' into cloud-interface
Change-Id: I7c493903fabad7e9444c5d1d16bd0d5cfca0c3fb
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jihun Ha [Mon, 7 Mar 2016 01:27:55 +0000 (10:27 +0900)]
Merge branch 'group-manager'
Conflicts:
service/SConscript
Change-Id: I583ef696a20ee406c2d6c17a79daabb0cbbf83d5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Jee Hyeok Kim [Fri, 4 Mar 2016 02:41:40 +0000 (11:41 +0900)]
Sample client for IoTivity Cloud feature
Change-Id: I7221324f6423b1b86c5a89aa228645f4f4b79221
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Saurav Babu [Fri, 4 Mar 2016 07:05:07 +0000 (12:35 +0530)]
Destroy ap handle after use
wifi_get_connected_ap() returns ap handle with allocated memory which
needs to be destroyed after use.
Change-Id: Ic157ddd973504b0a20ae87d2286fab5bc42de3f4
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5409
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Philippe Coval [Sun, 6 Mar 2016 11:57:06 +0000 (12:57 +0100)]
Fixed build issue caused by merge of 2 similar changes on DiscoveryManagerTest
Revert "Fixed a compilation error in DiscoveryManagerTest.cpp."
This reverts commit
d3f7b087e2d272dfbfba4f1114fd030c9d7219a2.
Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2)
Change-Id: I374236826587d67a07a0dd1ba39ac977b1943d29
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jee Hyeok Kim [Fri, 26 Feb 2016 10:57:03 +0000 (19:57 +0900)]
IoTivity Cloud feature
Change-Id: I27cb0613e65341f2b60570b63132e0b02549a629
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
projects / platform / upstream / iotivity.git / log