iotivity.git
8 months agoMerge branch 'master' into iot-1785 13/18413/2 iot-1785
Kevin Kane [Fri, 31 Mar 2017 19:41:13 +0000 (12:41 -0700)]
Merge branch 'master' into iot-1785

Conflicts:

    resource\csdk\security\include\internal\acl_logging.h
    resource\csdk\security\src\aclresource.c

Change-Id: Ide5322ac5c02c82af08586c4dc2fb2ec80b1b301
Signed-off-by: Kevin Kane <kkane@microsoft.com>
8 months agoCreate PSKs with the correct encoding type 07/18407/2
Kevin Kane [Thu, 30 Mar 2017 22:33:16 +0000 (15:33 -0700)]
Create PSKs with the correct encoding type

Encoding/decoding code that currently ignores the value of this
field, but this will change when certificates and role features
are merged in.

Change-Id: Idf8d2b1ffd95d2e517e4da7c76ce767a57ce428d
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18407
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
8 months agoIOT-1583: Removing boost usage from stack sample. 07/18307/6
Pawel Winogrodzki [Wed, 29 Mar 2017 01:00:30 +0000 (18:00 -0700)]
IOT-1583: Removing boost usage from stack sample.

There is no need to have an additional dependency on boost
for the sake of this sample.

Change-Id: I4bc65730aebb62f5b3d0e9edc0ff9ff8ae16a7e2
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18307
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoFixed memory leak detected by valgrind 27/18227/9
Jaewook Jung [Tue, 28 Mar 2017 00:04:26 +0000 (09:04 +0900)]
Fixed memory leak detected by valgrind

Fixed memory leak detected by valgrind

Change-Id: I96c4d0816ea5be4a90e20af59e64ea3aec454c27
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18227
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1785] Finish role certs feature 19/18219/5
Greg Zaverucha [Tue, 28 Mar 2017 23:23:39 +0000 (16:23 -0700)]
[IOT-1785] Finish role certs feature

Add end-to-end testing of role certificate scenario:
- provision role certs
- test role-based ACLs provisioning and enforcement
- test assertion of role certificates

Fix bugs and add new functions as necessary. Added the ROLE_CERT
usage to distinguish role certs (which can't be used for TLS)
from identity certs. Previously they were both saved as PRIMARY_CERT.
Some small changes to save and retrieve role certificates locally. Add
functionality to assert roles (POST the certs to /oic/sec/roles).

Change-Id: I9080e0ca6b0809608621eb8b23dd4bbbfbbb176c
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18219
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
8 months agoFix defect detected by static code analyzer 59/18259/5
YunheeHwang [Wed, 29 Mar 2017 09:45:47 +0000 (18:45 +0900)]
Fix defect detected by static code analyzer

Problem : Dynamic memory referenced by (*set)->actionsetName was allocated by calling malloc and lost without free before exit
Resolve : add OCFREE((*set)->actionsetName) before OCFREE(*set)

Problem : Dynamic memory referenced by payload was allocated by calling function 'OCRepPayloadCreate' and lost without free before exit
Resolve : add OCRepPayloadDestroy(payload) to free them

Change-Id: I2f8bbbd009c567cda8c091ffde925f1692416c9b
Signed-off-by: YunheeHwang <yunhee.hwang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18259
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoChange default vaule of acceptVersion and acceptFormat. 63/18263/6
Ziran Sun [Tue, 28 Mar 2017 14:48:07 +0000 (15:48 +0100)]
Change default vaule of acceptVersion and acceptFormat.

Change the value that was for OIC 1.1 to OCF 1.0.0.

Bug: https://jira.iotivity.org/browse/IOT-1959
Change-Id: Iac714ab5bc410c09f5ca4e20071b9749ce405340
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18263
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
8 months ago[IOT-1792] rectified bad check issue in pstatresource 11/18311/2
saurabh.s9 [Wed, 29 Mar 2017 04:46:18 +0000 (10:16 +0530)]
[IOT-1792] rectified bad check issue in pstatresource

Change-Id: Id8dbb670961d1efc40114f9de757cd31b296c2d4
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18311
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 months agoVersion option is not associate with application/cbor format. 67/18167/7
Ziran Sun [Fri, 24 Mar 2017 15:24:56 +0000 (15:24 +0000)]
Version option is not associate with application/cbor format.

    1. Remove versioing option settings for application/cbor format.
    2. Correct default versioing number value.

Change-Id: Ia9a5f1edfc834a450106eefc4097c60726e4d740
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18167
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
8 months agoFix defect detected by static code analyzer 05/18305/4
Parkhi [Wed, 29 Mar 2017 00:52:57 +0000 (09:52 +0900)]
Fix defect detected by static code analyzer

 - Changed return value because function declared void returns a non-void value.

Change-Id: I154e572292d95905ddd222b049cde7e870bd67f8
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18305
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoAdd missing exports. 01/18301/4
Todd Malsbary [Tue, 28 Mar 2017 23:10:16 +0000 (16:10 -0700)]
Add missing exports.

- OCCreateEndpointStringFromCA needed by resource_directory.lib

Change-Id: Ifdaeb6489dd32d5a9e9cb6b0788dd6ae555b4316
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18301
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agombedtls: Display exceptions on issue 17/17417/4
Philippe Coval [Wed, 22 Feb 2017 01:33:02 +0000 (02:33 +0100)]
mbedtls: Display exceptions on issue

To help to understand instability issues:

https://build.iotivity.org/ci/job/iotivity-verify-tizen/8815/

Observed message is:

  mbedtls SConscript: cannot copy
  /home/abuild/rpmbuild/BUILD/iotivity-1.2.0/extlibs/mbedtls/config-iotivity.
h
  to
  /home/abuild/rpmbuild/BUILD/iotivity-1.2.0/extlibs/mbedtls/mbedtls/include/
mbedtls/config.h

Change-Id: I08504251bd7768ff237bb757b82fc6d17d8f6dde
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17417
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months agoIPCA: Change to not use deprecated APIs. 53/18153/6
Soemin Tjong [Mon, 20 Mar 2017 05:57:00 +0000 (22:57 -0700)]
IPCA: Change to not use deprecated APIs.

Use setPropertyValue() instead of deprecated registerPlatformInfo() and
registerDeviceInfo().

Also, not calling setPropertyValue(OC_RSRVD_PLATFORM_ID) as platform ID
is automatically generated by OCStack.

Change-Id: Icf51cb27a408027a26eef51401b8b845cda7311d
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18153
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoFix to print private log in logger.h 15/18115/4
jihwan.seo [Thu, 23 Mar 2017 05:12:00 +0000 (14:12 +0900)]
Fix to print private log in logger.h

Change-Id: I25ae59500c9d7fbf18af52afdb96389bcd8f11d8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18115
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoReenable IPCA unit tests. 81/18181/8
Soemin Tjong [Sun, 26 Mar 2017 22:28:44 +0000 (15:28 -0700)]
Reenable IPCA unit tests.

Fix: https://jira.iotivity.org/browse/IOT-1960

Address a couple of items:
Make a snapshot of vector variables for calling back to apps to address
issue with vector update in the middle of callbacks.

Also, properly delete observe handles in the mock library when app
cancels resource observation.  Otherwise the unit tests slow down as
number of test iteration increases.

Change-Id: I0116deb534ddfaa8e29b84a942ba3d95c1986816
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18181
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoIOT-1583: Updating libcoap's SConscript. 81/17181/8
Pawel Winogrodzki [Fri, 10 Feb 2017 20:24:16 +0000 (12:24 -0800)]
IOT-1583: Updating libcoap's SConscript.

Making changes to extlibs/libcoap/SConscript to switch
to the newest tag.

Change-Id: I31cd7be0e343e5dec2ba28ea36e09e891fcb76d7
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17181
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
8 months agozigbee_wrapper: Do IEEE754 test at runtime 33/18333/3
Philippe Coval [Wed, 29 Mar 2017 12:44:06 +0000 (14:44 +0200)]
zigbee_wrapper: Do IEEE754 test at runtime

Some systems (Tizen) havent __STDC_IEC_559__ defined
while sizeof(double) = 8, build breaks.

Moving test to run time is more flexible

For the record:
  BUILD_ID=tizen-ivi_20170328.2_ivi-target-odroidxu3
  gcc -dM -E - < /dev/null | grep 559
  #define __GCC_IEC_559_COMPLEX 0
  #define __GCC_IEC_559 0

Change-Id: I427188afcb6178e9a5e15c341185eb1b3d951fc8
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18333
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: Joseph Morrow <joseph.l.morrow@intel.com>
8 months agoIOT-1961: Fixing Windows c_common test build environment. 75/18175/4
Pawel Winogrodzki [Fri, 24 Mar 2017 22:28:49 +0000 (15:28 -0700)]
IOT-1961: Fixing Windows c_common test build environment.

One test was missing the /W4 and /WX compiler options, because
it was using a default test environment variable.

Change-Id: I095d612e6778576384a4b78abf3a97b958e5f5ee
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18175
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
8 months agosecurity: Return error if invalid parameters as provided as input 59/18159/2
Philippe Coval [Fri, 24 Mar 2017 10:26:09 +0000 (11:26 +0100)]
security: Return error if invalid parameters as provided as input

This warning was observed with clang on GNU/Linux:

  resource/csdk/security/src/psinterface.c:80:9: \
  warning: expression result unused [-Wunused-value]
  OC_STACK_INVALID_PARAM;

Change-Id: I91b17533ddcf04ba7576a4162f4af4e45755fbb9
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18159
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 months ago[IOT-1785] Finish OCF 1.0 identity certificate support 83/17983/7
Greg Zaverucha [Wed, 29 Mar 2017 00:23:07 +0000 (17:23 -0700)]
[IOT-1785] Finish OCF 1.0 identity certificate support

Add unit test to exercise certificate provisioning and use
(previously only provisioning was tested).  Fixed bugs in
credresource and ca_adapter_net_ssl. Configure mbedtls to use
 OCF certificate EKUs. Added more logging in many places. Exposed
 API to remove credentials locally for use by test code.

Change-Id: Ia55c7f3a7518f12c99f60280062f156954bdf4ac
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17983
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
8 months agoresource: Use global LIBPATH for samples 93/18093/4
Philippe Coval [Wed, 22 Mar 2017 14:53:21 +0000 (15:53 +0100)]
resource: Use global LIBPATH for samples

As set in shared file:
resource/c_common/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I4defd1996ed17c8e0701f48ebe54b4de0310442c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18093
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoFix for invalid discovery query in the RE. 91/18191/6
KIM JungYong [Mon, 27 Mar 2017 11:09:03 +0000 (20:09 +0900)]
Fix for invalid discovery query in the RE.

When do discovery with specific uri using RE layer,
RE layer trigger to find resource with invalid uri
which is specific uri without wellknown-uri(/oic/res).

But, resource server never response for this discovery request.
Because discovery request only handled by /oic/res,
other discovery request does not a handled by base stack.

In this patch,
1) Request uri is changed to wellknown uri.
2) Related unit test is modified.

Change-Id: I529430834f8c48b0eb5e31b6f58da33fb55c946c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18191
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoFix Cloud ACL CSdk issues 25/17825/11
Andrii Shtompel [Fri, 10 Mar 2017 12:33:42 +0000 (14:33 +0200)]
Fix Cloud ACL CSdk issues

1. Rename:
   OCCloudAclIndividualDelete    -> OCCloudAclAcesDelete
   OCCloudAclIndividualDeleteAce -> OCCloudAclIndividualAceDelete
   OCCloudAclIndividualUpdateAce -> OCCloudAclIndividualAclUpdate
   OCCloudAclIndividualUpdate    -> OCCloudAclIndividualAceUpdate

2. Pass OCClientResponse *response to application layer to print
   received payload for every response in release mode

3. Create OIC_LOG_ACL/OIC_LOG_CRL macro instead of printACL/printCRL functions
   (they will print log in modules where TB_LOG enabled)

Change-Id: I2bff159c1cc7ad3620da21a0c2722a3445608a77
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17825
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 months agoFix packet loss related BLE fragmentation & MTU attr value size 17/18117/4
jihwan.seo [Thu, 23 Mar 2017 07:57:16 +0000 (16:57 +0900)]
Fix packet loss related BLE fragmentation & MTU attr value size

Change-Id: I26bd9c1303b5f6f4b5bf71a4e5a16989d90fe20b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18117
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoAuto generate platform ID. 03/18103/6
Soemin Tjong [Wed, 22 Mar 2017 22:57:10 +0000 (15:57 -0700)]
Auto generate platform ID.

This allows all apps running on a platform (e.g. an installation of OS)
to register with the same platform ID in the platform info.

Applications can override this value by using the regular
OCSetPropertyValue(OC_RSRVD_PLATFORM_ID).

Change-Id: I638ab08a5e0a6319524052b95ac649f167e52a90
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18103
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1900] Implemented read-only pstat.cm 73/18173/6
Nathan Heldt-Sheller [Fri, 24 Mar 2017 19:33:36 +0000 (12:33 -0700)]
[IOT-1900] Implemented read-only pstat.cm

Modifies pstatresource.c to change the UPDATE behavior and read-only nature of pstat.cm.

Also changes provisioning manager to write to pstat.tm instead of pstat.cm.

For now, the "cm" Prop just reflects the "tm" Prop.  This will change when
the other aspects are implemented including IOT-1958 fix.

patch set 2: merged the provisioning tool (OBT) changes from 18121;
renamed the map-size consts to make more sense and added comments for
future editors (plus a few TODO items for IOT-1958)

patch set 3: rebase

patch set 4: misc editorial cleanup on pstatresource.c

patch set 5: fix provisioning issue found by Jong-Min (thanks)

Change-Id: I42ef3b1128d34215067d81f2216a8de7a5812371
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18173
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
8 months agofix blocking issue related writeCharacteristic for Android BLE 85/18085/3
jihwan.seo [Wed, 22 Mar 2017 07:51:56 +0000 (16:51 +0900)]
fix blocking issue related writeCharacteristic for Android BLE

Change-Id: Ibf3d7cdc69f7b9520a7c2763dd38c6dcc6c64ca1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18085
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>
8 months agotizen: Depend on profile's bluetooth package if available 83/17683/4
Philippe Coval [Mon, 29 Aug 2016 14:59:34 +0000 (16:59 +0200)]
tizen: Depend on profile's bluetooth package if available

This is needed for Tizen:Common (currently major version 3)

Change-Id: I768771e3d6eafe362e4678d3c13be3022eb79f85
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17683
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoFixed memory leak on ocstack.c 87/18187/3
Jaewook Jung [Mon, 27 Mar 2017 08:26:49 +0000 (17:26 +0900)]
Fixed memory leak on ocstack.c

Fixed memory leak on ocstack.c detected by valgrind

Change-Id: Idabf6cc8d0752663f2116f1c543d5879e29bf882
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18187
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoFix memory leak on ResourceCache Module 77/15177/7
YounghyunJoo [Tue, 6 Dec 2016 01:23:10 +0000 (10:23 +0900)]
Fix memory leak on ResourceCache Module

- check memory leaks through Valgrind tool, and fix them

Change-Id: I58fb3356059a55313008fd04519779c35715b421
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15177
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoSet href value of rel=self links correctly. 41/17341/12
Todd Malsbary [Thu, 2 Mar 2017 20:22:51 +0000 (12:22 -0800)]
Set href value of rel=self links correctly.

Change-Id: I1904a33e3ae1f41321df003ecd0bf83a6ae9c1e6
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17341
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoClean up error handling in resource directory. 93/17793/6
Todd Malsbary [Thu, 9 Mar 2017 04:32:01 +0000 (20:32 -0800)]
Clean up error handling in resource directory.

- Response to /oic/res query of resource directory leaked the database
  handle and associated file descriptors.
- Update/delete transactions could be non-atomic.
- Short-circuit error paths did not clean up properly.

Change-Id: I0a6cb8e8332e4f1d6c960d61c8a39320c1381b5f
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17793
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoresource: Disable logging if not enabled 69/17869/10
Philippe Coval [Mon, 13 Mar 2017 08:39:46 +0000 (09:39 +0100)]
resource: Disable logging if not enabled

Curently without logging (LOGGING=False or undefined)
some trace messages are appearing:

  0:
  In entity handler wrapper:

Now with this change those log lines are sent to null stream.

Change-Id: I26892c7ca6efca025c24e762305d59589ca26543
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17869
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoAdd support for application/vnd.ocf+cbor to resource directory. 31/17631/10
Todd Malsbary [Wed, 1 Mar 2017 19:52:54 +0000 (11:52 -0800)]
Add support for application/vnd.ocf+cbor to resource directory.

- Add support to RD for publishing and storing endpoints.  Only
  publish secure or non-secure eps depending on resource properties.
- When creating application/cbor response to discovery, create
  separate links with the fully-qualified URI containing the supported
  endpoints.

Change-Id: Ifc370825103a73335eddccb4bbde4225d0a0a736
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17631
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoupdate Doxygen comment for cautilinterface 57/18157/5
jihwan.seo [Fri, 24 Mar 2017 06:44:19 +0000 (15:44 +0900)]
update Doxygen comment for cautilinterface

Change-Id: If43415acd3dbb12f090a06d8848ad398b2bf45be
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18157
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoAdd support for application/ocf.vnd+ocf discovery payloads. 75/17575/8
Todd Malsbary [Wed, 1 Mar 2017 01:10:38 +0000 (17:10 -0800)]
Add support for application/ocf.vnd+ocf discovery payloads.

- Remove baseURI and add anchor property.
- Plumb content format through to parsing/converting payloads.

Change-Id: I05d2a9263b085dec3683f6345190a4b4574ff2dc
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17575
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1921] Remove compiler warning 49/17949/7
Dan Mihai [Wed, 15 Mar 2017 23:10:46 +0000 (16:10 -0700)]
[IOT-1921] Remove compiler warning

Some of the compilers complain about static functions that are unused.

Change-Id: I8850112903e8e8e6d55d2465f96fedd4e792a69b
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17949
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
8 months agoresource-encapsulation: Remove exec permission on sources 97/17697/12
Philippe Coval [Mon, 6 Mar 2017 15:40:25 +0000 (16:40 +0100)]
resource-encapsulation: Remove exec permission on sources

Change-Id: Iabb87176a2a6d13fe74e7b92697a3273e8bf9f0c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17697
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
8 months agoMerge branch 'master' into iot-1785 45/18145/2
Kevin Kane [Mon, 27 Mar 2017 15:32:09 +0000 (08:32 -0700)]
Merge branch 'master' into iot-1785

Change-Id: I7adad0e43bced555c87a3b3d7f220f2fff79a13a
Signed-off-by: Kevin Kane <kkane@microsoft.com>
8 months agoFix result of static analyzer in primitive service. 91/18091/2
KIM JungYong [Wed, 22 Mar 2017 11:37:31 +0000 (20:37 +0900)]
Fix result of static analyzer in primitive service.

In this patch, unhandled exception in the RC and RE was handled.

Change-Id: If6337a3fa9e9cc2c3a3b055bffe384f90d6b555c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18091
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agodocs: Update Doxyfiles for c-doc 37/18137/3
George Nash [Thu, 23 Mar 2017 16:01:14 +0000 (09:01 -0700)]
docs: Update Doxyfiles for c-doc

- Only the cautilinterface.h from connectivity is currently
  intended as a public API. The documentation directly
  references values defined in cacommon.h. So cacommon.h
  is also included to prevent documentation errors.
- OPTIMIZE_OUTPUT_FOR_C has been changed to yes. This prevents
  the documentation adding things about classes and other
  documentation that does not make since in C only code.
- Updated the Home.txt. The page linked to no longer contains
  getting started guides.

Change-Id: I1bb5d42fcd1287bb0f5614ceb204b1e56f79aa2d
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18137
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoFix defects detected by static code analyzer 71/17971/6
Jihun Ha [Thu, 23 Mar 2017 01:39:24 +0000 (10:39 +0900)]
Fix defects detected by static code analyzer

Checking if a OICMalloc is failed is added.
Calling OICFree to prevent a memory leak is added.

Follow coding convention padding after condition "if ("

Change-Id: Ifdd2ba5f747758bd0120ff396f7441b77a444b81
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17971
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoIPCA: Temporarily disable all unit tests + run.bat revert. 79/18179/4
Soemin Tjong [Sat, 25 Mar 2017 00:28:49 +0000 (17:28 -0700)]
IPCA: Temporarily disable all unit tests + run.bat revert.

Observed a few cases of inexplainable unit tests failures today (all
with error 1033).

One example below where all unit tests were completed but scons reported
a failure.

https://build.iotivity.org/ci/job/iotivity-verify-windows-vs2015/11704/consoleText

[----------] 1 test from ElevatorServerStop
[ RUN      ] ElevatorServerStop.Stop
[       OK ] ElevatorServerStop.Stop (1 ms)
[----------] 1 test from ElevatorServerStop (1 ms total)

[----------] Global test environment tear-down
[==========] 31 tests from 6 test cases ran. (311 ms total)
[  PASSED  ] 31 tests.
scons: *** [out\windows\amd64\debug\resource\IPCA\unittests\utresource\ipca\unittests\ipcatests] Error 1033
scons: building terminated because of errors.
Build step 'Execute Windows batch command' marked build as failure

Change-Id: Ic9082e043b70e73e7d7eca20598e4500db5e364d
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18179
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1520] Allow MOT to be disabled after it is enabled. 09/18109/2
Alex Kelley [Tue, 21 Mar 2017 21:54:23 +0000 (14:54 -0700)]
[IOT-1520] Allow MOT to be disabled after it is enabled.

These changes do the following:
1. Fix updateWriteableProperty to honor the 'mom'
   property any time that it is changed.
2. Rename updateWriteableProperty to
   DoxmUpdateWriteableProperty to clarify its usage.
3. Fix an invalid check in the ProvisioningClient.
4. Added tests to ensure that mom can be enabled
   and disabled when MOT is available.

Change-Id: I97c01a9dc8f44bcf5a6aeac3bf459777c97e19b0
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18109
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months ago[IOT-1640] [IOT-1641] Fix MOT invalid pin handling 29/18029/4
Alex Kelley [Thu, 16 Mar 2017 20:42:13 +0000 (13:42 -0700)]
[IOT-1640] [IOT-1641] Fix MOT invalid pin handling

These changes do the following:
1. Set up PDM for each MOT attempt.
2. Clean up invalid PDM entries on failure.
3. Clean up invalid credentials on failure.
4. Break out success and failure paths for
   MOTDtlsHandshakeCB to simplify code.
5. Update SubownerClient to allow a user to
   provide a preconfigured pin instead of using
   the default preconfigured pin.

Change-Id: I9c4e9b802e6fe6e68da18c34e9150c43ba01c445
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18029
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months agoRemoved unused function declarations 69/17969/7
Jaewook Jung [Fri, 17 Mar 2017 05:03:17 +0000 (14:03 +0900)]
Removed unused function declarations

Removed unused function declarations
 - DeleteActionSets() in oicgroup.h
 - OCRepPayloadAddModelVersion() in ocpayload.h

Change-Id: Ia3109df490f47f6506b3a1a95d23f1017c443648
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17969
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1763] Implemented device onboarding state CR 23 93/17993/13
Nathan Heldt-Sheller [Sun, 19 Mar 2017 04:17:19 +0000 (21:17 -0700)]
[IOT-1763] Implemented device onboarding state CR 23

Added oic.r.pstat Property "dos" as made mandatory by
OCF Security Specification CR 23.

patch set 2: Functional cbor marshalling.

patch set 3: Updated json2cbor tool and every svr.json and
.dat file I could find to use the new pstat.dos property.

patch set 4: Updated json2cbor tool to support oic 1.1 format
but print warning if .dos property not found.

patch set 5: Added better handling for .dat files that don't
contain "dos" Property, to aid in legacy app migration.

patch set 6: Rebase.

patch set 7: Fixed unittest issue that appeared after re-base,
and addressed misc comments on patch set 5.

patch set 8: commit msg fix.

patch set 9: added "TODO" items for UPDATE handling once
other CRs are done.

patch set 10: addressed a few of Kevin's comments.

patch set 11: rebase

patch set 12: addressed Greg's request for specific JIRA numbers.

Change-Id: I6d9751ff1e6d7d88789e1462819736b38f176a53
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17993
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months agoFix crash issue related string reference in std::thread exec 05/18005/5
jihwan.seo [Mon, 20 Mar 2017 11:56:52 +0000 (20:56 +0900)]
Fix crash issue related string reference in std::thread exec

Change-Id: I24947070a50e787dabeadb8e15192eb68b687944
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18005
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1955] Notification service fails to load libca-interface.so 33/18133/4
Poovizhi [Thu, 23 Mar 2017 12:37:29 +0000 (18:07 +0530)]
[IOT-1955] Notification service fails to load libca-interface.so

Changes are made to add libca-interface.so to service/notification. This library
requires libresource_directory.so and hence added that.
Changes added in build.gradle to avoid duplicates.

Change-Id: I0a40aa9fdb726fb7a1e778ff63155d78ffde21f6
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18133
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoFix in EnableRemoteService for Notification Service via Cloud 59/17959/9
jake [Thu, 23 Mar 2017 07:44:42 +0000 (16:44 +0900)]
Fix in EnableRemoteService for Notification Service via Cloud

When notification message is sent thru cloud, consumer cannot receive.

It worked well from initial development environment
but others reported it does not worked well in some environment.
Initially, to call NSSetRemoteServerAddress(char *serverAddress)
resolves issue by testing but, logic perspective, this is not solution.

MSCacheSubData has messageObserverID, syncObserverID for local and
remote consumer respectively and this structure brings fundamental
complexity inspite they are not handled separately.
This patch remove remote set for these observerIDs member from struct.

Change-Id: I7e5e52487d71cba0cb3c9772fd0436d8e323285e
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17959
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoFix stopCaching logic in the RE client. 25/18125/4
KIM JungYong [Thu, 23 Mar 2017 08:59:45 +0000 (17:59 +0900)]
Fix stopCaching logic in the RE client.

When caught exception at calling stopCaching(),
can not start caching again, reason that IsCaching boolean does not changed in RE client.

In this patch,
exception handling and disable IsCaching flag.

Change-Id: I80f4629d21ea16799f945c90d56f70f81bc38e90
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18125
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months ago[IOT-1846] Resolved unittest failure on provisioning 35/18035/6
js126.lee [Tue, 21 Mar 2017 04:27:13 +0000 (13:27 +0900)]
[IOT-1846] Resolved unittest failure on provisioning

Resolved unittest failure of SRPSaveTrustCertChainDER and SRPSaveTrustCertChainPEM.

Change-Id: I9252c6718da1fa0be5942f296b391c49b7905c5f
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18035
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 months agoInitial commit of IPCA. 49/17449/24
Soemin Tjong [Wed, 22 Feb 2017 09:17:52 +0000 (01:17 -0800)]
Initial commit of IPCA.

IPCA stands for IoTivity Procedural Client Api, which implements C APIs
for accessing IoTivity RESTful CRUDN APIs.

IPCA uses the C++ APIs provided by OCPlatform and OCResource.
It is intended to be used by application developers, or by code
generated from swagger, to develop IoTivity client apps.

IPCA supports APIs for Discovery of IoTivity devices, Create, Delete
and Observe resources, Get and Set property values, and security
related APIs for password display (typically used in Onboarding
Tool case) and password input (typically used in Multiple Ownership
Transfer case).

Please find more info in: https://wiki.iotivity.org/ipca.
And more info in code:
inc\IPCA.h for API documentation.
src for the implementation of IPCA.
samples\ElevatorClient for sample application that uses the IPCA api.
samples\ipcaapp for sample application that discovers any IoTivity
devices on the network.

Change-Id: I683b02786d4df32b2feacdd9f1674350214b0618
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17449
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months ago[IOT-1475] Remove DER/PEM mixing in ParseChain 35/17835/3
Kevin Kane [Tue, 7 Mar 2017 22:43:57 +0000 (14:43 -0800)]
[IOT-1475] Remove DER/PEM mixing in ParseChain

Change cred resource to always provide own certificate as a PEM
string, and no longer require ParseChain to heuristically parse
a mixed bag of DER and PEM certs.

Also, go back to having ParseChain return an int rather than a size_t
which was changed during /W4 warning cleanup; it must be able to return
negative values to indicate errors.

Change-Id: Id36962ed580eb3bccc110aac0350349b05674ee7
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17835
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months agoTemporarily disable multithreaded on Jenkins for Windows. 99/18099/5
Soemin Tjong [Wed, 22 Mar 2017 00:31:54 +0000 (17:31 -0700)]
Temporarily disable multithreaded on Jenkins for Windows.

This is to address random crashes with error 1033 like the following:
scons: *** [out\windows\amd64\debug\resource\IPCA\unittests\utresource\ipca\unittests\ipcatests] Error 1033

Change-Id: I4d2d47b495091fe325a7fe82b26fdf3a0e438ccb
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18099
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoMake format and versioing number independent from each other. 01/17301/9
Ziran Sun [Wed, 15 Feb 2017 15:21:08 +0000 (15:21 +0000)]
Make format and versioing number independent from each other.

Change-Id: I68138694d59a00aedf0eef36fc135e57ebc6c661
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17301
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoIOT-1583: Removing /W3 warnings inside connectivity/ (part 4) 51/17551/22
Pawel Winogrodzki [Wed, 22 Feb 2017 02:31:11 +0000 (18:31 -0800)]
IOT-1583: Removing /W3 warnings inside connectivity/ (part 4)

Removing the /W3 warnings in order to add the /WX option to prevent new
ones from being added inside the resource/csdk/connectivity/ directory.

Change-Id: I0a6eb91c6c2cd940e9939f54a454aab2a01ec954
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17551
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agologger: Fix missing include for size_t 63/17963/2
Philippe Coval [Thu, 16 Mar 2017 13:13:05 +0000 (14:13 +0100)]
logger: Fix missing include for size_t

Observed issue on Tizen:Common:

  resource/csdk/logger/include/trace.h:60:65:\
   error: unknown type name 'size_t'
  resource/csdk/logger/src/trace.c:29:65:\
   error: unknown type name 'size_t'

Change-Id: Ic4c4a492d238b4f9d7860720fa10c92dfca051f8
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17963
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
8 months agoFix for Jira [IOT-1424] 75/15275/16
Veeraj Khokale [Mon, 10 Oct 2016 08:34:54 +0000 (14:04 +0530)]
Fix for Jira [IOT-1424]

1. Modified CHPGetOCContentType() and CHPGetOptionID() to
internally duplicate the string parameter passed and
work on this copy, thereby maintaining const correctness.
2. Also modified unit test to pass "application/cbor" as
http content type.

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>
(cherry picked from commit cac65bc77127b61056783bdd1178263518682912)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15275
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoFixed memory leak on cablockwisetransfer.c 27/18027/4
Jaewook Jung [Mon, 20 Mar 2017 23:41:19 +0000 (08:41 +0900)]
Fixed memory leak on cablockwisetransfer.c

Fixed memory leak on cablockwisetransfer.c detected by static analysis

Change-Id: I9de4b7ba8abffd53fe1659d4d1a504e623d8bbd5
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18027
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoupdate logs before callback in InProcClientWapper. 39/18039/4
jihwan.seo [Tue, 21 Mar 2017 04:44:02 +0000 (13:44 +0900)]
update logs before callback in InProcClientWapper.

Change-Id: I1b1976908ed8d5054fe63a46953005330c76855d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18039
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agodocs: Update file paths for devdocs.doxyfile 23/17923/7
George Nash [Tue, 14 Mar 2017 19:15:08 +0000 (12:15 -0700)]
docs: Update file paths for devdocs.doxyfile

Fixed the paths for the input files. Added additional
paths that were missing.

Adds a log output file when doxygen was run

This only updates the doxyfile it does not fix any
warnings produced.

Change-Id: Ic566e8ec728a72cc059e66cafdcece396897cd98
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17923
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoFix defects detected by static code analyzer 07/18107/2
Parkhi [Thu, 23 Mar 2017 02:22:17 +0000 (11:22 +0900)]
Fix defects detected by static code analyzer

- When using the strncpy function, modified it to include a null termination

Change-Id: Ibb47c2737c13558e5d18f809673300d2f8a0e8a7
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18107
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoSSL adapter unit tests update 61/17861/4
ol.beketov [Thu, 9 Mar 2017 12:59:31 +0000 (14:59 +0200)]
SSL adapter unit tests update

Unit tests for various cipher suites updated in
correspondence to changes from the patch 16251
"Support for multiple ciphersuites".

Change-Id: Ie65bb0df79cb9a17d88d41fde9f791c75a04db17
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17861
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 months agonotification: Reordering libs for linker on examples and tests 63/17563/16
Philippe Coval [Tue, 28 Feb 2017 13:20:17 +0000 (14:20 +0100)]
notification: Reordering libs for linker on examples and tests

Reordering libs by dependencies is solving observed issue on yocto:

  ld: warning: liboc.so, \
  needed by out/yocto/i586/release/libresource_directory.so, not found \
  (try using -rpath or -rpath-link)
  libresource_directory.so: \
  undefined reference to `OC::MessageContainer::representations() const'
  (...)

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I8622e0efbdad18236cb04fb14f8d01bcef7b8879
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17563
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agobuild: Prepare building by installing dependencies libs 99/11699/19
Philippe Coval [Mon, 29 Aug 2016 14:59:34 +0000 (16:59 +0200)]
build: Prepare building by installing dependencies libs

It is strongly recommended to rely on scons,
 if not possible, this can be done differently using this script.

For more details about building IoTivity please check:

https://wiki.iotivity.org/build

The main purpose of prep.sh, is for continuous integration experiments
 for Tizen platform, but could be used for others too.

Bug: https://jira.iotivity.org/browse/IOT-1600
Change-Id: I63e713c8531f0eea698277993cf21c3d55c80270
Origin: https://gerrit.iotivity.org/gerrit/#/c/11699/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12477
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 10c5f532f85a2e97dbbe91c94276fc9bfff5d016)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11699
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agocsdk: Fixed compiler warnings in ocstack.c 13/17813/6
George Nash [Thu, 9 Mar 2017 22:37:55 +0000 (14:37 -0800)]
csdk: Fixed compiler warnings in ocstack.c

-Wformat= warning fixed by changing the ssanf %lld flag to SCNd64
-Wunused-function fixed by removing the OCSetNetworkMonitorHandler
 function. Since the function is not used it is also not maintained
 it is best to remove the code.

Change-Id: Ib82e6e77a561ac8713cc77bdecc44a5ce42cefff
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17813
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agoEnable GetNetworkInformationTest on windows 35/17635/7
Dave Thaler [Thu, 2 Mar 2017 22:46:18 +0000 (14:46 -0800)]
Enable GetNetworkInformationTest on windows

Change-Id: Ic5f6449adb5ead85a2b5022a830397e3bb766a7a
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17635
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agodocs: Removed unused Doxyfile 09/17909/4
George Nash [Tue, 14 Mar 2017 16:55:29 +0000 (09:55 -0700)]
docs: Removed unused Doxyfile

There are two Doxyfiles for generating C API documentation
1. ./resource/docs/c-doc/Doxyfile
2. ./resource/csdk/doc/Doxyfile

The first file is listed in the wiki and appears to be
better maintained than the second. To avoid confusion
the second is removed by this commit.

Change-Id: I5fe1f688bbd9930de623fad26494a880bac35244
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17909
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
8 months agogtest: Test presence of source on existing file 55/17855/3
Philippe Coval [Fri, 10 Mar 2017 17:29:56 +0000 (18:29 +0100)]
gtest: Test presence of source on existing file

configure is not in upstream's repo
because, it's intended to be generated from configure.ac.

So to avoid ambiguity, we test if CMake file is present instead.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ia2e7c8c4d0c827b300b9345c9cb7811a193cfd9e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17855
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoAdd making post payload in occlient sample app 87/18087/2
ChaJiWon [Wed, 22 Mar 2017 10:41:02 +0000 (19:41 +0900)]
Add making post payload in occlient sample app

This patch add making post payload logic when client performs POST request.

Change-Id: I58e96b2c7cc325116409720c56a6e12046ecdfa5
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18087
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoremove duplicate code in caleadapter 97/17997/2
jihwan.seo [Mon, 20 Mar 2017 03:53:08 +0000 (12:53 +0900)]
remove duplicate code in caleadapter

Change-Id: I40ad527a8500b272d9c4660dfcded966e374d006
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17997
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agodocs: Update the list of of Doxyfile input files 91/17991/4
George Nash [Fri, 17 Mar 2017 22:25:58 +0000 (15:25 -0700)]
docs: Update the list of of Doxyfile input files

The default Doxyfile should only produce documentation
for public APIs.
.
For internal developer APIs the devdocs.doxyfile should
be used.

Change-Id: I6bce824095b33f3e2a51a960eb6c0b1f7e0a36d1
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17991
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoresource: Use global LIBPATH 29/17829/4
Philippe Coval [Fri, 10 Mar 2017 16:53:14 +0000 (17:53 +0100)]
resource: Use global LIBPATH

As set in shared file:
resource/c_common/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Id5fce812c8da866305647308919bced90397cc5d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17829
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoFix for the issue reported in [IOT-1923] 55/18055/3
Poovizhi [Tue, 21 Mar 2017 13:03:20 +0000 (18:33 +0530)]
Fix for the issue reported in [IOT-1923]

There are invalid signed vs. unsigned checks in cainterfacecontroller. Those needs to be fixed.

Change-Id: I780203e68d66e170714356192ea2469dece4c5ed
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18055
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>
8 months agoDisable Unit test of notificaiton service. 77/18077/3
KIM JungYong [Wed, 22 Mar 2017 02:27:34 +0000 (11:27 +0900)]
Disable Unit test of notificaiton service.

Change-Id: I5a89207f4897accacf4683b0561277bf0638cc2c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18077
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoFixed bug in compared WILDCARD_SUBJECT_ID 41/18041/3
js126.lee [Tue, 21 Mar 2017 06:43:06 +0000 (15:43 +0900)]
Fixed bug in compared WILDCARD_SUBJECT_ID

Issue : If the first character of deviceuuid generated ramdomly is *(2a) in PT,
        subjectuuid of cred is set to * wrongly instead of actual deviceuuid
        during generating cred payload during OT.

Change-Id: Idc6587d71456a1eb7a816bd083bfcbb5c94e9c34
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18041
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
8 months agoMerge branch 'master' into iot-1785 81/17981/3
Kevin Kane [Wed, 22 Mar 2017 02:26:26 +0000 (19:26 -0700)]
Merge branch 'master' into iot-1785

Change-Id: If30ba205d4fcb0b5dc969f83d464509a8059ef3f
Signed-off-by: Kevin Kane <kkane@microsoft.com>
8 months agoFix unused warning error in ACL resource 63/18063/2
Kevin Kane [Tue, 21 Mar 2017 20:44:20 +0000 (13:44 -0700)]
Fix unused warning error in ACL resource

Remove fetching of subjectCborType into its own variable, which
ends up being unused if LOGGING is not defined and causes a warning
that breaks the build; instead, fetch the value as part of the
logging call so it also gets compiled out if LOGGING is not defined.

Change-Id: Iee950abe0d7c160d2feb50138df5fe39c69addf4
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18063
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
8 months agombedtls: remove Tizen specific case 57/17857/2
Philippe Coval [Wed, 8 Mar 2017 10:40:38 +0000 (11:40 +0100)]
mbedtls: remove Tizen specific case

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I74ab383626672ec37287514b37826b23135b2f64
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17857
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoRemoved easy-setup TC associated with 37/18037/3
Parkhi [Tue, 21 Mar 2017 04:31:56 +0000 (13:31 +0900)]
Removed easy-setup TC associated with
 https://gerrit.iotivity.org/gerrit/#/c/17995/

 - ThrowExceptionWhenProvisionDeviceProperiesFailedWithoutSSID

Change-Id: I59058bdbf5e585979dae643d66279adc9886c65a
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18037
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoAdded Software Version Validation and Update oic.sec.dpmtype bits (CR-24) 21/17521/9
Craig Pratt [Mon, 27 Feb 2017 00:47:30 +0000 (16:47 -0800)]
Added Software Version Validation and Update oic.sec.dpmtype bits (CR-24)

Added oic.sec.dpmtype bitfield definitions and pstat.tm change
 detection logic.

Changed the SVR enum declarations to uints instead of enums to avoid
 C++ type conversion errors and enable bitfield operations on these fields.
 This was causing compilation errors on arduino builds when doing
 bitfield operations on pstat.tm/.cm.

Change-Id: I31b07cc040a2d22296d6cd75897b69a0d06b5eb4
Author: Craig Pratt <craig@ecaspia.com>
Signed-off-by: Craig Pratt <craig@ecaspia.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17521
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
8 months ago[IOT-1880] Adding Fixes for issues generated from static analyzer tool in Notificatio... 53/17653/8
Poovizhi [Fri, 3 Mar 2017 10:24:09 +0000 (15:54 +0530)]
[IOT-1880] Adding Fixes for issues generated from static analyzer tool in Notification service c++ , JNI layer

1) In JNINotificationConsumer.cpp, Getting native Provider object is common code for all the native methods.
   Added a separate method ' getNativeProvider' to do this, so that method size and complexity will be reduced.

2) JNiNotificationConsumer.cpp Line 1379, and NSTopicslist.cpp Line 59 has changes to fix the issue of Unreachable code.

3) Copy constructor and copy assignment operator are added  in class 'NSAcceptedProviders' & 'NSAcceptedConsumers'  which has dynamically allocated data members

4) In NSAcceptedProviders class, getProviders() method is changed to const since it is being used by the copy constructors and hence
   modified the member variable 'm_mutex' to be mutable.

5) In NSAcceptedConsumers class, getConsumers() method is changed to const since it is being used by the copy constructors
   and hence modified the member variable 'm_mutex' to be mutable.

6) In  NotiListener.java, the NULL check for mProviderSample is moved above the first instance where mProviderSample is beig used.

Change-Id: Ic18c3d9797a02a73f5397192b21e7dda5926119e
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17653
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agobuild: Add stack and logger pathes to pkg-config 45/17845/3
Philippe Coval [Fri, 10 Mar 2017 18:07:29 +0000 (19:07 +0100)]
build: Add stack and logger pathes to pkg-config

This will prevent errors, like:

/usr/include/iotivity/resource/octypes.h:32:27: \
 fatal error: ocstackconfig.h: No such file or directory

It was tested on Debian

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I8a4f06cd05158e8659628a654dfdbe7e1784e4bc
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17845
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoUpdate Readme.scons for LOG_LEVEL build option 35/17935/6
jihwan.seo [Wed, 15 Mar 2017 10:29:26 +0000 (19:29 +0900)]
Update Readme.scons for LOG_LEVEL build option

Change-Id: I07b98f7bb0e89addf9fafa496aea78061085707d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17935
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoRemove a condition of device provisioning 95/17995/2
Jihun Ha [Mon, 20 Mar 2017 00:42:31 +0000 (09:42 +0900)]
Remove a condition of device provisioning

There would be a case where user wants to provision only device configuration
without any wifi configuration. In this case, a condition to filter a case of
empty ssid should be removed.

Change-Id: Ib135d40d7f59f1ef0ee1bf7fe24a5a54d737aa96
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17995
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months ago[IOT-1905] Fix for Unit test in Notification service in C++ layer 79/17779/7
Poovizhi [Wed, 8 Mar 2017 13:00:33 +0000 (18:30 +0530)]
[IOT-1905] Fix for Unit test in Notification service in C++ layer

Dependency of hippomocks is removed in notificaiton service

Change-Id: I9705e2d92a4eec4addecb5a51893a7898d056867
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17779
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoFix a wrong return if an user does not set a MOT configuration 73/17973/2
Jihun Ha [Fri, 17 Mar 2017 08:20:44 +0000 (17:20 +0900)]
Fix a wrong return if an user does not set a MOT configuration

If an user does not set any MOT configuration and ownership transfer is
successfully done, then a result should be ES_OK.
If ESOwnershipTransferData->getMOTMethod() is OIC_OXM_COUNT, it means user
does not set the configuration.

Change-Id: I055beed8e893ae0754a4f5ea467cbe99f649ca4d
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17973
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoFix defects detected by static code analyzer 75/17975/2
Parkhi [Fri, 17 Mar 2017 08:20:07 +0000 (17:20 +0900)]
Fix defects detected by static code analyzer

Change-Id: I63dbeed58bae6c943ce8374685bcdaea867ec57e
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17975
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months ago[IOT-1849] fixed null subject ID comparison logic 03/17503/8
Nathan Heldt-Sheller [Fri, 24 Feb 2017 19:11:20 +0000 (11:11 -0800)]
[IOT-1849] fixed null subject ID comparison logic

Issue description:
CTT sends requests over coap, but isRequestOverSecureChannel incorrectly concludes
that these requests arrived over a secured channel. That's because here:

if(memcmp(context->requestInfo->info.identity.id,
nullSubjectId.id, sizeof(context->requestInfo->info.identity.id)) != 0)

sizeof(context->requestInfo->info.identity.id) is larger than sizeof(nullSubjectId.id).

So, that compares a bunch of random bytes from the stack with the bytes from
context->requestInfo->info.identity.id.

This changes logic to compare like-sized objects.

patchset 2: resolved IOT-1849; created new IOT-1894 "Determine appropriate CA_MAX_ENDPOINT_IDENTITY_LEN" (see "TODO IOT-1894" comment).

patchset 3: comment typo fix

patchset 4: self review fixes

patchset 5: addressed Dan's feedback

patchset 6: addressed Phil's feedback

patchset 7: replaced if( with if ( throughout

Change-Id: I2781357c74a1e0c47a534bc6df2f2b790c0caae7
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17503
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
8 months ago[IOT-1785] Cache computed roles 45/17945/2
Kevin Kane [Tue, 14 Mar 2017 22:32:56 +0000 (15:32 -0700)]
[IOT-1785] Cache computed roles

Only recompute roles for a peer when the list of certificates
changes, or when one of the certificates expires.

Change-Id: Ifb25af82fcaa412b46d7612f024deced667456b9
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17945
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months ago[IOT-1785] Use a CBOR map for roles in ACL resource 27/17927/2
Kevin Kane [Mon, 13 Mar 2017 21:44:25 +0000 (14:44 -0700)]
[IOT-1785] Use a CBOR map for roles in ACL resource

Previous solution used a temporary custom string format to
differentiate UUID-based and role-based subjects. Change this
to using a proper map inside the CBOR for a role, and
differentiate based on whether the subject value is a text string
(in which case it's a UUID type) or a map (in which case a role).

Plug another couple memory leaks found along the way.

Change-Id: Ic592d3538685c9a9ce664619099cfe2ac4889033
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17927
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
8 months agoAdd an error code, "ES_ERRCODE_UNSUPPORTED_WIFI_FREQUENCY", in easy setup 19/17819/3
Jihun Ha [Fri, 10 Mar 2017 02:10:13 +0000 (11:10 +0900)]
Add an error code, "ES_ERRCODE_UNSUPPORTED_WIFI_FREQUENCY", in easy setup

Added error code:
- ES_ERRCODE_UNSUPPORTED_WIFI_FREQUENCY = 13
- An Enrollee can not connect to a target WiFi AP because the AP resides in
  an unsupported WiFi frequency

Change-Id: Ia233e0e5e0bf8bee6dfa4f4b8a0660be325b363f
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17819
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 months agoIOT-1907: Fixing PMCloneOCProvisionDev, 43/17843/3
Pawel Winogrodzki [Thu, 9 Mar 2017 21:57:05 +0000 (13:57 -0800)]
IOT-1907: Fixing PMCloneOCProvisionDev,

Fixing PMCloneOCProvisionDev to perform a proper deep copy
of the internal doxm::subOwners and doxm::mom fields, so that
they no longer point to the same structs as the original.

Change-Id: I5b30e4e7012934b9a17a4f8d7cecd6d2b65b1055
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17843
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
8 months ago[IOT-1920] Fix logic in PS to encode and map unmodified resources 37/17937/2
Alex Kelley [Wed, 15 Mar 2017 04:51:31 +0000 (21:51 -0700)]
[IOT-1920] Fix logic in PS to encode and map unmodified resources

Change-Id: Ifbcc174efebd666d05f4134974267142a01c9f5f
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17937
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
8 months agocsdk: Remove exec permission of stack headers 83/17383/13
Philippe Coval [Mon, 20 Feb 2017 16:35:48 +0000 (17:35 +0100)]
csdk: Remove exec permission of stack headers

Change-Id: Ie8ef6699fc8a999579fe3e1e8474d3133a179ef9
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17383
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
8 months ago[IOT-1919] Fix pstat's map size 25/17925/2
Dan Mihai [Wed, 15 Mar 2017 00:27:29 +0000 (17:27 -0700)]
[IOT-1919] Fix pstat's map size

Recent change d10c4a88ae458d3d067d74edf8287b08cee14857 removed
the writeable deviceuuid (a.k.a. OIC_JSON_DEVICE_ID_NAME) property.

Change-Id: Iee4ca533c29a77461603a97fadc7ad2207a40411
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17925
Reviewed-by: Kevin Kane <kkane@microsoft.com>
8 months agoCrash fix for Notification provider sample. 13/17613/2
Harry [Thu, 2 Mar 2017 09:32:20 +0000 (15:02 +0530)]
Crash fix for Notification provider sample.

Change-Id: I9596008496042ca00890f93bc87f121bcbc7c7bd
Signed-off-by: Harry <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17613
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 months agoAdd following wrapper macros for convenience. 21/17821/9
Kihyuck Shin [Fri, 10 Mar 2017 05:16:13 +0000 (14:16 +0900)]
Add following wrapper macros for convenience.

- OIC_TRACE_MARK, OIC_TRACE_BUFFER

Add and modify trace point positions for clarification.

Change-Id: I3996b38d71d3a2cfe4abff2353f8aef66e6ceb8a
Signed-off-by: Kihyuck Shin <kihyuck.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17821
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 months agoAndroid RC: jar bundles correctly loaded 73/17773/2
Zoltan Kuscsik [Wed, 8 Mar 2017 10:36:13 +0000 (11:36 +0100)]
Android RC: jar bundles correctly loaded

Fixing the issue when jar bundles are never gets loaded.

Change-Id: I0e068f39b95434a21c1481244a79a444659aa430
Signed-off-by: Zoltan Kuscsik <kuscsik@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17773
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>