platform/upstream/iotivity.git
7 years agoFix static analysis issue in base layer.
Jaehong Jo [Thu, 9 Feb 2017 02:58:52 +0000 (11:58 +0900)]
Fix static analysis issue in base layer.

ocresource.c, ocstack.c

Change-Id: I8568bb8942eae29da646f7e9efa30d4f73fa9e07
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17133
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1531]PAL API for get link-local zone id from ifindex
bg.chun [Tue, 8 Nov 2016 12:00:56 +0000 (21:00 +0900)]
[IOT-1531]PAL API for get link-local zone id from ifindex

PAL API for get IPv6 link-local zone id from ifindex.
This changes need for mapping zone-id with IPv6 link-local Address
on Endpoint and CAGetNetworkInfo().

Change-Id: Ib5043d3de5747f3e461de775dba2d04e804297dd
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14123
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoUpdated SSL_CHECK_FAIL macro to ignore bad client hello message.
Chul Lee [Fri, 13 Jan 2017 05:12:58 +0000 (14:12 +0900)]
Updated SSL_CHECK_FAIL macro to ignore bad client hello message.

Change-Id: I317e63d192af372844e672650c261578508e9331
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16367
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7198d2fdd91adec7df769a78ef66d2b87d8d9e47)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17171

7 years agodelete wifi API and pkg config in tizen.
jihwan.seo [Mon, 6 Feb 2017 02:19:26 +0000 (11:19 +0900)]
delete wifi API and pkg config in tizen.

since IoTivity already use Tizen Connectivity Manager API instead of wifi API.
it should be removed in this and there.

Change-Id: I9a61d7d4d323fe83e988c792284179c099bc2855
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17079
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoIOT-1583: Preparing SConscripts for /W3 and /WX changes.
Pawel Winogrodzki [Wed, 1 Feb 2017 20:47:31 +0000 (12:47 -0800)]
IOT-1583: Preparing SConscripts for /W3 and /WX changes.

Initial commit making changes and small clean-up in SConscript
files to enable adding /W3 and /WX compiler options limited
to the resource/csdk/stack/ directory.

Changes made:
1. Building of stack's code moved to resource/csdk/stack/SConscript.
2. Turned extlibs/timer/ into a static lib, so that it doesn't compile
(and generate warnings) along with other modules' code.

Change-Id: I6c64916dbcfd23edb546d43db7b2470100528baa
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16975
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoreplace parameter name in setDevAddr
jihwan.seo [Tue, 7 Feb 2017 22:45:44 +0000 (07:45 +0900)]
replace parameter name in setDevAddr

Change-Id: I78a46e9c8be9f844277f6ccc9ac6820a69e75047
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17097
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoIOT-1804 Add option to build without MOT in run.bat
Alex Kelley [Tue, 7 Feb 2017 22:12:17 +0000 (14:12 -0800)]
IOT-1804 Add option to build without MOT in run.bat

Change-Id: Ie1e1a6d15acfbc02d3b6446b0ca1d700376260a7
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoImplement RD update.
Todd Malsbary [Wed, 14 Dec 2016 23:17:39 +0000 (15:17 -0800)]
Implement RD update.

Change-Id: I6d115b14ddefb60fbcfc289e40f69228b7878551
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15639
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-1810]Fix for Double free of payload in C for Notification Message
abitha.s [Thu, 9 Feb 2017 11:08:59 +0000 (16:38 +0530)]
[IOT-1810]Fix for Double free of payload in C for Notification Message

Change-Id: I8f1ddb3208e6383e4e4154c78b03838aa579c902
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17149
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix for missing-field-initializers compiler warning
George Nash [Tue, 7 Feb 2017 23:30:30 +0000 (15:30 -0800)]
Fix for missing-field-initializers compiler warning

The OCDevAddr struct has 7 values only 2 were
initilized when the addr struct was created.

Two values the port and addr were set after the
initilization. All values are now intilized when
the OCDevAddr struct is created.

In addition the EXPECT_EQ was changed to EXPECT_STREQ
the macro undertands that a string is expected and
will display more informative errors if the test fails.

Change-Id: I74093d0a42961f65c3709254e949b8feb8aec587
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17101
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoAdd API to allow application to set RD storage filename.
Todd Malsbary [Wed, 18 Jan 2017 18:51:25 +0000 (10:51 -0800)]
Add API to allow application to set RD storage filename.

Change-Id: I4afa1607ea9758747c212906a8ecf5b7f0099f72
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoFix static analysis issue in base layer
hyuna0213.jo [Wed, 1 Feb 2017 11:53:50 +0000 (20:53 +0900)]
Fix static analysis issue in base layer

-cainterfacecontroller.c: fix dereference memory
-oickeepalive.c: add null check logic

Change-Id: Iaa839b5a8c4eba44934931d9e3b3a529a07a762e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16997
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFix defect found by static analyzer
ChaJiWon [Fri, 3 Feb 2017 06:04:45 +0000 (15:04 +0900)]
Fix defect found by static analyzer

- ocpayloadparse : double free
- occollection : need to NULL check
- ocRepresentation : big size of m_devAddr parameter

Change-Id: I5bd4cbc6d5dab1dfe7293a234e90d2c465a0039c
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17007
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoClean up log messages in CA Layer.
jihwan.seo [Thu, 2 Feb 2017 10:08:49 +0000 (19:08 +0900)]
Clean up log messages in CA Layer.

- To make sure of analysis, Debug level is replaced with Info level.
- Remove unnecessary Logs of BLE and CA common.

Change-Id: Ifab4d264c7347e8575e008ca1bd7fd7deed03b9d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17023
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoImplement RD delete.
Todd Malsbary [Fri, 2 Dec 2016 19:59:43 +0000 (11:59 -0800)]
Implement RD delete.

Change-Id: I492034351d388b58a349024270d5abd9506da86d
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15075
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoUpdate MOT Enable API and added some ESResult.
Parkhi [Thu, 9 Feb 2017 07:30:21 +0000 (16:30 +0900)]
Update MOT Enable API and added some ESResult.

 - Security-layer support MOT enabled API. So updated MOT enabled API.
   Please check following changes.

   1. When the mediator finds an owned-secured resource that is MOT disabled,
      it can enable it according to whether it is the owner or the sub-owner.
   2. MOT related functions are separated.
   3. Changes in DB synchronized check logic have occurred as the above changes occur.

 - Added some ESResult(e.g. ES_MOT_NOT_SUPPORTED, ES_MOT_ENABLING_FAILURE)

Change-Id: I5af3bdfcfbdf6b62b50a07e2d6d699c96a7a2667
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17087
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix crash in ssl retransmission thread
Joonghwan Lee [Thu, 19 Jan 2017 08:33:20 +0000 (17:33 +0900)]
Fix crash in ssl retransmission thread

It is possible to happen segmentation fault if retransmission thread
lock a mutex during CAdeinitSslAdapter function is called

Patch 1: Initial upload

Change-Id: I446aeb2cc9d6cd07d2683984ba2783ab72020c58
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16575
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17107

7 years agoAdding Android Interface API saveACL() and doSelfOwnershiptransfer()
Randeep Singh [Wed, 18 Jan 2017 09:50:56 +0000 (15:20 +0530)]
Adding Android Interface API saveACL() and doSelfOwnershiptransfer()

Change-Id: Ia19bb669d073868a1ca74b1e98968383256a62aa
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15835
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16873

7 years agoChange the cred usage according to CR33(MfgCertOTMClarifications)
Chul Lee [Wed, 18 Jan 2017 00:44:06 +0000 (09:44 +0900)]
Change the cred usage according to CR33(MfgCertOTMClarifications)

Change-Id: I042a93cd8acc6c0ec5f6e77f24ecb78b667b9912
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16515
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 317078b7708e6542aa84f30da44afc2f1e14e0d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17109

7 years agoFix selected ciphersuite info of established session
Joonghwan Lee [Thu, 19 Jan 2017 04:25:46 +0000 (13:25 +0900)]
Fix selected ciphersuite info of established session

Fixed selected ciphersuite infomation to get from
the session object when session established.
This patch will be needed in case of multiple (D)TLS session are initiating.

Patch 1:Initial upload

Change-Id: I245443f9e1216da72c742fe7eafaf24445050dfa
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16569
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit f14b783b1828361a41de813f9780ae61ec8a6597)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17105

7 years agoIOT-1806: Temporarily disabling one of OCDiscover* tests.
Pawel Winogrodzki [Wed, 8 Feb 2017 20:27:20 +0000 (12:27 -0800)]
IOT-1806: Temporarily disabling one of OCDiscover* tests.

One of these tests is failing for Windows only. We're disabling it
temporarily to unblock other developers' changes.

Change-Id: I73bbad157acbd618d50f49bcd1fc7ef07baf2aee
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17103
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1685] Make /oic/res observable.
Todd Malsbary [Wed, 7 Dec 2016 01:57:38 +0000 (17:57 -0800)]
[IOT-1685] Make /oic/res observable.

The application is expected to do the following when it wishes to
enable this behavior:
- handle = OCGetResourceHandleAtUri(OC_RSRVD_WELL_KNOWN_URI)
- OCSetResourceProperties(handle, OC_DISCOVERABLE|OC_OBSERVABLE)
- OCNotifyAllObservers(handle, OC_NA_QOS)

Note that this change enables OCNotifyAllObservers for virtual
resources (such as OC_RSRVD_WELL_KNOWN_URI).

Change-Id: I5c49ab168791e6b5a6e3a97f561c2851614e0f8f
Bug: https://jira.iotivity.org/browse/IOT-1685
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15633
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoResource directory related fixes.
Todd Malsbary [Mon, 21 Nov 2016 20:01:33 +0000 (12:01 -0800)]
Resource directory related fixes.

- Use the passed in ID in OCRDPublishWithDeviceId(),
- Set the size of the CBOR array to the length of the discovery
  payload list in OCConvertDiscoveryPayload(),
- Return all local and published resources in response to GET
  /oic/res,
- Set the di and baseURI correctly in discovery payloads,
- Only return resources that match the intersection of 'rt' and 'if'
  queries.
- Add missing calls to ROLLBACK in error paths.

Change-Id: Ib1ad770fec8ec6f9eafff0e5f864ee115f1ba5b5
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14581
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-789] [IOT-792] [IOT-794] [IOT-1763 partial fix]
Nathan Heldt-Sheller [Tue, 24 Jan 2017 06:30:50 +0000 (22:30 -0800)]
[IOT-789] [IOT-792] [IOT-794] [IOT-1763 partial fix]
Remove AMS and clean up SRM context and response code.

The AMS code is dead, broken, and needs to be removed.

Also, the SRM uses a tangled and inconsistent set of context objects,
leaving it unclear which request is being processed, what the state
of processing is, and whether or not a response has been sent to the
requester.

This patch fixes this and should be used as the basis
for future improvements to the policy engine (ACL) code,
SVR handling, etc.

There is some additional cleanup I'd like to do, but this needs
to get merged, and is already a large change, so I'll add those
other fixes as smaller patches once this is merged to master.

NOTE TO REVIEWERS: a few places are marked "TODO Samsung" and need
review by Samsung engr because it is a Samsung feature.

patch set 7: deleted commented out code and files

patch set 8: fixed const assignment warning that was causing Arduino
build to fail

patch set 9: rebased and merged 16883

patch set 10: addressed Kevin's comments and automated build issue

patch set 11: automated build issue

patch set 12: automated build issue

Change-Id: I9560c8aeb1ee59925c0b7aa1282f0cf39f3cae9b
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16719
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix a wrong usage of return value of getMediatorDevId API
Jihun Ha [Tue, 7 Feb 2017 01:03:53 +0000 (10:03 +0900)]
Fix a wrong usage of return value of getMediatorDevId API

Instead of OCUUIdentity *, a value of std::string should be returned.
Additionally, removed a defect point in returning a value after OICFree

Change-Id: Ibcd204b14ea6f488f689ff0ff61da9b618124a4d
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17085
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1794]Adding comments for ProviderStateChanged callback handling
abitha.s [Mon, 6 Feb 2017 12:14:48 +0000 (17:44 +0530)]
[IOT-1794]Adding comments for ProviderStateChanged callback handling

Change-Id: Iec35dfb0a4103898ecb8797658348d4c69f9b890
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17073
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1793]Exclude Internal header from Interface header files
abitha.s [Mon, 6 Feb 2017 12:06:11 +0000 (17:36 +0530)]
[IOT-1793]Exclude Internal header from Interface header files

Change-Id: Ia159f481a1a4ddd5e1a7a1134fa2aa4cdd3cc6f3
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17071
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agosecurity: Fix to access dereferenced object memory in OCSecure class
Philippe Coval [Fri, 13 Jan 2017 06:11:44 +0000 (15:11 +0900)]
security: Fix to access dereferenced object memory in OCSecure class

[Joonghwan Lee]

This patch fix below invalid memory access in OCSecure class
- invalid DisplayNumContext object access
- invalid UserConfirmNumContext object access
- minor fix : prevent duplicated call of SetResult()

[Philippe Coval]

Ported from 1.2-rel branch to master

  Conflicts:
resource/csdk/security/provisioning/src/ownershiptransfermanager.c

Change-Id: I623c856f7086cf7fe7333e69f682070434961fbe
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16369
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Author: Joonghwan Lee <jh05.lee@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16949

7 years agoAdding C++ wrapper and test case to set a seed value for UUID generation
saurabh.s9 [Mon, 16 Jan 2017 11:55:05 +0000 (17:25 +0530)]
Adding C++ wrapper and test case to set a seed value for UUID generation

Change-Id: I14d20ce49b87741dfbef34631cb8f728f3c33b41
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16435
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d58a56bc2929f322b0997d2e6d52a8d2356192d2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16713

7 years ago[IOT-1775] Fix observer response handle logic
bg.chun [Thu, 2 Feb 2017 01:41:09 +0000 (10:41 +0900)]
[IOT-1775] Fix observer response handle logic

Fix observer response handle logic to return OC_STACK_OK,
cases of observer request fail and observer cancel response
will handled with this logic.
[As is]
return OC_STACK_UNAUTHORIZED_REQ
[To be]
return OC_STACK_OK

Change-Id: I7e36775b71d6e4baa3f611b27c2e1cec46779b66
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16999
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFixed a linking error on android for specific Android level
Jaewook Jung [Mon, 23 Jan 2017 10:35:53 +0000 (19:35 +0900)]
Fixed a linking error on android for specific Android level

Change-Id: I9242a64e3658f41e0c847c338307c2ce7d539428
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16697
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: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agobuild: Clean build folders when using scons -c
George Nash [Wed, 1 Feb 2017 20:50:35 +0000 (12:50 -0800)]
build: Clean build folders when using scons -c

Since Android and Java code is built using gradle
the build output is not properly tracked by scons.
Scons' Clean method is used to add the build
output to the clean build.

This commit is limited to the `build` folders
generated when building TARGET_OS=android or
BUILD_JAVA=1.

Change-Id: I69965272e377494bd99731fbacb2cc6e06ff7815
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16977
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoTo support BLE server disable flag in BT configure.
jihwan.seo [Wed, 18 Jan 2017 09:09:52 +0000 (18:09 +0900)]
To support BLE server disable flag in BT configure.

we can select disable/enable flag of ble server
even through there are both client and server mode in OCMode of PlatformConfig.
it will help to reduce battery consumption issue in both mode with ALL transports

Change-Id: I2e4179c1c6b673313d751770a1885774280cc428
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16909
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoTo support BLE MTU negotiation. (android server implementation)
jihwan.seo [Wed, 25 Jan 2017 01:27:52 +0000 (10:27 +0900)]
To support BLE MTU negotiation. (android server implementation)

Change-Id: I9efc5190bab0039afd9d3eb479ecb9700a31b583
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16751
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoGetDerCrl() fix
Oleksii Beketov [Mon, 16 Jan 2017 16:14:08 +0000 (18:14 +0200)]
GetDerCrl() fix

Memory leak in GetDerCrl() fixed

Change-Id: Iddf0628c73d69ce8beafa66b09b4b2f2e61e8006
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16439
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e43d061497721cfe8fbfef623c3c4d5ae2556ce7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/17059

7 years ago[IOT-1790]Changes in C++ APIs design to remove raw pointers
Abitha Shankar [Fri, 3 Feb 2017 07:50:54 +0000 (13:20 +0530)]
[IOT-1790]Changes in C++ APIs design to remove raw pointers

1. Callbacks are discovery and subscribtion is updated to smart pointers
2. Message and sync Callbacks are sent as object in place of pointers
3. Create Message and SendMessage are sent and received as objects in place of pointers.

patch 2 : added review comment changes
patch 3 : rebased
patch 4 : added separate files for accepted provider/consumer

Change-Id: I63f2655d51f46851dcc2e2a93fe2adadcff32134
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16961
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1592] Fix unit test of notification service.
KIM JungYong [Thu, 12 Jan 2017 06:22:32 +0000 (15:22 +0900)]
[IOT-1592] Fix unit test of notification service.

Dependency of hippomocks is removed in notification service

Bug: https://jira.iotivity.org/browse/IOT-1562
Change-Id: I4d8b44b1c06c1abcc73a15fa87db94056a642b9d
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16377
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoRemove ACE related to /oic/sec/acl on defualt ACE setting
js126.lee [Wed, 14 Dec 2016 09:14:57 +0000 (18:14 +0900)]
Remove ACE related to /oic/sec/acl on defualt ACE setting

Remove ACE related to /oic/sec/acl on defualt ACE setting
on SVR file of unowned sample apps, because that is not
required to Ownership Transfer.

Patch 1: upload patch.

Change-Id: Iff9b203cca64b7829ee3018587a1bc758ab966ac
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15599
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16945
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoUpdated with Valgrind memory leak fixes for Notification Provider and consumer.
Philippe Coval [Tue, 15 Nov 2016 12:47:45 +0000 (18:17 +0530)]
Updated with Valgrind memory leak fixes for Notification Provider and consumer.

Updated NS sample App to allow/deny consumer subscription.

[Philippe Coval]

Ported from 1.2-rel to master, did not change style

  Conflicts:
service/notification/cpp-wrapper/examples/linux/notificationserviceconsumer.cpp
service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
service/notification/cpp-wrapper/provider/SConscript
service/notification/cpp-wrapper/unittest/NSConsumerServiceSimulator.h
service/notification/cpp-wrapper/unittest/NSConsumerServiceTest.cpp
service/notification/cpp-wrapper/unittest/NSProviderServiceSimulator.h
service/notification/cpp-wrapper/unittest/NSProviderServiceTest.cpp

Change-Id: I6f3609895cbfe2d4d8b18247b7e7dd4c7a438161
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Author: abitha.s <abitha.s@samsung.com>
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16887
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoWindows: add support for SECURED=0
Dan Mihai [Thu, 2 Feb 2017 00:53:28 +0000 (16:53 -0800)]
Windows: add support for SECURED=0

Add -noSecurity script parameter, for parity with the other platforms.

Also, use case insensitive comparisons for the script parameters.

Change-Id: I57cd2928638fdd0a95bf7c9ce85568a56a0e2419
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17001
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoIOT-1789 Eliminate duplicate messages regardless of addr family
Way Vadhanasin [Tue, 31 Jan 2017 08:46:59 +0000 (00:46 -0800)]
IOT-1789 Eliminate duplicate messages regardless of addr family

There can be duplicate messages coming from multiple ipv6 (or v4)
addresses in the system. The presence of ipv6 link-local for instance
could cause duplicate messages to appear. They can also occur due to
retransmits.

This change extends the existing mechanism of looking at the previous
four unique messages and dropping the new one if the COAP token
matched any of the four messages regardless of the address family.

Change-Id: I88617ad441f51a730cdf75f8a0b01c01ee002eaa
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16973
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years ago[IOT-1783] Fix output buffer size
Dan Mihai [Fri, 27 Jan 2017 21:00:52 +0000 (13:00 -0800)]
[IOT-1783] Fix output buffer size

1. Don't allocate securityPayloadSize and use INIT_SIZE as the buffer
   size parameter, when calling OCConvertPayloadHelper.

2. Using Realloc here was wasteful, because Realloc copies the
   current buffer contents in the new, larger buffer. The current
   buffer contents are not needed in the larger buffer.

3. Call OCConvertPayloadHelper in a single place instead of three.

Change-Id: Ib854d91c5938df10597207f4aa88945dd8720cf5
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16859
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agobuild: Convert EOL to use UNIX convention (csdk)
Philippe Coval [Wed, 1 Feb 2017 09:39:42 +0000 (10:39 +0100)]
build: Convert EOL to use UNIX convention (csdk)

Remove CRLF

Also align to python coding style (using autopep8)

Change-Id: I1e4548b4557dce9c06e22b8774507cf599859015
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16857
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agotizen: Use mediator richsdk lib
Philippe Coval [Wed, 1 Feb 2017 14:15:31 +0000 (15:15 +0100)]
tizen: Use mediator richsdk lib

Change-Id: Ib63db28697925b02349da82c5feabc1334a39ba2
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/Ib63db28697925b02349da82c5feabc1334a39ba2
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16963
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17017

7 years agobuild: Updated boost Framework path for ios
Philippe Coval [Fri, 25 Nov 2016 11:19:59 +0000 (17:19 +0600)]
build: Updated boost Framework path for ios

[srijon.sb]
1. Updated boost Framework path for ios
2. Fixed build errors
a. Some void functions return values
b. Added missing Headers

[Philippe Coval]
Ported from 1.2-rel branch to master
  Conflicts:
service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp

Change-Id: I0b6a796fb815a16725e06fa154499d5a8d1605cf
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Author: srijon.sb <srijon.sb@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by:Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16881
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agobuild: Fix the ios build break
Philippe Coval [Thu, 24 Nov 2016 06:50:01 +0000 (12:50 +0600)]
build: Fix the ios build break

[srijon.sb]
iOS has been built successfully before,
but currently build fail happened due to some update in the IoTivity.
This fix resolves secure and insecure build of IoTivity for iOS

[Philippe Coval]
Rebased on renamed files and adapted,
removed cleanup changes (prefered in isolated patches)
Ported from 1.2-rel to master

Change-Id: I7599d02f1931f38a28eac90163aac5818540c5b9
Author: srijon.sb <srijon.sb@samsung.com>
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14731
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16879
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoRemove duplicated deviceID check in PM_Discovery
js126.lee [Wed, 11 Jan 2017 02:34:27 +0000 (11:34 +0900)]
Remove duplicated deviceID check in PM_Discovery

Patch 1: upload
Patch 2,3: If self reply, discard it.
Patch 4: Retriger jenkins build

Change-Id: Ife6bf2a802aa17da63899ad904a1df085696340e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16297
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16885
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoVersioning feature implementation.
Ziran Sun [Tue, 22 Nov 2016 16:26:22 +0000 (16:26 +0000)]
Versioning feature implementation.

1. Introduce in new Content Type application/vnd.ocf+cbor
2. Introduce in option headers Accept Version and Content-Format Version
3. Handle versioning at CA and RI layers
4. Expose the result of version handling to application layer
5. Add test codes at CA, RI and application layers

Bug: https://jira.iotivity.org/browse/IOT-1735
Change-Id: I9924881f6233b4c4f5af9d50098cd48ef258a753
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16505
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
7 years agoAdd log message for discovered secure resource in easy setup
Jihun Ha [Fri, 3 Feb 2017 03:33:54 +0000 (12:33 +0900)]
Add log message for discovered secure resource in easy setup

Once a target secure resource is discovered, some of useful information of
the found resource are provided by log messages.

Change-Id: If41390c884e5520f51fed1601d626c1eda523c01
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17029
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago/oic/res error response for query handling
Habib Virji [Tue, 6 Dec 2016 17:51:04 +0000 (17:51 +0000)]
/oic/res error response for query handling

- Stop the error response on invalid multicast /oic/res request.
- An error message is sent in case of unicast.
- In case of empty query for interface and resource type,, it sends an error message.
- Add unit tests to test the callback returned value.

BUG: https://jira.iotivity.org/browse/IOT-1650
Change-Id: I2f5902f46030d28ebcc8dc28c7e2f4fbcb6a1716
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15197
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Enable CLOUD and ship ES lib
Philippe Coval [Wed, 1 Feb 2017 14:15:31 +0000 (15:15 +0100)]
tizen: Enable CLOUD and ship ES lib

Change-Id: I84ce3dd94e1a90f13f0ff875221ca5061828618e
Forwarded: https://gerrit.iotivity.org/gerrit/#/q/I84ce3dd94e1a90f13f0ff875221ca5061828618e
Origin: https://review.tizen.org/gerrit/112583
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16965
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17019

7 years agoFix defects detected by static analysis
jaehyun Cho [Wed, 1 Feb 2017 11:07:35 +0000 (20:07 +0900)]
Fix defects detected by static analysis

Change-Id: I43d5400da6e7fd2ee6265c04c36ba59e6ab05478
Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16953
Reviewed-by: Jaehong Jo <jaehong.jo@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>
7 years agobuild: Disable resource-container unittests
Philippe Coval [Wed, 11 Jan 2017 13:21:38 +0000 (14:21 +0100)]
build: Disable resource-container unittests

This test is unstable on jenkins, let's disable it

This reverts commit 7dda698e3b7569eeb9189c33d5cc4805b825f768.

Change-Id: I513c720faa2ba371d2909b3bc364bdd969642f58
Bug: https://jira.iotivity.org/browse/IOT-1684
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16321
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoReplace u_array_list data structure with linked-list in catcpserver
hyuna0213.jo [Thu, 19 Jan 2017 23:58:30 +0000 (08:58 +0900)]
Replace u_array_list data structure with linked-list in catcpserver

Change-Id: I00560bbadf9a1b04864d6676e7605f9ed876d8b9
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16613
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoUpdate OTM condition check logic.
Parkhi [Thu, 2 Feb 2017 10:44:18 +0000 (19:44 +0900)]
Update OTM condition check logic.

 - we need to seperate OTM condition(i.e. Not synchronized with DB, enrollee is already owned by other mediator)

Change-Id: I20696908ff961f3c2ae2f18f9fec01cb6a60fc82
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17013
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoRefactoring EnrolleeSecurity class
Parkhi [Thu, 2 Feb 2017 04:13:58 +0000 (13:13 +0900)]
Refactoring EnrolleeSecurity class

  - provisionOwnership function is too long, so divide the function.

Change-Id: Ifd80fe5ceae70a5181c5020e014acda13215994c
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16915
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix defects detected by static analysis
Jihun Ha [Wed, 1 Feb 2017 10:13:17 +0000 (19:13 +0900)]
Fix defects detected by static analysis

1. nativeRemoteEnrollee and jRemoteEnrollee are initialized with NULL.
2. NULL is returned if global lister for event lister fails to create.

Change-Id: I9b77acb439f4f42e5c382370d060d525e5d6e652
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16939
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1779] Windows: fix linker errors for SECURED=0
Dan Mihai [Fri, 27 Jan 2017 00:23:30 +0000 (16:23 -0800)]
[IOT-1779] Windows: fix linker errors for SECURED=0

The recently-added octbstack.dll exports from octbstack_product_with_tcp
were actually not available when SECURED=0.

Also, move the larger SConscript if/else paths to the 'else' branch,
for easier reading of these two nested if/else statements.

Change-Id: I66821e51c2beef2f2fbad2755a5f361ba836d892
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16807
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years ago[IOT-1753] After-merge code review comments
Andrii Shtompel [Mon, 30 Jan 2017 13:21:57 +0000 (15:21 +0200)]
[IOT-1753] After-merge code review comments

Change-Id: Ibebbad962e6c9626f8387e16aabd558f496de667
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16877
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1366] coaps request for secure resource
Philippe Coval [Thu, 6 Oct 2016 15:12:19 +0000 (20:42 +0530)]
[IOT-1366] coaps request for secure resource

[Randeep Singh]

[IOT-1366] coaps request for secure resource

handled pending review comments

[Philippe Coval]

Ported from 1.2-rel to master

  Conflicts:
resource/csdk/security/src/secureresourcemanager.c

Change-Id: Iacde7395b7a5da53caff7f175beb3d3e17dd9894
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Author: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16883
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoTo support BLE MTU negotiation (android to android)-> clean up LE state
jihwan.seo [Mon, 23 Jan 2017 13:15:21 +0000 (22:15 +0900)]
To support BLE MTU negotiation (android to android)-> clean up LE state

- move common codes related device state calestate for android BLE

Change-Id: Iccfc0250fd1522d098851ad072c067bd72012d3c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16733
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoHarden parsing of CBOR to ensure types are accurate
Thiago Macieira [Wed, 11 Jan 2017 06:42:03 +0000 (22:42 -0800)]
Harden parsing of CBOR to ensure types are accurate

TinyCBOR requires that the caller ensure that the type of the entry
pointed by CborValue be of the correct type before extracting the
value. Otherwise, bad things happen (failed assertions in debug mode).

This fixes IOT-1722.

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I2bc52f3c7a574209b213fffd1498a48851c9c5d8
Reviewed-on: https://gerrit.iotivity.org/gerrit/16309
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
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>
7 years agoFix static analysis defect in NSProviderInterface.c
jake [Wed, 1 Feb 2017 06:09:31 +0000 (15:09 +0900)]
Fix static analysis defect in NSProviderInterface.c
 - Add mutex unlock in exception code.

Change-Id: Ic244e65ee0efb814264e8f1d29ee61f3a42f3e25
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16943
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1774]Add BLE, NFC, RA flag for RI endpoint
bg.chun [Mon, 23 Jan 2017 07:13:55 +0000 (16:13 +0900)]
[IOT-1774]Add BLE, NFC, RA flag for RI endpoint

BLE, NFC, RA is not working due to endpoint.
So add BLE, NFC, RA flag for RI endpoint to make work
BLE, NFC, RA adapter

Change-Id: Iaf7ba69e5b28465876ef3abb986479cacb91e1b7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16691
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix Tizen build issue related BLE MTU negotiation.
jihwan.seo [Tue, 24 Jan 2017 05:46:59 +0000 (14:46 +0900)]
fix Tizen build issue related BLE MTU negotiation.

Change-Id: I4df80bd64137c38f6b1683e6b9eb859b00436182
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16715
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoIOT-1583: Removing /W3 warning from resource/csdk/security.
Pawel Winogrodzki [Tue, 6 Dec 2016 02:09:45 +0000 (18:09 -0800)]
IOT-1583: Removing /W3 warning from resource/csdk/security.

I'm also refactoring some SConscript files in order to enable
/W3 and /WX only for specific directories and I'm adding
_CRT_NONSTDC_NO_WARNINGS to disable warnings about issues we cannot
change anyway, because the code has to build for multiple platforms.

Change-Id: Ifef66b6c59540df2ceb40a54af47865d56a302d7
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16329
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoAdd API to set a seed value for UUID generation,
Chul Lee [Mon, 9 Jan 2017 12:04:05 +0000 (21:04 +0900)]
Add API to set a seed value for UUID generation,
to ensure that a device always uses the same UUID.
If the seed value is not set, a UUID is generated randomly.

Patch #1 : Initial upload
Patch #2 : add header file include on srmutility.c.
Patch #3 : Updated according to comments.
Patch #4 : Fix build error
Patch #5 : rebase
Patch #6 : Fix coredump
Patch #7-8 : Retrigger
Patch #9-10 : Updated according to comments.
Patch #11-13 : Retrigger

Change-Id: I6ce668866b5881386a52ef8cb9de5226b8595749
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16921
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoChange default settings to allow Ownership Transfer
Dan Mihai [Tue, 24 Jan 2017 01:42:16 +0000 (17:42 -0800)]
Change default settings to allow Ownership Transfer

If a Device did not provide a CBOR file that includes appropriate
ACLs, generate a CBOR file that allows Ownership Transfer, using the
Random PIN method.

The default read-only ACE for /oic/sec/acl has been removed, because
it is not required by provisioningclient.

There are new ACEs allowing read+write by default for /oic/sec/doxm,
/oic/sec/pstat and /oic/sec/cred. Those are required by the current
Onboarding design.

Change-Id: I52a80bfc7f0a84ef19888d78eea9223fbf09241c
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13569
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoprovisioning: Fix OIC_LOG args (FTBFS on tizen)
Philippe Coval [Fri, 27 Jan 2017 17:42:18 +0000 (18:42 +0100)]
provisioning: Fix OIC_LOG args (FTBFS on tizen)

It was observed when building with SECURED=1

Also use local include as it's not part of system

Change-Id: I7c1cf2090df7aeb2dc3084e9e469c8acee0ced2c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16837
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoFix a defect to access a NULL variable
Jihun Ha [Tue, 31 Jan 2017 06:34:10 +0000 (15:34 +0900)]
Fix a defect to access a NULL variable

If OICMalloc fails, mediatorDevId gets to be NULL, which causes a crash
in calling getDeviceID API with mediatorDevId.

Change-Id: Ie59211187e6be896f0f4d0387884092812521a84
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16905
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd a log message for better understanding in OT
Jihun Ha [Wed, 25 Jan 2017 08:11:52 +0000 (17:11 +0900)]
Add a log message for better understanding in OT

Change-Id: I8409ae00196bcfd0ead8118cb21e38c51f8d4c07
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16759
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Add trace api for using ttrace
Eunji, Lee [Wed, 11 Jan 2017 09:02:48 +0000 (18:02 +0900)]
tizen: Add trace api for using ttrace
android: Add trace api for using ftrace

This patch includes implementation of alternative trace api set for android.
Since Atrace (android trace) api is available at android level 23,
we implement trace api by using ftrace directly.

Change-Id: I5370a190f340816934b77a83159c7c7ba9c8a17e
Signed-off-by: Eunji, Lee <eunjieji.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16467
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoprovide setConfigure API related BT including EDR, BLE by cautil.
jihwan seo [Tue, 17 Jan 2017 07:19:34 +0000 (16:19 +0900)]
provide setConfigure API related BT including EDR, BLE by cautil.

It can be set Adv Flag that check whether start Adv
in initialize step or not.
and It will resolve battery consumption issue.

Change-Id: I09791c1d8ca71373c36309150dbc97c5031a8bc2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16491
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoEnable discovery in Zigbee plugin in IoTivity's Plugin Interface module.
Joseph Morrow [Mon, 5 Dec 2016 17:33:11 +0000 (09:33 -0800)]
Enable discovery in Zigbee plugin in IoTivity's Plugin Interface module.

The PISetup() API needed to be called. It was never being called from the
sample application. Therefore no one knew how to perform the discovery.
This should unblock anyone looking to use this plugin.

Change-Id: Idcb269a48958ee3b262356a054c78ca6e0109315
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15165
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoservice: [IOT-1562] Fix for unittest with SECURED at RE/RC
KIM JungYong [Mon, 28 Nov 2016 08:33:18 +0000 (17:33 +0900)]
service: [IOT-1562] Fix for unittest with SECURED at RE/RC

[KIM JungYong]
When IoTivity was built with SECURED and TEST,
some of test case at RE and RC occurring crash.
because RE and RC has not set the precondition of security.

In this patch, added the security flow and persistence storage files at RE.
related security test case is disabled at RC.

[Philippe Coval]
Ported from 1.2-rel to master branch

Change-Id: I4094bd01cba84d395c408a56f4c57d4ebcb45b44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1562
Reviewed-on: https://gerrit.iotivity.org/gerrit/14837
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16867
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoAdd ACLs to java SimpleClientService so example runs when SECURED=1
George Nash [Fri, 13 Jan 2017 22:53:22 +0000 (14:53 -0800)]
Add ACLs to java SimpleClientService so example runs when SECURED=1

The ioc_svr_db_server ACL file is a copy of the ACL file from
resource/examples. This currently installs the .dat file from
the simpleserver sample.

Build:
scons BUILD_JAVA=1

Run example:
export LD_LIBRARY_PATH=<iotivity>/out/linux/x86_64/release/

java -cp java/examples-java/simpleclientserver/build/libs/simpleclientserver.jar:\
java/iotivity-linux/build/libs/iotivity-linux.jar \
org.iotivity.base.examples.SimpleClientServer

Change-Id: I02617ad852231a730cdf75f8a0b01c01ee0daeb2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16399
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoFix maybe-uninitialized warning in ca_adapter_net_ssl.c
George Nash [Thu, 26 Jan 2017 19:00:13 +0000 (11:00 -0800)]
Fix maybe-uninitialized warning in ca_adapter_net_ssl.c

The compilar was warning that the variables macKeyLen, ivSize, and keySize
could be used uninitialized. Very unlikely but really easy to fix.

Change-Id: Ie3a8872194c3ffe3a43576cdc399f8a1e99e3387
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16799
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoFixed unused-const-variable compiler warning
George Nash [Thu, 26 Jan 2017 21:43:18 +0000 (13:43 -0800)]
Fixed unused-const-variable compiler warning

Removed the CBOR_MAX_SIZE const variable.

In other parts of the code the CBOR_MAX_SIZE is used to
check if realocation can be used to resolve an out-of-memory
cborEncoderResult.

In credresource.c it is not used and can be removed.

Change-Id: I967b84375dd7f3d3532f191aa503d2d80542ffb1
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16805
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agocsdk: move OCEntityHandlerResponse from stack to heap
Hauke Mehrtens [Mon, 3 Oct 2016 19:00:28 +0000 (21:00 +0200)]
csdk: move OCEntityHandlerResponse from stack to heap

OCEntityHandlerResponse is over 50KByte and I got a stack overflow on MIPS
running on LEDE without this patch. Instead of storing
OCEntityHandlerResponse on the program stack, allocate some memory on
the heap and free it afterwards again.

This fixes one part of this issue for me:
https://jira.iotivity.org/browse/IOT-1374

Change-Id: I365a5c7a34dce2dfb0897a20b57a13ba566748ec
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12729
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoFixed typo of "Enviornment" to Environment so that greps for the term don't fail.
Nivedita Singhvi [Wed, 11 Jan 2017 00:35:51 +0000 (16:35 -0800)]
Fixed typo of "Enviornment" to Environment so that greps for the term don't fail.

Change-Id: Ie1964490f5a2d613f6079e296e68f9ba6fde2c60
Signed-off-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16293
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years ago[IOT-1782] fixing protocol enumeration for use in introspection response.
Srikrishna Gurugubelli [Fri, 27 Jan 2017 18:11:18 +0000 (10:11 -0800)]
[IOT-1782] fixing protocol enumeration for use in introspection response.

Change-Id: I06a55b629a383ba1f47dab384bae3e45097b51af
Signed-off-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16841
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agocsdk: move OCClientResponse from stack to heap
Hauke Mehrtens [Mon, 3 Oct 2016 21:22:36 +0000 (23:22 +0200)]
csdk: move OCClientResponse from stack to heap

OCClientResponse is about 50KByte and should not be stored on the
stack. On LEDE with MIPS, musl libc this causes a segmentation fault.
Moving this structure to the heap is the simple solution for this
problem, but this structure should be shrined.

There are probably more places were this is stored on the stack and
will cause problems. This fixes the other issue I saw in
https://jira.iotivity.org/browse/IOT-1374

Change-Id: I45d8aee4a8151fea51d3318acb1eea61ce579060
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12731
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoWindows: fix the default TARGET_ARCH
Dan Mihai [Fri, 20 Jan 2017 17:22:17 +0000 (09:22 -0800)]
Windows: fix the default TARGET_ARCH

Fix recent regression from commit
5198fa0c4abe18c5122d16984ce0c70c63dba882.

Change-Id: I7b7e36441f5f63cb89aeeb3fa2ba0b34ad1ce5ff
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16631
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoIOT-1776 Fix Windows TCP Transport
Way Vadhanasin [Wed, 25 Jan 2017 18:06:09 +0000 (10:06 -0800)]
IOT-1776 Fix Windows TCP Transport

This change makes the TCP transport on Windows functional when the application
picks resource based on COAP+TCP.

Change-Id: I9d6965afc0cbdadf4c9597f1b24a04ccafc17855
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16763
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoreplace NotifyCharacteristic property with indicate in Tizen BLE server.
jihwan.seo [Wed, 25 Jan 2017 05:37:57 +0000 (14:37 +0900)]
replace NotifyCharacteristic property with indicate in Tizen BLE server.

Change-Id: Icd9725c864fc3a64aae8ecc54502ba1b12a6e3c7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16757
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix BLE MTU nego issue in writeDescriptor logic
jihwan.seo [Wed, 25 Jan 2017 05:30:58 +0000 (14:30 +0900)]
fix BLE MTU nego issue in writeDescriptor logic

Change-Id: I84fa340afda3ecdee0a1f85bf0f63073c26d2a59
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16755
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1704]Apply new api OCDoRequest() to samples.
bg.chun [Fri, 6 Jan 2017 02:04:46 +0000 (11:04 +0900)]
[IOT-1704]Apply new api OCDoRequest() to samples.

Apply new api OCDoRequest() to samples.
And remove deprecated api OCDoResource().
related with below commit
[IOT-1704]Deprecate OCDoResource and add OCDoRequest
https://gerrit.iotivity.org/gerrit/#/c/16725/

Change-Id: I762b4e4c00caa1d52b471e46f2a0e7299402a7f7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16183
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdded Android interface API setPinType().
saurabh.s9 [Fri, 27 Jan 2017 09:56:56 +0000 (15:26 +0530)]
Added Android interface API setPinType().

Change-Id: I98ba58c440d252cc3f32dd589e1a0eed3935b675
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16525
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoFix unused-const-variable compiler warning
George Nash [Thu, 26 Jan 2017 20:43:30 +0000 (12:43 -0800)]
Fix unused-const-variable compiler warning

The variable MSECS_PER_SEC was declared but not used.
There were two ways to solve this compiler warning.
  1. Delete variable
  2. Use variable

Option 2 was used for this change. In several locations that the
hardcoded number 1000 was used that was clearly intended to be
MSECS_PER_SEC. This also results in a few locations where
multiplication by MSECS_PER_SEC is used to conver the time to
micro seconds.

While doing this one location was updated to also use the USECS_PER_SEC
const variable.

Change-Id: I448fc1ca614b0d8be7ea4836da6406dbd69ef325
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16801
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>
7 years ago[IOT-1775]Fix obsHeaderOpt check logic
bg.chun [Tue, 24 Jan 2017 11:47:16 +0000 (20:47 +0900)]
[IOT-1775]Fix obsHeaderOpt check logic

Fix obsHeaderOpt check logic like below
AsIs
check protocolId and optionId are exist
ToBe
check optionId is exist or protocolId and optionId are exist

Change-Id: I96acc0ef5c69b17aab0f722135cb09ab61bce1d2
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16729
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1704]Deprecate OCDoResource and add OCDoRequest
bg.chun [Tue, 24 Jan 2017 10:36:53 +0000 (19:36 +0900)]
[IOT-1704]Deprecate OCDoResource and add OCDoRequest

Deprecate OCDoResource which free given payload
and add new api OCDoRequest which does not free
given payload

Change-Id: Id9f8d3cec126c39512150850a806bd55f5cc009b
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16725
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoSsladapter unit tests update
Oleksii Beketov [Wed, 11 Jan 2017 13:46:38 +0000 (15:46 +0200)]
Ssladapter unit tests update

Ssladapter unit tests updated to correspond new ciphersuites list

Change-Id: I0f4a6327f0eb9aa6038974db89a8b3bb2c6814c3
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16323
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 374fc66bb7a04871853000d0ae58ac3a18ad4772)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16577
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoCheck if stack is init'ed in call to OCProcess()
Mandeep Shetty [Thu, 19 Jan 2017 19:05:02 +0000 (11:05 -0800)]
Check if stack is init'ed in call to OCProcess()

OCProcess() returned OC_STACK_OK even when the stack was
not initialized.

Note that even with returning OC_STACK_OK, it was
effectively a no-op as all the other calls in OCProcess() checked for
initialization.

Change-Id: I84423f19390ae840e785e340bc458a5b41b0795a
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16589
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agobuild: Suggest to download supported tinycbor
Philippe Coval [Thu, 24 Nov 2016 16:47:25 +0000 (17:47 +0100)]
build: Suggest to download supported tinycbor

Note this patch is appropriate for release versions (or branches)
 while master or development branches can follow upstream's master branch
 and eventually synched when needed.

Bug: https://jira.iotivity.org/browse/IOT-1600
Change-Id: I361a75fa9dd52739dce0daa8e14333c95e6c9284
Origin: https://gerrit.iotivity.org/gerrit/#/c/14763/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 16d6391f55577bae92cd458ef6a8dbafc57dc81b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14805
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Mike Finch <mike.f.finch@lowes.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
7 years agoFixed a crash error caused on IP network get down
Jaewook Jung [Fri, 20 Jan 2017 03:15:54 +0000 (12:15 +0900)]
Fixed a crash error caused on IP network get down

Because CAGetIPInterfaceInformation() allocates memory to
CAEndpoint_t at once, OICFree also should be called once.

Change-Id: I7cb85761e1d49e73d357928c77b364555d82c87f
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16621
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFree options and pdu in the end of the tests.
Ziran Sun [Tue, 10 Jan 2017 10:42:00 +0000 (10:42 +0000)]
Free options and pdu in the end of the tests.

Change-Id: Ic036417c8aa02d76f5d9c8a1805c5c18a050fe13
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16277
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years ago[IOT-1771]Adding Doxygen comments for Subscribe and Unsubscribe API for expected...
abitha.s [Mon, 23 Jan 2017 10:03:34 +0000 (15:33 +0530)]
[IOT-1771]Adding Doxygen comments for Subscribe and Unsubscribe API for expected call order

Change-Id: Ic0c0e8f72076640796b29aaf3586324222e186fe
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16695
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1773]Removing redundant return code by modifying Java APIs to return void.
abitha.s [Tue, 24 Jan 2017 08:55:37 +0000 (14:25 +0530)]
[IOT-1773]Removing redundant return code by modifying Java APIs to return void.

As error status is thrown in exception

Change-Id: I3bd917cb1840db51ade54e49033b2281416d7add
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16723
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[Hotfix] Add DTLS handshake callback invocation after DTLS handshake done.
Chul Lee [Tue, 17 Jan 2017 09:14:30 +0000 (18:14 +0900)]
[Hotfix] Add DTLS handshake callback invocation after DTLS handshake done.

Change-Id: I482f3d56dc1528c1287691d168b5272878065bbe
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16485
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 9f35361d0a8d313d98128a604c7ee22c4fd54138)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16683
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoFix ownership transfer issues
Jongmin Choi [Fri, 13 Jan 2017 06:41:34 +0000 (15:41 +0900)]
Fix ownership transfer issues

Fix issues related to ownership transfer
- Port change after failed ownership transfer

Patch #1: initial upload
Patch #2: build error fix

Change-Id: Ia6df0e7b862f73fab166ccb2c8ceee6c348b8189
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 75bd7cd65fc5bdd362120ca2ac10d5d09a7755c5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16417
Tested-by: jenkins-iotivity <jenkins@iotivity.org>