iotivity.git
4 years agoAdd iotivity.pc.in file and generate iotivity.pc file 78/2378/5
Ravi Nanjundappa [Fri, 4 Sep 2015 10:55:09 +0000 (16:25 +0530)]
Add iotivity.pc.in file and generate iotivity.pc file

This patch addresses the second part of IOT-524. The current
changes include adding a new iotivity.pc.in file and generating
the iotivity.pc file using .pc.in file.

Making the relevant changes in gbsbuild.sh files to include iotivity.pc.in
file during tizen builds.

Change-Id: Ie3ed7ccdf6e29d427362d0bb2b85439508997b6b
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2378
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoFixed android local reference overflow 75/2675/2
Jaehong Jo [Fri, 18 Sep 2015 07:01:58 +0000 (16:01 +0900)]
Fixed android local reference overflow

Delete JNI local reference

Change-Id: I1b0b54ec775be075a3fe9e127d57fe0bc882c9a8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agooptimization to use the existing buffer in blockwise-transfer. 03/2503/5
hyuna0213.jo [Mon, 14 Sep 2015 09:32:49 +0000 (18:32 +0900)]
optimization to use the existing buffer in blockwise-transfer.

if we have to update payload data, we always allocate new memory.
so we modified the code to use the existing memory if one exists.
This patch addresses the first part of IOT-690.

Change-Id: I04ca551273caf02f783c62a76f11f7e07409d8dd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoRemove unnecessary include. 51/2651/3
Thiago Macieira [Thu, 17 Sep 2015 23:44:13 +0000 (16:44 -0700)]
Remove unnecessary include.

syscall(3) is not used, so <sys/syscall.h> is not required. It's a
Linux-specific header anyway, so it should never have been on this file.

Change-Id: I42e7ef1a481840699a8dffff1404e8e982839caf
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2651
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agofixed the prevent issues for CA android platform. 91/2591/4
jihwanseo [Wed, 16 Sep 2015 11:55:46 +0000 (20:55 +0900)]
fixed the prevent issues for CA android platform.

-remove the logically dead code
-memory leak
-dereferencing null pointer

Change-Id: Ided9d1fc0a909f10309df47e23b04d7f1ca8db22
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoUpload command update for Arduino DUE 15/2515/2
sandipan.p [Mon, 14 Sep 2015 12:51:55 +0000 (18:21 +0530)]
Upload command update for Arduino DUE

With the previous implementation, CA and RI binaries were trying to get uploaded
on DUE board during SConscript parsing.

Change-Id: I12955a09e5695192b6cb756f2252b12bc62c0726
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2515
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoRemove GroupSynchronization class in things manager 61/2661/3
Jihun Ha [Fri, 18 Sep 2015 04:31:13 +0000 (13:31 +0900)]
Remove GroupSynchronization class in things manager

We've decided to remove the GroupSynchronization class because the current
implementation of the class is not clear to be used and does not provide
any useful functionalities to developers.
We will re-design this features more concretely and re-summit it in the future.

For Android and Tizen platform, we will summit patchsets soon.

Change-Id: Icd8116c69f9078af275aa91216c0f28db4378d32
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agotinydtls: remove certificate_list length field for raw public keys 69/2569/3
Hauke Mehrtens [Tue, 15 Sep 2015 16:53:35 +0000 (18:53 +0200)]
tinydtls: remove certificate_list length field for raw public keys

This fixes https://jira.iotivity.org/browse/IOT-715
This patch introduces an API incompatible change, old IoTivity clients
using Raw Public key will not be able to communicate with clients
with this change.

backport of tinydtls upstream commit:
From 71d5f5c9247bbdb5ae1f43533f94c13be1153160 Mon Sep 17 00:00:00 2001
From: Olaf Bergmann <bergmann@tzi.org>
Date: Wed, 26 Aug 2015 21:35:26 +0200
Subject: [PATCH] dtls.c: remove certificate_list length field for raw public
 keys

RFC 7250 has changed the format of the Certificate structure from
RFC 5246 to the following:

opaque ASN.1Cert<1..2^24-1>;

struct {
    select(certificate_type) {

        // certificate type defined in RFC 7250
        case RawPublicKey:
           opaque ASN.1_subjectPublicKeyInfo<1..2^24-1>;

        // X.509 certificate defined in RFC 5246
        case X.509:
           ASN.1Cert certificate_list<0..2^24-1>;
    };
} Certificate;

Thus, there must be no additional length field indicating a
certificate list in case the message contains a raw public key.

Change-Id: I3887fe962548e8e9d0c5bbb9f450073b9f95d1cb
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoupdated CA sample app related to removed CA_SUCCESS 09/2609/3
jihwan.seo [Thu, 17 Sep 2015 00:31:20 +0000 (09:31 +0900)]
updated CA sample app related to removed CA_SUCCESS

https://gerrit.iotivity.org/gerrit/#/c/2549/

Change-Id: I625b24978e7d4b418dbcb311f04ad683e1990bf2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoModified the argument in CAAddBlockOption() 13/2613/3
hyuna0213.jo [Thu, 17 Sep 2015 04:22:10 +0000 (13:22 +0900)]
Modified the argument in CAAddBlockOption()

In CAAddBlockOption1 and CAAddBlockOption2 the second argument
is a CAInfo_t. but This is a large array. so we have to use pointer.
This patch addresses the first part of IOT-690.

Change-Id: I78ce8799a6db1a4a378bca016dd27c3529109e2e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2613
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoMerge remote-tracking branch 'origin/routing-manager' 01/2301/34
Jaehong Jo [Thu, 17 Sep 2015 02:26:45 +0000 (11:26 +0900)]
Merge remote-tracking branch 'origin/routing-manager'

Implementation for Routing Manager.
1) Gateway resource Hosting and exchange of routing tables.
2) Linklist implemenation.
3) Routing table manager to add, remove, get next hop etc.
4) Routing message parser using cbor parser funtions.
5) Dynamic route updates on addition/removal of gateways.
6) Support for Endpoint

Please refer to below links for wiki and jira updates.
https://wiki.iotivity.org/routing_through_heterogeneous_transports
https://jira.iotivity.org/browse/IOT-565

Change-Id: I228b59ef922f55552386fb0b0e1b2bb2343b1adb
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoFixed a session problem related to BT off/on for Android BLE. 79/2579/5
jihwan.seo [Wed, 16 Sep 2015 08:23:21 +0000 (17:23 +0900)]
Fixed a session problem related to BT off/on for Android BLE.

when BT turn off/on while device is connected,
BLE is not connected again.
so i have modified something like in below

- when BLE Disconnect event is called
  server have to start advertising again.
- the dataList of server/client have to destroy, when BT turn off.
- client have to start device scan again, when BT turn on.

Change-Id: I97b75d349a0e3205e221e1347d3f24ca23f4e139
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoFixed wrong update of ip information 01/2501/7
jnashok [Mon, 14 Sep 2015 06:30:47 +0000 (15:30 +0900)]
Fixed wrong update of ip information

interface name is assigned instead of ip address
port is assigned with 0 instead of correct port number
This patch fixes both

Change-Id: Id88e02d37bfb7a83c59100b997a021782f67099a
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoMerge "Merge branch 'security-summit' into 'master'"
Sachin Agrawal [Thu, 17 Sep 2015 15:56:04 +0000 (15:56 +0000)]
Merge "Merge branch 'security-summit' into 'master'"

4 years agoRemoved Eesysetup implementation for validation 11/2611/3
Madan Lanka [Thu, 17 Sep 2015 00:50:16 +0000 (20:50 -0400)]
Removed Eesysetup implementation for validation

Removed Easysetup implementation due to pending internal code validation step.
The support will be added after validation is completed

Change-Id: I8cc1499a1d033ed0eeb5cfff1ceb0c729e2968d4
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2611
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
4 years agoModify permissions for files in Things Manager 15/2615/2
Jihun Ha [Thu, 17 Sep 2015 05:20:14 +0000 (14:20 +0900)]
Modify permissions for files in Things Manager

All files with "Excutable bit" has been changed into "Non-executable bit"
(755 -> 664)
And, I've modified typo strings in con-client and con-server applications

Change-Id: I6498d22b96fadd078e0ae9a05e782dfccb84bb07
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2615
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoMerge branch 'security-summit' into 'master' 07/2607/2
Sachin Agrawal [Thu, 17 Sep 2015 05:36:46 +0000 (22:36 -0700)]
Merge branch 'security-summit' into 'master'

* security-summit:
  Add assignment of newly introduced member in OCProvisionDev_t - AddDevice() and PMCloneOCProvisionDev() are changed.   Since change 2333 introduced DeviceStatus memeber in OCProvisionDev_t,   Add and Clone functions should handle this new member properly.
  Add C++ API for OCUnlink / OCRemove CAPI to Provisioning Manager
  Add 'sct' (Supported Credential Types) in doxm resource. - Implements madatory property 'sct' in doxm resource.
  Updated ACL & DOXM entity handler to process GET query
  Fix 2 warnings in C Provisioning Module - Comparision between size_t and int type incurs warning.   Add typecast of int when int is zero or positive value.
  Refactored provisioning client sample on C-level API
  Added Device dashboard OC APIs
  Remove unnecessary data type in PM - OTMStates is not used/required in current version.
  Added C++ API for Provisioning Manager
  Add OCUnlink / OCRemove API to Provisioning Manager
  Check PDM Initialization before excuting exposed PDM APIs - There is a case that user might call PDM API without initialization.   This patch could prevent this case by checking initialized status of sqlite DB.
  Remove unnecessary OC API in Provisioning Manager - OCDeleteProvisionResults() is not required any more   because OCProvisionResult_t is freed after user callback is hitted.
  Removed global variables from OTM
  Add filter to Owned Device Discovery. - Previous version discovers devices with condition 'owned=true'.   This patch adds one more condition that 'owned=true' and 'owner=myself'   This filter is required to screen out devices that are out of control.
  Added PDM Module to Provisioning APIs
  Bug-fix & Internal API name change
  1. Change OCDeleteProvisionResults() parameters    - double pointer -> single pointer
  Updated provisioning API to cater different connectivity type.

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

Change-Id: Idcfcc236f1a0f7a6c8c40dbfe21914eb2a935393
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoChanged from c++11 to c++0x in Tizen csdk samples. 89/2589/2
vimala.v [Wed, 16 Sep 2015 11:48:21 +0000 (17:18 +0530)]
Changed from c++11 to c++0x in Tizen csdk samples.

Change-Id: Ic95783e7227f8bebb3b279fc9938013155feae0c
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2589
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoremoved unneccessary code to check sending data in BLE 95/2595/3
jihwan.seo [Wed, 16 Sep 2015 13:28:36 +0000 (22:28 +0900)]
removed unneccessary code to check sending data in BLE

although data is sending,
error message is calling from unnecessary spot.
it have to modify

Change-Id: I4172da1ec18707a12bd02775bd78ee68511a4a52
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2595
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoreplace meaningless comment with detail comment. 73/2573/3
jihwan.seo [Tue, 15 Sep 2015 17:29:29 +0000 (02:29 +0900)]
replace meaningless comment with detail comment.

OC is not available name as layer or module

Change-Id: Iba4cd83a3b59d3b82e720bcdb65930e7544f1a7a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2573
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoUpdated a code value of CAResponseResult_t. 49/2549/6
jihwan.seo [Tue, 15 Sep 2015 08:47:27 +0000 (17:47 +0900)]
Updated a code value of CAResponseResult_t.

since there is no code in CoAP Spec.
I have removed CA_SUCCESS code from CA.

According to CoAP Spec, 2.05 Content code is like HTTP 200 "OK"
thur 2.05 will be used instead of 2.00.

---------------------------------------------------------

5.9.1.5.  2.05 Content

This Response Code is like HTTP 200 "OK" but only used
in response to GET requests.

---------------------------------------------------------

Change-Id: I9f4d3c09661c4dec967f2bb91f51941b93084a93
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoMerge "Merge easysetup branch into master"
Patrick Lankswert [Wed, 16 Sep 2015 19:44:50 +0000 (19:44 +0000)]
Merge "Merge easysetup branch into master"

4 years agoAdd security payload type to a request/response 39/2539/4
Sakthivel Samidurai [Tue, 15 Sep 2015 01:54:00 +0000 (18:54 -0700)]
Add security payload type to a request/response

After removing the OCPayloadType from the payload, the stack has to
fill the appropriate payload type for security and non-security
payload type. Added PAYLOAD_TYPE_SECURITY as a payload type for
security resource request in HandleResourceWithEntityHandler
and response in HandleCAResponses.

Change-Id: I3007a1e79ad25b4e557ab15edb038a22cb9e85c3
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2539
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoClean up the stack code of csdk to check NULL 11/2511/8
jihwan.seo [Mon, 14 Sep 2015 12:29:03 +0000 (21:29 +0900)]
Clean up the stack code of csdk to check NULL

Change-Id: I71cbfc835d1710a472d3089c2686e4e980a05ce4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoCloud Interface Feature base on CoAP over TCP in CA Layer 98/2298/52
jihwan.seo [Tue, 15 Sep 2015 16:16:13 +0000 (01:16 +0900)]
Cloud Interface Feature base on CoAP over TCP in CA Layer

- modified libcoap library to support coap over tcp
- added new transport adapter and flag in CA
- linux platform can be supported
- TLS, IPv6, Keep alive and so on will be support 2nd phase
- https://wiki.iotivity.org/proposal_for_cloud_interface_in_iotivity

Change-Id: Ifcc0f78c1a5ca9d11e41498f712c0039213bd3d0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2298
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAdded unit tests for OCRepresentation to CBOR and back 83/2483/7
Erich Keane [Fri, 11 Sep 2015 16:30:09 +0000 (09:30 -0700)]
Added unit tests for OCRepresentation to CBOR and back

These unit tests validate the conversion of OCRepresentation objects
through OCRepPayload and into CBOR, then brings them back.  This
validates all data types, including jagged arrays.

Change-Id: I6c74a29f51febcff8553ac194c5ae57eaa50a460
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoRemoved the OCPayloadType from the payload 82/2482/5
Erich Keane [Thu, 10 Sep 2015 21:51:32 +0000 (14:51 -0700)]
Removed the OCPayloadType from the payload

Previously, the CBOR container included the type of the message to make
parsing of the CBOR items easier.  This is unfortunately against the
spec, so this patch removes it and requires the caller to ensure that
the expected message type is sent.  Incorrectly formatted messages will
result in the message not passed back via the callback.

Change-Id: If1ca9eed65b5274239b670e8a2bd6cadce763c19
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2482
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoChanged CBOR array format 27/2527/2
Erich Keane [Mon, 14 Sep 2015 17:18:09 +0000 (10:18 -0700)]
Changed CBOR array format

Previously, a CBOR array was predicated by its type and dimensions.
In order to be closer to spec compliant, this fix removes these two, and
encodes by using recursive arrays.

Change-Id: Ib644d59c44e0897479ff1473f6b57eacfc9b4da3
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAndroid: Removing cancelObserve in OcResource destr. 56/2356/6
Tim Kourt [Wed, 2 Sep 2015 17:46:00 +0000 (10:46 -0700)]
Android: Removing cancelObserve in OcResource destr.

It also resets the event listeners to nullptr.
In addition it replaces all occurrences of NULL with nullptr

Change-Id: Ie0d80cc2e2312c6886e168ce7b0e4eaa9f84eac3
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2356
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoMerge branch 'master' into security-summit 03/2603/3
Sachin Agrawal [Wed, 16 Sep 2015 19:11:45 +0000 (12:11 -0700)]
Merge branch 'master' into security-summit

* master: (50 commits)
  Update the stack to use the new CoAP return code 2.04/2.05 values.
  resolve memory leak of ip monitor
  removed warning message for CA
  Add frag/defrag logic in EDR
  Add support for and handle presence of the coap ACCEPT option.
  Addressed endpoint pointer type mismatches in LE adapter.
  modify the OCTransportAdapter structure in RI
  apply smack rule and make resource samples package
  [Resource-Encapsulation] Updated Java SDK and RE Android Samples
  Enable error responses to be sent back to the client.
  Updated Android Sample App for block-wise transfer
  Enabled CoAP over TCP in RI Layer.
  [TIZEN] Updated properties of Configuration resource in Things manager.
  resource: Add test for ConstructResourceObject with InvalidUri
  [Services - Things Manager] Removed Things Manager class and exposed its component classes for SDK
  [Things-Manager] Updated Things Manager Sample Applications
  Fixed pointer-type arrays with NULL values
  Remove ifaddr files
  replaced some ERROR tag with DEBUG
  [TIZEN] Removed things manager class dependency from TIZEN SDK and used its component class.
  ...

Conflicts:
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/doxmresource.c
resource/src/SConscript

Change-Id: I615c48ee6066873b9a5bb1dc27fff7e2490fb68f
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoAdd assignment of newly introduced member in OCProvisionDev_t 35/2535/2
Woochul Shim [Tue, 15 Sep 2015 00:24:46 +0000 (09:24 +0900)]
Add assignment of newly introduced member in OCProvisionDev_t
- AddDevice() and PMCloneOCProvisionDev() are changed.
  Since change 2333 introduced DeviceStatus memeber in OCProvisionDev_t,
  Add and Clone functions should handle this new member properly.

Change-Id: I1b227b8d70ca43730b098bc1bfc5837706c78ea7
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2535
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoAdd C++ API for OCUnlink / OCRemove CAPI to Provisioning Manager 97/2497/6
Ashwini Kumar [Mon, 14 Sep 2015 04:40:16 +0000 (10:10 +0530)]
Add C++ API for OCUnlink / OCRemove CAPI to Provisioning Manager

  - Based on changeset #2407
[Patch #2]: Addressed review comments, removed warnings,
    updated to changeset #2333
[Patch #3]: Solve build issues

Change-Id: I1e0088c214154c643fd790fdc8fe61741657cf4c
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2497
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
4 years agoMerge easysetup branch into master 78/2478/3
lankamadan [Fri, 11 Sep 2015 13:34:33 +0000 (22:34 +0900)]
Merge easysetup branch into master

Conflicts:
        resource/csdk/connectivity/SConscript
resource/csdk/stack/src/ocstack.c
        service/SConscript

Change-Id: I1c850a63fe8b10162a8861dc1f9e79269a7d0824
Signed-off-by: lankamadan <lanka.madan@samsung.com>
4 years agoAdd 'sct' (Supported Credential Types) in doxm resource. 70/2470/9
Ashwini Kumar [Tue, 15 Sep 2015 07:26:29 +0000 (12:56 +0530)]
Add 'sct' (Supported Credential Types) in doxm resource.
- Implements madatory property 'sct' in doxm resource.

1. Modify marshalling/Unmarshalling functions in doxmresource.c.
2. Modify all SVR databases that have 'doxm' resource.

[Patch #2] Modify property(attribute ID) and wrong usage of a type for sct.
[Patch #3] Rebase & Fix Arduino build error
[Patch #4] Fix Provisioning C++ Sample build error
[Patch #5] Add 'sct' to resource/provisioning/example/xxx.json
[Patch #6] Updated xxx_client.json acl perms

Change-Id: I4340de22a138437f4307639a2e05dbe8a5affb8b
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2470
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoUpdated ACL & DOXM entity handler to process GET query 11/2411/8
Sachin Agrawal [Mon, 14 Sep 2015 23:55:15 +0000 (16:55 -0700)]
Updated ACL & DOXM entity handler to process GET query

Updated ACL resource entity handler to process GET query
and DOXM resource entity handler to process GET query for
device ID.

Change-Id: Ia293fd633e0ce4f70202a6f80a04bd0f283510fa
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2411
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
4 years agoUpdate the stack to use the new CoAP return code 2.04/2.05 values. 96/2396/6
Stephane Lejeune [Fri, 4 Sep 2015 20:06:45 +0000 (22:06 +0200)]
Update the stack to use the new CoAP return code 2.04/2.05 values.

Since draft-ietf-core-observe-02 (September 16, 2011),
the result value "2.00" was depricated and replaced with "2.05"
for GET a method and "2.04" for POST and PUT methods.

Change-Id: I8061089469609d5ad801fa0456fda326cbc1fc33
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2396
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoresolve memory leak of ip monitor 05/2505/3
Myungchul Kwak [Mon, 14 Sep 2015 07:48:36 +0000 (16:48 +0900)]
resolve memory leak of ip monitor

Resolve memory leak in the IP network monitor of Android & Tizen app.
Calloc'd memory (32bytes) in CANewInterfaceItem(...) fuction is not freed,
and this function is continously called in network monitor thread.
So gradual memory leak is occurred.

Our Android sample app for blockwise-transfer test freezes,
if the app transfers some large data over 10 mins.
(I suppose that this time can be different by device spec.)

Change-Id: Ic6e85acb7c70376c125450c0641b557cc147d39c
Signed-off-by: Myungchul Kwak <minus2k@hotmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2505
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoremoved warning message for CA 57/2557/2
jihwan.seo [Tue, 15 Sep 2015 10:57:07 +0000 (19:57 +0900)]
removed warning message for CA

Change-Id: I6823ba9ca9a27deab03e4f8ea3d155c62445704e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2557
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAdd frag/defrag logic in EDR 75/2375/11
vimala.v [Fri, 4 Sep 2015 06:42:12 +0000 (15:42 +0900)]
Add frag/defrag logic in EDR

As data is clubbed into single packet when we use EDR adapter in android,
it is necessary to use the fragmentation, defragmentation logic.
As its platforms limitation, to have interoperability
it needs to be handled at EDR adapter.

https://jira.iotivity.org/browse/IOT-692
This code to fix the above Jira issue.

Change-Id: I84d9592775a6a638917e5574a2d8425027f5a26f
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2375
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoFix 2 warnings in C Provisioning Module 33/2533/2
Woochul Shim [Tue, 15 Sep 2015 00:11:51 +0000 (09:11 +0900)]
Fix 2 warnings in C Provisioning Module
- Comparision between size_t and int type incurs warning.
  Add typecast of int when int is zero or positive value.

Change-Id: I967c673fdc12e0ac8028477a4ff4573cf4596172
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoRefactored provisioning client sample on C-level API 67/2367/12
Woochul Shim [Tue, 15 Sep 2015 07:40:50 +0000 (16:40 +0900)]
Refactored provisioning client sample on C-level API

[Patch #1] submitted initial patch set
[Patch #2] fixed minor variable initialization
[Patch #3] fixed minor typo bugs
[Patch #4] updated enough callback timeout
[Patch #5,6] Rebase
[Patch #10] Rebase, DeleteACL is exposed by Provisioning Manager
[patch #11] Remove DeleteACLLit() prototype in srmutility.h

Change-Id: Ifa929b37eae410605285aaeb66ac5385f08f94dc
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoAdd support for and handle presence of the coap ACCEPT option. 92/2492/4
Stephane Lejeune [Thu, 10 Sep 2015 23:58:19 +0000 (01:58 +0200)]
Add support for and handle presence of the coap ACCEPT option.

This commit adds the CBOR accept option to all requests.
When a request comes in with an accept option, the option is evaluated
against the supported encoding formats. If the format is undefined or
when CBOR is requested, CBOR will be used to encod the payload.
When the response does not carry a payload, the accept option is
ignored and the response will proceed irrespective whether the accept
format was supported or not. This allowsi for example a device that
performs a delet operation proceed first working out which format is
supported by the server.

Change-Id: I7ae3430d11f1481a91413088a959f105b216ffea
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2492
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAddressed endpoint pointer type mismatches in LE adapter. 88/2488/3
Ossama Othman [Fri, 11 Sep 2015 22:53:46 +0000 (15:53 -0700)]
Addressed endpoint pointer type mismatches in LE adapter.

Corrected a pointer type mismatch in the BLE adapter implementation
introduced by commit 6c0321f5 where the endpoint parameter of the
network packet received callback was changed from CAEndpoint_t* to
CASecureEndpoint_t*.

Change-Id: Id7413f2085fe7e230be811723ff0392bb11efd33
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2488
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agomodify the OCTransportAdapter structure in RI 07/2507/5
hyuna0213.jo [Mon, 14 Sep 2015 08:20:25 +0000 (17:20 +0900)]
modify the OCTransportAdapter structure in RI

currently if RA and TCP are together used, there is a compile issue.
so I fixed the issue to build iotivity.

Change-Id: I844deb28afc1556d7faa9c33ac4062550d9e223c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAdded Device dashboard OC APIs 33/2333/13
Randeep Singh [Wed, 9 Sep 2015 09:10:16 +0000 (18:10 +0900)]
Added Device dashboard OC APIs

The apis in this change will be used to get complete state of
all the devices like owned/unowned status,device link status
and power on/off status.

[Patch 2] Updated code according to review comments.
[Patch 7] Rebase

Change-Id: If29a73646a4f77e4c6305de9ab4f3088a69a6eb7
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoapply smack rule and make resource samples package 42/2442/4
Minchul Lee [Thu, 10 Sep 2015 07:30:42 +0000 (16:30 +0900)]
apply smack rule and make resource samples package

Change-Id: Ib98fa2130700ce8dc33c9216c0c9a82147ff8dde
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2442
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years ago[Resource-Encapsulation] Updated Java SDK and RE Android Samples 84/2484/4
Jay Sharma [Mon, 14 Sep 2015 06:10:20 +0000 (11:40 +0530)]
[Resource-Encapsulation] Updated Java SDK and RE Android Samples

- Renamed Applications to REServer and REClient
- Fixed sample app issues.
- FIxed issues in JNI.
- Added separate Listener for set and get attributes.
- Updated Doxygen comments

Change-Id: I86f186b1153f02b15064177ac4b41ffcf6d6ddfe
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2484
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoRemove unnecessary data type in PM 71/2471/2
Woochul Shim [Fri, 11 Sep 2015 10:20:13 +0000 (19:20 +0900)]
Remove unnecessary data type in PM
- OTMStates is not used/required in current version.

Change-Id: I74d88ab1ea38f41afb4523b302d15df2201f3e29
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2471
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoAdded C++ API for Provisioning Manager 20/2320/9
Ashwini Kumar [Mon, 31 Aug 2015 12:03:20 +0000 (17:33 +0530)]
Added C++ API for Provisioning Manager

 - Unowned/Owned device discovery, ACL, Credential provisioning
 - Ownership transfer
 - Sample client.

[Patch#4]: Addressed review comments from Sakthivel
[Patch#5]: Added API for Unlink, device revocation, Dashboard
[Patch#6]: Rebase
[Patch#7]: Addressed review comments from Randeep & Woochul
[Patch#8]: removed extra env Clone from SConscript

Change-Id: I4fcca4d5efdc6f46514b1e2456aba2c7761fbc32
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2320
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoAdd OCUnlink / OCRemove API to Provisioning Manager 07/2407/8
Woochul Shim [Fri, 11 Sep 2015 05:37:15 +0000 (14:37 +0900)]
Add OCUnlink / OCRemove API to Provisioning Manager

- Since security admin should revoke disclosed credential,
  these API give capability to security admin to manage
  symmetric key type credentials in his/her network.

[Patch #3,#4] Fix wrong behavior of functions, Correct style, unittest

Change-Id: I73f14c207511ce85d739da0504aa8c65259b11cf
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoEnable error responses to be sent back to the client. 54/2454/5
Mandeep Shetty [Thu, 10 Sep 2015 21:35:05 +0000 (14:35 -0700)]
Enable error responses to be sent back to the client.

The resource uri was moved from the endpoint to the uri response info
struct in IPv6.
The function sendDirectStackResponses responsible for sending out ACKs,
RESETs and error codes back to the client was not updated to take in the
resource uri.
As a result, the CA layer ate this error with a uri is NULL log and the
client did not receive any response.

Added resource Uri to the responseInfo struct to fix the problem.

Change-Id: Ic3b964c646244698c1621860922fc06b40842bc3
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2454
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoUpdated Android Sample App for block-wise transfer 23/2423/4
jihwan.seo [Wed, 9 Sep 2015 13:04:19 +0000 (22:04 +0900)]
Updated Android Sample App for block-wise transfer

- To add big data from sample app for block-wise transfer.
- this change is came from Change 1371.
  https://gerrit.iotivity.org/gerrit/#/c/1373/

Change-Id: I983f106a5d0b750457da46865d81b0efb5ebd3fc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoEnabled CoAP over TCP in RI Layer. 05/2405/2
hyuna0213.jo [Tue, 8 Sep 2015 12:33:30 +0000 (21:33 +0900)]
Enabled CoAP over TCP in RI Layer.

- added new transport adapter in RI
- linux platform can be supported
- https://wiki.iotivity.org/proposal_for_cloud_interface_in_iotivity

Change-Id: Iaf245c3bbf30e76708545d136435a371b86fda7e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2405
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoModified Android UI to accept Enroller information 75/2475/4
lankamadan [Fri, 11 Sep 2015 12:30:35 +0000 (21:30 +0900)]
Modified Android UI to accept Enroller information

- Added support Enrollee UUID
- Added display of OnBoarded Enrollee Info

Change-Id: I8667a18af5e08e030e994a89f450d65a6c076360
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2475

4 years agoOptimized Arduino Logging using PCF 64/2464/2
lankamadan [Fri, 11 Sep 2015 09:01:28 +0000 (18:01 +0900)]
Optimized Arduino Logging using PCF

- Modified the error case handling in Enrollee
- Optimized Logging

Change-Id: I6567d748579a207326543ce768bfed107f3f5576
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2464
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
4 years ago[TIZEN] Updated properties of Configuration resource in Things manager. 45/2445/5
arya.k [Thu, 10 Sep 2015 11:58:54 +0000 (17:28 +0530)]
[TIZEN] Updated properties of Configuration resource in Things manager.

"Device Name" and "Location Name" properties are added and "SystemTime" property
is removed.

diagnosticsresource file is renamed to maintenanceresource.

Change-Id: I4fab4b7989a714d2aa1089f22f8adde674597bab
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2445
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoCheck PDM Initialization before excuting exposed PDM APIs 24/2424/3
Woochul Shim [Wed, 9 Sep 2015 13:20:04 +0000 (22:20 +0900)]
Check PDM Initialization before excuting exposed PDM APIs
- There is a case that user might call PDM API without initialization.
  This patch could prevent this case by checking initialized status of sqlite DB.

[Patch  #2] Removing Tab

Change-Id: Iaa9aa0f8f04fa8e69ab79c90fb5fc6ee6bbfd3b3
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2424
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoRemove unnecessary OC API in Provisioning Manager 22/2422/2
Woochul Shim [Wed, 9 Sep 2015 11:30:30 +0000 (20:30 +0900)]
Remove unnecessary OC API in Provisioning Manager
- OCDeleteProvisionResults() is not required any more
  because OCProvisionResult_t is freed after user callback is hitted.

Change-Id: I6daa2eeb869121944b3839257129496cb5fb9321
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2422
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoresource: Add test for ConstructResourceObject with InvalidUri 18/2418/4
Ravi Nanjundappa [Wed, 9 Sep 2015 10:05:39 +0000 (15:35 +0530)]
resource: Add test for ConstructResourceObject with InvalidUri

Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with uri having of not having "/" as its prefix.

Change-Id: Iadfc60fa67e3f5d0d2653720f5557c4a0e5279dd
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2418
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years ago[Services - Things Manager] Removed Things Manager class and exposed its component... 25/2425/4
Jay Sharma [Thu, 10 Sep 2015 16:28:14 +0000 (21:58 +0530)]
[Services - Things Manager] Removed Things Manager class and exposed its component classes for SDK

- Updated Java SDK
- Updated JNI layer

Change-Id: I910b9990c9d60865519af152cf8057302d713547
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2425
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years ago[Things-Manager] Updated Things Manager Sample Applications 26/2426/3
Jay Sharma [Thu, 10 Sep 2015 12:19:06 +0000 (17:49 +0530)]
[Things-Manager] Updated Things Manager Sample Applications

- Updated TMSampleApp and con-server app as per new Java SDK

Change-Id: Ic699461a1c0e31fff01366ba41bc758836b60da9
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2426
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoFixed pointer-type arrays with NULL values 52/2452/2
Erich Keane [Thu, 10 Sep 2015 17:24:53 +0000 (10:24 -0700)]
Fixed pointer-type arrays with NULL values

NULL values for OCRepresentation and string types in an array would
cause a variety of seg-faults.  This patch corrects the behavior to
allow for NULLs in these arrays.

This is necessary because the CSDK enforces rectangular arrays, but
the C++ stack does NOT, so it compiles with those dimensions.

Change-Id: Ie0ddc5faea980ccb37f0ac8f6b73027b965b7257
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2452
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoRemove ifaddr files 84/2384/3
Tim Kourt [Fri, 4 Sep 2015 21:54:56 +0000 (14:54 -0700)]
Remove ifaddr files

No need for ifaddr files and removed them.

Change-Id: I2250edf4feb3950b7354858e5f1cf3ae91330274
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2384
Reviewed-by: John Light <john.j.light@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoreplaced some ERROR tag with DEBUG 37/2437/3
jihwan.seo [Thu, 10 Sep 2015 01:45:36 +0000 (10:45 +0900)]
replaced some ERROR tag with DEBUG

this log is giving some confusion.

Change-Id: I9a31bdc287bd8742213e1bcee26f19edabfeea97
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2437
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoUpdated the Arduino APIs and updated sample app 46/2446/2
lankamadan [Thu, 10 Sep 2015 12:44:35 +0000 (21:44 +0900)]
Updated the Arduino APIs and updated sample app

- Arduino EasySetup APIs are updated
- ES_RESULT is changed to ESResult
- Updated sample application

Change-Id: I29c3d024ea42c1c4edf6a3586e604bfe9f18b1aa
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2446
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
4 years agoAndroid Ui is modified & removed ProvisionEnrollee 31/2431/3
Hemant Mahsky [Wed, 9 Sep 2015 16:10:31 +0000 (21:40 +0530)]
Android Ui is modified & removed ProvisionEnrollee

Change-Id: Id9fb85e01988fa8ce72e4afbf57e5eea16eafc1f
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Fixed Android Application UI crash issue

Change-Id: Id9fb85e01988fa8ce72e4afbf57e5eea16eafc1f
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years ago[TIZEN] Removed things manager class dependency from TIZEN SDK and used its component... 01/2401/4
arya.k [Thu, 10 Sep 2015 04:54:06 +0000 (10:24 +0530)]
[TIZEN] Removed things manager class dependency from TIZEN SDK and used its component class.

Updated tizen sample applications to removed things manager class dependency.

Enabled things manager library build for tizen.

Change-Id: I30db7102d6598103c46b3044fff1e218acded6c5
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoRemoved global variables from OTM 98/2398/6
Randeep Singh [Mon, 7 Sep 2015 12:23:12 +0000 (21:23 +0900)]
Removed global variables from OTM

Change-Id: I5b037529c661e37a6b9c34899e499e4a89e66527
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2398
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoRemoved unused defines from ocstackconfig header file 30/2430/2
Sachin Agrawal [Wed, 9 Sep 2015 16:16:59 +0000 (09:16 -0700)]
Removed unused defines from ocstackconfig header file

Since OIC stack now supports Block wise transfer and payload check
is done in CA layer for MAX PDU size, there is no need for max request
and max response variables. MAx Dev address size is defined in cacommon
header file.

Change-Id: I77de6aba4664d8675b559abe4d220a0ce722ff51
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2430
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoFixed intialization of 3-deep arrays in CPP 32/2432/2
Erich Keane [Wed, 9 Sep 2015 16:40:58 +0000 (09:40 -0700)]
Fixed intialization of 3-deep arrays in CPP

The C++ 3 deep arrays were seg-faulting, since the initial vector
was not initialized correctly with the size.  This patch ensures
that this happens correctly.

I've validated that the 3 deep array of Ints works correctly after
this patch.

Change-Id: I55166105d2a6a9ee97d88e287b54705a8f175cb6
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2432
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoRemoved memory leaks in CA Layer 00/2400/2
hyuna0213.jo [Tue, 8 Sep 2015 07:33:06 +0000 (16:33 +0900)]
Removed memory leaks in CA Layer

These memory leaks are reported by Valgrind.
The blockwise-transfer was not properly free the memory
that was allocated.

Change-Id: Ibfefc94879fc31f562139e0bc68b53b4a3b34ff8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2400
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoFix regression on confirm-able messages. 02/2402/3
Stephane Lejeune [Tue, 8 Sep 2015 10:07:05 +0000 (12:07 +0200)]
Fix regression on confirm-able messages.

MessageID should not be updated with the BlockID when the transfer is
not using the block-tranfer mechanism. This unnecessary update was
causing an error that prevented the pdu to be transmited normally.

Change-Id: I5927a636fb05f77fb2aa085e92b6f362e6e2a69e
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2402
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoModify specification for Tizen build 78/2278/6
Minchul Lee [Wed, 26 Aug 2015 07:00:50 +0000 (16:00 +0900)]
Modify specification for Tizen build

Change-Id: Id036ce3f4e779fbba829aff16e959a7854bba9ee
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2278
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoRemoved modules from Android studio gradle files 21/2421/2
lankamadan [Wed, 9 Sep 2015 10:50:58 +0000 (19:50 +0900)]
Removed modules from Android studio gradle files

Resolved modules loading issue in Android Studio

Change-Id: I4e0bf2e45467cb1ff2b800498a7e24eeebfa426a
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2421

4 years agoAdded Build instructions document 20/2420/5
lankamadan [Wed, 9 Sep 2015 10:35:38 +0000 (19:35 +0900)]
Added Build instructions document

Updated build instructions document for Android and Arduino.

Change-Id: Id2fded63259bc8cf2e51a232e3883c6ca28c3c56
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2420

4 years agoMade the AttributeItem nullptr_t enabled only for direct conversions 14/2414/3
Erich Keane [Tue, 8 Sep 2015 22:03:46 +0000 (15:03 -0700)]
Made the AttributeItem nullptr_t enabled only for direct conversions

This will fix the GCC5.0 and CLANG 3.5 and newer compile issues.

Change-Id: Ib9c6b69c29e4c6ac70f0d04a2c791a60eae004f9
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2414
Reviewed-by: Kevron Rees <tripzero.kev@gmail.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoFixed CPP Conversion of nested array types 12/2412/2
Erich Keane [Tue, 8 Sep 2015 20:21:14 +0000 (13:21 -0700)]
Fixed CPP Conversion of nested array types

The CPP array type was incorrectly using reserve instead of
resize for the smaller vectors.  This resulted in the index-assignment
of each element to not work properly.  This patch fixes this, so that
the arrays are properly loaded.

Change-Id: I29eb78a1dc69602087ba9861a378f478d611b0f0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2412
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoChanged arraylist implementation to avoid floating point. 82/2382/2
Jon A. Cruz [Fri, 4 Sep 2015 18:33:53 +0000 (11:33 -0700)]
Changed arraylist implementation to avoid floating point.

Updated calculation of u_arraylist growth to no longer use
floating point. This helps for limited platforms that might
not have native FP support, such as some Arduino boards.

Change-Id: I7d8923786ac31cab8eb3004c8a956d36d884ec29
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2382
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
4 years agoFix for IOT-686 95/2395/2
Ravi Nanjundappa [Mon, 7 Sep 2015 08:35:25 +0000 (14:05 +0530)]
Fix for IOT-686

Replaced "tiny-cbor" with "tinycbor".

Change-Id: I923cb348fdfda3afa7de97b7323c5e4275210127
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2395
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoAdded missing license headers to Java files 15/2415/3
lankamadan [Wed, 9 Sep 2015 02:41:01 +0000 (11:41 +0900)]
Added missing license headers to Java files

- Added license header
- Performed code formatting using Android style

Change-Id: I614ecc9309577f975be4f353d09efdc56071b9b0
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2415
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
4 years agoJavaDoc comments and code formatting 10/2410/4
Hemant Mahsky [Tue, 8 Sep 2015 18:36:50 +0000 (00:06 +0530)]
JavaDoc comments and code formatting

- Updated Java doc comments for EasySetup SDK APIs
- Performed code formatting using Android style

Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Change-Id: Ibdce574d460110de2e965817163561375a0669e9
Reviewed-on: https://gerrit.iotivity.org/gerrit/2410
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoresource-encapsulation: Updated doxygen comments 43/2343/2
Ravi Nanjundappa [Wed, 2 Sep 2015 07:16:09 +0000 (12:46 +0530)]
resource-encapsulation: Updated doxygen comments

Updated and fixed some issues w.r.t doxygen comments in resource-encapsulation dir.

Change-Id: I95f61c9d0b99a89a8d72812eb5e2c8c7ff7fe170
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
4 years agosoft-sensor-manager: Updated doxygen comments 45/2345/2
Ravi Nanjundappa [Wed, 2 Sep 2015 08:24:22 +0000 (13:54 +0530)]
soft-sensor-manager: Updated doxygen comments

Updated and fixed some issues w.r.t doxygen comments in soft-sensor-manager dir.

Change-Id: I8996af3eff49eed1f8696c5c8ba02cd641588692
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2345
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
4 years ago[RI] Fix for out of memory issue in Arduino Mega 63/2363/9
koushik.girijala [Thu, 3 Sep 2015 11:01:42 +0000 (16:31 +0530)]
[RI] Fix for out of memory issue in Arduino Mega

OC log and OC log V used almost 3500bytes of RAM in Mega board because of improper log usage.
Updated code using PCF properly in OC logging to save almost 3500 bytes of RAM memory.

Verfied changes on both Arduino Due and Mega boards and found Working fine.

Change-Id: I9ca134d5cff9c8a91707a18bd9279089533a9b99
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoClean up structure allocation to follow best practices. 40/2340/3
Doug Hudson [Tue, 8 Sep 2015 16:58:18 +0000 (09:58 -0700)]
Clean up structure allocation to follow best practices.

Change-Id: Ia10b74926fce44cf0b55ed4964ea5f634e1c73d3
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2340
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAdded support for CBOR content format option. 62/2262/13
Stephane Lejeune [Mon, 24 Aug 2015 14:15:30 +0000 (16:15 +0200)]
Added support for CBOR content format option.

Added a new option defining content format for CBOR encoded payloads.
This will allow a more robust interpretation of incomming payloads
and will also permit generic stacks that have no apriori knowledge
about OIC to interpret the payloads going accross the network.

Change-Id: I34feb4e305458fcef4e7343cda313d9a52d12046
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2262
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
4 years agoAdd filter to Owned Device Discovery. 93/2393/4
Woochul Shim [Mon, 7 Sep 2015 04:25:34 +0000 (13:25 +0900)]
Add filter to Owned Device Discovery.
- Previous version discovers devices with condition 'owned=true'.
  This patch adds one more condition that 'owned=true' and 'owner=myself'
  This filter is required to screen out devices that are out of control.

[Patch  #3] Add free to prevent memory leak & Rebase

Change-Id: I0eb4ed9fd3b5dda72af5d17774bf42e8fcd7cd17
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2393
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoRefactoring of EasySetup Android implementation 06/2406/6
lankamadan [Tue, 8 Sep 2015 13:16:47 +0000 (22:16 +0900)]
Refactoring of EasySetup Android implementation

Updated Android Java code to support SoftAP and BLE OnBoarding methods

Change-Id: I6e66f979c1b7c61dd87c0448f43e6b0d33e433f3
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2406
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
4 years agoModify the term "Diagnostics" to "Maintenance" in file names 94/2394/3
Jihun Ha [Tue, 8 Sep 2015 01:03:05 +0000 (10:03 +0900)]
Modify the term "Diagnostics" to "Maintenance" in file names

ThingsDignostics and DiagnosticsCollection files are renamed to
ThingsMaintenance and MaintenanceCollection files.

Update properties of Configuration resource

"Device Name" and "Location Name" properties are added and "SystemTime" property
is removed.

Change-Id: I0f4028aea14997a6a35ae5660671e47aedb2b67b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2394
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years agoMerge remote-tracking branch 'origin/master' into easysetup, Provisioning Handler... 03/2403/1
sandipan.p [Tue, 8 Sep 2015 10:14:32 +0000 (15:44 +0530)]
Merge remote-tracking branch 'origin/master' into easysetup, Provisioning Handler changes and NDK-build fix

-Vinil Jain

Change-Id: Ia5e04b1efba94f7c178b7034147ca0722b29bd4f
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
4 years agoAdded PDM Module to Provisioning APIs 16/2316/17
Randeep Singh [Mon, 7 Sep 2015 07:33:01 +0000 (16:33 +0900)]
Added PDM Module to Provisioning APIs

This module will save the information for provisioning APIs in database.

[Patch #4] Resolve Build Error
[patch #5] Added unit test case in build
[patch #6] Removed jenkins UT error
[patch #8] Changed code according chul lee's comments
[patch #9] Updated code according to sakthivel's comments
[patch #14] Rebase & Remove compilation warning
[patch #15] Added new error code and corrected PDMDeleteDevice API

Change-Id: I4281b9596870553834cef3efe38e8e6dbf34517a
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2316
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoBug-fix & Internal API name change 91/2391/2
Woochul Shim [Mon, 7 Sep 2015 02:12:44 +0000 (11:12 +0900)]
Bug-fix & Internal API name change

1. Change Internal API Name
  - DeleteDeviceList() -> PMDeleteDeviceList()

2. Modify wrong log text in ownershiptransfermanager.c

3. Modify invalid return in DeviceDiscoveryHandler()
  - KEEP_TRANSACTION is used instead of ERROR and DELETE
    because this handler is waiting responses from multicast request

Change-Id: Id78b6d6ae91f6c92986ea26e9fc4d9cab3429fcb
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2391
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agoRemove a Things Manager class and expose its component classes for SDK 77/2377/2
Jihun Ha [Fri, 4 Sep 2015 07:20:39 +0000 (16:20 +0900)]
Remove a Things Manager class and expose its component classes for SDK

Previously, there was a single Thing Manager class for SDK which comprises
ThingsConfiguration, ThingsDiagnostics, GroupManager, and GroupSynchronization
classes. Now, we've decided to keep the components seperately for more
efficient maintenance for each component.

Additionally, to be aligned with OIC spec, a class name of "DiagnosticsCollection" has
been changed into "MaintenanceCollection".

Change-Id: I2b5cbf832abca3ac3ecfcab88e2153cca91a67f6
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years ago1. Change OCDeleteProvisionResults() parameters 61/2361/3
Woochul Shim [Thu, 3 Sep 2015 03:55:13 +0000 (12:55 +0900)]
1. Change OCDeleteProvisionResults() parameters
   - double pointer -> single pointer

2. Remove segmentation fault from unittest of provisioning
   - due to the mismatched extern definition of AddDevice

3. Change invalid usage of OC_LOG
   - OC_LOG(ERROR, ERROR, ...) -> OC_LOG(ERROR, TAG)

Change-Id: I58e627a72d43fafe98bf32120ca8354968ec1f05
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
4 years agorealigned some preprocess to the left. 66/2366/3
jihwan.seo [Thu, 3 Sep 2015 14:08:00 +0000 (23:08 +0900)]
realigned some preprocess to the left.

it can be gaven some confusion.

Change-Id: If3b228b404e830fad23ce793334723d0e0f92e89
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2366
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoAndroid: Allow "null" entityHandler to be passed to registerResource in order to... 46/2346/2
Cosmin Petrisor [Wed, 2 Sep 2015 08:19:41 +0000 (11:19 +0300)]
Android: Allow "null" entityHandler to be passed to registerResource in order to use the defaultEntityHandler (see Collections usage)

Change-Id: I0e685311c70a297d76a1a7a908a4470610c47b7f
Signed-off-by: Cosmin Petrisor <cosmin.petrisor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2346
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoFixes the observe option size to the legal max value of 3. 51/2351/14
Stephane Lejeune [Wed, 2 Sep 2015 11:45:55 +0000 (13:45 +0200)]
Fixes the observe option size to the legal max value of 3.

The options that have variable byte length are now being
encoded to their minimal value. This patch also truncates the
option data to their maximum value allowed per the spec. One specific
example is the observer data option which receives 4 bytes of data from
the OC stack. When encoding in CoAP, the maximum value is 3 bytes.
Consequently, the CA layer which is aware of the CoAP encoding truncates
the value back to 3 bytes. Also when registering an observe, the data
length is now set to 0 using the CoAP var byte encoding which saves the
4 bytes that were just carying zero's before thsi fix.

Change-Id: I033969b407aa3426df8c85c3836206c9366fb0a2
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years agoFix for the Jira issue IOT-524 62/2362/3
Ravi Nanjundappa [Thu, 3 Sep 2015 08:35:04 +0000 (14:05 +0530)]
Fix for the Jira issue IOT-524

This patch addresses the first part of IOT-524. This patch is a continuation of
the changes submitted at https://gerrit.iotivity.org/gerrit/#/c/1439/.
The current changes include installing the public header files inside PREFIX/include/
directory.
For ex: /home/XYZ/BUILD_IOT_PREFIX/include/resource/ocstack.h

Change-Id: I40be9cfe112a81263fb22acf494fa7f8fd8dc549
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2362
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
4 years ago[Resource-Encapsulation] Updated Android SampleResorceClient App 71/2371/2
Jay Sharma [Fri, 4 Sep 2015 04:45:06 +0000 (10:15 +0530)]
[Resource-Encapsulation] Updated Android SampleResorceClient App

- Added Resource Container part.
- updated comments

Change-Id: If6821f26cd9d39dd13f0ff8e13e1ab050b7e993b
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
4 years ago[Resource-Encapsulation] Added Resource Container in Java SDK 32/2332/2
Jay Sharma [Tue, 1 Sep 2015 08:10:58 +0000 (13:40 +0530)]
[Resource-Encapsulation] Added Resource Container in Java SDK

- Updated Java sdk for resource Container
- updated client and server jni files for exceptions.

Change-Id: I7406be52e1cb596a27a9b8d130e029f30075fffe
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2332
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>