iotivity.git
2 years agoRevert cloud sign-up response behavior 25/20225/2
Jee Hyeok Kim [Mon, 22 May 2017 08:22:57 +0000 (17:22 +0900)]
Revert cloud sign-up response behavior

1. Revert cloud behavior not to disconnect client
   after cloud sends sign-up response to client.

Change-Id: I367dfe4ebe16567ada67ae2f7aac8b8a4c0f5db2
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20225
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoMake loading of oauth libraries available without changing iotivity codebase. 09/20009/5
Ondrej Tomcik [Wed, 17 May 2017 22:15:45 +0000 (00:15 +0200)]
Make loading of oauth libraries available without changing iotivity codebase.

Change-Id: I4ac25b7f605e355fc3aad286baa206d67584be69
Signed-off-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
Issue: IOT-2316
Reviewed-on: https://gerrit.iotivity.org/gerrit/20009
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
2 years agoUpdate cloud project README files 09/20209/2
Jee Hyeok Kim [Mon, 22 May 2017 00:11:18 +0000 (09:11 +0900)]
Update cloud project README files

Change-Id: I10a04fcc499fa8de7fccfd6333d74f6688bb691b
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20209
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
2 years ago[IOT-2295] Some libraries in "services" don't have the soname set. 05/20105/2
Herve Jourdain [Thu, 18 May 2017 08:06:57 +0000 (16:06 +0800)]
[IOT-2295] Some libraries in "services" don't have the soname set.

In the android case, this results in some jni libraries not being able
to load the shared libraries they depend upon, which results in errors.
The solution is to add the soname for the libraries that don't have it.

Change-Id: I52e3e3e182b1aeb9257862c7253d11023a634ac3
Signed-off-by: Herve Jourdain <herve.jourdain@beechwoods.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20105
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoIoT-1842: Fix OCRepresentation issues on VS2013. 53/19553/4
Soemin Tjong [Wed, 3 May 2017 00:51:02 +0000 (17:51 -0700)]
IoT-1842: Fix OCRepresentation issues on VS2013.

https://jira.iotivity.org/browse/IOT-1842

Removed the not working shallow copy of the OCRepresentation object.
No problem is observed.

Deep copy should also fix the problem if any issue is found in the
future.

Change-Id: Ifc4aba57a591d0cb6a55e65e1a179e2c8a9ebc08
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19553
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2271] [IOT-2308] fix hard-coded ACL for discovery and onboarding 71/19971/12
Nathan Heldt-Sheller [Wed, 17 May 2017 02:34:21 +0000 (19:34 -0700)]
[IOT-2271] [IOT-2308] fix hard-coded ACL for discovery and onboarding

The GetDefaultACL() function needed to be updated to /acl2 format.
Fixed the printACL() function to support ace2 as well.
Fixed aclresourcetest.cpp unit tests.
Updated related .json and .dat files.

Change-Id: Id1a14067e3c9d743cab489c733486fcea1e91d52
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19971
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoFix defects detected by static code analyzer 87/20087/7
Jaewook Jung [Fri, 19 May 2017 02:02:29 +0000 (11:02 +0900)]
Fix defects detected by static code analyzer

 - fixed memory leak
 - removed unreachable codes
 - add a null checking before refer a character pointer

Change-Id: Ie49c44f0d2e5211dec24a607382c202900b4f6a3
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20087
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2334][IOT-2335] Fixed presence sample app crash issue 11/20211/3
hyuna0213.jo [Mon, 22 May 2017 04:50:11 +0000 (13:50 +0900)]
[IOT-2334][IOT-2335] Fixed presence sample app crash issue

we should call CADestroyToken() to free memory after merging
https://gerrit.iotivity.org/gerrit/19263

Bug: https://jira.iotivity.org/browse/IOT-2334
Bug: https://jira.iotivity.org/browse/IOT-2335
Change-Id: I10fb78d1f6f63a31678b07d917da547e054161b0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20211
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFix build warning on Notification service. 15/20215/2
KIM JungYong [Mon, 22 May 2017 06:23:26 +0000 (15:23 +0900)]
Fix build warning on Notification service.

1. unused parameters is resolved.
2. implicit using of functions is fixed as including owned header.
3. print format is fixed.

Change-Id: I240ac626f6ed9f1aa02db7980ba657ae666653e9
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20215
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years agonotification: Build when cloud is not enabled 35/19835/6
Philippe Coval [Fri, 12 May 2017 18:50:10 +0000 (20:50 +0200)]
notification: Build when cloud is not enabled

Problem was observed while building with:

scons VERBOSE=1 RELEASE=true SECURED=0 WITH_MQ=PUB,SUB,BROKER

  service/notification/examples/linux/notificationconsumer.c:268:23: \
  error: 'CLOUD_ADDRESS' undeclared (first use in this function)
  service/notification/examples/linux/notificationconsumer.c:268:23: \
  note: each undeclared identifier is reported only once for each function it appears in

Bug: https://jira.iotivity.org/browse/IOT-2244
Change-Id: I12f9a457ac7f838b90567794cbb030bdf80c3dc9
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19835
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2281] /oic/sec/amacl responding to GET but not to POST 85/20185/3
Nathan Heldt-Sheller [Sat, 20 May 2017 18:36:29 +0000 (11:36 -0700)]
[IOT-2281] /oic/sec/amacl responding to GET but not to POST

Until AMS and /amacl functionality is implemented, the /amacl Resource
should not be instantiated as it misleads Clients (including CTT) into
expecting full Specification behavior.

Change-Id: Id542b7a5974cb96ae84e7165326e4d2e8170d5dd
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20185
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoFix two "implicit function declarations 43/19943/2
Mats Wichmann [Fri, 7 Apr 2017 16:42:20 +0000 (10:42 -0600)]
Fix two "implicit function declarations

service/easy-setup/enrollee/src/easysetup.c:182:9: warning: implicit declaration of function 'RegisterConnectRequestEventCallBack' [-Wimplicit-function-declaration]
service/notification/examples/linux/notificationprovider.c:99:14: warning: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration]

Change-Id: I0e449b2834da90422f44e116c6ee91f241d6ec9e
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18613
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f33bfc11627ee1adc9bcde85fea4e5f1df0ca197)
Reviewed-on: https://gerrit.iotivity.org/gerrit/19943

2 years agoWindows: single-threaded unit test run 61/20061/5
Dan Mihai [Thu, 18 May 2017 17:29:06 +0000 (10:29 -0700)]
Windows: single-threaded unit test run

Serialize the tests, because otherwise investigation of failures is
too difficult. For an example of puzzling failure, see:
https://build.iotivity.org/ci/job/iotivity-verify-windows-x86-vs2015/1495/

Change-Id: I90b836b4c4c6587de108de32d761f99fb3073819
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20061
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years ago[IOT-2280] update /doxm.rowneruuid in POST handler 83/20083/2
Nathan Heldt-Sheller [Fri, 19 May 2017 00:53:36 +0000 (17:53 -0700)]
[IOT-2280] update /doxm.rowneruuid in POST handler

This workaround fixes issue reported in 2280, but the root cause of
2280 is that the /doxm POST handler still does all sorts of strange
things per IOT-2107.  IOT-2107 will certainly result in another failed
TC shortly.  I am changing IOT-2107 to P1 and to Fix In 1.3.0.  This
patch doesn't hurt in the meantime to resolve 2280.

Change-Id: I2204cddabe943941f46136b60d0922a77f208665
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20083
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2293] [IOT-2192] reject POST to /acl2 Resource with ACL1 payload 89/20189/2
Nathan Heldt-Sheller [Sat, 20 May 2017 20:42:52 +0000 (13:42 -0700)]
[IOT-2293] [IOT-2192] reject POST to /acl2 Resource with ACL1 payload

/acl2 POST handler now calls a version-check-only optional CBORPayloadToAcl()
function and, if an acl1 payload is found, denies the POST request.

This update caught some unit test issues that were also corrected with
this patch.

Change-Id: I20d148ef037c82f5862fd9fec156bbb399ab7417
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20189
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoIgnore introspection 99/20199/2
Dmitriy Zhuravlev [Sun, 21 May 2017 14:55:35 +0000 (17:55 +0300)]
Ignore introspection

Skip /introspection resource in secure stack sample

Change-Id: I36dd6718ba57d0712b22a147e3a7d2c638fe1c92
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20199
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years ago[IOT-2105] Removing undocumented property oxmtypes from doxm 03/19703/8
saurabh.s9 [Mon, 8 May 2017 08:34:55 +0000 (14:04 +0530)]
[IOT-2105] Removing undocumented property oxmtypes from doxm

[patch 2] Retrigger jenkins

Change-Id: I2fc90f3814471ad6c0961b3d6266dc1a04fe1fc3
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19703
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2315] gAcl fix 27/20127/5
Oleksandr Dmytrenko [Fri, 19 May 2017 10:36:30 +0000 (13:36 +0300)]
[IOT-2315] gAcl fix

1) Problem of accessing 'gAcl' global pointer variable fix
2) compile warning fix

Change-Id: Ib79d6b9e2ad3c6a377ca08b30252378356a31a28
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20127
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2337] Fix credential resource warnings 95/20195/2
Dmitriy Zhuravlev [Sun, 21 May 2017 10:23:59 +0000 (13:23 +0300)]
[IOT-2337] Fix credential resource warnings

Fix compiler warnings in credresource.c

Change-Id: Ibf6d9a115771c444e656329950a8f5c88e9f5ff6
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20195
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
2 years ago[IOT-2282] Do not update ACL in SVR DB when receive NULL aces from cloud 93/20193/2
Andrii Shtompel [Sun, 21 May 2017 09:52:05 +0000 (12:52 +0300)]
[IOT-2282] Do not update ACL in SVR DB when receive NULL aces from cloud

Change-Id: I0aea3490cd9f41c6a192c2ed87d8f49c80f6ac3c
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20193
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2087] Check NULL pointer after realloc 21/19621/10
ol.beketov [Sun, 21 May 2017 09:37:48 +0000 (12:37 +0300)]
[IOT-2087] Check NULL pointer after realloc

Change-Id: Ia9eac5375ea4d322cbe4f685588a57b6af047deb
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19621
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2245] Fix CredEntityHandlerDeleteTest 83/20183/6
Dmitriy Zhuravlev [Sat, 20 May 2017 15:01:17 +0000 (18:01 +0300)]
[IOT-2245] Fix CredEntityHandlerDeleteTest

POST replaced by Add

Change-Id: If8f529b4dc18744c9362eab715cec84e43f89a31
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20183
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
2 years ago[IOT-2331] segmentation fault in aclresource.c 69/20169/3
Oleksandr Dmytrenko [Sat, 20 May 2017 10:34:48 +0000 (13:34 +0300)]
[IOT-2331] segmentation fault in aclresource.c

Linux enrollee sample crashes - segmentation fault in aclresource.c

Change-Id: Id6d50d29184e239ac7cc3371918bed8980c35204
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20169
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2124] added NULL check after OICCalloc 75/20175/3
saurabh.s9 [Sat, 20 May 2017 13:15:28 +0000 (18:45 +0530)]
[IOT-2124] added NULL check after OICCalloc

Change-Id: I4013385beb5ba13fe8830f6b64a20f9562f0bdbf
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20175
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2133] Adding missing updateIndividualAcl API 97/19897/7
saurabh.s9 [Sat, 20 May 2017 09:15:43 +0000 (14:45 +0530)]
[IOT-2133] Adding missing updateIndividualAcl API

Change-Id: I0b2f2db077a77b586e0799ec4d2ea3551fc363ca
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19897
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[NS] Valgrind Invalid read/write fix for notification consumer. 15/20015/5
Jay Sharma [Thu, 18 May 2017 04:07:14 +0000 (09:37 +0530)]
[NS] Valgrind Invalid read/write fix for notification consumer.

Bug: https://jira.iotivity.org/browse/IOT-2200
Change-Id: Iadff8323da99f9267193787f2e8192d18cd50c4b
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20015
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix issues detected by static analysis 45/20045/7
Glen Youngjin Kim [Thu, 18 May 2017 12:36:49 +0000 (21:36 +0900)]
Fix issues detected by static analysis

Fixed memory leak issue on occlientcb.c, occollection.c, ocpayload.c
and ocresource.c.
Fixed dereference issue without checking NULL on ocpayloadparse.c

Change-Id: Ibf1757ca85833c2f1b849354e93882730c6c78f9
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20045
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoRevert "[IOT-2250] Mediator Android App Crash Fix." 49/20149/3
Senthil Kumar G S [Fri, 19 May 2017 13:16:43 +0000 (13:16 +0000)]
Revert "[IOT-2250] Mediator Android App Crash Fix."

This reverts commit 24a880e4a5e02cd40451a66857d3c92790f6f588.

Reason: Dependent patch https://gerrit.iotivity.org/gerrit/#/c/20007/ got reverted.

Change-Id: I19502c667b56a762eba3987d3f372e806f78088c
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20149
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFree payload and option in clientCB. 57/20157/3
Ziran Sun [Fri, 19 May 2017 18:21:25 +0000 (19:21 +0100)]
Free payload and option in clientCB.

This is to fix crash issue when OCF client sends unicast GET to OIC server.

Bug: https://jira.iotivity.org/browse/IOT-2329
Change-Id: Id3992563e3d7a8db02f8308ab00eaea1f93db5e5
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20157
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2283] connectivity: Fixed the duplicated response issue on discovery 17/20117/6
hyuna0213.jo [Fri, 19 May 2017 09:48:02 +0000 (18:48 +0900)]
[IOT-2283] connectivity: Fixed the duplicated response issue on discovery

Dualstack is unnecessary condition.

Bug: https://jira.iotivity.org/browse/IOT-2283
Change-Id: I1a0635fdfc85c27ead8da66b1bd2ccd7fe1e25c4
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20117
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix Windows build breaks 79/20179/2
Dan Mihai [Sat, 20 May 2017 14:06:14 +0000 (07:06 -0700)]
Fix Windows build breaks

New build breaks introduced by a79fe554f66c1332d1f1b55743d6d4705d2a7c7f

Change-Id: I85d96c44ad0d6e1faca620837c4be0172db44499
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20179
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
2 years ago[IOT-2263] Fix provisioning flow with DOS 31/19931/24
Dmitriy Zhuravlev [Mon, 15 May 2017 20:56:00 +0000 (23:56 +0300)]
[IOT-2263] Fix provisioning flow with DOS

Updates provisioning flow for:
1) Trust Chain
2) PSK
3) ACL

Change-Id: Id1824b3ef7974658857a203125d36ca25a653add
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19931
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoFix SVACE defects - part 2 41/20141/6
Oleg Kopysov [Fri, 19 May 2017 19:10:49 +0000 (22:10 +0300)]
Fix SVACE defects - part 2

File: resource/csdk/security/provisioning/sample/certgenerator.cpp
-- file handle loss
-- potential buffer overrun by sprintf call

Change-Id: I12217045b42683b4eac3af03b76c4c189f7a00db
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Signed-off-by: Oleg Kopysov <o.kopysov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20141
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2262][IOT-2232][IOT-2305] Fix manufacturer certificate OTM 99/19899/11
ol.beketov [Fri, 19 May 2017 10:52:50 +0000 (13:52 +0300)]
[IOT-2262][IOT-2232][IOT-2305] Fix manufacturer certificate OTM

Fix for manufacturer certificate ownership transfer

Patch 4: remove workaround and fixed original issue for certOTM

Change-Id: I44bcc2c09f75c3170644e48fc297c8ac323b7405
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Signed-off-by: Jongsung Lee <js126.lee@samsung.com>
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19899
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoFix defects detected by SVACE 49/20049/9
Oleg Kopysov [Fri, 19 May 2017 17:38:46 +0000 (20:38 +0300)]
Fix defects detected by SVACE

Fix SVACE warnings in the following directories:
- /resource/csdk/security/provisioning
- /resource/provisioning

Implemented:
- use snprintf instead of sprintf
- null pointer checks
- fclose added to remove lost handles

Change-Id: I31d6765df649e30c24c931932eb68bc35b7e6cef
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Signed-off-by: Oleg Kopysov <o.kopysov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20049
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoRemove build warnings 93/20093/4
Jaewook Jung [Fri, 19 May 2017 05:56:49 +0000 (14:56 +0900)]
Remove build warnings

 - fix implicit declaration of function
 - remove unused codes
 - remove unused parameter warnings

Change-Id: I830f9ada169e334a566bb696dee6cf9b46c87459
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20093
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agodisable cloud function in simplebase app. 29/20129/2
jihwan.seo [Fri, 19 May 2017 10:39:56 +0000 (19:39 +0900)]
disable cloud function in simplebase app.

since both cloudprovisioningclient app is main app and
simplebase app can not cover update cloud spec directly.

it is better to disable cloud function in the app before final spec fix.

Change-Id: I6573683f1dd92a1e63021a905cc3dac06481bb44
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20129
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoIOT-2333 : Introspection resource should be OC_SECURE only 59/20159/2
Srikrishna Gurugubelli [Fri, 19 May 2017 23:54:58 +0000 (16:54 -0700)]
IOT-2333 : Introspection resource should be OC_SECURE only

Change-Id: I2ce16521c98eb6b2c2d131189a860da1433e74a9
Signed-off-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20159
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFixed memory leak on ocpayload.c 37/19937/3
hyuna0213.jo [Tue, 16 May 2017 07:17:50 +0000 (16:17 +0900)]
Fixed memory leak on ocpayload.c

Fixed memory leak on ocpayload.c detected by static analysis

Change-Id: I3a8de43b8feff88509af6959f6b78b79eb8feb4c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19937
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years ago[IOT-2294] Resolved saveTrustChain issue 29/20029/3
saurabh.s9 [Thu, 18 May 2017 10:00:32 +0000 (15:30 +0530)]
[IOT-2294] Resolved saveTrustChain issue

Change-Id: Ib64f565304c78a281d082be1dd6cc99a73e3fdb9
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20029
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoFix some lines for proper coding convention. 37/20037/3
Jihun Ha [Thu, 18 May 2017 10:37:37 +0000 (19:37 +0900)]
Fix some lines for proper coding convention.

Some brace locations are changed to better coding convention in scene manager

Change-Id: Id8edd9fbdf582ffcae1bfd8ba239e13a875f2068
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20037
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2324]warning fix 2 39/20039/3
Oleksandr Dmytrenko [Thu, 18 May 2017 10:52:39 +0000 (13:52 +0300)]
[IOT-2324]warning fix 2

Warning fix in resource/csdk/security/provisioning

Change-Id: I3791fa427b04ac80a7e0847d4b13e6b121f74aa5
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20039
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2324]warning fix 1 27/20027/3
Oleksandr Dmytrenko [Thu, 18 May 2017 09:58:00 +0000 (12:58 +0300)]
[IOT-2324]warning fix 1

Warning fix in resource/provisioning

Change-Id: I75664d7e2d083caab3eee222bef486a433a77e26
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20027
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2317] gDoxm NULL checks 39/20139/3
Oleksandr Dmytrenko [Fri, 19 May 2017 11:54:35 +0000 (14:54 +0300)]
[IOT-2317] gDoxm NULL checks

Accessing global pointer variable gDoxm without NULL check fix

Change-Id: Ief964e6c941ef17a7a24fc07fb4f1807cfc07e0f
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20139
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoFix return value in GetDtlsPskCredentials() 37/20137/2
ol.beketov [Fri, 19 May 2017 11:42:37 +0000 (14:42 +0300)]
Fix return value in GetDtlsPskCredentials()

Fix return value in GetDtlsPskCredentials() from
credresource.c missed in patchset #19785

Change-Id: Id79111409f574ce49f037adb6602a4195666db0c
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20137
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoDefine OC_CALL (call convention for public APIs). 47/18847/9
Soemin Tjong [Fri, 3 Mar 2017 08:13:17 +0000 (00:13 -0800)]
Define OC_CALL (call convention for public APIs).

Set to __stdcall for WIN32.
Add to IPCA public APIs.
Other public APIs will be updated in separate commit.

Change-Id: I3201b7088eeb2227d2681847d20172825fbf4cae
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18169
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18847

2 years ago[IOT-2131] Adding Method to create ACL id for Android App 91/19791/7
saurabh.s9 [Thu, 11 May 2017 04:52:19 +0000 (10:22 +0530)]
[IOT-2131] Adding Method to create ACL id for Android App

Change-Id: I49658c8612f42b4d5caf90cce04e97d8e3315642
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19791
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoFix MessageQueue TC failure 03/20103/3
jihwan.seo [Fri, 19 May 2017 07:36:19 +0000 (16:36 +0900)]
Fix MessageQueue TC failure

Change-Id: I8a3ed1067f86a9a398b6b640ba738586cedf3f7e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20103
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix some filenames to be more Linux-friendly 59/19359/4
Mats Wichmann [Fri, 10 Mar 2017 20:13:52 +0000 (13:13 -0700)]
Fix some filenames to be more Linux-friendly

Two filenames: one contains space, another an apostrophe,
interferes with easily running linux "find" on iotivity,
and there's no compelling reason why these characters are needed
in the names.

Change-Id: I85b554d874bed654a150915a23fb8b237e2f189a
Signed-off-by: Mats Wichmann <mats@linux.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19359
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix build warning on notification sample. 45/19945/2
KIM JungYong [Tue, 16 May 2017 08:46:21 +0000 (17:46 +0900)]
Fix build warning on notification sample.

strcmp function is used but does not a including header.
in this patch string.h is included.

Change-Id: I37de71e3171c3586982c4173ef3c22864d82092b
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19945
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agosimulator: Fix permission of sources 27/19827/3
Philippe Coval [Tue, 9 May 2017 17:27:07 +0000 (19:27 +0200)]
simulator: Fix permission of sources

Change-Id: Iad9def49f47016435243c8ff44e2b052cd946ed2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19827
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoFix static analysis warnings on notification. 25/20025/4
jake [Thu, 18 May 2017 09:49:40 +0000 (18:49 +0900)]
Fix static analysis warnings on notification.

 - Uninitialized variable is initialized
 - Function strcpy is changed to strncpy
 - When execution of equal operation, prevent copied it self
 - Insert brace

Change-Id: I4de2c8cae30eea4c81cde1db7191788dc646b3dc
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20025
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
2 years agoUpdated mediator android application for secure mode. 53/20153/2
Senthil Kumar G S [Fri, 19 May 2017 15:11:10 +0000 (20:41 +0530)]
Updated mediator android application for secure mode.

In secure mode, mediator should send requests to the secure endpoint
of the easy-setup resource. Updated the sample to handle the same.

Change-Id: I5a27f06bcf2f8698d58e2b79049d7b342e303599
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20153
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoUnit tests enhancements for Proxy 55/20155/2
Abhishek Sharma [Fri, 19 May 2017 16:22:45 +0000 (21:52 +0530)]
Unit tests enhancements for Proxy

Change-Id: I6c0285b3c8b396dde5337fe69c54a81ad610f2f3
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20155
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoRemove a build warning in easy-setup compilation 41/19941/2
Jihun Ha [Tue, 16 May 2017 08:43:18 +0000 (17:43 +0900)]
Remove a build warning in easy-setup compilation

- The 3rd parameter of OCRepPayloadSetStringArray is one in "const char **"
type, not "char **"
- Align types to unsigned int in comparison

Change-Id: I391b29ac86f75928e4bea34077a38a2bea392b7e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19941
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2319] Discovery Request fix 51/20151/2
Oleksandr Dmytrenko [Fri, 19 May 2017 14:21:06 +0000 (17:21 +0300)]
[IOT-2319] Discovery Request fix

[CS][Csdk][Sample App] Discovery Request Crashed fix

Change-Id: Iffc7b61fce57dfab706122bc5649d3fd65ab0daa
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20151
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2265] [IOT-2142] [IOT-2164] Resolved Unowned device discovery in Android 19/20019/6
saurabh.s9 [Thu, 18 May 2017 07:22:19 +0000 (12:52 +0530)]
[IOT-2265] [IOT-2142] [IOT-2164] Resolved Unowned device discovery in Android

Change-Id: Ic4327443832798ed3ce093566f1994216b84dad4
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20019
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agoIOT-2204: Fix IPCA compiler warnings on Linux 53/19753/9
Soemin Tjong [Tue, 9 May 2017 02:16:19 +0000 (19:16 -0700)]
IOT-2204:  Fix IPCA compiler warnings on Linux

https://jira.iotivity.org/browse/IOT-2204

Change-Id: I523c947aba51b3d4d7b0b6e19745e783eab3eeeb
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19753
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-2258: Allow secure and nonsecure endpoints with OCCreateResource. 95/19995/4
Todd Malsbary [Wed, 17 May 2017 18:56:13 +0000 (11:56 -0700)]
IOT-2258: Allow secure and nonsecure endpoints with OCCreateResource.

Added new property flag OC_NONSECURE.  To specify both secure and
nonsecure endpoints use OC_SECURE | OC_NONSECURE.  The behavior when
neither flag is specified is OC_NONSECURE, the same as before this
change.

Bug: https://jira.iotivity.org/browse/IOT-2258
Change-Id: I12ffdff70a83455eff46d4464e234963063c4f35
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19995
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-2275 Windows: Disable the Cloud APIs 67/19967/3
Dan Mihai [Tue, 16 May 2017 20:00:32 +0000 (13:00 -0700)]
IOT-2275 Windows: Disable the Cloud APIs

These APIs are not working on Windows.

Change-Id: I6c4869da290808fdb41d2d834a5dd1cbd0766744
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19967
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years ago[IOT-2259] Windows: Handle Persistent Storage for UWP Apps 45/19845/11
Ibrahim Esmat [Thu, 27 Apr 2017 16:13:35 +0000 (09:13 -0700)]
[IOT-2259] Windows: Handle Persistent Storage for UWP Apps

Changes to allow UWP apps that use IPCA to handle Persistent
Storage:
- Updated the SConscripts to point to store LIBS
- Added a UWP_APP env variable to enable building store DLLs
- Disabled gtest and other tests when building store DLLs
  because gtest is heavily dependent on win32 APIs and DLLs
- Add code to set the sqlite3 temporary directory when building
  for store DLLs (as required by sqlite3). This temporary
  directory will be the appropriate temp directory.
- Add a platform helper function to get the best application
  path to store the Persistent Storage files. IPCA uses this
  helper function to get the path when opening PS files.
- Add capability to run.bat to build UWP DLLs

Change-Id: Iac3a2c9e9e2fd994b06e964254f2d394b15526aa
Signed-off-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19845
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2269] Do not include rowner property in csr resource CBOR 13/20013/3
Kevin Kane [Wed, 17 May 2017 23:13:26 +0000 (16:13 -0700)]
[IOT-2269] Do not include rowner property in csr resource CBOR

"rowner" property was being erroneously included in the CBOR
payload for the CSR resource, which caused the map in the
response to contain one more key/value pair than it should have.

This property should not be included as it is not part of the
specification for this resource.

Change-Id: I61a25535b79d21857b18f7f1f2bb077e8420b3f5
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20013
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2289] Add NULL check for acl param in OCProvisionACL 43/20043/3
Andrii Shtompel [Thu, 18 May 2017 11:10:45 +0000 (14:10 +0300)]
[IOT-2289] Add NULL check for acl param in OCProvisionACL

Change-Id: I5f950a890d4d7492795aced3dee4d6a052635361
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20043
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2291] Remove OCProvisionCRL from ocprovisioningmanager.h 41/20041/3
Andrii Shtompel [Thu, 18 May 2017 10:58:15 +0000 (13:58 +0300)]
[IOT-2291] Remove OCProvisionCRL from ocprovisioningmanager.h

Change-Id: I07415f840dac350beee008698d7b64f5bdae4517
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20041
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoCheck for null alloc in rddatabase unit tests. 29/19229/6
Ziran Sun [Thu, 13 Apr 2017 12:48:14 +0000 (13:48 +0100)]
Check for null alloc in rddatabase unit tests.

Bug: https://jira.iotivity.org/browse/IOT-2022
Change-Id: I6306e10d1c3ab1146e4588077cbe091f34089059
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19229
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
2 years ago[IOT-2306] Direct pairing removed from provisioning java sample 07/20107/3
saurabh.s9 [Fri, 19 May 2017 08:37:28 +0000 (14:07 +0530)]
[IOT-2306] Direct pairing removed from provisioning java sample

Change-Id: I91d58d4f015cb12d114d995afbbe4e60649cf8c7
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20107
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2296] Removed unsupported menu option 95/20095/3
Randeep Singh [Fri, 19 May 2017 05:19:48 +0000 (10:49 +0530)]
[IOT-2296] Removed unsupported menu option

Change-Id: Ie99a9d2b2d8181488cc49c7af4f1049e51a6537f
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoAdded unit test cases for missed out APIs of mediator in easy-setup. 91/19991/2
Senthil Kumar G S [Wed, 17 May 2017 14:55:33 +0000 (20:25 +0530)]
Added unit test cases for missed out APIs of mediator in easy-setup.

Unit test case for requestToConnect and provisionCloudProperties APIs.
This improves code coverage as well.

Change-Id: Ice5f616150269c9b375d47a7dd3eb23c0fec95a5
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19991
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2171] Add string blank check logic. 09/19709/14
Jaehong Jo [Mon, 8 May 2017 10:32:08 +0000 (19:32 +0900)]
[IOT-2171] Add string blank check logic.

Because space is not empty.

Change-Id: I8c422c20322bab8b7833fc0293cdd4d84cc90019
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19709
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2131] Resolved Sample App SignOut crash issue 05/19805/2
Randeep Singh [Thu, 11 May 2017 15:17:06 +0000 (20:47 +0530)]
[IOT-2131] Resolved Sample App SignOut crash issue

Change-Id: Ieaa575d50ff467e705667930bc4f8e907532c795
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19805
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
2 years agoDon't include cacommon.h in sample apps 57/20057/5
Dan Mihai [Thu, 18 May 2017 15:38:33 +0000 (08:38 -0700)]
Don't include cacommon.h in sample apps

cacommon.h is not a Public header.

This also fixes recent Windows build breaks:

ocserver.cpp
C:\Program Files (x86)\Windows Kits\8.1\include\shared\ws2def.h(100):
error C2220: warning treated as error - no 'object' file generated

C:\Program Files (x86)\Windows Kits\8.1\include\shared\ws2def.h(100):
warning C4005: 'AF_IPX': macro redefinition

C:\Program Files (x86)\Windows Kits\8.1\include\um\winsock.h(452):
note: see previous definition of 'AF_IPX'

C:\Program Files (x86)\Windows Kits\8.1\include\shared\ws2def.h(140):
warning C4005: 'AF_MAX': macro redefinition
...

Change-Id: I4c6ac41a5869c2dced1f38a8eed09c4ab42e2076
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20057
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoFix Windows build break 55/20055/3
Dan Mihai [Thu, 18 May 2017 14:43:09 +0000 (07:43 -0700)]
Fix Windows build break

Fixing:

resource\csdk\connectivity\src\adapter_util\ca_adapter_net_ssl.c(1345):
error C2220: warning treated as error - no 'object' file generated

resource\csdk\connectivity\src\adapter_util\ca_adapter_net_ssl.c(1345):
warning C4389: '!=': signed/unsigned mismatch

Change-Id: I42fb71ff8dd39e5db600068daf8ab2b41c6336ce
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20055
Reviewed-by: Kevin Kane <kkane@microsoft.com>
2 years ago[IOT-2247] [IOT-2308] Clean up provisioning/sample/*.json files 23/19923/10
Nathan Heldt-Sheller [Mon, 15 May 2017 15:53:29 +0000 (08:53 -0700)]
[IOT-2247] [IOT-2308] Clean up provisioning/sample/*.json files

The goal is to make the .json more readable an remove confusing extra
values.

I tried to leave them functionally identical, with
the exception that I merged the /doxm (Read, Update) and /roles
(Full Control) ACEs into a single ACE with permission 14
(Read, Update, Delete) which is sufficient for both /doxm and /roles.

I verified that at least JustWorks and Random PIN files work,
as well as security unittests.

Change-Id: Id4e7c94a7ce941b5e396b61096b89732aab1be4e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19923
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
2 years agoRevert commit that modified OCRepresentation and AttribueValue 07/20007/3
George Nash [Wed, 17 May 2017 20:36:36 +0000 (13:36 -0700)]
Revert commit that modified OCRepresentation and AttribueValue

The commit for [IOT-1583] had several unseen concequnces and
should not be on the 1.3-rel branch.

This change reverts that commit as well as two commits
that were made in responce to that commit.

Revert "resource: Avoid to expose internal headers"
This reverts commit 6303c498fcebe1304983e5a650e5e6ec712e0cab.

Revert "[IOT-2251] Resolve getValue() & setValue() APIs for argument string, Attribute Value"
This reverts commit 05671f38527acd30ff5a761b3c0a7cde933a0b17.

Revert "IOT-1583: Fixing /W3 warnings in /resource directory - part 5."
This reverts commit 924a7f267298aafc379ee0fa62871724e8afce19.

See also the following bugs
Bug: https://jira.iotivity.org/browse/IOT-2233
Bug: https://jira.iotivity.org/browse/IOT-2251
Bug: https://jira.iotivity.org/browse/IOT-2277
Bug: https://jira.iotivity.org/browse/IOT-1583
Bug: https://jira.iotivity.org/browse/IOT-2254

Change-Id: I6ca8fad887ff7a17a0bceacfe0ba2147d64c9394
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20007
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2285] Fix build failure 33/20033/5
ol.beketov [Thu, 18 May 2017 10:21:34 +0000 (13:21 +0300)]
[IOT-2285] Fix build failure

Fix build failure due to checkin
https://gerrit.iotivity.org/gerrit/19785

Change-Id: If9793e3b3219b71b12d53a1e66672863ab66d62e
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20033
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoFixes for issues found by SVACE in branch 1.3-rel 83/19983/2
Oleksandr Moliavko [Wed, 17 May 2017 13:52:06 +0000 (16:52 +0300)]
Fixes for issues found by SVACE in branch 1.3-rel

Change-Id: Ibdb076b2c35390fc0d38d578b0a1e2c8fc40dc54
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19983
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-1818] Fix SetResult() usage in OwnerCredentialHandler() 77/19977/2
Andrii Shtompel [Wed, 17 May 2017 10:17:33 +0000 (13:17 +0300)]
[IOT-1818] Fix SetResult() usage in OwnerCredentialHandler()

Change-Id: Ia8a0535164e73fcc8e53ca9755717af701759e8c
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19977
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoAppend accept format and accept version in options. 35/19535/8
Ziran Sun [Tue, 2 May 2017 09:52:10 +0000 (10:52 +0100)]
Append accept format and accept version in options.

If accept format and accept version are not set via option headers,
set them to default value via stack functions.
These values will be passed to rcvdVendorSpecificHeaderOptions through
requestInfo.info.options.

Bug: https://jira.iotivity.org/browse/IOT-1973

Change-Id: I10f589cf3e18fc105640e1a27df5d50aa1b73298
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19535
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoRemove build warnings related to comparison between enums. 51/19951/3
Glen Youngjin Kim [Tue, 16 May 2017 12:31:42 +0000 (21:31 +0900)]
Remove build warnings related to comparison between enums.

Change-Id: Iaff2e2312ab215c352a1573ba0dddb195afa73a3
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19951
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoRemove build warnings 49/19949/8
Jaewook Jung [Tue, 16 May 2017 11:10:51 +0000 (20:10 +0900)]
Remove build warnings

Change-Id: Ib22fda47f5e843bc753966c085942014d70d4922
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19949
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFix build error for WITH_MQ=1. 63/19963/4
Soemin Tjong [Tue, 16 May 2017 16:38:47 +0000 (09:38 -0700)]
Fix build error for WITH_MQ=1.

Change-Id: I24652573cebe1b7a04c3c1c2ac765234377e8216
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19963
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2089] Realloc NULL checks added 63/19663/8
ol.beketov [Tue, 16 May 2017 15:32:08 +0000 (18:32 +0300)]
[IOT-2089] Realloc NULL checks added

Change-Id: Ie1b99a3815c8126e35576d4c3daa91c73ad66c6d
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19663
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years ago[IOT-2172] Length check before memcpy added 85/19785/4
ol.beketov [Wed, 10 May 2017 14:56:36 +0000 (17:56 +0300)]
[IOT-2172] Length check before memcpy added

Change-Id: I539a8f21fd149b7d468d96b52e7bcadc964f6931
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19785
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
2 years agogtest: Use whereis instead of which 45/19345/8
Philippe Coval [Wed, 26 Apr 2017 07:57:11 +0000 (09:57 +0200)]
gtest: Use whereis instead of which

whereis command is more popular that which among GNU/Linux Distros:
Archlinux is not having which by default

For reference debian has them in different packages:

  util-linux: /usr/bin/whereis
  debianutils: /usr/bin/which

Bug: https://jira.iotivity.org/browse/IOT-2084
Change-Id: I1966a31df1281e7f28fb8ea40f3dc4514ba22713
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19345
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years ago[IOT-2202] Optimize memory allocation logic 47/19947/3
Abhishek Sharma [Tue, 16 May 2017 10:44:16 +0000 (16:14 +0530)]
[IOT-2202] Optimize memory allocation logic

Change-Id: I936752834dfd4c8f80525a773a2a92607a147702
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19947
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoImplement reconnection and ping-pong between cloud services. Make 07/19907/5
Ondrej Tomcik [Mon, 15 May 2017 09:10:34 +0000 (11:10 +0200)]
Implement reconnection and ping-pong between cloud services. Make
heartbeat configurable. Fix tests.

Change-Id: I2483f6548f906fd1cf780d63e1ce82fb2b66ca86
Signed-off-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19907
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
2 years agoresource: Avoid to expose internal headers 09/19909/3
Philippe Coval [Mon, 15 May 2017 10:03:48 +0000 (12:03 +0200)]
resource: Avoid to expose internal headers

Change-Id: Ifa7b2c20e1b793b14d48557cc1d194be24fcd622
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19909
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoIOT-2228: Stop observe once. 61/19761/4
Soemin Tjong [Wed, 10 May 2017 01:09:10 +0000 (18:09 -0700)]
IOT-2228: Stop observe once.

https://jira.iotivity.org/browse/IOT-2228

Prevent raised exception in OC library.

Change-Id: I8774cac155b446a166f574a2e5c357c6a53ba1f2
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19761
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
2 years agoFix Windows build break 61/19961/4
Dan Mihai [Mon, 15 May 2017 18:53:57 +0000 (11:53 -0700)]
Fix Windows build break

Increase the default compiler limit. Error started with recent change
05671f38527acd30ff5a761b3c0a7cde933a0b17.

Fixing:

fatal error C1128: number of sections exceeded object file format
limit: compile with /bigobj.

Change-Id: I1e4c1284c7fb7057a14355d7362397ed2919c37d
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19961
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoFix provisioning/unittest after apply #19593 65/19865/8
Andrii Shtompel [Sat, 13 May 2017 12:08:23 +0000 (15:08 +0300)]
Fix provisioning/unittest after apply #19593

Following changes were made for provisioning/unittest:

1. Use default SVR DB for client  (from provisioning/sample)
2. Use default SVR DB for server1 (server_justworks.dat)
3. Use default SVR DB for server2 (server_justworks.dat) + set unique uuid

4. Increase timeout's to the same value's as in provisioning client
5. Increase from 3s to 5s servers initialization time

Change-Id: I5ae27fdd4e89163e0f437cdf05070dad7079dbb8
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19865
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years agoFix provisioning unit tests 29/19829/4
Andrii Shtompel [Fri, 12 May 2017 13:14:52 +0000 (16:14 +0300)]
Fix provisioning unit tests

1. Fix SRPSaveOwnCertChainTestNullKey
2. Fix SRPSaveOwnCertChainTest

Change-Id: I7f669edca162ab87178817b131359bfc3b059c7b
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19829
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
2 years ago[IOT-2224] ace2 Resource "wc" type 61/19861/4
Nathan Heldt-Sheller [Sat, 13 May 2017 04:26:48 +0000 (21:26 -0700)]
[IOT-2224] ace2 Resource "wc" type

Implement phase-out of "*" href and replace with
"wc" types:

"*" = ALL_RESOURCES
"+" = ALL_DISCOVERABLE
"-" = ALL_NON_DISCOVERABLE

Add support for "wc" type to Policy Engine.

Change-Id: I738110de4d132dc5e60c73c79ad8e6b0d535d8d5
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19861
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoFix Windows build break 27/19927/2
Dan Mihai [Mon, 15 May 2017 17:59:35 +0000 (10:59 -0700)]
Fix Windows build break

Verify that the block data ID is smaller than UINT8_MAX, then cast
its value to uint8_t.

Fixes compiler warning/error:

resource\csdk\connectivity\src\cablockwisetransfer.c(893):
error C2220: warning treated as error - no 'object' file generated

resource\csdk\connectivity\src\cablockwisetransfer.c(893):
warning C4267: 'function': conversion from 'size_t' to 'uint8_t',
possible loss of data

scons: *** [out\windows\amd64\debug\resource\csdk\connectivity\src\cablockwisetransfer.obj] Error 2

Change-Id: Iae032d52614cf6d10b8ec229430dddbb6f8ee114
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19927
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
2 years agoFix broken build for Proxy 17/19917/3
Abhishek Sharma [Mon, 15 May 2017 12:07:07 +0000 (17:37 +0530)]
Fix broken build for Proxy

Change-Id: I97fcdc8510a10172b52567fbf2c99db19e490a78
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19917
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix 'isCloudAccessible' API which returned a wrong value 91/18991/5
Jihun Ha [Tue, 16 May 2017 04:00:56 +0000 (13:00 +0900)]
Fix 'isCloudAccessible' API which returned a wrong value

"rt" property is written inside "rep" property.

Change-Id: I2cf76661d9c04b32587333a5aefb4474f863d3e7
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18991
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoUpdated Randompin resource di 15/19915/3
Mushfiqul Islam Antu [Mon, 15 May 2017 11:46:04 +0000 (17:46 +0600)]
Updated Randompin resource di

Randompin Resource di has been changed to be same as justworks
resource di, which is causing fail in pair wise link menu of
provisioningclient app(As pairwise link is not supported for
2 different device with same di)
[Update] changed di to be visually distinct

Change-Id: Ibcf7d6f1d7e65a32ee7113ddaec958ab8073aa08
Signed-off-by: Mushfiqul Islam Antu <i.mushfiq@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19915
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
2 years agoNSConsumerTest2.cpp string typo 21/19521/4
Uze Choi [Tue, 2 May 2017 05:48:38 +0000 (05:48 +0000)]
NSConsumerTest2.cpp string typo

Sample application has string typo.

Change-Id: I8eb8c70e89199cb123dff1991759edb38056dec5
Reviewed-on: https://gerrit.iotivity.org/gerrit/19521
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years ago[IOT-2117][Bug][Data loss] No check for snprintf return. 57/19657/9 1.3.0-RC2
Senthil Kumar G S [Thu, 11 May 2017 12:09:31 +0000 (17:39 +0530)]
[IOT-2117][Bug][Data loss] No check for snprintf return.

Added code to properly handle the return value of snprintf().

Change-Id: I12bb53e32279d0ac7c09740389e6d3124b19c4dc
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19657
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix defects detected by static code analyzer 13/19913/2
Jaewook Jung [Mon, 15 May 2017 11:39:16 +0000 (20:39 +0900)]
Fix defects detected by static code analyzer

- 'addr' of CAEndpoint is a char array so the address of the array cannot
  be null.
- 'requestData' is not dynamic-allocated memory.

Change-Id: Ibcb9f5011b01f19e4624b4d71dcb0181637480b3
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19913
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
2 years agoFix for IOT-2253. 21/19921/3
Senthil Kumar G S [Mon, 15 May 2017 15:28:18 +0000 (20:58 +0530)]
Fix for IOT-2253.

Perform Null check before calling the member functions of OC::OCSecureResource.
This patch solves the crash issue.

Change-Id: Ieb292eee8724bf5ceb2918de424c76c9b780fa16
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19921
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>