David Antler [Fri, 1 Jul 2016 21:28:42 +0000 (14:28 -0700)]
Merge branch 'windows-port'
Add support for Visual Studio 2015 and 2013 builds.
Change-Id: I3ce9bee6b3e57ccd548b849b5d147ca0babd872e
Signed-off-by: David Antler <david.a.antler@intel.com>
David Antler [Tue, 28 Jun 2016 21:50:16 +0000 (14:50 -0700)]
Prepare for merge. Improved consistency and style.
* Reformat Windows SConscript to use spaces and add TODO
* Add TODO about most critical warnings to re-enable
* Fix unassigned declarations, use designated initializer when possible
* Fix various spacing and doxygen issues
* Improve consistency of macro definitions in platform_features.h
* Include failure codes on assert conditions for win_sleep.c
Change-Id: I0e88cf2a3fa0ed6e2f8822a6ce0b606a9070af64
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9041
Reviewed-by: Daniel Jay Ferguson <daniel.j.ferguson@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Kyungsun Cho [Fri, 1 Jul 2016 04:49:55 +0000 (13:49 +0900)]
Fixed svase-warnings for iotivity-product's SQA on |credresource|
Change-Id: I48452b2b0e634d2d7b6cf7643ba9a27ede4877e5
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Inga Stotland [Wed, 29 Jun 2016 06:15:33 +0000 (23:15 -0700)]
[IOT-1133] Fix size setting for CA URI buffer
Use common define CA_MAX_URI_SIZE instead of hardcoded magic number
Change-Id: I61f6f39d1646166be92775e25419c1749f946c76
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jongmin Choi [Fri, 24 Jun 2016 09:33:22 +0000 (18:33 +0900)]
Fixed Security Resource Flags and Interface
OCResourceProperty Fixed for Following Security Resources
- doxm: OC_OBSERVABLE Removed
- cred, pstat: changed from OC_RES_PROP_NONE to OC_SECURE
Patch #2: OC_DISCOVERVABLE added to pstat
Patch #4: oic.mi.def removed
Change-Id: I35978a242636754977724045780af0082562b525
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Tue, 21 Jun 2016 18:52:52 +0000 (11:52 -0700)]
Download boost automatically on Windows
Change-Id: I5782b99f3a84898e5da71de94f19f9b9c7eabb0a
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
George Nash [Mon, 27 Jun 2016 16:56:01 +0000 (09:56 -0700)]
Clean up compiler warnings
ocresource.c: (-Wunused-variable)
Fix the waring by moving the tcport inside the #ifdef
amsmgr.c (-Wunused-variable)
b64Ret, outLen, and base64Buff were all local variables that were
unused. They are removed since they are unused.
amaclresource.c (-Wunused-function)
OicSecAmaclCount function is unused anywhere. Since it is unused
it is not being maintained so it was removed.
Change-Id: Ia0327aec1feb484f084b2ce0d6608738ef5f6ad9
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Chul Lee [Wed, 22 Jun 2016 03:40:21 +0000 (12:40 +0900)]
Remove the endianness dependency in cbor conversion.
A similar bug reported from https://gerrit.iotivity.org/gerrit/#/c/8755/
Change-Id: I631bab77f7486f1f45eaff96c67d39606e37c6b6
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Vinay Bhatia [Wed, 29 Jun 2016 12:41:07 +0000 (18:11 +0530)]
Svace Defects Fixes.
Removed Tab and extra space.
Fixed Remaining Defects.
Fixed Defect in provisioning/unittest/otmunittest.cpp
Change-Id: I1d163b1a39fe858323c5c799f9e26ba6a1a3f620
Signed-off-by: Vinay Bhatia <vinay.bhatia@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9031
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
i.pazderskyy [Wed, 29 Jun 2016 11:25:41 +0000 (14:25 +0300)]
Fixed SVACE report defects.
Change-Id: I90bef9beb9619b1fba1ce03f96a6873d6fc31594
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jihwan.seo [Wed, 29 Jun 2016 02:24:55 +0000 (11:24 +0900)]
modified coding style for parenthesis for Android JNI
and some variable is declared with initial value
Change-Id: I44977ced60dfd2f15f162e5beac0461840f72ef6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9011
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Ziran Sun [Tue, 21 Jun 2016 13:30:35 +0000 (14:30 +0100)]
Change observe option header behaviour to be in line with spec
at the following points:
1. If the resource can't register the client as observer,
or the resource does not support observe, then the resource
sends back normal GET Response with NO observe option field.
2. Upon successfully removing the client from observer list,
the resource sends back a normal GET response with NO observe
option field
3. This patch also reverted https://gerrit.iotivity.org/gerrit/#/c/8901/
after discussed with the author to be inline with spec.
JIRA issue: https://jira.iotivity.org/browse/IOT-1122
Change-Id: I36510baa69a8ef3be9e0d9aef3fbd40d31488b0f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Philippe Coval [Mon, 27 Jun 2016 21:33:40 +0000 (23:33 +0200)]
ocpayload: Set default DMV values and only use comma as delim
For IoTivity-1.1.1: "res.1.1.0,sh.1.1.0" are used
as default Data Model Versions.
Now only use ',' as CSV separator (so ';' must be avoided).
This change has been tested on Debian jessie
and can be squashed into :
https://gerrit.iotivity.org/gerrit/#/c/8707/
Bug: https://jira.iotivity.org/browse/IOT-1101
Change-Id: I8e79776a8fc6c6112db9d5a9ab9a2008e9ea426e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8973
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
jihwan.seo [Tue, 28 Jun 2016 08:01:21 +0000 (17:01 +0900)]
removed build warning for android
- removed unused method
- removed 'write to static field' warning
Change-Id: I1964dbae99b01c62a739cca34de57304ac79a434
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
hyuna0213.jo [Tue, 28 Jun 2016 09:05:11 +0000 (18:05 +0900)]
remove build warning for linux
- remove unused parameter
- remove 'implicit declaration of function' warning
- adjusted code style
Change-Id: If1a2bb525f293e2425122019bcf42199cd6c40c3
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8989
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Habib Virji [Tue, 28 Jun 2016 10:09:09 +0000 (11:09 +0100)]
Jira Issue-964: Add more types for OCEntityHandlerResult
OCEntityHandlerResult includes more type that matches with
CAResponseResult_t.
This patch does not modify the return value of the exisitng code
and neither changes the enum value of the existing code.
It appends to the existing list based on the CoAP return values.
Change-Id: I2be12bb5f80ab751c9afc4e89c48446479c8f565
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Jongmin Choi [Tue, 28 Jun 2016 08:02:20 +0000 (17:02 +0900)]
Fixed policy response in /oic/res discovery
Added "sec": false to response in case of unsecure resource
Removed "port" information in case of unsecure resource
This patch is based on the Core Spec CR on resource policy.
If "sec" is false, it may or may not be included in /oic/res discovery response.
If "sec" is false, "port" shall be omitted in the response.
This patch should be used together with
Disable OC_SECURE flag in case of SECURED=0 build patch
(https://gerrit.iotivity.org/gerrit/#/c/8875/)
Change-Id: I8e0f3b39896c8856ab659f966e1227196e0f2153
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8987
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Gregg Reynolds [Mon, 6 Jun 2016 05:58:31 +0000 (00:58 -0500)]
fix warning test cond always true by removing unnecessary test
Change-Id: I4753c69049295379f85641638b3ece4ca09da5c1
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
hyuna0213.jo [Thu, 23 Jun 2016 00:10:34 +0000 (09:10 +0900)]
[JIRA-1151] IoTivity Blockwise transfer is sort of broken when
paired with slow response
- When a resource is set as slow response resource,
and it has a large enough payload to be sent as blockwise
transfer data, and a CON retrieve message is sent to the resource,
the coap messaging mechanism break down.
- Remove the unnecessary code
Change-Id: I4bfabc4f457f637a8a88e6c237c25831c7b6c776
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Phil Coval [Thu, 16 Jun 2016 08:25:44 +0000 (10:25 +0200)]
ocpayload: Supports multiple data model versions (DMV) using CSV
DMV can be CVS if multiple values are supplied.
OIC 1.1 has a single value but future spec is expected to have multiple values
For more details about this specification please refer to:
20160531-OIC_Core_Specification_v1.1.0_r0.13.docx
Section 11.3.4,
Table 18 for property description
& Section D.3.4 for RAML definition.
For now it's supporting simple patterns like "one-1,two-2"
In the longer term a full implementation of rfc4180 might be desired.
Internally those items are stored in OCStringLL (linked list of strings),
and later it would make sense to relocate those helper functions
in a common place.
This change has been tested on Tizen:3.0:IVI
Bug: https://jira.iotivity.org/browse/IOT-1101
Change-Id: I7274d74ba525aedda49b78398743aa24a7999c00
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
vimala.v [Tue, 28 Jun 2016 10:24:34 +0000 (15:54 +0530)]
[Tizen] Resolved build warnings
Change-Id: Ic1fb1d3e5b12f3e9f7c548f7b00969ee19c1d00c
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8993
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Philippe Coval [Thu, 23 Jun 2016 19:52:14 +0000 (21:52 +0200)]
tizen: Bump to 1.1.1
Change-Id: I4ba6addba481b3180f6ebb6969caf86115589c48
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
David Antler [Tue, 21 Jun 2016 22:23:06 +0000 (15:23 -0700)]
Use oic_time inside provisioning
Change-Id: I8f91e99f3a84898e5da71de94f19f9b9c7e82635
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8823
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Wed, 22 Jun 2016 20:09:58 +0000 (13:09 -0700)]
Remove references to 'winrt'
Change-Id: Iaa0cb9b830eeb040971023296c3b0c677d028d28
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Philippe Coval [Sat, 12 Dec 2015 01:05:32 +0000 (01:05 +0000)]
tizen: also support ARMv7 machine
It was successfully tested on :
* Tizen:2.4:Mobile profile (TM1 and Samsung Z1)
* Tizen:2.3:Wearable profile (GearS)
Change-Id: I9e43f35ed2fa18e7dc691f1f5cbfa9a2e4830aad
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Ziran Sun [Thu, 23 Jun 2016 10:18:45 +0000 (11:18 +0100)]
Change resource type of /oic/res from string to array.
JIRA Issue: https://jira.iotivity.org/browse/IOT-1131
Change-Id: I91f77f806ed7feb290fea0aa1b12f76a3b119442
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Sandeep Sharma [Mon, 23 May 2016 09:33:33 +0000 (15:03 +0530)]
Implementation for Direct Pairing Android Interface API and Sample App.
1. Android Interface API's for direct Pairing feature.
2. Android Sample App for Direct Pairing.
[patch #2]
Commnts fixes.
Add Support for direct Pair provisioning in ProvsioningClient Android sample
app.
[Patch #3]
Build Fix.
[Patch #4]
Review comments addressed.
Change-Id: I09572eb8cb54f7cd122c6eb224ac2abbcb1ec530
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
js126.lee [Wed, 22 Jun 2016 11:53:10 +0000 (20:53 +0900)]
Remove double checking type in credential data
Remove double checking type in credential data
Patch 1,2: Remove double checking type in credential data
Change-Id: Ibb532700dff39e1f4ef261de7dda15a48e782d61
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
js126.lee [Fri, 24 Jun 2016 07:17:53 +0000 (16:17 +0900)]
Change CARemovePeer condition when DTLS is closed
In order to align with tinydtls, this patch have modified that
CARemovePeer is called in below condition.
(DTLS_ALERT_LEVEL_FATAL == level || DTLS_ALERT_CLOSE_NOTIFY == code)
Change-Id: Ia8c9d6294973416e01714dad35fe239907eba48c
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8943
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Jongmin Choi [Thu, 23 Jun 2016 10:33:57 +0000 (19:33 +0900)]
Fixed Occlient app usage
Change-Id: Ia4614129602a4920ab19a59996833b8d66412ad9
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8923
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Gregg Reynolds [Mon, 6 Jun 2016 05:28:54 +0000 (00:28 -0500)]
fix inconsistency: WrapRequest decl'd class, def'd struct
Change-Id: I26809689a0f685318702c4f2881e31c0ff8da116
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
saurabh.s9 [Tue, 24 May 2016 12:17:38 +0000 (17:47 +0530)]
Added UTC to cover uncovered APIs and Corrected build issue in credentialgenerator.h
This patch is dependent upon https://gerrit.iotivity.org/gerrit/#/c/8813/
Change-Id: I49a9de85e04c47f0d9ebbfab99248cf58a998248
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
saurabh.s9 [Tue, 21 Jun 2016 06:49:25 +0000 (12:19 +0530)]
Check for NULL parameter
Change-Id: I27b316b11f0362deeaff2de8e06ffc296759411d
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8813
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Ziran Sun [Fri, 10 Jun 2016 14:22:18 +0000 (15:22 +0100)]
Added function that enables RI passing message ID from CA
layer to application layer. This allows application layer
to differentiate new messages and re-transmitted messages.
JIRA Issue: https://jira.iotivity.org/browse/IOT-1112
Change-Id: Iec7286586c81ae245dbb78a07707a2ea39875d18
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8595
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Ziran Sun [Wed, 1 Jun 2016 09:25:26 +0000 (10:25 +0100)]
Retrieve on /oic/res?rt=oic.d.xxx should return as per oic.if.ll
rather than returning as per oic.if.baseline.
This change set the default interface of /oic/res as oic.if.ll when
no interface is specified in the enquiry.
JIRA issue: https://jira.iotivity.org/browse/IOT-1103
Change-Id: I7694be578aec57b640ba6fdc84c4fec472fe92f5
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8415
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Ziran Sun [Tue, 21 Jun 2016 14:04:14 +0000 (15:04 +0100)]
Change rt type from string to array in sample code.
Change-Id: I45e41908cb44fe75617c16f5d2cba9ab976d623e
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
hyuna0213.jo [Wed, 22 Jun 2016 05:09:53 +0000 (14:09 +0900)]
Fix a wrong conditional statement about token value.
if the first byte of the token is 00, the condition will
return false even though the token is valid.
Change-Id: I7386cb3644f32e7d1cabb58a1ef8c7162cf19476
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8831
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Wed, 8 Jun 2016 04:04:41 +0000 (13:04 +0900)]
removed svace warning for android
- initialize some variables
- adjusted code style
- modified unreached code
Change-Id: Id0001f98d49b09131f4a4177400bdc6defa51a2f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
js126.lee [Tue, 14 Jun 2016 05:40:31 +0000 (14:40 +0900)]
Modify GET request handler for /oic/sec/acl
Issue: If 'subject' field is not included in REST request,
a error occur on HandleACLGetRequest.
This implementation does not meet the spec, and causes the failure with CTT.
Resolution: A server responds for GET 'oic/sec/acl', even if 'subject' field
is not included in REST request.
Patch 1: Fixed this issue, and adding GetACL API for debugging only.
Patch 2: Rebase it on the latest master branch
Change-Id: Icb3869fee6039a076ee90146ae94eb527a88865c
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8633
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Hauke Mehrtens [Fri, 17 Jun 2016 15:38:35 +0000 (17:38 +0200)]
security: fix reading of permission attribute from configuration
Casting the pointer to the permission attribute from uint16_t to uint64_t
causes problems on MIPS Big Endian systems and probably othrs as well.
When the calling method interprets it as uint64_t not the value is
converted but the pointer is interpreted as it would point to a 64 bit
integer, but it is only a 16 bit wide integer. On MIPS BE permission was
always 0 independent of which value between 0 and 32 the permission
attribute had, this was probably written to some padding area or into
some other member of the struct.
This patch fixes the memory corruption and makes the code work for me with
a MIPS BE CPU.
Change-Id: Ifa843e69980ad4309b1e3076b8e2c98c03324352
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jihwan.seo [Wed, 8 Jun 2016 02:27:55 +0000 (11:27 +0900)]
removed unused parameter warning in resource-container
Change-Id: Id6bec0675e2c5776a3f0e9a6a8caab3ec696b4f6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Chul Lee [Thu, 16 Jun 2016 04:56:33 +0000 (13:56 +0900)]
Hoxfix to support the base64 encoded credential.
This patch for the test w/ CTT
to support base64 encoded private data as workround.
Also this changes will be replaced when I upload SVR data structure modification.
[Patch #1~#3] : Intial upload
[Patch #4] : Remove the compile errors for arduino
Change-Id: Iaddd6068e15e316cfc8cea1c7acda8e89f8fc9b0
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
js126.lee [Thu, 16 Jun 2016 09:53:41 +0000 (18:53 +0900)]
[IOT-1129]Crash when received invalild type in security resouces
Issue: Crash when received invalild cbob type in security resouces.
Jira : https://jira.iotivity.org/browse/IOT-1129
Resolved : Add checking type.
Patch 1: Add checking type.
Change-Id: Iee0ffa883586a680696c4173e8c33f08810e763b
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8695
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Sandeep Sharma [Fri, 27 May 2016 11:30:40 +0000 (17:00 +0530)]
Discard provisioning tool reply for owned device discovery
[Patch #1] fix C provisioning client as now PT's reply won't come
for owned device discovery.
Change-Id: Ica5a66166c589282e99a3fd6c60bfd68b79013f6
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Randeep Singh [Thu, 9 Jun 2016 10:28:01 +0000 (15:58 +0530)]
[IOT-1114] Updated rt for security resource
The security resources schema v1.1.0 specifies rt
for each of these resources as oic.r.*
https://jira.iotivity.org/browse/IOT-1114
Change-Id: Ia16cff9e107e3c9725309e4c729d14b71309c217
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8571
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
David Antler [Fri, 15 Apr 2016 22:35:19 +0000 (15:35 -0700)]
Fix all references from ocmalloc to oic_malloc
Change-Id: I65fcc26e2888414f04fde645beb9dd39cf404b8d
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7799
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>
David Antler [Wed, 15 Jun 2016 17:08:44 +0000 (10:08 -0700)]
Re-enable subset of provisioning unittests
Some unit tests were added without comprehending Windows requirements.
These must be disabled until the code is rewritten to be more
cross-platform.
Change-Id: I588d566e7fc43d135c088c63749b93c6776ca841
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8673
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Philippe Coval [Tue, 14 Jun 2016 15:10:37 +0000 (17:10 +0200)]
Fix typo "Model" is correct spelling not "Modle"
Maybe be squashed into :
5f505cf352f0f5fd675b3f97662b5f243dd2f89e
https://gerrit.iotivity.org/gerrit/#/c/8325/
Bug: https://jira.iotivity.org/browse/IOT-1100
Change-Id: If13b0155b1d94ce2bb362ed4cf580b2879e84090
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Habib Virji [Wed, 15 Jun 2016 10:53:12 +0000 (11:53 +0100)]
[JIRA Issue - 1092] IoTivity Zigbee sample application wrongly freeing memory
OICFree was wrongly freeing memory in OCSetDeviceInfo for a sample application.
Change-Id: Idf621cce81da84e5ae6719f18a31a95b26ef7855
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
js126.lee [Mon, 13 Jun 2016 10:51:09 +0000 (19:51 +0900)]
Add GET request handler for CRED resource
GET request returns credential without private data
This patch is requried, because there is step for 'GET oic/sec/cred' in TEST SPEC.
Patch 1: Init patch.
Patch 2: Add OC/SRPGetCredResource API for debugging only.
Patch 3: Apply Randeep's comment
Change-Id: I3ff154f786a278b6737e86d66b47624abd8e2434
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8397
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Wed, 15 Jun 2016 16:57:49 +0000 (09:57 -0700)]
Merge branch 'master' into windows-port
Needed to disable provisioning unit test due to introduction of
complex Linux dependencies.
Change-Id: I4bd864cd7dc134bf7fb2faa8398f9f4afab40937
Signed-off-by: David Antler <david.a.antler@intel.com>
Gregg Reynolds [Sat, 11 Jun 2016 13:08:55 +0000 (08:08 -0500)]
WARNING: eliminate warnings: [-Wsometimes-uninitialized]
The warning is caused by decls "TWEntry* entry = NULL;" coming
after tests that call "goto exit;" where "entry" is used.
the decl in front of the conditionals removes the warning.
Also added NULL test on "entry" to avoid unecessary calls
to TWDeleteEntry.
Change-Id: I0d7069e2497563a2c5378789c26acfdd3c48d89d
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8599
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Phil Coval [Tue, 14 Jun 2016 21:43:37 +0000 (23:43 +0200)]
resource-container: Port to gcc6 using std namespaces
Bug: https://jira.iotivity.org/browse/IOT-1111
Change-Id: Ie64ae80bb5851a887dd6fd589f72c4e64198b227
Credit-to: Kevron Rees <tripzero.kev@gmail.com>
Signed-off-by: Phil Coval <philippe.coval@s-opensource.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8651
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Gregg Reynolds [Tue, 7 Jun 2016 12:33:31 +0000 (07:33 -0500)]
BUGFIX: variable has incomplete type 'OIC::Service::RCSResourceObject::WeakGuard'
Embedding the definition of WeakGuard syntactically eliminates
the error we get if its definition is a sibling.
Change-Id: Ia020ca5fda0f604d4c60ebfde895b3ecbd244a4c
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Ziran Sun [Wed, 1 Jun 2016 12:31:18 +0000 (13:31 +0100)]
Remove extra href property in /oic/res as
the href property should be within links only.
JIRA Issue: https://jira.iotivity.org/browse/IOT-1104
Change-Id: I2b7b6996feebe92902a23a275c5bfbd3ad7e47e9
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
hyuna0213.jo [Thu, 9 Jun 2016 10:57:54 +0000 (19:57 +0900)]
fixed bulid issue for tcp adapter in RI layer
Bulid error occurs by https://gerrit.iotivity.org/gerrit/#/c/8423/
patchset if WITH_TCP=true option is used to build IoTivity.
so I modified the code to resolve the build issue.
Change-Id: Iea33722f9d3b5b501dfcca0b98ed61a7bc6ff590
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Mon, 13 Jun 2016 00:30:08 +0000 (09:30 +0900)]
modified tcp connection callback parameter type
I modified the parameter of the tcp connection callback
to pass the connectivity and flag information
Change-Id: Id99b92726b39ffac2b73a1e6d9041521e624af3d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
i.pazderskyy [Tue, 24 May 2016 15:34:25 +0000 (18:34 +0300)]
Implement missing unit tests for CKM.
Added CKM unit tests to common build.
Added result state to functions.
Change-Id: I11ef2d003f95d850ed395f5c2584bbb34ca154a4
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Thu, 12 May 2016 17:48:14 +0000 (19:48 +0200)]
Build: Export pkg-config when cross compiling using yocto
Without this change, host's /usr/include may be used which is unwanted.
This was obsevered when building with Yocto jethro setup
with security checks (LfAgl).
While this change has been done for crosscompiling purpose,
it make sense to have this in all contexts.
(ie: those which don't set CROSS_COMPILE variable)
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Origin: https://github.com/tizenteam/iotivity
Change-Id: I3027642c77cc27f2072cdc22886aa09e124cdf4c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8125
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
leechul [Fri, 20 May 2016 04:55:03 +0000 (13:55 +0900)]
Update OTM's unit test to use the real resource servers during OTM test
[Patch #1] Initial upload
[Patch #2] Update to use the correct path for OTM unittest w/ sample server.
[Patch #3] Remove the warnings in OTM unittest.
[Patch #4] Update to use the default SVR DB.
Change-Id: I806b1bd0ec860a91f3e9d762dbed0dc35b133cd6
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Ashwini Kumar [Mon, 23 May 2016 06:29:25 +0000 (11:59 +0530)]
Add context param to DP
Added user context to direct pairing API OCDoDirectPairing
Change-Id: Ie0cd85446a1b7d56d153ba4f3ccabbefd0ff5284
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Ashwini Kumar [Mon, 23 May 2016 08:26:22 +0000 (13:56 +0530)]
Add C++ API for Direct pairing
Added C++ API for direct pairing feature
Updated unittests for C++
Added direct pairing sample
Fixed Construct resource to '|' Secure flag instead of '&'
Note: this change needs https://gerrit.iotivity.org/gerrit/#/c/8273/
Change-Id: I4a1cfc27206adf7308388406d0c8821aa46d87a8
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
js126.lee [Tue, 7 Jun 2016 11:44:19 +0000 (20:44 +0900)]
Changing DOXM resource to be normally discoverable
Issue: DOXM is not listed by default in /oic/res response.
Resolve : Changeg DOXM to be normally discoverable
PT should use secure port of DOXM for OTM and Provision,
even if Device has different COAPS ports per resource.
Patch 1: Init
Patch 2: According to review of Randeep, modified form strcmp to strncmp
Change-Id: I7742681b75261694c809e98f639379332c77e3b5
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Mon, 13 Jun 2016 21:33:25 +0000 (14:33 -0700)]
Merge branch 'master' into windows-port
Change-Id: Ia2e02ce01d3cb8b73b22f7c2ff4169c340d6f72f
Signed-off-by: David Antler <david.a.antler@intel.com>
Philippe Coval [Tue, 7 Jun 2016 08:24:28 +0000 (10:24 +0200)]
tizen: deploy gtest file to be included by unittests
Note, currently unit testing is not done on Tizen,
but only on GNU/Linux and Darwin (OSX).
Change-Id: Ifaf020bdf23fba3f0922f38f260e81b7481930dc
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8543
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Ziran Sun [Thu, 26 May 2016 10:55:58 +0000 (11:55 +0100)]
Change the type of "rt" in /oic/p from string to array.
JIRA issue: https://jira.iotivity.org/browse/IOT-1102
Change-Id: I4ab7bbe3a42c8f0890ed1acecac07e8d18ccf470
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Todd Malsbary [Thu, 2 Jun 2016 17:48:41 +0000 (10:48 -0700)]
[IOT-1113] MAX_ADDR_STR_SIZE_CA should match MAX_ADDR_STR_SIZE.
Change-Id: I9c178a2fe3a744115b43d6ad7e4a3a55f67ea0ed
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Thu, 19 May 2016 01:33:32 +0000 (10:33 +0900)]
added Scan Interval API
3rd party can adjust scanning with interval time as user scenario.
Change-Id: I44384676fac14dd888ddf0529942cbcde36e7d74
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Salvatore Iovene [Thu, 28 Apr 2016 10:52:19 +0000 (13:52 +0300)]
Expose OcRepresentation values to the Java layer
Change-Id: Ia6ef76be68f686e9a461475b1cd6282b749a39fd
Signed-off-by: Salvatore Iovene <salvatore.iovene@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
js126.lee [Thu, 9 Jun 2016 04:49:53 +0000 (13:49 +0900)]
Change request method on OTM
Post is used for UPDATE.
Put is used for CREATE.
Patch 1: Change request method form PUT to POST on update case.
Patch 2: Change hadler on doxmresource.c
Change-Id: I9d90e7d7cfce99de5f8ad8848912590af2d59f09
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8565
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
George Nash [Wed, 1 Jun 2016 22:05:49 +0000 (15:05 -0700)]
Cleanup compiler warnings
ocpayload:
The `tcpPort` was unused in the in the `OCCopyResource` function
The only place the `OCCopyResource` function was called from was
from the `OCDiscoveryPayloadAddNewResource`.
[-Wunused-parameter]
Change-Id: Icb17930e730c8154fbf10d54dd9b5e3857e3e1db
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Gregg Reynolds [Sun, 5 Jun 2016 14:15:38 +0000 (09:15 -0500)]
fix warning/bug: address of array 'info->addr' will always evaluate to 'true'
Change-Id: Ib4b65f43f35fc0547d50983334c2e6760d212340
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tim Kourt [Fri, 20 May 2016 21:40:29 +0000 (14:40 -0700)]
[RI][Android]: Propagation of the mandatory device info types into Android
Follow up for the https://gerrit.iotivity.org/gerrit/#/c/5747/
Change-Id: Iedafa880cea0cf5ee25e30f29429889b3b5b8b50
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Todd Malsbary [Wed, 25 May 2016 18:28:40 +0000 (11:28 -0700)]
[IOT-1106] Properly clone OCByteString values.
Change-Id: Id320d183ca12b48e842e184d54aa5f8fb6d9376d
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Daniel Ferguson [Mon, 6 Jun 2016 21:23:23 +0000 (14:23 -0700)]
Fix bug in resource/csdk/security/unittest/SConscript
Change-Id: I5b3eaad9923cdf0f25f1b92cc0a4e9ab9276f284
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Dmitriy Zhuravlev [Fri, 27 May 2016 12:50:45 +0000 (15:50 +0300)]
Fix CA DTLS handshake retransmission timer
registerTimer allows only positive integers
which can not be less than RETRANSMISSION_TIME = 1 sec
Change-Id: Ide9344e0eb703564558626a74f754e394288fa1d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Dave Thaler [Tue, 7 Jun 2016 00:19:55 +0000 (17:19 -0700)]
More VS2013 fixes
Change-Id: I038f6ddc0cd654b2b2a687f6564d5a66a048dbb3
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Daniel Jay Ferguson <daniel.j.ferguson@intel.com>
David Antler [Mon, 6 Jun 2016 17:48:42 +0000 (10:48 -0700)]
Add and run CSDK provisioning unit tests
Change-Id: Id328851efa68b1167c27d8fb3270aab2d5db82d7
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8499
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
David Antler [Fri, 3 Jun 2016 18:45:08 +0000 (11:45 -0700)]
[Win32] Fix types in caipserver.c
Created a CASocketFd_t generic which provides a consistent type
for a socket file descriptor. Updated functions accordingly.
Change-Id: I05f591b3679daafc8cd83f7a93b2c71fa4bae5f9
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8453
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Daniel Ferguson [Mon, 6 Jun 2016 20:19:40 +0000 (13:19 -0700)]
Fix win32 bug in pmutility.c
Win32 implementation of pmutility.c:PMTimeout() was broken
Change-Id: I313fac3b7fc2437ad5de89baf03600a01516ed24
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8503
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Chul Lee [Thu, 26 May 2016 04:52:09 +0000 (13:52 +0900)]
Modify the incorrect UUID parse in 'GetSubjectFromQueryString' API.
[NOTE]
GetSubjectFromQueryString API will be invoked when received REST requests to
retrieves the 'subject' field.
BTW, Since the subject of query is the string type,
The subject field should not be copied directly.
it should be converted as OicUuid_t.
[Patch #1] : Intial upload
[Patch #2] : Update unittest
Change-Id: I772ee91a9061ac2c9762ed09c5d09c5e90be90ff
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Mon, 6 Jun 2016 18:04:17 +0000 (11:04 -0700)]
Merge branch 'master' into windows-port
Change-Id: I87c2e5ee2d6c9574c2a50d83256d6845a340fd86
Signed-off-by: David Antler <david.a.antler@intel.com>
Dave Thaler [Thu, 2 Jun 2016 18:26:55 +0000 (11:26 -0700)]
VS 2013 fixes
Change-Id: Ic3a398995bb558b6e0b8fb01fcbfed6098f757d7
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8443
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Gregg Reynolds [Mon, 6 Jun 2016 06:00:26 +0000 (01:00 -0500)]
add missing OCException case
Change-Id: Ia5d92080ab6adb31c4748366dd5392a70bf4cf0f
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
George Nash [Wed, 1 Jun 2016 17:06:09 +0000 (10:06 -0700)]
Clean up compiler warning/removed unused code
ocstack.c:
Removed the verifyUriQueryLength() function. This function
is not used anywhere in the code. The code may be valid,
however, if it is not used its not being maintained.
[-Wunused-function]
Change-Id: Ifa9b0a6a4b22416eb91b67b4476b544c70ff20c8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8421
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
George Nash [Tue, 31 May 2016 22:35:05 +0000 (15:35 -0700)]
Clean compiler warnings.
in caipserver.c:
the function static void CAHanderlNetLink() was not defined or used and could
be removed. [-Wunused-function]
the function CAIPInitializeNetworkMonitorList was not returning a status on
the succesful use case. [-Wreturn-type]
In the CARemovedNetworkMonitorList the ifindex value comes from a system
library and can not be changed so I cast the removedifitem->index to int
to prevent the warning [-Wsign-compare]
Change-Id: I5dd8c52c2e82d68df9a0baf4ad2aa6acb4facfc7
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Wed, 1 Jun 2016 07:17:04 +0000 (16:17 +0900)]
Fixed crash issue related to BT on/off in Tizen
Fixed crash issue related to BT on/off in Tizen
Change-Id: I3d5f2807a39dbb76a0a8155bd6b88bdd9f96998a
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8411
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Mon, 23 May 2016 23:42:31 +0000 (08:42 +0900)]
Added CA Util API to assign the port number of IP(UDP/TCP)
CA utility layer provides transport specific functions.
and the UDP/TCP port number related functions are added.
- get the port number currently openned.
- set the port number to use.
Change-Id: Ibb4ca1b1a08ee2d7e540f07c0b6267b05dd0bd6a
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Thu, 2 Jun 2016 10:44:35 +0000 (19:44 +0900)]
modified observe logic in ocstack
when register/deregister of observation is failed,
ocstack will send response directly.
Change-Id: Ifb93dfbf2cc2ae5a449e676442194a5e8fa09976
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Wed, 1 Jun 2016 02:27:13 +0000 (11:27 +0900)]
fixed the bug to check the tcp header type from size
fixed the bug to check the tcp header type from size
Change-Id: Ic30d1885dda5a2f1c7a20d1a1ef86a3cd3c71b31
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8409
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Wed, 25 May 2016 10:48:22 +0000 (19:48 +0900)]
removed retry code for uncommon case in android BLE
Change-Id: I9ae6ae4c620c785f608908aa05a3ff3f92a2c3ac
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8329
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Thu, 2 Jun 2016 19:52:41 +0000 (12:52 -0700)]
Add explicit warning for missing CMake dependency
Change-Id: I3ad555d8e577cbff9dd0526cc4f87c3f5f58d4f8
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8437
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
David Antler [Wed, 1 Jun 2016 23:22:23 +0000 (16:22 -0700)]
Add run.bat - build, run, debug helper script
Change-Id: Ide0ef8b6cdac86374cba6c3f9ac497a6f7588da8
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
David Antler [Thu, 2 Jun 2016 17:59:35 +0000 (10:59 -0700)]
Merge branch 'master' into windows-port
Change-Id: Ideba675f1379a9044e9a7668ad72a34953d26767
Signed-off-by: David Antler <david.a.antler@intel.com>
Dave Thaler [Fri, 27 May 2016 01:06:41 +0000 (18:06 -0700)]
VS 2013 changes for csdk
Change-Id: Ib4c437c96c80327eb80e259d4f937696afbe1002
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8361
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
David Antler [Wed, 1 Jun 2016 23:35:50 +0000 (16:35 -0700)]
VS2013/15 aggregate changes of Intel and Microsoft
Status: Compiles in VS2015 and runs tests
List of TODOs:
TODO: Fix tinydtls tick and locking issues.
TODO: Fix disabled tests (PersistentStorageHandlerTest, usleep)
TODO: Enable ocpmapi.dll shared lib (currently it's static)
TODO: Remove hacks to solve error C2059: syntax error: 'constant'
see: resource\include\StringConstants.h
TODO: Address inconsistent style! Perhaps file a JIRA issue; CI
should reject such issues before they enter the code base.
TODO: Understand priority around enabling services.
Merger changelog:
* Adopted libtimer\timer.c changes from Microsoft
* Adopted Boost SCons installation changes from Intel
* Combined build_common\windows\SConscript from both Intel and
Microsoft
* Adopted tinydtls code changes from Microsoft (INLINE_API macro,
features wrapped in #ifdefs, etc)
* Adopted tinydtls SCons changes from Intel, tinydtls random seed
generation from Intel
* Adopted ocrandom.c "QueryPerformanceCounter" from Microsoft.
* Adopted resource\examples from Intel
* Adopted liboc_logger and liboc from Intel
* Adopted resource/src from Intel
* Adopted boostification from Microsoft (BOOST_NOEXCEPT, etc.)
* Adopted "getopt" from Microsoft (multiple locations)
- resource\csdk\stack\samples\linux\secure\occlientbasicops.cpp
- resource\csdk\stack\samples\linux\SimpleClientServer\common.cpp
* Adopted SimpleClientServer changes from Microsoft
- resource\csdk\stack\samples\linux\SimpleClientServer\
* Adopted oicgroup.c from Intel
* Adopted OC_EXPORT changes (and OC_EXPORT_DLL define macro)
from Microsoft
Change-Id: Ib4298cd63731b39e1bcfa6a790fd18298c73720a
Signed-off-by: Henry Beberman <henry.beberman@intel.com>
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7627
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
David Antler [Wed, 11 May 2016 20:34:09 +0000 (13:34 -0700)]
[Win32] Modify SConscripts to prepare for VS
Change-Id: Ieebc9ab44f597a9cd47e28591e6edb8be30399c4
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8107
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
David Antler [Wed, 24 Feb 2016 00:49:46 +0000 (16:49 -0800)]
[Win32] Add media client, server, GUI examples
Change-Id: Ia4c4861ba932692a4ea40c5a2bff46f8791935fa
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5693
Reviewed-by: Daniel Jay Ferguson <daniel.j.ferguson@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Dmitriy Zhuravlev [Fri, 27 May 2016 14:10:09 +0000 (17:10 +0300)]
Fix retransmission according to RFC
tinyDTLS does not satisfy RFC (https://tools.ietf.org/html/rfc6347):
1. "Partial reads (whether partial messages or only some of the messages
in the flight) do not cause state transitions or timer resets.
2. "In addition, for at least twice the default MSL defined for [TCP],
when in the FINISHED state, the node that transmits the last flight
(the server in an ordinary handshake or the client in a resumed
handshake) MUST respond to a retransmit of the peer's last flight"
List of changes:
1. Changed 'dtls_stop_retransmission' function. It clears timer only.
Needed to save server's last flight in retransmission buffer.
2. Added 'dtls_start_retransmission' function. It can resume the
retransmission after 'dtls_stop_retransmission'.
Needed for responding to the client's last flight in FINISHED state.
3. New function 'dtls_clear_retransmission' clears retransmission buffer
instead of 'dtls_stop_retransmission'.
4. Disabled clearing retransmission buffer in case of partial flight
in 'handle_handshake_msg' function.
5. Added answering HELLO_VERIFY_REQUEST if client retransmit CLIENT_HELLO
in 'handle_handshake_msg' function.
Change-Id: Ief775733e52a0e5f2e663b0317ed3f922bd92629
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8371
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
js126.lee [Tue, 31 May 2016 07:24:25 +0000 (16:24 +0900)]
Change QOS to HIGH for security module
Issue: If packet loss happend during OTM, OTM is failed due to Non-Confirmable msg.
Solution: In order to retransmission, change msg type to confirmable.
Patch 1,2: Init patch
Change-Id: I5222d19661a6eb01a2cc0033857e96ad63a8f175
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
projects / contrib / iotivity.git / log