hyuna0213.jo [Tue, 29 Nov 2016 07:49:39 +0000 (16:49 +0900)]
[IOT-1612] Fix OCRDPublishWithDeviceId() to publish with a specific id
Fixed OCRDPublishWithDeviceId() to publish resource with a specific id
bug: https://jira.iotivity.org/browse/IOT-1612
Change-Id: Id0242a1c4a7040c928db179a840abf1c7f85400e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14893
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit
6dbd734ef4ca54d49ae474f8e7291a54e70cbcbf)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15149
Parkhi [Wed, 30 Nov 2016 02:42:56 +0000 (11:42 +0900)]
Update a payload format to be compatible to OIC spec in easysetup
1. In a response for get/post request with batch interface,
"rep" keyword should be included for containing child resource's properties
for each child resource.
2. Provisioning resource is a collection resource so it should have
a "oic.wk.col" resource type.
3. "links" property for baseline and linklist interfaces should include a
"p"(i.e. policy) property.
e.g. response for baseline:
{
"rt":[
"oic.wk.prov",
"oic.wk.col"
],
"if":[
"oic.if.baseline",
"oic.if.ll",
"oic.if.b"
],
"ps":0,
"lec":0,
"links":[
{
"href":"/WiFiProvisioningResURI",
"rt":[
"oic.wk.wifi"
],
"if":[
"oic.if.baseline"
],
"p":{
"bm":3
}
},
{
"href":"/DevConfProvisioningResURI",
"rt":[
"oic.wk.devconf"
],
"if":[
"oic.if.baseline"
],
"p":{
"bm":3
}
},
{
"href":"/CloudServerProvisioningResURI",
"rt":[
"oic.wk.cloudserver"
],
"if":[
"oic.if.baseline"
],
"p":{
"bm":3
}
}
]
}
e.g. response for linklist:
{
"links":[
{
"href":"/WiFiProvisioningResURI",
"rt":[
"oic.wk.wifi"
],
"if":[
"oic.if.baseline"
],
"p":{
"bm":3
}
},
{
"href":"/DevConfProvisioningResURI",
"rt":[
"oic.wk.devconf"
],
"if":[
"oic.if.baseline"
],
"p":{
"bm":3
}
},
{
"href":"/CloudServerProvisioningResURI",
"rt":[
"oic.wk.cloudserver"
],
"if":[
"oic.if.baseline"
],
"p":{
"bm":3
}
}
]
}
e.g. response for batch:
[
{
"href":"/ProvisioningResURI",
"rep":{
"if":[
"oic.if.baseline",
"oic.if.ll",
"oic.if.b"
],
"rt":[
"oic.wk.prov",
"oic.wk.col"
],
"ps":0,
"lec":0
}
},
{
"href":"/WiFiProvisioningResURI",
"rep":{
"if":[
"oic.if.baseline"
],
"rt":[
"oic.wk.wifi"
],
"swmt":[
2,
3,
4
],
"swf":1,
"tnn":"",
"cd":"",
"wat":0,
"wet":0
}
},
{
"href":"/CloudServerProvisioningResURI",
"rep":{
"if":[
"oic.if.baseline"
],
"rt":[
"oic.wk.cloudserver"
],
"ac":"",
"apn":"",
"cis":""
}
},
{
"href":"/DevConfProvisioningResURI",
"rep":{
"if":[
"oic.if.baseline"
],
"rt":[
"oic.wk.devconf"
],
"dn":"Test Device",
"mnmo":"Test Model Number",
"loc":"",
"lang":"",
"ctry":""
}
}
]
Change-Id: I13ccda6fedb7c628dc77cc13e84c1c10c0e1b487
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
e1409c4bb075b7be18d911b07df07568a694c971)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15139
Habib Virji [Thu, 1 Dec 2016 12:01:43 +0000 (12:01 +0000)]
Fix Android SetPropertyValue function call
setPropertyValue call in the Android was swapped, compared to function call how it was in the JNI layer.
setPropertyValue0 is for passing string array and setPropertyValue1 is passing string.
Change-Id: I91c480f162cc53712a68bef078371559fd2eff21
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
c54aaa1f7de9227236cb8f023df99209c6dddb64)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15067
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Philippe Coval [Thu, 1 Dec 2016 15:55:29 +0000 (16:55 +0100)]
doc: Fix typo in NOTICE.md
Harmless change to test CI
Change-Id: I3aa34dbdeb8905f53939d6eaee90a681bf85d730
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14919
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
88eeaaf37ee848a28eab10b8916dcde28a122c0b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/8149
George Nash [Wed, 23 Nov 2016 18:49:15 +0000 (10:49 -0800)]
[IOT-1578] Fix OSx build with SECURED=1 option
Add the symbols for mBedTLS if building a secure build
Change-Id: Ibbe2387307bc432193daaa2b7f88491cb18687bd
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
George Nash [Thu, 17 Nov 2016 19:26:31 +0000 (11:26 -0800)]
Cleanup output from Gradle builds done in services
This change cleans up the build output from android service samples
- easy-setup
- notification
- resource-container
- resource-encapsulation
Change-Id: I942e365fd787387a30d6358f4586b9caa98fbeda
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
George Nash [Thu, 1 Dec 2016 22:31:43 +0000 (14:31 -0800)]
[IOT-1643] Fix illegal memory access - Don't return local string
the std::string ret is a local varaible and is destroyed when the
what() member function returns.
Put the return string into the m_whatMessage variable. Since
'what()' member function is a const function it can not modify the
member variable m_whatMessage so it is generated in the
ResourceInitException constructor.
Issue found using static analysis tool.
Change-Id: I907b984f35dee59b2f300afe6a640b15a26f020f
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15035
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
bg.chun [Thu, 1 Dec 2016 06:01:54 +0000 (15:01 +0900)]
[IOT-1627][Android]resolve ipadapter memory leak issue
On android ipadapter there is memory leak issue
since the function which used for free pointer
of structure does not free all pointer member
Change-Id: If44dd9dc7562f851fa3f38526830aa84e4b35491
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
jaehyun Cho [Mon, 28 Nov 2016 06:31:16 +0000 (15:31 +0900)]
Add unittest test-case for cafragmentation code.
Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Change-Id: Id98b2151b8149d892d1e063ca893c85fd672af50
Reviewed-on: https://gerrit.iotivity.org/gerrit/14353
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Tue, 25 Oct 2016 09:58:52 +0000 (18:58 +0900)]
add stop API of base stack in android.
since some user application want to use IoTivity more dynamically.
stop API of IoTivity should be provided effeciently.
Change-Id: Ie9ebb874b9b1d49703d5023a972cff5c630acaf3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13649
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Ziran Sun [Mon, 8 Aug 2016 13:30:50 +0000 (14:30 +0100)]
Change service type config in platform unit tests.
Using ServiceType::OutofProc causes exception throw in
registerResource unit test. Replace with ServiceType::InProc.
Change-Id: I89ea8741c19af2567f9ae84dc88983a8e54fb64f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
saurabh.s9 [Mon, 5 Dec 2016 06:52:24 +0000 (12:22 +0530)]
Adding C++ API for MOT
Patch #11 Fix Review comments
Changed MACRO _ENABLE_MULTIPLE_OWNER_ to MULTIPLE_OWNER and this
change propagated upto C-API's.
Change-Id: I55305d5cf9210b25c68f0eaf04c1362111735979
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15145
YounghyunJoo [Thu, 24 Nov 2016 06:59:00 +0000 (15:59 +0900)]
Modify gbsbuild script file to support other options
- before this commit, gbsbuild script file can get a few build options like as "WITH_TCP, WITH_CLOUD, WITH_PROXY, etc.."
- so, to add other option, need to modify gbsbuild scriptfile.
- in this commit, I modified gbsbuild script file to support other options
- using bash script, gets other option like way to get option in other platform
- ex) ./gbsbuild.sh WITH_TCP=1 WITH_CLOUD=1 SECURED=1 WITH_MQ=PUB,SUB
Change-Id: I61c0b02fe68acf517b64de7e3a8a10fe2549c3d2
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14637
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JunHo Lee <junho13.lee@samsung.com>
Reviewed-by: daeken kwon <daeken.kwon@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
sy01.youn [Mon, 5 Dec 2016 01:39:58 +0000 (10:39 +0900)]
EasySetup Tizen Sample App. Build Script is fixed.
There was a build error when building enrollee sample app based on tizen, because of missing ocrandom.h file in iotivity.spec file.
Change-Id: I3e20cac04d2691d58fc291ea88e2983845e9fbd6
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JunHo Lee <junho13.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jihwan.seo [Wed, 30 Nov 2016 06:48:58 +0000 (15:48 +0900)]
Apply print log method in Android EDR adapter.
Change-Id: I7d88f7f140781ea23db02d0bfbf00f66cd145a13
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Fri, 2 Dec 2016 08:11:07 +0000 (17:11 +0900)]
add exception check login in android BLE
Change-Id: If324fc9399f48ce64d759d016da124963e136ea9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Minji Park [Fri, 18 Nov 2016 02:48:12 +0000 (11:48 +0900)]
[IOT-1576] Changed error handling logic when tls message send failed
- Changed error handling logic when tls message send failed
in tcpadapter.
Change-Id: I22d11d34d2092a7f452d41be9f243dcfdf16a02d
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit
5f39be87c9c3a9c657c9828260a9db5e383cee6c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14771
Minji Park [Tue, 15 Nov 2016 07:30:02 +0000 (16:30 +0900)]
Add shutdown() to disable send/receive on a socket in catcpserver
- Add shutdown() before close socket when closing connection in catcpserver
Change-Id: Ibe2ed942428f754dc148bd1c48422036f84a319c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit
009b22f7cead9bf9bb0a5d66fbe6dc653e0f8057)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14773
jihwan.seo [Mon, 28 Nov 2016 13:17:51 +0000 (22:17 +0900)]
Apply print log method in Android BLE adapter.
Change-Id: I5b0873a56e8c98094412b536309fa77f3643d126
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Mon, 28 Nov 2016 06:04:52 +0000 (15:04 +0900)]
modified print log method in CA layer.
to make sure of analyze transmission state,
all messages related important code point is printed same log method.
- print CoAP message.
- print send result.
- print adapter state callback.
Change-Id: Iccd8c8e9351165c7a6feb477e62b3b8814af0955
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
KIM JungYong [Wed, 30 Nov 2016 06:08:29 +0000 (15:08 +0900)]
Fix for result of static analysis.
In this patch, incorrect coding rule is fixed and resolved warning of static analysis.
1. Uninitialized variables is fixed with initialized.
2. Invalid bracket location is fixed.
3. Incorrect division with zero is prevented.
4. Incorrect referenced pointer is prevented.
Change-Id: I715d671241f3d48a1174c49cbe34074b31a50f02
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Thu, 24 Nov 2016 00:18:38 +0000 (09:18 +0900)]
[IoT-1597] bug fix about retransmission
When a consumer had control, they did not send a response
So I modified it to respond.
and remove duplicate defined about NS_QUERY_COSUMER_ID
In the commit below,
Committed without adding the file.
https://gerrit.iotivity.org/gerrit/#/c/14657/
Change-Id: Ie38aec8895422d9edab9d46bef7c6b17499f5bce
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14709
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
9dae1cd32d99938b6f86e2337229d54cac26bb5e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15129
jaesick.shin [Wed, 23 Nov 2016 09:12:48 +0000 (18:12 +0900)]
[IoT-1590] Modify attribute key name followed by OCF property naming convention.
All the OCF property should be written as lower case.
So, change the key name of attributes.
second patch include,
removed duplicated NS_QUERY_CONSUMERID.
Change-Id: I2fcc76fac003e805ad19edb0d7ee10c659218b5f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14657
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
421ca0f436ae959caba272030df9b10d3024f788)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15131
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jaesick.shin [Tue, 15 Nov 2016 01:38:55 +0000 (10:38 +0900)]
[IoT-1557] Bug fix about related relay server.
This patch include,
missing the declare of function.
Change-Id: I1b543402a9ba8487029d8b59e806c6b570439652
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
ff0148a824e06fd94c5a67a7e6133391fb336f01)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14809
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Ziran Sun [Mon, 28 Nov 2016 11:50:14 +0000 (11:50 +0000)]
Correct missuse of get attribute value in ResourceClient unit test.
Change-Id: I57863e2291451aea5f1ce6d5fb7059b29d68a102
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14847
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
(cherry picked from commit
9146a47b8249bda1f62a45592d81dde47dcb2942)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14875
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Parkhi [Thu, 1 Dec 2016 09:07:45 +0000 (18:07 +0900)]
Fix defects detected by static analysis
Change-Id: I9eba31f8f716f8d3b5b04b803bc4c9ecdf035e10
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15007
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
srijon.sb [Fri, 2 Dec 2016 04:28:51 +0000 (10:28 +0600)]
Void function RemoveOTMContext should not return a value
Change-Id: I3855ed16970eb5a0cb686ffe396410c6e0934709
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15047
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Dave Thaler [Tue, 29 Nov 2016 02:26:30 +0000 (18:26 -0800)]
[IOT-1611] Memory corruption in OCSetAttribute
Fix memory corruption bugs in OCSetAttribute introduced by
https://gerrit.iotivity.org/gerrit/#/c/14377/ which left pointers to
freed memory in the attribute list, which was then later used.
Change-Id: Ib776d4bd14aab7b39c74188246005628fbe18ecf
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit
f4217dab180e728271e79d5a3ea314c39fb1d628)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14905
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
bg.chun [Wed, 30 Nov 2016 10:19:16 +0000 (19:19 +0900)]
[tizen]Modify bt_edr adapter to apply new logger
Modify tizen bt_edr apdapter to apply new logger
which is Analyzer.
Change-Id: I49d57a1d633c1d899494567080763f4ebdb26ccb
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14961
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jongmin Choi [Thu, 1 Dec 2016 07:23:05 +0000 (16:23 +0900)]
Handle Error during Ownership Transfer
If an error is returned during ownership transfer,
on-boarding tool needs to remove the server's information from PDM DB
and close secure connection with the server.
Patch #1: Initial patch
Patch #2: Change Log Level
Change-Id: I641529552de0e25438bd94da9b2ec45320428a61
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14999
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
ca6799753d9ce26f42b69af30f39548cf99b990f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15021
Todd Malsbary [Tue, 25 Oct 2016 17:30:12 +0000 (10:30 -0700)]
[IOT-1116] Support heterogeneous array encoding.
OCRepPayloads with values having only sequential integer names are
encoded/decoded as CBOR arrays of mixed types.
Change-Id: I2cdd87f9fb4b8473e00aefdd5bc5daa74941290f
Bug: https://jira.iotivity.org/browse/IOT-1116
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Parkhi [Thu, 1 Dec 2016 09:21:56 +0000 (18:21 +0900)]
Correct callback function for security provisioning in easy setup
Change-Id: Id7d1deb6371d49e4810c191bc52979693ce16e8d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15011
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jihwan.seo [Wed, 16 Nov 2016 22:36:27 +0000 (07:36 +0900)]
add log message for TCP adapter
Change-Id: I7803348f17ac8b860863e25a35c6a12b73a5886d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
jihwan.seo [Mon, 14 Nov 2016 22:36:49 +0000 (07:36 +0900)]
[IOT-1540] Add plumbling logic of connection manager
Change-Id: Ieffef039491a8895c359efb807dc36daa55860d1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Jaewook Jung [Mon, 21 Nov 2016 02:27:38 +0000 (11:27 +0900)]
added fail case for coap_add_option
If coap_add_option fails, it has to return fail while sending data.
Otherwise, it causes a crash error when it tries to use a pdu wrong.
The below is the comment for coap_add_option on libcoap-4.1.1
/**
* Adds option of given type to pdu that is passed as first parameter.
* coap_add_option() destroys the PDU's data, so coap_add_data() must be called
* after all options have been added. As coap_add_token() destroys the options
* following the token, the token must be added before coap_add_option() is
* called. This function returns the number of bytes written or @c 0 on error.
*/
size_t coap_add_option(coap_pdu_t *pdu,
unsigned short type,
unsigned int len,
const unsigned char *data);
Change-Id: I1add40ab44e0e57e675f56db0211b12414dfa5ae
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14539
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Tue, 22 Nov 2016 05:05:16 +0000 (14:05 +0900)]
remove unused callback method in securityinterface.h
Change-Id: I2f1118de1217f61a8d0c7aa820bf27d0ef14773b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Oleksii Beketov [Fri, 25 Nov 2016 15:55:20 +0000 (17:55 +0200)]
ocf.patch for mbedtls compatibility fix
Fixed to comfirm compatibility in case if no PSK hint received on the client side.
Change-Id: I2860188f966d8a71dbd834873f206b3ae78ec93e
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
12f1087b073263dc6122dd04c06b5ee070d83b32)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14881
hyuna0213.jo [Wed, 16 Nov 2016 06:43:24 +0000 (15:43 +0900)]
Removed unnecessary/duplicated log in connectivity abstraction
remove unnecessary/duplicated log in connectivity abstraction
to print the correct message.
Change-Id: I2d0c4535bb4abc576d7e7130b0d38111f37cd3e0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14269
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Habib Virji [Wed, 23 Nov 2016 12:16:31 +0000 (12:16 +0000)]
Remove cJSON library include from resource
Removing this reduces ocbtstack from 180kb to 168kb in size.
cJSON is not used anymore in the resource, except in json2cbor tool in
the security module.
cJSON is used in coap-http and simulator and scripts has been updated
to include and build cjson. It was included mostly in sconscript.
pmutility had helper function which was not used anywhere.
smutility, psinterface, oicgroup all had function calling cjson but the
function was not used anywhere in the code. Except psinterface and
smutility there are no public API with cjson. The public API are not
called by either sample or test code. The API are obsolete and using them
will not yield any result and can crash the platform.
Change-Id: Ifbf3384536394a26cd6b168dcd15285ef9ce08a7
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14685
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Ossama Othman [Wed, 23 Nov 2016 18:52:49 +0000 (10:52 -0800)]
Free strings allocated by TinyCBOR with free(), not OICFree().
The TinyCBOR API requires that strings it allocates should be
deallocated with the free() function. OICFree() is not an appropriate
replacement in this case since it is conceivable the underlying memory
allocator could differ.
Change-Id: I48325c8fd41eaee156bf2da5e2f67b243114e3de
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14695
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
bg.chun [Fri, 5 Aug 2016 09:48:18 +0000 (18:48 +0900)]
[IOT-1207] Endpoint C API with request filtering
provide public capi "OCCreateResourceWithEp" for mapping endpoint to
resource and filltering request which come from unbinded endpoint.
Change-Id: I7f273acdacff9116d99b60afb76f70fa48709341
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Randeep Singh [Tue, 29 Nov 2016 11:14:30 +0000 (16:44 +0530)]
resolved svace issues
Change-Id: If2b022d06a46c46cba1b3535c49ddcdbc794bf3c
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
(cherry picked from commit
73c1e373ddba4e748fc1466e352f812038a17b3e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14943
Chul Lee [Wed, 30 Nov 2016 00:29:16 +0000 (09:29 +0900)]
Insert license text.
Change-Id: Ide755195b0041412d04aca7b11793682c4b0a406
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14933
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
347410c8569a8d88671a7b5fc29f1b4a03fa0831)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14939
Ziran Sun [Mon, 28 Nov 2016 15:24:26 +0000 (15:24 +0000)]
Remove unused functions that introduced compilation warnnings.
These functions were initially introduced for a test that had been
removed at a later stage.
Change-Id: I5bd5f0f4cae38627b34b8cd7a14d8ea99b7f5435
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jihwan.seo [Mon, 14 Nov 2016 23:46:11 +0000 (08:46 +0900)]
[IOT-1546] add DeleteLocalRef method in send logic for BLE
Change-Id: I93f97239a40534c7005c6527992db4ef285b2bff
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
jihwan.seo [Fri, 25 Nov 2016 00:00:39 +0000 (09:00 +0900)]
add deviceID information in CA layer
since IP can be changed by AP status.
it is needed to have deviceID in CA layer.
Change-Id: I94fe8c3f48356a9d58ec8004387b99a39398041e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14769
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
bg.chun [Wed, 23 Nov 2016 23:08:44 +0000 (08:08 +0900)]
[IOT-1596]Fix ocendpoint/BT static analyze issue
Wrap unused code by if/def when BT adapter unselected.
Change-Id: I684add2261d2a76ed45f00529a98a45dd2102526
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
George Nash [Thu, 17 Nov 2016 17:25:28 +0000 (09:25 -0800)]
Cleanup unused-parameter warnings
Note:
The OC_UNUSED macro from octypes.h is not avalible for
caconnectivitymanager so casting to (void) was used to
avoid the unused-parameter warning.
Change-Id: I653156039ddd9e9bf6096ec5c0b6e313de56c343
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14463
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Kevin Kane [Tue, 22 Nov 2016 18:17:28 +0000 (10:17 -0800)]
[IOT-1588] Update cJSON to v1.0.1 and add version tracking note
Added README file that notes the source repository for this
dependency, the commit ID and release tag (where applicable)
used when copying the source files from it, and any local
modifications made.
Change-Id: Ic19b2bcc0cf6e0c2b77906eacb4203a0874dec55
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14625
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
41010a8a4bac41f27c53a4036daf67e6dda87d81)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14767
Ziran Sun [Mon, 21 Nov 2016 11:12:21 +0000 (11:12 +0000)]
Remove Client side sample code. This code is not
needed and not in right place either.
Bug: https://jira.iotivity.org/browse/IOT-1384
Change-Id: I60d89ba42b01962d68ab9fd903c32b776ae06605
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
KIM JungYong [Mon, 31 Oct 2016 07:31:39 +0000 (16:31 +0900)]
Add including headers description.
Change-Id: I304790db3f9346e7eb80a1e662dcbe4ba6d4a616
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13869
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
6eb9c9cfeacfd97fc92429fd524933713b698c8f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
js126.lee [Tue, 29 Nov 2016 07:42:50 +0000 (16:42 +0900)]
Add to Null checking log in IsSameEowner
When building with MULTIPLE_OWNER=1, ace is updated as appending alwadys,
because the return value is false in IsSameEowner in case both ewoner1 and
ewoner 2 are NULL.
Change-Id: I0068db4196fb467e4c95d29ae808848d95776bbe
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14891
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
73b04a36692e1d23931b621262298b5a4b7f8431)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14899
Alex Kelley [Mon, 31 Oct 2016 21:23:02 +0000 (14:23 -0700)]
[IOT-1382] Fix MediaServer db file extension
Change-Id: I4fd66025d07e20c9d0b98424fb6e2f23636d6b15
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13901
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Dave Thaler [Tue, 22 Nov 2016 00:49:57 +0000 (16:49 -0800)]
[IOT-1513] One more incorrect URI construction
Change-Id: I3ea6f8cc55935ea3f30f30320386d7c430ee1b77
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14587
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
jihwan.seo [Tue, 15 Nov 2016 01:08:17 +0000 (10:08 +0900)]
[IOT-1547] add stop BLE scan API
scanning should be stopped for saving battery when BLE is not using.
Change-Id: I0e12afb4f0961bd1fa4ec579b3e0412796cacf23
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Jaehong Jo [Wed, 23 Nov 2016 13:51:59 +0000 (22:51 +0900)]
Fixed Brace location
The matched '{' and '}' symbols in compound statements(except do-while) shall have the same indentation,
and these symbols in a line shall be used alone (except comment)
Change-Id: I3f760f430120a2bea371376eb0a589189613e64e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14681
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
George Nash [Fri, 18 Nov 2016 00:09:35 +0000 (16:09 -0800)]
Don't display third party library warning on x86_64 build
Change-Id: I7cef30cfc4c8199d45cdb7e9824f56d2995ba3d5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14487
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Philippe Coval [Mon, 28 Nov 2016 12:14:33 +0000 (13:14 +0100)]
build: only add dependency for valgrind supported hosts
Windows is confused with implicit .exe suffix ie:
scons: *** [out\windows\...\utresource\csdk\connectivity\test\catests] \
Explicit dependency ...\utresource\csdk\connectivity\test\catests' \
not found, needed by target \
...
Change-Id: I010eb13f7904cba510e492b73be1caeeb0061edd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14849
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Philippe Coval [Wed, 23 Nov 2016 22:27:46 +0000 (23:27 +0100)]
build: Valgrind script now depends on unit test executable
This prevents Sporadic Valgrind Failures, caused by race conditions
Common error message is like:
out/linux/x86_64/debug/resource/unittests/unittests: Permission denied
Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I49bfb21ee7cd934b965e132cb150d59c047ef383
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Philippe Coval [Fri, 25 Nov 2016 16:41:27 +0000 (17:41 +0100)]
sqlite: Use in needed cases (RD and Secured) only
Today, only a few modules are using it:
* resource-directory (in Server mode)
* provisioning
Bug: https://jira.iotivity.org/browse/IOT-1296
Change-Id: I918c17820f78fe222d2410cdf7a820ef8f0b579d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
js126.lee [Thu, 24 Nov 2016 11:19:16 +0000 (20:19 +0900)]
[IOT-1601]Adding logic to validate oxmsel updating
Oxms should be considered at updating oxmsel.
Oxm should be read-only.
Patch 1: Init patch
Patch 2: Rebase
Patch 3: If owned=Ture, validate oxmsel is omitted for CTT testing
Patch 4: Revert file permission to 644
Don't merge this patch because need to confirm an operation in case of owned=True
Change-Id: I57fbd6a65db9a8d4400934e11ec40cc4c8e96051
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
d53432d2d090a3ea28611454650c9cc285dd1ba6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14833
Joonghwan Lee [Tue, 15 Nov 2016 08:25:49 +0000 (17:25 +0900)]
[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP
Fixed sending/receiving for large size of data which is bigger than 16kbytes on TLS.
https://jira.iotivity.org/browse/IOT-1548
*Notice : This patchset necessarily requires https://gerrit.iotivity.org/gerrit/#/c/14325/.
Change-Id: I1921d1d2d9d18acb921f093136457120ac862a2c
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14351
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14827
Sunil Kumar K R [Thu, 24 Nov 2016 09:40:21 +0000 (15:10 +0530)]
CloudProvisioningClient Signout bug fixed. updated to call new api
Change-Id: I26f60b5ec04583907170ea7c49796b58003e5120
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
eb98d88a7485ab43639a9fa3789b15e1a836266f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14793
Oleksandr Dmytrenko [Fri, 18 Nov 2016 13:25:14 +0000 (15:25 +0200)]
fix: messageID for coap over TCP always is null
Change-Id: Iaf883a1a63a3b221bbcfe9f13bb4856d676de9fe
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
e62ef1079225787d3c757325409c8142a93bdf22)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14789
Habib Virji [Fri, 11 Nov 2016 11:51:33 +0000 (11:51 +0000)]
Remove shared resource directory library usage from other modules
All the added code for the resource directory shared library dependency on library oc.
https://jira.iotivity.org/browse/IOT-1510
Change-Id: Ic8710588bf0a044e8b29283dc36a411c1928b6ae
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Habib Virji [Thu, 24 Nov 2016 11:14:26 +0000 (11:14 +0000)]
Add secure and port in policy
In the collection response, add secure and port information.
Change-Id: Iaec8788bba04fa0a404dfb16ddf54a704493e65b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14751
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Habib Virji [Thu, 24 Nov 2016 12:30:48 +0000 (12:30 +0000)]
Fix query handling for /oic/res
There was a mix up when query was supplied, it was only working if the interfaceQuery passed too. With just rt supplied,
it was returning all the resource. This patch fixes up the issue.
Change-Id: I980f0dd73fafdadd3d1dabae5edf024ac256f95c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Chul Lee [Thu, 24 Nov 2016 07:37:35 +0000 (16:37 +0900)]
Add param check code in PrepareMCertificateCallback.
Change-Id: I1bd917024ab1ac20c000dccf9da5e31ba865a2a0
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
83a63409ebe7e320e835c62aaeb87359bdc29b47)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14749
Chul Lee [Wed, 23 Nov 2016 09:36:27 +0000 (18:36 +0900)]
Add cipher suites
TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 and TLS_ECDHE_ECDSA_WITH_AES_128_CCM
cipher suites were added in order to support manufacturer certificate based OxM.
Change-Id: I3ec5ddce982e5bfd5f7591b493448eec5468653f
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14619
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
e2a98487b8fffab23e11e93e8cd0fd21b5df0340)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14745
Kevin Kane [Sat, 19 Nov 2016 00:17:11 +0000 (16:17 -0800)]
[IOT-1569] Use OICMalloc/OICFree consistently
Lingering and mixed uses of malloc/free exist throughout
IoTivity. Some buffers allocated with malloc are later freed
with OICFree; this is dangerous in case the implementation of
OICMalloc/OICFree ever changes.
This change harmonizes the code to use the OIC versions to
ensure code is always using the same heap allocation and free
functions with two exceptions:
* Sample code continues to use malloc/free; samples should not
refer to internal functions.
* The oc_logger module also still uses malloc/free; oic_malloc
calls oc_logger when operating in ENABLE_MALLOC_DEBUG mode, and
could result in a circular dependency if changed over.
Change-Id: Icd47243eec33500fe7fcd7d5d79ddf2128a9e717
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
8141de8815b7c7a39b8b7d8ce9acb91608cf9e17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14697
Reviewed-by: Omar Maabreh <omarm@microsoft.com>
Habib Virji [Wed, 23 Nov 2016 20:11:30 +0000 (20:11 +0000)]
Add p in response of oic.if.ll
In collection response add p parameter.
This is the response in case of default entity handler.
Application has to handle on its own adding policy parameter.
Change-Id: Ie2195eb07575fbcc34413fca729a1a7db0805314
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
b19d08056e4efe08d3ae3e3a53c01d7c61347e4b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14699
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Habib Virji [Sun, 20 Nov 2016 22:54:46 +0000 (22:54 +0000)]
Add generic API for setting and getting defined tag values
- Uses the resource attribute of OCResource for storing and retrieving device and platform values.
- Removed global savedDeviceInfo and savedPlatformInfo. The information passed via
OCSetDeviceInfo and OCSetPlatformInfo is stored in rsrcAttributes.
- OCAttribute type change from char * to void * to store generic value, this was part of OCResource but was not used.
- Payload type PAYLOAD_TYPE_DEVICE and PAYLOAD_TYPE_PLATFORM is removed from PAYLOAD_TYPE as this was used only internally.
- Payload convert and parse for payload type device and platform is removed, as device and payload uri uses
OCRepresentation payload type.
- Delete function to delete resource attributes.
- OCDevicePayloadCreate and OCPlatformCreate is removed as this was only used internally, all values are now stored in
resource attributes.
- Moves OCSetDeviceInfo and OCSetPlatformInfo from ocstack to ocresource to avoid duplicate checking.
- Add set and get API to set parameter for /oic/d and /oic/p.
- OCGetResourceHandleAtUri accesible without ifdef RD_CLIENT.
- Updated Unit test to test the functionality.
- Add the OCSSetParam and OCGetParam in C++ and Java
Change-Id: If822ae95a70e681121528679de8da1375718de0c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14377
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
js126.lee [Tue, 22 Nov 2016 07:07:13 +0000 (16:07 +0900)]
Add OCConvertStringToUuid on C_common
Patch 1,2: Expose ConvertStrToUUID on OC stack to use common
Ptach 3: Add OCConvertStringToUuid on C_common
Change-Id: Icf9b0ee1bda6fa4d914c696fbbdc27e0998a7262
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
d026fc6e98db05280cb7e94aacffd1d7d09838d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14723
Nathan Heldt-Sheller [Mon, 21 Nov 2016 19:41:01 +0000 (11:41 -0800)]
[IOT-1582] Change "PUT" to count as "Create" and never as "Update"
Per Core Spec conventions, even though PUT is technically legal
for Create or Update, PUT is only ever used for Create. Therefore
we need to change the CRUDN permission bit check in security layer.
Updated Readme.scons.txt and README-building-and-running-secure-IoTivity-
stack.txt to clarify build and use of secure IoTivity stack.
Change-Id: Id362c9c0225e53240b2d1f844c5f05d55cfa2938
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
da4ccd548c926669896e844a672edb32f8de6d70)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14719
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Nathan Heldt-Sheller [Wed, 23 Nov 2016 20:20:52 +0000 (12:20 -0800)]
[IOT-1595] Change Policy Engine to us ACE Union behavior.
The current Policy Engine logic is to assess the permissions on the first matching ACE for a
request (matched via Subject and Resource), and respond to the request (Grant or Deny) based on
that ACE.
The new OCF 1.0 behavior specifies that if any ACE allows a request, it should be Granted (so-called "Union" behavior).
To allow consistency we must fix this in 1.2.1.
This patch changes the Policy Engine to keep searching for an ACE that Grants the request,
until either the request is granted, or the end of the ACL is reached.
Change-Id: Idd4e90c37c7e0fcf963105b34b3e82dfde2ccfd2
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14701
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
(cherry picked from commit
9524976da93a87f1b74e550a672a431e63e858f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14717
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Jee Hyeok Kim [Wed, 23 Nov 2016 08:51:41 +0000 (17:51 +0900)]
[IOT-1592] Fix rd publish fail
1. RD publish fail due to lack of shared point lock logic.
https://jira.iotivity.org/browse/IOT-1592
Change-Id: I278b67ac050fb5bcb0cb5ee6920c27e446f0f01a
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
d1abd0caaa69ba0f4346ecd8958e4fb4363ae239)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14711
KIM JungYong [Mon, 31 Oct 2016 02:34:02 +0000 (11:34 +0900)]
Fix bugs for no catch std::out_of_range exceptions.
Samples of serveral services, no catch exception about out_of_range.
With this patch, all of exception was caught.
Change-Id: I18b9cf7633ac6c6ad3d5a8b9e37a5110ffd9d68f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
8b776fc5549f97cee12aefd41a085f4e678129ea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13865
Jongmin Choi [Wed, 23 Nov 2016 07:41:01 +0000 (16:41 +0900)]
Remove x.org.iotivity from secure resources
Remove x.org.iotivity from IoTivity secure resources
Patch #1: Initial upload
Change-Id: Icb067cc8a44d365665ef26e3955f6f79fa12415c
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
7704a4d2318cf63bccb3fc09c9e8ca9cb8eaf0c7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14663
Chul Lee [Wed, 23 Nov 2016 08:33:10 +0000 (17:33 +0900)]
Fixed bug for device status management in OTM.
[Bug]
1. Perform the OTM.
2. Remove the device using OCRemoveDevice or OCRemoveDeviceWithUuid
3. Initialize the server to unowned status.
3. Perform the OTM again w/ same server.
[Actual Result] Device UUID removed from PDM DB.
[Expected result] Device UUID should be set to initial status.
Change-Id: Ie662ca6eeedfb5a98db4d97e020b61fbf331cb0e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14643
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
531eb849bb6cd36510ecd83194268a1f304e85a9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14665
Parkhi [Tue, 22 Nov 2016 10:58:38 +0000 (19:58 +0900)]
Update Easysetup mediator android sample app
- Add validation check logic when received response of findResource.
Change-Id: Ib2e9f6bf3534f77e7d6260fca803ccf629df5b2d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14617
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Kevin Kane [Wed, 16 Nov 2016 18:46:28 +0000 (10:46 -0800)]
Add raxmpp and yaml extlibs to .gitignore
If these dependencies are cloned into the repo, git will think
they're untracked subtrees of the iotivity repo. This change
adds them to .gitignore like the rest of the dependencies in
extlibs.
Change-Id: I65074d5df9accef813d8f1ffc3be2a0e887ced91
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
7a89bb933037540bf5e32647260b9a43d2054842)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14519
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Dan Mihai [Tue, 15 Nov 2016 08:23:04 +0000 (00:23 -0800)]
[IOT-1561] Improve vs12_snprintf
Improve the snprintf surrogate used to build for Windows using Visual
Studio 2013 or older.
Also remove the dependency on cmake for building gtest for Windows, to
fix a build break for the new snprintf_test.cpp.
This is a cherry-pick of commit b2a398e from the 1.2-rel branch.
Change-Id: I70c9d0766a9a316a19cbd283671137e61ab88dbf
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14387
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14627
Trevor Bramwell [Sat, 23 Jul 2016 15:11:14 +0000 (08:11 -0700)]
Add gitreview File
This is used by the 'git-review' to specify the upstream gerrit server.
Change-Id: I5823a86f1eb0d0a8b6d2ed39fc0927347ea2ca94
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Ossama Othman [Fri, 11 Nov 2016 22:33:38 +0000 (14:33 -0800)]
[connectivity] Fix parameter type mismatches.
To match the corresponding callback function prototype
(e.g. CANetworkPacketReceivedCallback and CAErrorHandleCallback), the
data length parameter for a few callback function implementations
should have been of type size_t instead uint32_t. This addresses
several parameter type mismatch warnings on 64 bit platforms.
Change-Id: Iaa5740a9fdb9d59fa13832eb3b87335d3355bd37
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Philippe Coval [Thu, 20 Oct 2016 08:25:13 +0000 (10:25 +0200)]
tizen: Declare used licenses using SPDX convention
Change-Id: I6f016165739f57e33fd950f07f1d379b6fa3da69
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13523
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
(cherry picked from commit
9f9489062b780aa77f44c0b2d8fd4e4bb4d59d02)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13561
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Oleksandr Dmytrenko [Wed, 9 Nov 2016 15:33:44 +0000 (17:33 +0200)]
D2D Get request error fix
Removed payload type check in Get request
Change-Id: I405a7a6bba7255d8c05cc8a34342217c6e04e819
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
0528ed289e063f7ea5ec139f579032acbfc31a61)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14601
bg.chun [Thu, 17 Nov 2016 12:13:34 +0000 (21:13 +0900)]
[IOT-1361]Fix android X86_64 runtime issues
Add missing .h files on ifaddrs.h
and android caipnwmonitor.c for fix runtime issue.
Change-Id: Iec71fa0929b8682fda05a4d0d7cb89351be01d2d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14537
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Todd Malsbary [Thu, 17 Nov 2016 23:38:50 +0000 (15:38 -0800)]
Return correct entity handler result for Get and Publish requests to
RD server.
Prior to this fix, rdEntityHandler would always return OC_EH_ERROR.
Change-Id: I1099ffe19e200982562cd9de4f7c97e173a71431
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jeff Beck [Thu, 11 Aug 2016 19:42:50 +0000 (14:42 -0500)]
Add Idea to gitignore
Ignore extra IDE files for IDEA
Change-Id: I06656bc9fb15fee68559902e6b620bfb6e9ea62c
Signed-off-by: Jeff Beck <beckje01@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Kevin Kane [Wed, 9 Nov 2016 17:38:22 +0000 (09:38 -0800)]
[IOT-1529] Sync TinyCBOR to release tag before using
Current build will sync to the head of TinyCBOR's master branch.
To remove this unpredictability from the build, always sync to
a particular release tag.
Change-Id: I471ac19aedc787bca64ee01c4733ab319d6f32d3
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit
6b368cb9e7f45efccad93455aff98ad5b4e0ccb0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14425
bg.chun [Wed, 9 Nov 2016 08:49:16 +0000 (17:49 +0900)]
[IOT-1528]update file path and remove static analysis warring
update file path(ifaddrs.x -> caifaddrs.x)
and fix netlink usage for remove static analysis warring
Change-Id: I672d9ba1250710cc10c66cbbde56b6b12afc15e8
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
bg.chun [Mon, 1 Aug 2016 11:10:07 +0000 (20:10 +0900)]
[IOT-1207] Data structure for OCF Endpoint Impl
provide basic data structure, function, types for OCF Endpoint
See detail in Jira IOT-1207
Change-Id: I4bdcca71ffdab101c729406a6509b6f1103b9ca8
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Gregg Reynolds [Mon, 6 Jun 2016 06:22:01 +0000 (01:22 -0500)]
fix C++11 error with constexpr
error: constexpr function's return type 'std::vector<TypeInfo>' is not a literal type
Change-Id: I3f0e2ac5ba0330698052db962a3ca4b81b3edb39
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Robert Spielmann [Tue, 22 Mar 2016 14:39:22 +0000 (15:39 +0100)]
Fixed Typos: DEFALUT -> DEFAULT
Change-Id: If23217339d99ba5ad9e38133607de813ba27fd75
Signed-off-by: Robert Spielmann <spielmann@kellendonk.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Jake Kim [Tue, 23 Jun 2015 14:53:13 +0000 (23:53 +0900)]
Modify a typing error of help message.
A name of this file is OICMiddle, but there is a typing error
in help message. So modify from IOCMiddle to OICMiddle.
Change-Id: I29be198ca313022753531088e53d5d47c61fef36
Signed-off-by: Jake Kim <copy_x@naver.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1405
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Chul Lee [Mon, 14 Nov 2016 04:49:36 +0000 (13:49 +0900)]
Manufacturer certificate based ownership transfer support.
1. Add manufacturer certificate OxM callbacks
: resource/csdk/security/provisioning/src/oxmmanufacturercert.c
: resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h
2. Apply the manufacturer cert based OxM on the client & server.
: resource/csdk/security/provisioning/src/ownershiptransfermanager.c
: resource/csdk/security/src/doxmresource.c
3. Add manufacturer certificate supported sample server
: resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp
4. Add API to set the allowed/not-allowed OxM which is OCSetOxmAllowStatus()
: resource/csdk/security/provisioning/src/ocprovisioningmanager.c
: resource/csdk/security/provisioning/include/ocprovisioningmanager.h
5. Add OCStackResult code to handle not allowed OxM exception.
: resource/csdk/stack/include/octypes.h
: resource/src/OCException.cpp
: resource/include/StringConstants.h
: resource/unittests/OCExceptionTest.cpp
6. Update the SConscript according to above modifications.
: resource/csdk/security/provisioning/SConscript
: resource/csdk/security/provisioning/sample/SConscript
Change-Id: Ibb4b4eec33a1e39234f808e32cc3b96aff4879ad
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
7b7e5a97b1acdf4a265915bd4eaf745dd8262b03)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14503
hyuna0213.jo [Sun, 20 Nov 2016 23:51:44 +0000 (08:51 +0900)]
Fix windows build failed about incompatible types in jenkins
- resolve incompatible types error to build windows
Change-Id: I5095bb7de066eb966316812d57728361c685a811
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Benjamin Cabé [Mon, 1 Jun 2015 15:10:46 +0000 (17:10 +0200)]
Import SCons.Errors to fix error at line 35
Change-Id: I683b6602afcc26984be146d800559532df729675
Signed-off-by: Benjamin Cabé <kartben@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1158
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Dave Thaler [Sat, 12 Nov 2016 08:57:16 +0000 (17:57 +0900)]
[IOT-1513] Incorrect URI construction
The % character is not legal to be placed literally in a URI, it must be
escaped (as "%25") before being enclosed in a URI. Other places were
changed in July in change 9419, and some more in change 14009, but these
code paths were not changed at that time.
This also fixes a bug in setHost which did not mark an IPv6 address as
IPv6, and adds a test case that covers this.
Change-Id: I1331ecb9c5482a2d43dd675978a1f34c6d37cb4c
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14263
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Habib Virji [Wed, 16 Nov 2016 10:32:31 +0000 (10:32 +0000)]
Fix Device and Payload response
Bug fix due to change introduced in https://gerrit.iotivity.org/gerrit/#/c/12283/
Change-Id: Ib6b03f4296c8ef0fb1ac7ac79ff1023856a070bc
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14419
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>