Patrick Lankswert [Wed, 16 Sep 2015 19:44:50 +0000 (19:44 +0000)]
Merge "Merge easysetup branch into master"
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Jay Sharma [Wed, 2 Sep 2015 05:13:38 +0000 (10:43 +0530)]
[Resource-Encapsulation] Android Sample Application for Server side
- For Server Builder APIs
- For Resource Container APIs
Change-Id: Ia15bbfdadddc82ca45ebee8e58e579b5db399e0d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2342
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 1 Sep 2015 04:33:20 +0000 (10:03 +0530)]
[Resource-Encapsulation] Enabled Sample bundle build for Android platform
- [Resource Container] Soft Sensor Bundle build for android
- Added Exception to RCSRemoteResourceObject API
Change-Id: I98e3711857a6339efc09e146c2e6fb399e654b44
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2329
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
vimala.v [Mon, 31 Aug 2015 10:08:15 +0000 (15:38 +0530)]
Resolved Tizen crash while printing FATAL errors.
Temp fix for https://jira.iotivity.org/browse/IOT-704.
This fix will be reverted back when Tizen binary issue is resolved.
Change-Id: I38cdff511c61ac74912a45763be9b7dc3b7e9e4e
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2319
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Cosmin Petrisor [Mon, 31 Aug 2015 16:10:09 +0000 (19:10 +0300)]
Fix DefaultCollectionEntityHandler in csdk/stack/src/occollection.c to handle POST requests
Change-Id: Icd1d5c5a960d21525bca363956fbbad0c6c65efd
Signed-off-by: Cosmin Petrisor <cosmin.petrisor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2322
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
hyuna0213.jo [Tue, 1 Sep 2015 02:07:46 +0000 (11:07 +0900)]
code refactoring for blockwise-transfer
the code refactoring for blockwise-transfer.
- add null check logic
- changed coding style
- fixed minor bugs
Change-Id: I42eea430765c5dc1cac9ea7f18cca3311b465b38
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2328
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
vimala.v [Wed, 2 Sep 2015 09:04:25 +0000 (14:34 +0530)]
Enabled occlient to communicate over EDR adapter on Tizen.
The wait/re-try logic is added in CAEDRClientSendMulticastData() to make sure
atleast one connection is established before sending the data.
Change-Id: I2ea9fdab45bef800f05ade65296d3c4014037dea
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2348
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
arya.k [Wed, 2 Sep 2015 09:25:01 +0000 (14:55 +0530)]
[Resource Encapsulation] Android unittest crash fix.
Change-Id: I3a71aa30e7521c96a32bf5eb2de76a7189320525
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jon A. Cruz [Tue, 1 Sep 2015 22:42:38 +0000 (15:42 -0700)]
Fixed bug in u_arraylist_contains caused by poor member naming.
Corrected a bug in u_arraylist_contains caused by the member names
'size' and 'length' being too similar and hiding a logic problem.
Fixed by changing 'size' to the more common 'capacity'.
The base fix (without any of the name change) was pulled from
Vimala's revision 10 submission of change 2301.
https://gerrit.iotivity.org/gerrit/#/c/2301/10/
Change-Id: I22ac6fc159669ad58212b145f70cb559187fa999
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Vimala Vishwanathan <vimala.v@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Randeep Singh [Tue, 1 Sep 2015 12:29:06 +0000 (21:29 +0900)]
Resolved doxm issue
SVR db is not not getting updated with owned as true and owner
information, in case of JUST_WORKS case.
Change-Id: Icbbd19171d0177c5fadae429dc54b8626af57a75
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2336
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jay Sharma [Mon, 31 Aug 2015 17:27:21 +0000 (22:57 +0530)]
[Resource-Encapsulation] Java SDK for resource-encapsulation layer
- SDK for client side [updated as per review comments]
- SDK for server side [updated as per review comments]
Change-Id: Ie13656f263d39377269dd2479c43ef2a3efaeac0
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2266
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Sat, 29 Aug 2015 05:58:03 +0000 (14:58 +0900)]
Add sequence types to ResourceAttributes
There are sequence types supported by OCRepresentation, for ResourceAttributes to support perfect compatibility with OCRepresentation these types are added.
Change-Id: I260f4363e07e72220a2424c700d12dbef1d10e54
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2314
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Madan Lanka [Tue, 1 Sep 2015 01:48:38 +0000 (21:48 -0400)]
CBOR changes for EasySetup Enrollee and Mediator
1) Updated Enrollee to handle CBOR payload
2) Updated Mediator to handle CBOR payload
Change-Id: I1dc346c360f9415e14f54313e27ef0f89a170733
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2327
leechul [Thu, 27 Aug 2015 07:07:31 +0000 (16:07 +0900)]
Updated provisioning API to cater different connectivity type.
- PMGenerateQuery() will make a proper query
based on connectivity type of endpoint.
[Patch #1] Intial upload
[Patch #2] Update according to comments.
[Patch #3] Modify the buffer size which is request query is stored.
[Patch #4] Update according to comments.
[Patch #5] Update according to Jon's comment.
Fixed a buffer size for writing queries.
Change-Id: I996888faec20614736907dc7c17300eb8d1550cf
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2300
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tim Kourt [Fri, 28 Aug 2015 18:54:12 +0000 (11:54 -0700)]
Android: Mimics stack behavior and allows "null" entityHandler to be passed into the registerResource API
Change-Id: Ic7d11043e2b5a18e832e06ef1c71865d6a912530
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tim Kourt [Thu, 27 Aug 2015 21:27:06 +0000 (14:27 -0700)]
Android: Allows to destroy OcResource java object before all of the C++ callbacks have been received.
Change-Id: Idc77b12f7ad6aa3dd8d4cea6e4555eac3f776ab7
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2306
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Fri, 28 Aug 2015 07:07:27 +0000 (00:07 -0700)]
Fixed android build to work multithreaded.
Previously the android build was missing proper dependencies
so could only be built if multithreading was disabled. This change
adds minimal dependencies to get gradle to be executed after the
native parts are built, and re-enables threaded builds.
This could reduce build times by roughly 75% on average systems.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Change-Id: Iccecd7cc976855592d3375027a4de1f9fd2dbe98
Reviewed-on: https://gerrit.iotivity.org/gerrit/2310
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Shilpa Sodani [Fri, 28 Aug 2015 07:37:05 +0000 (00:37 -0700)]
Fixed IOT-674 bug
Updated doxm resource to set it's oxmSel field to selected ownership
transfer method during onboarding process.
Change-Id: I518e69e9f92b5dbbb8bb7fb83c2489a272c950b8
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ravi Nanjundappa [Thu, 27 Aug 2015 06:07:33 +0000 (11:37 +0530)]
Updated doxygen comments for OCResource.h
Updated and fixed some issues w.r.t doxygen comments in OCResource.h file
Change-Id: Ia89553197b32aad5ae1c8fa6482c03783e70baed
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Shilpa Sodani [Wed, 26 Aug 2015 07:17:23 +0000 (00:17 -0700)]
Fixed the IsRequestWithinValidTimeTest unit tests.
Fixed IsRequestWithinValidTimeTest unit tests so that they don't failing on boundary
conditions.
Change-Id: Ie52e3e75d8fc2ee052f43a532681cb2091545fbb
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jay Sharma [Tue, 25 Aug 2015 15:59:42 +0000 (21:29 +0530)]
[Resource-Encapsulation] Android Sample Application for client side APIs.
Change-Id: I1605fe00027c8bd6d2182a70e3dbb35f2d6c2b2d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2267
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
lankamadan [Fri, 28 Aug 2015 04:26:27 +0000 (13:26 +0900)]
Fix for compilation errors in Android EasySetup
Fixed OCConnectivity Type in Android Easy Setup Code based on latest master branch changes.
Change-Id: I4d7e0e207c152e6596a817704edf35957dec6e07
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2308
Rami Jung [Thu, 27 Aug 2015 07:58:34 +0000 (16:58 +0900)]
update comments of RCSResourceObject.h for doxygen
-straighten up lines
-typedef AttributeUpdatedListener
-class LockGuard
Change-Id: Idfbad3ade7fcedc6870835bff32b966d574bc8b5
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2302
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sakthivel Samidurai [Thu, 27 Aug 2015 20:25:54 +0000 (13:25 -0700)]
Generate device ID from Secure Virtual Resource
SRM should generate the device ID for the resource server
Change-Id: Ic4f83f63a59827bf5cfb412afc34e1d955ee69e2
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2162
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jaehong Jo [Thu, 27 Aug 2015 15:15:18 +0000 (00:15 +0900)]
Fix Android EDR Client memory leak
Delete JNI local reference
Change-Id: Iee79cdf5adac2a8d2f1bac67fd1ac34757d974d8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Hauke Mehrtens [Wed, 26 Aug 2015 13:36:58 +0000 (15:36 +0200)]
OCRepresentation: fix segmentation fault by initializing memory
dimensions was not fully initialized, but used by the code, so it could
contain arbitrary memory. If this memory was a big number this code
could allocate very much memory as this was used to create a 2 or 3
dimensional arrays.
This fixes a Segmentation fault seen in normal operation of the
garageserver and a invalid memory read and a following segmentation
fault seen with valgrind in the garageserver
Change-Id: Ifbab3d48b00bd2e3559ca3a8d79336ecf5feef6e
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Thu, 27 Aug 2015 11:45:33 +0000 (20:45 +0900)]
Variable declaration incorporated in for() loop itself.
https://gerrit.iotivity.org/gerrit/#/c/2277/
Change-Id: I83c03bdba83109b9a313dee977efd13b6e65aa55
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2303
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
js126.lee [Wed, 26 Aug 2015 07:41:50 +0000 (16:41 +0900)]
Change build option about provisioning
Now, provision manager is working on linux only.
So, build condition is changed to SECURED=1 and linux.
Change-Id: I310ccffcd911ec925b9c9725909d22d24062603d
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2280
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Vinil Jain [Thu, 27 Aug 2015 12:53:33 +0000 (18:23 +0530)]
Merge branch 'master' into easysetup & CBOR changes
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Change-Id: I7c3e7fc8a234388aab3c02e33a6010edd4eca04d
Jihun Ha [Thu, 27 Aug 2015 06:33:08 +0000 (15:33 +0900)]
Modify a group management implementation with CBOR conversion in c stack
Previously, oicgroup.c file dealt with processing group action requests and
constructing the corresponding responses and it was strongly related with
json encoding/decoding. With this commit, all json-based codes in the file
have been updated to use CBOR instead of json.
Change-Id: I2f0953fab9c77024435d389538a4f43b600d7864
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Rami Jung [Wed, 26 Aug 2015 12:05:37 +0000 (21:05 +0900)]
add a gtest case into serverBuilder unittest of resource-encapsulation for testing nested attributes
new case of unittest : SettingNestedAttributesIsSameToGettingNestedAttributes
A RCSResourceAttributes, itself could be value of a key-value pair like int, double, string and so on.
That means developers are able to nested structure when they make key-value pairs and it is possible to set up the following hierachy in attributes.
{
"type": "Living Colors",
"name": "LC 1",
"modelid": "LC0015",
"swversion": "1.0.3",
"state": {
"hue": 50000,
"on": true,
"effect": "none",
"alert": "none",
"bri": 200,
"sat": 200,
"ct": 500,
"reachable": true,
"colormode": "hs"
}
}
Change-Id: Ifdf2fb41860ad7227753677741bf79c6709fbaa6
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2284
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sakthivel Samidurai [Wed, 26 Aug 2015 21:17:10 +0000 (14:17 -0700)]
Fix resource sample and unit test warnings
Change-Id: Ieced950f54f7ce9997852a455fd5f9b5e89afbc1
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tim Kourt [Wed, 26 Aug 2015 22:56:08 +0000 (15:56 -0700)]
Re-enabled some of the Android smoke tests
Change-Id: If90118088be6f4663196bd1dd05cdd5c7d1ec161
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2294
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Sat, 15 Aug 2015 07:09:17 +0000 (00:09 -0700)]
Fixed u_arraylist to correct performance and missing calls.
Corrected poor memory management to not realloc() on each remove
call, use a normal approach to growth of the backing store, and
some general cleanup. Added calls for reserving space and for
requesting reduction of the backing store.
These were all issues called out in the intial code review.
Simple cleanup improved performance of the contains function
reducing its time by 40%-50% (~ 36ms down to 21ms-19ms).
With the backing store corrections, repeted add/remove testing was
improved with its time being cut by 75% (36.8ms down to 9.4ms).
(Times should be taking as very rough, since runs were done using
valgrind to slow things enough to actually measure.)
Change-Id: I81e42f2fdbec8fb7fb18f16f09cfa5008640a2d4
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2293
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jay Sharma [Wed, 26 Aug 2015 06:47:14 +0000 (12:17 +0530)]
[TIZEN] Enabled Resource Encapsulation build for Tizen platform with sample applications.
Change-Id: I1cdd77f53c959ac4825bafe1d31cfcb39aff4975
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tim Kourt [Wed, 26 Aug 2015 21:07:57 +0000 (14:07 -0700)]
Fix for the incorrect payload size conversion in the stack
Change-Id: I928170769799b4c9ca5c466680e9103956a35a53
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2290
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Sat, 15 Aug 2015 00:28:43 +0000 (17:28 -0700)]
Add unit tests for u_arraylist_t in preparation for subsequent changes.
Change-Id: I489398da1bb5455977b8bbb0d302a889f130b04f
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2214
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Ravi Nanjundappa [Wed, 26 Aug 2015 06:01:31 +0000 (11:31 +0530)]
things-manager: Updated doxygen comments for ThingsManager.h
Updated and fixed some issues w.r.t doxygen comments in ThingsManager.h file
Change-Id: Icafdaa0bd00b275b1e7423ea25d22601bcab9323
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2276
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Hauke Mehrtens [Mon, 8 Jun 2015 21:28:21 +0000 (23:28 +0200)]
android: fix location of sdk
The file android-sdk_r24.2-linux.tgz contains a directory named android-
sdk-linux and the macos and windows version use similar directory names.
This fixes the following error message:
/iotivity/extlibs/android/gradle/gradle-2.2.1/bin/gradle build -b/iotivity/android/android_api/build.gradle -PTARGET_ARCH=armeabi -PRELEASE=release
FAILURE: Build failed with an exception.
* What went wrong:
A problem occurred configuring project ':base'.
> The SDK directory '/iotivity/extlibs/android/sdk/android-sdk_r24.2' does not exist.
This was only tested under Linux and not tested under windows or macos.
Change-Id: Ia316ed65dc22f653a297b6423d4e1b47a24c8dbe
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1222
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Wed, 26 Aug 2015 06:16:42 +0000 (15:16 +0900)]
Remove sleep in Android EDR.
It is no longer necessary.
Change-Id: I8d2e0f741830f659edee7b977f24d32f8e93b8c1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
projects / platform / upstream / iotivity.git / log