ch79.cho [Tue, 11 Oct 2016 06:20:39 +0000 (15:20 +0900)]
Update C API doxygen
C API description is updated for some fields such as subControllability.
Change-Id: Ie44c213657a9ffdd55ec386e8bc953bad709432d
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
nikhil.a [Fri, 7 Oct 2016 10:45:22 +0000 (16:15 +0530)]
Update and fix of UnitTest for cpp-wrapper
1)Updated new unittest for consumer and provider
2)Fix for removing segmentation fault
Change-Id: If06e9606c405a3fa2dace726a5c9320399b06e66
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Mon, 10 Oct 2016 07:11:46 +0000 (16:11 +0900)]
[IOT-1430] bug fix for seg fault on start consumer.
With this patch, segmentation fault is resolved on the starting consumer service.
Change-Id: I929ec45d34a401ea7e6e503d6c686471656f39cf
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13007
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
nikhil.a [Wed, 12 Oct 2016 09:24:33 +0000 (14:54 +0530)]
Update Cpp Api doxygen
Change-Id: I4ed23e32956980d816c3a7e6bb0605272df2782f
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
nikhil.a [Wed, 12 Oct 2016 07:15:01 +0000 (12:45 +0530)]
Add doxygen comment for java api's of ProviderServicer and ConsumerService.
Change-Id: I149a714258db8495473064c98f270b9b01fd2497
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13131
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Mon, 10 Oct 2016 08:56:18 +0000 (17:56 +0900)]
Fix bug for invalid remove a context at request.
When receive responce of getting topic information,
consumer serivce remove context manually.
But, it is the invalid way.
With this patch, consumer service does not remove manually.
Context will be removed automatically by RI layer.
Change-Id: I1278dc13bf297b95e513d364f243064b525a7083
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Tue, 11 Oct 2016 11:29:54 +0000 (20:29 +0900)]
Modify gradle version for building notification service.
Change-Id: I93557aac43c2d1c808495dff1120cff737ccea44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 11 Oct 2016 03:44:47 +0000 (12:44 +0900)]
Bug fix about invalid parsing and modify sconscript.
this patch include,
1. Bug fix about invalid parsing in jni side
and send notification was changed to once call.
2. Modify sconscript for android 6.0 devices
Change-Id: I9ae6d68ebf24d944e896db54949f86de62fc0f6e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Glen Youngjin Kim [Fri, 7 Oct 2016 07:23:59 +0000 (16:23 +0900)]
Add invitation accept/deny method in invite resource.
Server can not know the intention of user when a user deletes received
invitations.Therefore, i add a new field "accept" in query. if "accept"
is "1"(accept=1), then it means accept, otherwise(accept=0) deny.
Change-Id: I2030099ed084c3238cc0f5cc4ff7e5f38eba5235
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12937
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Nathan Heldt-Sheller [Tue, 11 Oct 2016 20:23:01 +0000 (13:23 -0700)]
[IOT-1441] Update DevOwner access policy to remove implicit access in RFPROV.
With this patch, the DevOwner now will only be able to access SVRs during
RFOTM or RESET states, unless of course there is an ACE installed allowing
explicit access to the DevOwner.
This behavior change is required by the Security Test Matrix v7, published
by the Security WG.
Patch 2: updated with JIRA ticket #
Patch 3: fixed logic bug found by Kevin
Patch 4: corrected commitmsg
Change-Id: I267c9eb78682bc810b7b2399f6606b8379d6e718
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13117
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
yeonghun.nam [Tue, 11 Oct 2016 00:37:06 +0000 (09:37 +0900)]
Account server static analysis issue solved
1. Account server static analysis issue solved in AclResource.java
Change-Id: Ieeadf6f0d018efddcac1b69a56341ce4464bbb79
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
jihwan.seo [Tue, 11 Oct 2016 05:09:40 +0000 (14:09 +0900)]
[IOT-1436] fix scons build issue related sqlite3 with unsecured mode
sqlite3 is triggering to download by default.
it causes a storage memory waste in user side.
scons build script should check any option for download that lib
Change-Id: I701752bb450dc79d3604304fc7130375586e5356
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13071
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Kevin Kane [Sat, 1 Oct 2016 00:13:41 +0000 (17:13 -0700)]
[IOT-1380] Use BCryptGenRandom on Windows
Patch mbedTLS to use BCryptGenRandom on Windows.
Add the mbedtls subtree to .gitignore.
Change-Id: I23367aac194de2531299badc466a0d39e46eda4d
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
881029a89e9e1f5a828fc2d2df705a6d62a93189)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13123
jihwan.seo [Fri, 7 Oct 2016 10:02:06 +0000 (19:02 +0900)]
[IOT-1434] fix subscribe presence for multicast.
it causes a big memory issue to add in serverRequestList.
because this request never remove
and subscribe presence for multicast should be not sent
on network.
since it is just for register clientCB in stack.
Change-Id: I14c9701009350ad52dfdf4e72db64522fc591705
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12941
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Andrii Shtompel [Tue, 11 Oct 2016 08:53:09 +0000 (11:53 +0300)]
[IOT-1417] Fix Sign Up/In/Out Workflow
Change-Id: Icfadd8e40fcb8cbf8d962464d8bc1372b302d5c6
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13093
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Chul Lee [Tue, 11 Oct 2016 07:53:48 +0000 (16:53 +0900)]
Disable security version discovery
Change-Id: I22183fc82ef953f2fe49966406488d491de18ada
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13087
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Oleksii Beketov [Mon, 10 Oct 2016 14:15:26 +0000 (17:15 +0300)]
Unit tests for SSL adapter (ca_adapter_net_ssl.c)
Change-Id: Ia9bb81012159df0f1b5f87d80e821610aeaa44c1
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Parkhi [Fri, 7 Oct 2016 08:23:14 +0000 (17:23 +0900)]
Update easysetup's security-provisioning logic.
- This patch indicates the method to reduce security-provisioning time
by improving the secured-resource search process.
Change-Id: I7cb1a9be272dc92451cf5099afb55c15adeb27ec
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Thu, 6 Oct 2016 08:47:31 +0000 (17:47 +0900)]
Add logic for checking the null
Add logic about malloc failed.
Change-Id: I8ac6169f65b00200f9d64fa1572217e53c05435f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
f114f92cbc6c025fbd92ec99599f79974a43957d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12981
Ziran Sun [Mon, 12 Sep 2016 12:42:45 +0000 (13:42 +0100)]
Correct observe callback function in occlient.
1. For observe register request, Sequence number received
in client response falls in range 0 - MAX_SEQUENCE_NUMBER.
2. For observe deregister request and or any failed requests,
the client sequence number value is MAX_SEQUENCE_NUMBER + 1.
Change-Id: Idcc0775179e17ce6df85fb93f127336fede9a42a
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11695
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit
7ed91f143c91ce4d7522faad5f772e55a41ac0da)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12789
jihwan.seo [Thu, 6 Oct 2016 06:21:16 +0000 (15:21 +0900)]
fix android build failure issue with WITH_CLOUD=1 and secure mode
Change-Id: I1f1cca166866fda08e2d644032eca7e721bf8db8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Thu, 6 Oct 2016 07:57:09 +0000 (16:57 +0900)]
[IOT-1400] fix memory leak related presence in ocstack
Change-Id: Ib838532de9ab732fd1833d9423b2759c8aec0cf7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Fri, 7 Oct 2016 10:54:44 +0000 (19:54 +0900)]
[IOT-1434] Fix memory leak related server request List.
when there is no response data for virtual reqeust in server.
it should be removed, since it never remove and
causes a big memory leak.
Change-Id: Ic65692ae8b2c1c27f554f466d00bd0cc1674118f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12947
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Veeraj Khokale [Mon, 10 Oct 2016 08:34:54 +0000 (14:04 +0530)]
Fix for Jira [IOT-1424]
Modified unit test to pass mutable string to CHPGetOCContentType().
Change-Id: Ic0ea5704ddff20dc67086296e54775ef8d677d69
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13013
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jee Hyeok Kim [Mon, 10 Oct 2016 01:19:28 +0000 (10:19 +0900)]
Fix mq sample client crash
1. Fix mq_publisher crash (IOT-1432)
1. Fix mq_subscriber crash (IOT-1433)
Change-Id: I499f2e1ef95cfde69e29618c8580271009b0a61e
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12989
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Sandeep Sharma [Fri, 7 Oct 2016 12:52:55 +0000 (18:22 +0530)]
Fixed [IOT-1414]
Propagate INVALID_CALLBACK instead of INVALID_PARAM when Listener is null
Change-Id: Id41c9be5dc33e9220c4809351b8269738eb95f56
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12949
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jaesick.shin [Wed, 5 Oct 2016 08:39:16 +0000 (17:39 +0900)]
Add logic for sending responses according to the interface of requests.
This patch include,
Generate response for each of interface
and Add handling about exception cases.
Second patch include,
1. change NS_DEFAULT_INTERFACE to NS_INTERFACE_BASELINE
2. Add first patch logic into Topic case.
Change-Id: I7aa5868fc9a4b4537964c8bdf92b1f15d058d892
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
c7a5965ec9778c92fa3a36431155d0697424e76f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12983
jaesick.shin [Mon, 10 Oct 2016 00:45:40 +0000 (09:45 +0900)]
add logic for invalid char
this patch include,
add logic for invalid char in notificationprovider example only.
sometimes, input variable has an incorrect value.
Change-Id: Id8fa6152a7a7f15ef5d54425daf896680d6c9447
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jongmin Choi [Fri, 7 Oct 2016 10:12:22 +0000 (19:12 +0900)]
[IOT-1396] Changed values of OicSecDpom_t to align with oic.sec.pomtype from Security Spec v1.1.12
The bitmask values for the pstat.om and pstat.sm properties were incorrectly
defined. A few other files (including provisioning tool files) appeared to use
the values incorrectly, and are also fixed as part of this patch.
Patch #2: .json and .dat files changed accordingly
Patch #3: unittest svd db changed accordingly
Change-Id: Ie1d4b13a271eafea38b41313bba6e087b69a2f62
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Wed, 28 Sep 2016 14:41:51 +0000 (16:41 +0200)]
tizen: Disable Bluetooth transport for Tizen:2.3
Tizen:2.3:Wearable (Samsung GearS) builds at least.
Because it's not building using outdated capi BT packages.
Change-Id: Id1b37df55bbdebd7ada1413935f5306ccd1e0002
Bug: https://jira.iotivity.org/browse/IOT-1320
Origin: https://gerrit.iotivity.org/gerrit/#/c/12475/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Wed, 5 Oct 2016 11:00:18 +0000 (20:00 +0900)]
[IOT-1388] fixed duplicate start server in EDR adapter.
when both mode(server and client) in App is set.
startDiscoveryServer and startListenningServer is calling.
and then both accept thread
and receive thread is running redundantly
Change-Id: I70395ace6115d52d28d2c034ea24c70aafeb671e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12799
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>
Jihun Ha [Fri, 7 Oct 2016 15:57:54 +0000 (00:57 +0900)]
Add DeviceID Parameter on SingleDeviceDiscovery function
this Parameter for discover a specified deviceID
If specify the deviceID, It can discover a specified device
when there is one or more device on the network
Change-Id: I99bff0620ee339a42e22e434099772e4175d73d9
Signed-off-by: Sijae Kim <sijae.kim@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Ashwini Kumar [Fri, 7 Oct 2016 13:15:52 +0000 (18:45 +0530)]
[IOT-1405, IOT-1418] Bug fixes
Memory leak issue in Secure resources
scan newline '\n' at end of line
Change-Id: I8e7675fef88670ea6f4fc7c38a1b484cc6e28b50
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Jongmin Choi [Wed, 5 Oct 2016 11:33:05 +0000 (20:33 +0900)]
[IOT-1395] Fix for rowneruuid update
[IOT-1395] Fix for rowneruuid update for CTT testing
Patch #1-2: rowneruuid update enabled
Patch #4: Logic modified
Change-Id: I2d6a53c1868e59ea112def5c45ed869b2b6d86da
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
KIM JungYong [Wed, 5 Oct 2016 11:55:36 +0000 (20:55 +0900)]
Fix bug for invalid access variable.
when access consumer main thread but initialized, service will crash.
So this patch prevent invalid access to not initialized thread handle.
Change-Id: I77d86a712e0efe6bbec17780426df4a5ba98decc
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
7c6e61367021005ed0fdc401513629eb6fb48d07)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12899
KIM JungYong [Tue, 4 Oct 2016 05:06:36 +0000 (14:06 +0900)]
Fix bug for multiple extras of message.
When the receive multiple extras in the message from notification provider,
consuemr service misparse as parsing just one extras for incorrect operation of pointers.
In this patch, incorrect operation of pointers is fixed.
Change-Id: Ifacaf247ca836d81031ffe93b0b72d2b46db65f3
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12745
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
cb699f9e7b6fede0c32c254aa5572e349854ea30)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12901
KIM JungYong [Wed, 5 Oct 2016 12:06:52 +0000 (21:06 +0900)]
Update build scons for notificaiton android sample.
When building notification service on android,
was built just aar file but sample apk.
In this patch building android will be built aar file and sample apk.
Conflicts:
service/notification/examples/android/NotiConsumerExample/app/build.gradle
Change-Id: I32b9e06600e9063bc8115cd7302c73c938d14e8f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jongmin Choi [Wed, 5 Oct 2016 11:47:38 +0000 (20:47 +0900)]
Cloud ACL Modifications
Modifications to Cloud ACL
Patch #1: ACE Id changed to UUID format
Patch #2: Changes modified DeleteACE & UpdateACE changes added
Patch #3: Oid check included in verifyAcl
Patch #4-5: OCCloudAclIndividualDeleteAce() added
Patch #6: Minor bug fixes
Patch #7: OCCloudAclIndividualUpdate() added
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Change-Id: I6b3b4c68f06c43ce002df36a741ea4eb8549ba44
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12739
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Andrii Shtompel [Thu, 6 Oct 2016 11:16:51 +0000 (14:16 +0300)]
Add ECDSA to cipher suite selection menu
Change-Id: I74efcab80da86123540e5355378ab3b1bb343718
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Dmitriy Zhuravlev [Mon, 3 Oct 2016 13:22:11 +0000 (16:22 +0300)]
Common adapter for DTLS/TLS
Format of a certificate changed, so previous X.509 parser
is not able to parse new certificates provided by Cloud:
1) For DTLS and TLS used mbedTLS
2) CKManager removed
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
X-Origin-Change-Id: I6b47f7b3439b923ec12f26b0e159e3b7a1144658
Change-Id: I1764aadaf5131cdd99e75382ef54e1214483469e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Ashwini Kumar [Fri, 7 Oct 2016 06:36:34 +0000 (12:06 +0530)]
Modified CloudClient (CPP)
to use DEFAULT_PORT 5683
Change-Id: I32c5d5c7e373250ac2af3354c5a345a02d4cdbea
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Andrii Shtompel [Wed, 5 Oct 2016 15:03:21 +0000 (18:03 +0300)]
RC3 svace fix (cloudClient + crlresource.c)
Change-Id: Ic6093286d89daf6de10ed617c445fbc53d8a3bd1
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Oleksii Beketov [Thu, 6 Oct 2016 12:33:07 +0000 (15:33 +0300)]
parseChain() fix
parseChain() from ca_adapter_net_tls.c that parse chain of X509 certificates
in DER or PEM format bug fixed. Line endings for PEM certificates corrected.
Change-Id: Ieed09114fea10eb5adb6ff88d59ca58074ea19bb
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12045
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Sunil Kumar K R [Fri, 7 Oct 2016 05:09:48 +0000 (10:39 +0530)]
Added implementation for getDeviceId and setDeviceId
code formatted
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Change-Id: Ic0d640638bd0c1a258db6c21bbecbd73e2c6dd3f
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12929
Chul Lee [Wed, 5 Oct 2016 11:50:32 +0000 (20:50 +0900)]
Update the OTM module to guarantee uniqueness of OwnerPSK on the PT side.
Change-Id: I22c9e7c2e81b49bb14c90d5c89744ee478ab108d
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12813
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
eunok.shin [Thu, 6 Oct 2016 06:04:50 +0000 (15:04 +0900)]
set device presence to default 'off'
Change-Id: Ic076be38a576acafccfce5d1c68f7a1ee77f2030
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12859
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Andrii Shtompel [Thu, 29 Sep 2016 15:36:21 +0000 (18:36 +0300)]
[IOT-1352] SampleApp(CloudClient) goes into infinite loop while testing some features
Change-Id: Ib173abc1968051e2a8ef3dc70e1bbff14bc4d732
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Randeep Singh [Thu, 6 Oct 2016 15:12:19 +0000 (20:42 +0530)]
[IOT-1366] coaps request for secure resource
handled pending review comments
Change-Id: Iacde7395b7a5da53caff7f175beb3d3e17dd9894
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Habib Virji [Thu, 6 Oct 2016 10:41:18 +0000 (11:41 +0100)]
Fix compilation issue in the security stack
- Some variable were left unused.
- ifdef was
- size_t being print with %d
Change-Id: I22524cd67a9cc4e1b8cd7844c2d81903b8084985
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12885
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Habib Virji [Thu, 6 Oct 2016 13:33:25 +0000 (14:33 +0100)]
Fix RD_SERVER flag
Small fix for the build with RD_SERVER flag.
Change-Id: I96eb60e05202635f595c3d1edc82aa634908c95b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
ch79.cho [Thu, 6 Oct 2016 06:21:14 +0000 (15:21 +0900)]
Change the property of topic resource
The resource property of topic is changed from DISCOVERABLE to NONE.
Change-Id: I670dbd26725171b7639061062bdb412e0ace7a81
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Tue, 27 Sep 2016 13:55:29 +0000 (15:55 +0200)]
tizen: Disable Bluetooth for Tizen:IVI (capi outdated)
Make sure capi-network-bluetooth-devel
is shipping bluetooth_internal.h.
For instance, 0.1.39 does not have it, while 0.1.52 have it.
In that case it will fail to build and report a message like:
resource/csdk/connectivity/src/bt_edr_adapter/tizen/\
caedrclient.c:30:32: \
fatal error: bluetooth_internal.h: No such file or directory
This need to be checked for other Tizen profiles:
Tizen:2.3.1:Wearable, Tizen:2.4:Mobile have it.
Bug: https://jira.iotivity.org/browse/IOT-1343
Change-Id: I028f3c4fd8c9526b5d06a55b0f2a5f5c6c113d3d
Origin: https://gerrit.iotivity.org/gerrit/#/c/12355/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Randeep Singh [Fri, 30 Sep 2016 06:31:21 +0000 (12:01 +0530)]
[IOT-1366] coaps request for secure resource
with this patch, all the request coming over insecure channel for secured resource will be rejected
Change-Id: I5b24c4095d99f6b6f6080b1f46f1fd4d9f0d8e20
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Philippe Coval [Tue, 22 Mar 2016 02:41:52 +0000 (19:41 -0700)]
tizen: Enable Bluetooth along IP
Revert "Change build option - IP only"
This reverts commit
28d898d2dab5a4463ba5f7ea380258a4f4362578.
Change-Id: Ia3223a2ab09ba219bf8048aa28014744e19ed4b0
Author: Yungjae Shin <yj99.shin@samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/63051/
Bug: https://jira.iotivity.org/browse/IOT-1343
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12353
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Andrii Shtompel [Thu, 29 Sep 2016 13:41:20 +0000 (16:41 +0300)]
[IOT-1347] OCCloudAclIdCreate or OCCloudAclIdGetByDevice API doesn't provide the ACL ID Directly
Print aclId, gid, gp in external callbacks (application level, provisioning/sample module)
Print acl, crl, group id list, invite response too.
Change-Id: Ifb9f4ee996030894a31b4317c98a8159e345218b
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12563
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Habib Virji [Wed, 7 Sep 2016 15:49:21 +0000 (16:49 +0100)]
RD updates
- [Server] Includes a new functionality to store RD details in the database.
- [Server] Use SQLite to store details Published details in the database.
- [UnitTest] Added rdtest to be built as a unittest
- [Service] Moved Client code from resource/csdk/stack/src to
resource/csdk.
- [Build] Updated auto_build to use RD_MODE flag instead of WITH_RD flag.
- [Cleaning] Removed all RD types in the octypes.h
- [PayloadHandling] rdpayload handling is removed from ocpayload.
- [PayloadHandling] All payload is created in services/resource-directory.
- [PayloadHandling] Uses OCRepPayload to create RD Payload.
Change-Id: I0a32c01ca6b5db1ad36141667e1ee94e545be290
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11519
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12333
Jihun Ha [Fri, 30 Sep 2016 08:57:21 +0000 (17:57 +0900)]
Add more provisioning status and error code in provisioning resource
To describe more specific provisioning status and error in easy setup,
some status and error codes are added.
Change-Id: Ibd37d207b55d6d6274380d2fd9aff0771c7c9911
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sunil Kumar K R [Fri, 23 Sep 2016 10:15:24 +0000 (15:45 +0530)]
added cloud provisioning android application
Change-Id: I4f544c2b665543c4a8f3bec422598f5e7cb8e958
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
2a2c834829502b08668269b353338ea4a92c47d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12811
jihwanseo [Tue, 4 Oct 2016 10:09:23 +0000 (15:39 +0530)]
[IOT-1392] Fix Android build for SECURE=0 and WITH_TCP=1
Change-Id: Ia4423b2ad9b2f0d38f95050aea5380d4bde70fae
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12761
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Sunil Kumar K R [Mon, 3 Oct 2016 07:02:40 +0000 (12:32 +0530)]
Enable AclVerifyResource line added
Change-Id: Idbc16ae7893ce57eb4f5b0e7473693dab2a05288
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12717
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Chul Lee [Wed, 28 Sep 2016 02:32:00 +0000 (11:32 +0900)]
Fix the incorrect credential access in SRPProvisionTrustCertChain.
SRPProvisionTrustCertChain deletes credential list.
But this credential list is read from global credential list through GetCredResourceDataByCredId API.
So credential list should not be deleted in SRPProvisionTrustCertChain.
Change-Id: I8c143d320ead4aea99daaa7d6882c11cfddf26e2
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Sat, 27 Aug 2016 14:53:16 +0000 (16:53 +0200)]
doc: Fix some typos in scons_script_how_to.txt
Maybe this file worth to be migrated to iotivity wiki in a scons page
Change-Id: I288da1273621a48add047993506ed40c107363ab
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit
da851aa0583bb1fcccfa634de8b61ee815fbdbd8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12109
Nathan Heldt-Sheller [Thu, 29 Sep 2016 22:10:20 +0000 (15:10 -0700)]
Change DevOwner access policy to address JIRA 1369
This changes the Policy Engine to grant requests from DevOwner
without checking ACLs ONLY if the device is not in Ready for Normal
Operation state, AND the request is for a SVR.
Change-Id: I9aa4314cc2beb9fdb4629c1e63ea6971f7cc8909
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
7e0ed7dff05620d4cbcc335724a62bc0adbd4eaf)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12757
eunok.shin [Tue, 4 Oct 2016 08:35:49 +0000 (17:35 +0900)]
fix TC fail issue
Change-Id: Ib378acbee3db935aeb308742899039ee798662b8
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12751
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Andrii Shtompel [Tue, 13 Sep 2016 16:22:40 +0000 (01:22 +0900)]
Cloud Client manual
Change-Id: I82f42e4fcdce91011eb4d6f0d329cfdd29a9789c
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11745
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12755
Jung Seungho [Tue, 4 Oct 2016 05:00:04 +0000 (14:00 +0900)]
fixed testcase in ResourceFindTest
Change-Id: Id13aa6fe61d6d8c422ebffff34d1bee1f484ad12
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
KIM JungYong [Fri, 30 Sep 2016 07:49:20 +0000 (16:49 +0900)]
Fix build fail of notification android.
Android building execute on notification SConscript.
And bug for build fail is fixed.
Change-Id: I6fad802576f34c32f5b2a36e3af23e2a89af2d65
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12631
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Rajendra S [Fri, 30 Sep 2016 11:06:36 +0000 (16:36 +0530)]
Unit Tests added for CoAP-HTTP Proxy module
Change-Id: I8554cd9010bbd27ef29f1615a53f62cda4e41d30
Signed-off-by: Rajendra <raje_ndra.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12637
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Dave Thaler [Fri, 30 Sep 2016 23:12:55 +0000 (16:12 -0700)]
IOT-1381 Make iotivity compile in a way usable by windows store apps
Replace GetTickCount with GetTickCount64
Replace CryptGenRandom with BCryptGenRandom
Change-Id: I867f1325d576e52c10466abd7620802351b743c5
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12701
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12727
George Nash [Fri, 30 Sep 2016 20:00:14 +0000 (13:00 -0700)]
[IOT-1330] Fixed build error caused by calling tinydtls build script twice
When building android build with SECURED=1 there is no need to call the tinydtls
build script it is build as part of the csdk.
See: resource/csdk/connectivity/src/SConscript line 60
Change-Id: Idf140944f81ca33369a42f2986e526b38882a3f5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12673
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Herman Lu <herman.ghlu@gmail.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Philippe Coval [Wed, 28 Sep 2016 08:25:40 +0000 (10:25 +0200)]
tizen: Can support linux as fallback TARGET_OS
It can be helpful for platform developers
to bypass tizen APIs on Tizen devices.
Might be useful for other RPM based distro,
like Fedora for ARTIK, or (obsolete) Tizen profiles
(with outdated Tizen packages).
Reformat options list to make nicer patches
when configuration is changed (single word == single line).
Bug: https://jira.iotivity.org/browse/IOT-1320
Change-Id: Id1b37df55bbdebd7ada1413935f5306ccd1e0001
Origin: https://gerrit.iotivity.org/gerrit/#/c/12473/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Daniel Ferguson [Thu, 29 Sep 2016 18:33:04 +0000 (11:33 -0700)]
IOT-1378 Fix windows\CAIPNWMonitor.c
* Allow IPv4 and IPv6 to coexist. Previously, these two
modes were mutually exclusive.
Change-Id: I5c04289590b0edd58dc854722c0288a99b4c70c9
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Habib Virji [Tue, 30 Aug 2016 12:47:15 +0000 (13:47 +0100)]
MAX_URI_LENGTH was being redefined at multiple places
MAX_URI_LENGTH was redefined at multiple places. It is defined in
ocstackconfig.h and should not be redefined at other places. Please
note this was only done in the sample code.
https://jira.iotivity.org/browse/IOT-1218
Change-Id: I334f028779f202a4371a1409d4e3ce69cd40d121
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12291
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Oleksandr Dmytrenko [Fri, 30 Sep 2016 08:34:01 +0000 (11:34 +0300)]
cloud server crl
Change-Id: Ic920258819ae8ebcc14592279c07b2069a6525ff
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12635
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Wed, 28 Sep 2016 12:07:16 +0000 (14:07 +0200)]
linux: Support also armeabi-v7a TARGET_ARCH
This EABI is used in Tizen, this way iotivity
can be rebuild on Tizen using "linux" profile (TARGET_OS).
For instance unsupported older tizen profiles can be rebuilt using gbs
(ie Tizen:2.3:Wearable).
Change-Id: Ia84cb173add8efbb10cb2a9632a7637cf6202114
Origin: https://gerrit.iotivity.org/gerrit/#/c/12417/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
cc [Fri, 30 Sep 2016 08:17:11 +0000 (17:17 +0900)]
Add android sample app
Consumer and provider sample app are added.
Change-Id: I2a52dcff98b0b5b627d9f48a4fee85fddf1fc0a7
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12629
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Andrii Shtompel [Wed, 14 Sep 2016 14:33:37 +0000 (23:33 +0900)]
Split cloudClient to Client & Server part
1) Server part creates LED resource
2) Only Client part supports d2d requests
[Patch #2] Fix minor logic error during last cherry-pick
Change-Id: I335f7556a1ef247526886175ebcf400cd9e19b99
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Oleksandr Dmytrenko [Sat, 24 Sep 2016 15:56:50 +0000 (18:56 +0300)]
svace fix
Change-Id: Ibcc7b545bfefb6861bdfecf954ca24b158229150
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12179
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Jongmin Choi [Thu, 29 Sep 2016 07:39:00 +0000 (16:39 +0900)]
Prevent duplication of aclid with same di
Prevents duplication of aclid linked to the same di
Patch #1: Initial upload
Change-Id: I586f494877aa57ad3fa51c3acbcb53442da5c363
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Andrii Androsov [Wed, 28 Sep 2016 11:51:07 +0000 (14:51 +0300)]
Fix Unit tests.
1) Add cleaning up for CERTIFICATE_TABLE and CRL_TABLE in Mongo.
2) Fix random test execution with help of @BeforeClass annotation in CrlResourceTest.
3) Fix SVACE issues.
4) Add new java documentation for public and private methods.
Change-Id: I43b7c2dc814d67d3a53b598f4eddf3c1acc2a94d
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12177
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
cc [Fri, 30 Sep 2016 05:37:08 +0000 (14:37 +0900)]
Merge notification service from master branch
Change-Id: I60d53c447c706b70acd4e19f0b5fb3c3bdcf137a
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Fri, 1 Jul 2016 20:36:36 +0000 (22:36 +0200)]
ocpayload: Adding OCByteString support in representation
Add Bytestring handling in OCRepPayloadClone()
along arrays/vectors of them.
Also added in native java (JNI) part for android
inspired by existing code, note for later,
original code might be double checked for potential MLK
regarding local references to allocated objects within loops.
Maybe those unref are not mandatory
as they "are freed automatically after the native method returns."
http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html
Improved tests, it is assumed that contents of OCByteString
are not duplicated when not wanted,
plus style cleanup on surrounding code.
Note of my understanding of this design mixing C++ and C paradigms :
- As OCByteString is a C structure there is no destructor
- If assigned (no deep copy) into Payload class
bytes will be freed by Payload's destructor as it "owns" it.
- If contents are deep copied anywhere else
then bytes should be also freed manually
(in other classes' destructor ? like Payload).
Bug: https://jira.iotivity.org/browse/IOT-983
Change-Id: Icfa0657df9b332b4d11b737731636c8fb2a80001
Credits-to: youngman <yman.jung@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/8931/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
(cherry picked from commit
f2059ea75cb7f8966f59132fb05962b2f52e352b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12611
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Thu, 29 Sep 2016 11:43:29 +0000 (20:43 +0900)]
Fix for request to secure resource server.
When send to discovered secure resource server,
client should change port to secure channel port.
But, it is not apply at notification consumer service.
In this patch, when discover secure notification resource
consumer service will send request with changed port for secure.
Change-Id: Ib8101753be76996fa4978d7714e8cf474278f771
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12561
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
2cb04ce3be4473203e253258b526ca903cdcfba2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12619
Jung Seungho [Thu, 29 Sep 2016 22:59:59 +0000 (07:59 +0900)]
add sample for sharing light resource using group.
- Two users share light resource in public group
- Owner adds resource and send invitation to member
- Member can find light resource and send message
Change-Id: If84fd19dc1c0771488a647a7a8db9b3c1219cb6b
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Chul Lee [Tue, 27 Sep 2016 05:13:53 +0000 (14:13 +0900)]
Update the CADtlsClose API to remove the DTLS peer when closing temporary DTLS session.
Change-Id: I3cd6e081ade3017ec417ee0b6de772278aefcf67
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Larry Sachs [Thu, 29 Sep 2016 17:46:19 +0000 (10:46 -0700)]
Throw OcException for invalid (null) parameters in Java Layer of android_api
[IOT-1323] -- [RI][Android] observe(with QualityOfService) API does not throw OcException while passing parameter-observeType as Null value
Change-Id: If0d7acb0f5bbfda75e2fd774b6cccc8ce21e5650
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12571
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: Rick Bell <richard.s.bell@intel.com>
Parkhi [Fri, 30 Sep 2016 02:41:03 +0000 (11:41 +0900)]
Merge all changes of easy setup in master branch to 1.2-rel branch
https://gerrit.iotivity.org/gerrit/#/c/11947/
https://gerrit.iotivity.org/gerrit/#/c/12003/
https://gerrit.iotivity.org/gerrit/#/c/12155/
https://gerrit.iotivity.org/gerrit/#/c/11991/
Change-Id: Id3ac0160c5edd6c7abecb9714425601747d1a384
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Randeep Singh [Thu, 29 Sep 2016 08:36:44 +0000 (14:06 +0530)]
Andorid(JNI) Implementation for Cloud Provisioning.
Patch #1: Add JNI interface for getAclByDeviceID API.
Patch #2: Fixes.
Change-Id: I0e8b09f9f1be66d202834e56f3d535604f6a766b
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/11507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
(cherry picked from commit
05969521d6bab5c3c5e148b418872d21ac4d8282)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12557
jaesick.shin [Thu, 22 Sep 2016 05:10:06 +0000 (14:10 +0900)]
Fix bug about NSProvider Config
the changes about wrong parameter input.
Change-Id: I25e4f864d5e5713c3fdd04aea56271ba14362f23
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12123
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
a841588e54cfad3c6e2277a0fe26c75cda99f587)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12445
jaesick.shin [Wed, 21 Sep 2016 05:55:53 +0000 (14:55 +0900)]
Fixed bug for conditional in API.
Fixed bug for invalid compare.
Change-Id: I3396a4884a8691edf08364ea7e65dfbcd9514c6e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12013
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
34b9e19eb45da293e63fbbc82dd22649b1ef3e82)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12443
jaesick.shin [Wed, 21 Sep 2016 06:38:21 +0000 (15:38 +0900)]
Add unittest for negative case.
Add unittest for negative case in provider side.
and remove printf, cout.
Change-Id: I6fd7119e4cade3da6d87e85f0c8e1957f3bf0ce4
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
669d87d7ec40cc96d4aaceaf279d104f007a2df7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12441
jaesick.shin [Mon, 19 Sep 2016 08:15:44 +0000 (17:15 +0900)]
Modify logic for subscribe callback and bug fixed.
this patch included,
1. modify logic for subscribe callback.
call the user subscriberquestcallback function always.
2. bug fixed for NSProviderUnsetConsumerTopic.
Change-Id: Iad177bdf56cc7932ba1b95c157496d47ab6f9132
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11923
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
e6cfc565ae20673e2cc71ca4c4ee05473b49ee77)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12439
jaesick.shin [Tue, 20 Sep 2016 09:02:04 +0000 (18:02 +0900)]
Add logic for extra Information.
This patch include,
1. Add extraInfo field in NSMessage.
2. Modify logic for related sendMessage.
second patch include,
modify setting Message payload.
third and fourth patch include,
add defence code for double free.
Change-Id: I2dcfaa9cf9bc0e42b1c0aaff83de99819433f01e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
4ef1e3f85db4980d9e4d316c98bef3f2ac67c8e3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12449
KIM JungYong [Thu, 29 Sep 2016 05:33:09 +0000 (14:33 +0900)]
Modify generating notification consumer id.
generating consumer id is replaced with device id generated by base layer.
Change-Id: I4e8157b938c0e9ea524c838d7d355443f9bb0c41
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
cbf966cc737b79530cac8cf8920412ec3d36bde9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12555
Parkhi [Tue, 27 Sep 2016 10:39:03 +0000 (19:39 +0900)]
Fix warning codes in Easysetup
Change-Id: I98657cf28e67db3956540a7a27eb4a7fc28d79ac
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12309
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
6b311610a9aec78c4da0f5520ed928244719e3ff)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12533
Dave Thaler [Mon, 19 Sep 2016 03:04:48 +0000 (20:04 -0700)]
IOT-1302 Thread-unsafe code in oicgroup.c
Remove potential thread safety bugs in oicgroup.c
Make RD mutex implementation work on Windows
Change-Id: Ie47b24619a10ab3d9cab2d421f3a7d8be7ac7b55
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12243
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Parkhi [Mon, 26 Sep 2016 04:51:48 +0000 (13:51 +0900)]
Fix Jira issues (IOT-1338)
Change-Id: Id3949851748bbcf8a528b7e86a4b07a91fbcedab
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
be4331e60220473004fc01f548cadb99c5307c5f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12531
Parkhi [Mon, 26 Sep 2016 02:54:47 +0000 (11:54 +0900)]
Fix Jira issues(IOT-1268)
Change-Id: Ifaf1708cbcf2f0b3f66ecc10b8d2ee389ddb723e
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
0f74090bec9ff412e78b0529eca922792bf316c9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12529
Parkhi [Thu, 22 Sep 2016 10:21:27 +0000 (19:21 +0900)]
Updated ESResult which supports more detail on Android layer.
- The patch is associated with "https://gerrit.iotivity.org/gerrit/#/c/11947/"
Change-Id: I9e20fbccef12678c6f70a27e167ac2d7fdff9b00
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
e686b0a24f0f4586646c7054b0ddb8a4fcb9fe09)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12527
Parkhi [Tue, 20 Sep 2016 02:18:56 +0000 (11:18 +0900)]
Updated all of request using High QOS.
Change-Id: Icdb0805a29f6385900b22703cda2eb824330f0d6
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11963
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
f9496a14fe81547972b01a897e85cfbedc805401)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12523