platform/upstream/iotivity.git
8 years agoFix tizen build issue.
Jaehong Jo [Fri, 19 Feb 2016 02:43:57 +0000 (11:43 +0900)]
Fix tizen build issue.

Duplicate define GMainLoopThread in EDR, LE.

Change-Id: Ie6757412d8741be801e30b7f29744dc33bd68d51
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5059
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>
8 years agoremoved duplicated OC_LOG and replace it with OIC_LOG
jihwan.seo [Fri, 19 Feb 2016 07:22:22 +0000 (16:22 +0900)]
removed duplicated OC_LOG and replace it with OIC_LOG

Change-Id: I9294ccb4da022ac845d54a215ea157bfedd3cce2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoEMPTY ACK/RESET message Handling by Routing Manager
vimala.v [Mon, 8 Feb 2016 11:11:30 +0000 (16:41 +0530)]
EMPTY ACK/RESET message Handling by Routing Manager

In case of EMPTY message, according to CoAP spec it can have only 4 bytes containing
Version, Message type, Token Length as 0, Response result as CA_EMPTY and
Message ID.  However Route Option is required for routing the message via multihop.
In order to resolve this issue, we defined a MSGType in the RouteOption which is set
to 0 for normal messages while ACK for Empty acknowledgement and RST for Empty
Reset messages.
When a client sends Empty acknowledgement for a Response received, a POST message
carries the MSGType via multiple hops and the border gateway translates it to Empty ACK

Change-Id: I9550d1ad76f4b6a83a90ee2f06cef1899a3e7564
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4649
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for IOT-927 resource container attribute update/notify race condition
Markus Jung [Tue, 2 Feb 2016 12:34:13 +0000 (21:34 +0900)]
Fix for IOT-927 resource container attribute update/notify race condition

- Asynchronous notification of observing clients
- Mutex for access on RCSResourceAttributes
- returning RCSResourceAttributes by value
- reference to const RCSResourceAttributes for handleSetAttributeRequest API

Note: The change breaks backward compatibility with previous APIs

Change-Id: I2f84353aa993772e7a1a908c766c77786fe7c3ea
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoupgrade gatt connection performence
jihwan.seo [Fri, 19 Feb 2016 11:54:10 +0000 (20:54 +0900)]
upgrade gatt connection performence

when autoconnect flag is used in connectGatt(..),
connection speed is better than another flag true
so only first gatt connection will be requested as autoconnect flag false.

and next connect will be requested as auto connect flag true.
so, background connect will be supported by BT platform.

Change-Id: I73425eb61b3411b242845b0e5f86b9f4b726d4d4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5079
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoModified edrinterface for initiaize and terminate
Jaehong Jo [Tue, 12 Jan 2016 02:45:21 +0000 (11:45 +0900)]
Modified edrinterface for initiaize and terminate

I Modified edrinterface header file for initiaize and terminate
it will be worked more commonly

Change-Id: I20d40db3110d35d27259713453fbf0ec47599f62
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-953] coap message is not sent in android ble
jihwan.seo [Fri, 19 Feb 2016 01:02:57 +0000 (10:02 +0900)]
[IOT-953] coap message is not sent in android ble

when message is sent, deadlock is happened.
so send flag that whether send is finished or not
has to be covered mutex lock.

Change-Id: I97698fa67df1bc6dcd04a3e5ef607d02050d1e69
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoMerge branch 'nfc-transport'
Ashok Channa [Thu, 19 Nov 2015 09:55:23 +0000 (18:55 +0900)]
Merge branch 'nfc-transport'

Change-Id: I9e850b4347ef0027a28dc646f2deb119f1b3f116
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix for defects detected by static analysis in ca android
hyuna0213.jo [Thu, 18 Feb 2016 03:08:41 +0000 (12:08 +0900)]
Fix for defects detected by static analysis in ca android

modify ca android ble client/server to fix defects detected
by static code analysis

Change-Id: I5b48824b03a00b373e07ccc311b7b77f32dd5b77
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5035
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoclean up android ble implement code
jihwan.seo [Wed, 17 Feb 2016 06:27:18 +0000 (15:27 +0900)]
clean up android ble implement code

Change-Id: I0123497c72b28d78e208da013267b6f0e949396c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BT
hyuna0213.jo [Thu, 21 Jan 2016 06:11:12 +0000 (15:11 +0900)]
CoAP over TCP transmission over BT

currently, CoAP/UDP message format is used over BT-RFCOMM.
but BT-RFCOMM data transmission requires dedicated session
between devices and guarantees reliable data transmission
by its MAC & PHY layer. So, CoAP/TCP message format might
be more efficient for Bluetooth

Change-Id: I0b7752a1146efd1abbe74eb613c72346b99039e9
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/4447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agokeepalive for coap over tcp
hyuna0213.jo [Mon, 18 Jan 2016 11:08:25 +0000 (20:08 +0900)]
keepalive for coap over tcp

In order to ensure that the connection between an OIC Devices,
OIC Device should send application layer keepalive messages.

Change-Id: I630b186db58317f28cdfbd99a66e6bf75970ae3e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-946] To support Resource Discovery on unicast for Android BLE.
jihwan.seo [Mon, 15 Feb 2016 05:01:52 +0000 (14:01 +0900)]
[IOT-946] To support Resource Discovery on unicast for Android BLE.

I have updated resource discovery on unicast for BLE.
it will waiting for connected callback
before send message like multicast.

Change-Id: I06f05d0212f04fc4c0cff8bb81229fcbf95006a3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BLE
jihwan.seo [Wed, 10 Feb 2016 23:56:24 +0000 (08:56 +0900)]
CoAP over TCP transmission over BLE

there is another header for fragmentation is added in CoAP PDU.
since CoAP over TCP has message length field,
it is better to apply to BLE

Change-Id: I35f174f85a114abc5521c42cd6b25eda02cd9f6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoBLE Client support for Tizen 2.4
jihwanseo [Mon, 18 Jan 2016 11:47:57 +0000 (17:17 +0530)]
BLE Client support for Tizen 2.4

Change-Id: I687d57eae2b89e414b39a45aaebf9a8b5333c3b4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFixed a bug regarding the batch interface in RCSResourceObject.
coderhyme [Mon, 15 Feb 2016 05:00:51 +0000 (21:00 -0800)]
Fixed a bug regarding the batch interface in RCSResourceObject.

There was a problem that RCSResourceObject didn't handle the batch interface.
The response format also was wrong.

Change-Id: I9e55779ceec70fcb7d7140f5b21e03107e65e56b
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded SeparateResponse class for the RCSResourceObject in RE.
coderhyme [Fri, 5 Feb 2016 02:42:12 +0000 (18:42 -0800)]
Added SeparateResponse class for the RCSResourceObject in RE.

The class is to support the SLOW response concept of the base.
For it, the RCSRequest now holds its owner resource object.

- how to use

RCSSeparateResponse separateResponse;

...

server->setSetRequestHandler([](const RCSRequest& r, RCSResourceAttributes& attrs){
    // make separate response to set result later
    separateResponse = RCSSeparateResponse(r);

    return RCSSetResponse::separate();
});

...

// the set method will throw an exception when the operation is failed.
separateResponse.set();

Change-Id: I054ee3948d7742b5c45f821f3fec48216915f273
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify DiscoveryManager and DiscoveryManagerTest
ChaJiwon [Mon, 1 Feb 2016 08:18:39 +0000 (17:18 +0900)]
Modify DiscoveryManager and DiscoveryManagerTest

- Discovery Test using multiple resource types
- Check the size of vector that contains resource types

Change-Id: Ia5c8db2413d787ead4490cc2b128fcc2c2a5bbe6
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed EDR problem related to BT on/off for Android.
Jaehong Jo [Thu, 10 Dec 2015 07:03:25 +0000 (16:03 +0900)]
Fixed EDR problem related to BT on/off for Android.

When BT turn off, call Stop EDR Server,
and when BT turn on, call Start EDR Server.

Change-Id: Ife12956568fd631140209472912d3e0fef62f13d
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-931] Added send logic to check write/notify in BLE
jihwan.seo [Thu, 21 Jan 2016 06:13:22 +0000 (15:13 +0900)]
[IOT-931] Added send logic to check write/notify in BLE

according to android BLE guide,
I have modified transmission logic for BLE.
when there is a big message to sent,
next segmentation data has to wait for
callback write/notify Characteristic for previous sent data.

Change-Id: Idf543504d634ab4dfbc2fbd4bb90aa7e2ad1831e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoTo separate receive data in caleadapter as per adapter type
jihwan.seo [Mon, 18 Jan 2016 03:19:54 +0000 (12:19 +0900)]
To separate receive data in caleadapter as per adapter type

since there is SERVER_CLIENT type in base API.
BLE address will be same to each other for BOTH type.
so it is need to access each data as per adapter type.

Change-Id: I7f446166765bfa2391e49a80b62f4878cc6d8b7f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[Arduino BLE]Property of Read characteristic is changed to Write
vimala.v [Mon, 1 Feb 2016 11:07:58 +0000 (16:37 +0530)]
[Arduino BLE]Property of Read characteristic is changed to Write

Read characteristic property is changed from WriteWithoutResponse to Write.
The changes required in RBL library for enabling Write property will be applied as patch.

Change-Id: I686eabee6ac956e44446b17b520d75a18bd00d40
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded get/set apis with query params in RCSRemoteResourceObject.
coderhyme [Mon, 1 Feb 2016 09:03:14 +0000 (01:03 -0800)]
Added get/set apis with query params in RCSRemoteResourceObject.

These apis work with callbacks taking the RCSRepresentation.
An operation retrieving the interface of a request added in the RCSRequest.
An operation to create the RCSRemoteResourceObject from the OCResource added.

Change-Id: I630727e61068326c262dc0fe4ae6c19f324adcc5
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd cloning of identity to CACloneInfo
Tobias Rauter [Thu, 7 Jan 2016 15:42:51 +0000 (16:42 +0100)]
Add cloning of identity to CACloneInfo

In block-transfer mode, the identity was not set
in the resulting CARequestInfo. Therefore, ACLs did not
work properly.

Change-Id: Ie47ee8f18bc3c914c0a662656b42cbf03cadc0fc
Signed-off-by: Tobias Rauter <tobias.rauter@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoreplaced OC_LOG with OIC_LOG in stack
jihwan.seo [Wed, 23 Dec 2015 01:22:48 +0000 (10:22 +0900)]
replaced OC_LOG with OIC_LOG in stack

Change-Id: Ice2639c3bc09e9a7fe2452ab9fbb1593b07bdb9c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoSpecified the missing inclusion of standard library file.
G S Senthil Kumar [Thu, 28 Jan 2016 12:13:19 +0000 (17:43 +0530)]
Specified the missing inclusion of standard library file.

Included algorithm standard library file in RAML source file to avoid build failure.

Change-Id: Idf858145d3eede3b8bbaa2f39e6c5d7e910ed210
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoreplaced current TAG with 'OIC_xxx' commonly in CA
jihwan.seo [Thu, 21 Jan 2016 02:12:09 +0000 (11:12 +0900)]
replaced current TAG with 'OIC_xxx' commonly in CA

To make easy debugging,
i have modified TAG in CA once.
it is better to add common string 'OIC_' + current TAG name.

Change-Id: I9d497608ec9ecd30c8577609a8775e4189fae0e0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4837
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoReverting back to Android-21 as the move to Android-23 causes Android
Rahul Rahul [Wed, 27 Jan 2016 18:42:13 +0000 (10:42 -0800)]
Reverting back to Android-21 as the move to Android-23 causes Android
to crash on M devices. The current build scripts will need to be updated
to generate shared libs with soname.
Till the scripts are updated, Android-21 will be used as it works even
on M devices.

Change-Id: I33e0ccc19fb406b3508d888f7b04617c7d6e0868
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoreplaced current TAG with 'OIC_xxx' commonly in RI Layer
hyuna0213.jo [Thu, 21 Jan 2016 06:00:23 +0000 (15:00 +0900)]
replaced current TAG with 'OIC_xxx' commonly in RI Layer

The current TAG doesn't have a rule.
i have modified TAG in RI Layer to make easy debugging.
it is better to add common string 'OIC_' + current TAG name.

Change-Id: I722c1944e9ba89d901d93d6ba208e931c9094028
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoreplaced OC_LOG with OIC_LOG in security
jihwan.seo [Mon, 25 Jan 2016 23:24:54 +0000 (08:24 +0900)]
replaced OC_LOG with OIC_LOG in security

Change-Id: I38ba90586d9ea5fb978c2a1cc8a925dbf1e59f9c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded bind apis to RCSResourceObject
coderhyme [Fri, 29 Jan 2016 02:11:55 +0000 (18:11 -0800)]
Added bind apis to RCSResourceObject

Bind apis are required for some specific use-cases.
An auto-interface handler for BATCH, which builds the response conforming with the OIC-spec, is added.

Change-Id: I9dd7c822bfb1ec06ed9176b20d3dcd06c8cb1f44
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd discovery by multiple resource types.
ChaJiwon [Fri, 15 Jan 2016 04:39:03 +0000 (13:39 +0900)]
Add discovery by multiple resource types.

Change-Id: I9e95a0488880b10fce744a2dd4eed464297bedc6
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4805
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoPartially Revert OC_LOG -> OIC_LOG for service layer
Trevor Bramwell [Tue, 26 Jan 2016 20:08:16 +0000 (12:08 -0800)]
Partially Revert OC_LOG -> OIC_LOG for service layer

There is currently no OIC_LOG_PAYLOAD function

Change-Id: Ie6e349f85a96fd9267fcd563385a0f9e1a3b93cd
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agomodified target transport type related blockwise transfer.
jihwan.seo [Fri, 8 Jan 2016 10:38:06 +0000 (19:38 +0900)]
modified target transport type related blockwise transfer.

since EDR is not support BWT anymore,
I removed the build script related that.

Change-Id: I105bf0d9d4d921ca760808b2aff8776a3973ebf1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoModify RCSRequest to wrap OCResourceRequest
coderhyme [Tue, 26 Jan 2016 07:09:51 +0000 (23:09 -0800)]
Modify RCSRequest to wrap OCResourceRequest

RCSRequest just wraps OCResourceRequest and it exposes OCResourceRequest for users who want to get information from oc request.

Change-Id: I12d2210e672c6d1a49d4766e07a0d648a7982773
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated documentation for BundleActivator::destroyResource
George Nash [Fri, 22 Jan 2016 17:36:23 +0000 (09:36 -0800)]
Updated documentation for BundleActivator::destroyResource

The documentation said that the destroyResource destroys and registers
the the resource.

It should unregister the resource then destroy.

Change-Id: Ib9f628097a89f87bbb8e20f4ba562dc687d4cebe
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoWait for Linux BLE event loop to start before stopping.
Ossama Othman [Fri, 22 Jan 2016 19:26:51 +0000 (11:26 -0800)]
Wait for Linux BLE event loop to start before stopping.

This addresses a corner case where the LE transport is stopped before
it has fully started.  In that case, the thread running the GLib event
loop never exited since the event loop itself was still running.  That
ultimately caused the CA layer termination to block indefinitely on a
pthread_join().

Change-Id: I521c7a66c6541cb14df7d4ba098899f303e50999
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded RCSRepresentation class and get function with params in PrimitiveResource.
coderhyme [Wed, 27 Jan 2016 03:03:41 +0000 (19:03 -0800)]
Added RCSRepresentation class and get function with params in PrimitiveResource.

The class is to represesnt resource information in a form of hierarchy.
It replaces ResponseStatement which was a class used internally.
Addtionially broken tests in PrimitiveResource related with Set operation are fixed.

Change-Id: I0b1bcc97b0b210a5a2c3da6e6219de1ff3fc727c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoReplaced current TAG with 'OIC_xxx' in c_common and routing
Jaehong Jo [Thu, 21 Jan 2016 07:53:51 +0000 (16:53 +0900)]
Replaced current TAG with 'OIC_xxx' in c_common and routing

To make easy debugging,
I have modified TAG in c_common and routing.
It is better to add common string 'OIC_' + current TAG name.

Change-Id: I1965db71f58f0ab4dfe3e0bacdd243098d2baf77
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4845
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agomodified the initialize/deinitialize logic in CA
hyuna0213.jo [Wed, 20 Jan 2016 08:53:58 +0000 (17:53 +0900)]
modified the initialize/deinitialize logic in CA

I changed the initialize/deinitialize logic in CA adapter
and removed the unnecessary code.

Change-Id: Ia9d3dd503f25a393a4053c95c508d1166c574b73
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoSimulator Build
Trevor Bramwell [Fri, 8 Jan 2016 00:24:37 +0000 (16:24 -0800)]
Simulator Build

Adds a build for the IoTivity Simulator Eclipse plugin to auto_build.sh

Change-Id: Ia98c34c004fff542c98b5f1d683cb98889926fe5
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Radha Bhavani <radha.p@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoreplaced OC_LOG with OIC_LOG in service layer
jihwan.seo [Thu, 21 Jan 2016 00:17:08 +0000 (09:17 +0900)]
replaced OC_LOG with OIC_LOG in service layer

Change-Id: I892b23e6087368addb63a418fac7f95794aae04d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agothings-manager: remove reference to groupsyncaction
Hauke Mehrtens [Fri, 15 Jan 2016 21:47:53 +0000 (22:47 +0100)]
things-manager: remove reference to groupsyncaction

This SConscript tried to include service/things-manager/sampleapp/linux
/groupsyncaction/SConscript which does not exists, remove the reference.

Change-Id: Ic5265db3757539113121d1e68df542ca744b54e8
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoClean up documentation warnings reported by doxygen
George Nash [Fri, 15 Jan 2016 17:22:42 +0000 (09:22 -0800)]
Clean up documentation warnings reported by doxygen

Most of the documentation cleanup is due to overloaded member functions.

The @overload tag was used to remove the warnings. All of the parameteres
are documented for both functions with the @see tag added for each
overloaded function. This is a balance between not repeating documentation
yet still keeping the output clean. To have clean output some repetition
is required.

The @override tag was removed from the move constructors since @override is
not a keyword understood by doxygen.  The best I could tell the documentation
should have been the same for the move constructors as it was for the the
copy constructors.

note: @overload automatically adds "This is an overloaded member function,
provided for convenience. It differs from the above function only in what
argument(s) it accepts." to the output documentation.

Change-Id: Id167dc8d38bcca65d91a8bd3d6e43f9ca291aa79
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix CA Layer build warnings
hyuna0213.jo [Tue, 22 Dec 2015 05:06:52 +0000 (14:06 +0900)]
Fix CA Layer build warnings

This patch fixes compiler warnings related to CA Layer.

Change-Id: I2c92a201492cf2e9b8eff2d58ce187bf397a8239
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agotcp_adapter: use CASecureEndpoint_t
Hauke Mehrtens [Fri, 15 Jan 2016 22:15:52 +0000 (23:15 +0100)]
tcp_adapter: use CASecureEndpoint_t

The callback function for g_networkPacketCallback gets
CASecureEndpoint_t as first parameter and not CAEndpoint_t. The TCP
adapter always provided it with the wrong type CAEndpoint_t. This patch
makes the tcp adapter use CASecureEndpoint_t instead and fix this
problem.

Change-Id: Ic3b1ca0aadf7a95c846a31424932a7e90a86a55b
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoconnectivity: fix warning about missing method declarations
Hauke Mehrtens [Thu, 1 Oct 2015 22:33:06 +0000 (00:33 +0200)]
connectivity: fix warning about missing method declarations

The WITH_TCP define is not set here, but the libcoap header checks for
it and only adds the tcp functions if it is set. Add it here to fix the
warnings.

Change-Id: I28f1831341583597f5bf06406724e236911b0b81
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3393
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoTo Integrate logger files
jihwanseo [Wed, 16 Dec 2015 05:58:35 +0000 (14:58 +0900)]
To Integrate logger files

There are two logger files in iotivity.
These are 'resource/csdk/logger' and
'resource/csdk/connectivity/common/logger'.

since 'resource/csdk/connectivity/common/logger' is using in only CA.
it is better to integrate with 'resource/csdk/logger'
so only 'resource/csdk/logger' will be used after that.

ps. oc_* logger name will be replaced with oic_* name
    through other Change

Change-Id: I195b6d9e8066bcc87c0a9ea50a3bf335e3b7340a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoDisable compilation of IoTivity Services for iOS
Trevor Bramwell [Wed, 6 Jan 2016 22:22:55 +0000 (14:22 -0800)]
Disable compilation of IoTivity Services for iOS

As this is already disabled for Darwin, it should be disabled for iOS as
well.

Change-Id: Id1c984bfb3bb32896227721ad620904b92d7f2dd
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Install build tools and a missed library to the Readme.scons.txt
George Nash [Fri, 15 Jan 2016 16:58:01 +0000 (08:58 -0800)]
Add Install build tools and a missed library to the Readme.scons.txt

Add the apt-get command to add the build tools used by the IoTivity
build. This includes valgrind that is only needed in some build
configurations.

libglib2 is required for the  build but seems to be missed in the
readme file as well.

Change-Id: I8fc514a584c7b2134edd55052e4dfe229f2fbf51
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4813
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCorrected incompatible pointer and format specifier warnings.
Ossama Othman [Thu, 14 Jan 2016 20:55:20 +0000 (12:55 -0800)]
Corrected incompatible pointer and format specifier warnings.

Change-Id: Id2d0dfaafbb7bb9c6c0f4863e2c3822c8cd23018
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4803
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdd OICFree() to release the memory already allocate for the uri
Jay Oh [Thu, 14 Jan 2016 07:07:45 +0000 (16:07 +0900)]
Add OICFree() to release the memory already allocate for the uri

Change-Id: I14590e2f5427c5aef80eefce0b264eb6b4344328
Signed-off-by: Jay <junghyun.oh@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-771] Reintroduce missing Linux BLE adapter code.
Ossama Othman [Thu, 7 Jan 2016 00:40:02 +0000 (16:40 -0800)]
[IOT-771] Reintroduce missing Linux BLE adapter code.

The IoTivity BLE Linux transport doesn't send data due to missing
code, e.g. stub implementations for several functions required by the
CA LE interface. A incorrect revision was merged during the code
review, likely because the gerrit draft revision with the correct
implementation was not published, and ultimately lost. This patch
reintroduces implementations for those functions.

Change-Id: If9e9f7ebaeebb9072cd7762e94a82ef45809f95b
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3011
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoprocess return type for some method related CAConnectivityhandler_t
jihwan.seo [Thu, 7 Jan 2016 03:02:32 +0000 (12:02 +0900)]
process return type for some method related CAConnectivityhandler_t

Change-Id: I02ab53c144275b96e16288e41c1f8648273190eb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoRevert "Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples...
Dmitriy Zhuravlev [Wed, 13 Jan 2016 09:18:20 +0000 (09:18 +0000)]
Revert "Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples) according to spec B."

Roll back the JSON changes for waiting until the Security Spec JSON definitions are released.

This reverts commit b578b61090303a71ae07126107c40c18238a02cd.

Change-Id: I8c520b0a99ca2dbae6c3e44ff93f5221288a4188
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
8 years agoRemoved unneccessary code for stack
jihwan.seo [Tue, 22 Dec 2015 08:42:42 +0000 (17:42 +0900)]
Removed unneccessary code for stack

I have removed unneccessary code for stack
and some code format has been changed more clearly

Change-Id: Ia9d970a2a8b6e3637f472d6384993d512b791514
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-844] Modify Tizen spec forprovisioning
hekra [Mon, 23 Nov 2015 00:49:24 +0000 (16:49 -0800)]
[IOT-844] Modify Tizen spec forprovisioning

Signed-off-by: Hugues Ekra <hekra@cisco.com>
Change-Id: I6ef65066d68a45767b0a825bf309454d289bfb61
Reviewed-on: https://gerrit.iotivity.org/gerrit/4309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: koushik girijala <g.koushik@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years ago[IOT-919] Only run send queues if GATT adapter is running.
Ossama Othman [Fri, 18 Dec 2015 22:23:37 +0000 (14:23 -0800)]
[IOT-919] Only run send queues if GATT adapter is running.

Don't run the client and server side sending queue threads unless the
client and server, respectively, have actually started.  This addresses an
issue where an attempt to send data from a GATT client to a server
fails due to no connection being established beforehand, as well as
accessing uninitialized resources that are only fully initialized
after server start.

Change-Id: I7b6e9728c2edc6a2a283836f7ee31b68555fc34d
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4665
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevron Rees <tripzero.kev@gmail.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agobuild: avoid to use ARMv5 machine flags by default
Philippe Coval [Fri, 11 Dec 2015 23:28:59 +0000 (23:28 +0000)]
build: avoid to use ARMv5 machine flags by default

To use this flags it is encouraged to set TARGET_ARCH to "*v5*" from.
If unset, generic (buildsystem)'s flags will be used as expected.

I noticed this while building with Tizen:2.4:Mobile toolchain (gbs)
but it could also affect other ports or build infrastructures.

Bug: https://jira.iotivity.org/browse/IOT-694
Change-Id: I4bc279e809474bf664b4825f201df471c66a191c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4541
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCorrected signed/unsigned integer comparison warnings.
Ossama Othman [Mon, 21 Dec 2015 23:56:55 +0000 (15:56 -0800)]
Corrected signed/unsigned integer comparison warnings.

The return value of the ftell() function was assigned to an unsigned
integer typed variable and then compared to -1.  Since ftell() actually
returns a 'long' assign to a 'long' instead.  This addresses
signed/unsigned integer comparison warnings.

Change-Id: I990e891ee2ad1f81cd0721ad82646fcf2e79d2b0
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agocode refactoring on camessagehandler
jw0213.jung [Tue, 12 Jan 2016 23:46:24 +0000 (08:46 +0900)]
code refactoring on camessagehandler

Some codes need a refactoring
like memory free missing when a initialize fails.

Change-Id: Ifdb8c790b666c9d2203a0d3b8f4976382ff1f074
Signed-off-by: jw0213.jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoUpdated the android version to API 23 and build tools version to 23.0.1.
Rahul Rahul [Tue, 5 Jan 2016 21:48:09 +0000 (13:48 -0800)]
Updated the android version to API 23 and build tools version to 23.0.1.
The user will be prompted to download these versions if they do not have
Android SDK installed. Both are the latest supported versions.

Change-Id: I6c988b9dcde12b47406a8490840d07c135c5dd0e
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAllow empty token usage.
Stephane Lejeune [Mon, 19 Oct 2015 14:25:29 +0000 (16:25 +0200)]
Allow empty token usage.

RFC7252: An empty token value is appropriate e.g., when
no other tokens are in use to a destination, or when requests are
made serially per destination and receive piggybacked responses.

Empty tokens are often used by clients in order to have more compact
messages.

Change-Id: I2b409159a225f06ba80130547ffc9d5cabfee298
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoandroid: c_compat: add __cmsg_nxthd() for Android KitKat 4.4
Hauke Mehrtens [Thu, 15 Oct 2015 11:59:13 +0000 (13:59 +0200)]
android: c_compat: add __cmsg_nxthd() for Android KitKat 4.4

The function __cmsg_nxthd() is missing in Android 4.4, but the Android NDK
header files in the version we are using are referencing it and we use it in
our code, this functions was added in version 5.0. To make IoTivity
dynamically loadable on Android KitKat 4.4 add this functions
as a weak symbol, so it will be used if the c lib does not provide it, like
on Android < 5.0 This code was taken from these two resources:
https://raw.githubusercontent.com/android/platform_bionic/master/libc/bionic/__cmsg_nxthdr.cpp
https://github.com/android/platform_bionic/commit/ff64831b0965c16c95c9f81a148f30a6ef3a6c64

Change-Id: I02ef763cf3f82c73b1e0169230dd8c7e9d6d379b
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoupdated the code related ipadapter more clearly
jihwan.seo [Tue, 22 Dec 2015 07:10:59 +0000 (16:10 +0900)]
updated the code related ipadapter more clearly

Change-Id: Iff3bf220017bc447ef0e73c8f25f92bb50aa9539
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agomerge the duplicated function in camessagehandler
jw0213.jung [Mon, 11 Jan 2016 05:28:40 +0000 (14:28 +0900)]
merge the duplicated function in camessagehandler

There were two functions separately for sending request/response message
although they had almost same codes. So I merged it.

Change-Id: Iecaf407d765f04bbffea8b98fbe22b06fa540434
Signed-off-by: jw0213.jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoMoved common method to check null parameter.
jihwan.seo [Mon, 14 Dec 2015 07:48:23 +0000 (16:48 +0900)]
Moved common method to check null parameter.

preprocessor to check Null parameter is in adapter util.
however it checker is using here and there.
so it is better to move common header.

Change-Id: If54032ada0926da0f8917d1d32f36498a9054a12
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoremoved unnecessary BLE interface method
jihwan.seo [Thu, 7 Jan 2016 08:45:02 +0000 (17:45 +0900)]
removed unnecessary BLE interface method

and both initialize and terminate method are called
here and there irregularly.
to make sure correct usage, I modified BLE codes related interface

Change-Id: I26a89ae3079a834200533678e2ae8aba0d683122
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agochanges the tcp adapter logic for exception case.
hyuna0213.jo [Wed, 2 Dec 2015 05:06:26 +0000 (05:06 +0000)]
changes the tcp adapter logic for exception case.

if the sending side pauses or goes offline after sending
a partial message, the receive thread will spin.
because receiver is waiting for the remained data.
so I modified the receive logic to processing the partial message.

Change-Id: I54d54238728ca1945874e09ed70ea310072dda51
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix security unittest regarding iotvticalendartest on 32 bit OS
js126.lee [Thu, 7 Jan 2016 06:40:36 +0000 (15:40 +0900)]
Fix security unittest regarding iotvticalendartest on 32 bit OS

-issue : IsRequestWithinValidTimeTest.IsRequestWithinValidTimeValidPeriod1 is failed on 32 bit OS
-reason : On 32 bit OS, integer overflow occur in return of mktime due to Year 2038 problem,
        when Checking whether endDateTime is after startDateTime in iotvticalendar.c
-solution : Checking the period using tm structure members instead of mktime and difftime function.

-Patch#5 : Split long lines

Change-Id: I5bb14336573ee8b7d42dbbe4f3c45af44f937c3e
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4765
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoAdded missing AUTHENTICATION_FAILED OCException reason.
Ossama Othman [Wed, 23 Dec 2015 04:38:40 +0000 (20:38 -0800)]
Added missing AUTHENTICATION_FAILED OCException reason.

Fixed warning about missing OC_STACK_AUTHENTICATION_FAILED case in
OCException::reason() switch statement, and added appropriate
corresponding string constant.

Change-Id: Ibdc2d68f9cfb76f8165a62bce65dc183b19d7622
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4709
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoip_adapter: fix setting setsockopt() IP_MULTICAST_IF on Linux kernel < 3.5
Hauke Mehrtens [Thu, 17 Dec 2015 12:59:57 +0000 (13:59 +0100)]
ip_adapter: fix setting setsockopt() IP_MULTICAST_IF on Linux kernel < 3.5

The struct ip_mreq is only support since Linux 3.5 and not on older Linux
versions for IP_MULTICAST_IF. On older and also on recent Linux kernel
versions using struct ip_mreqn (version with n at the end) is still supported.
See the man page for details: http://man7.org/linux/man-pages/man7/ip.7.html

Without this patch I was getting this error message when trying to send a
multicast message from a USB tethered Android phone:
E/IP_SERVER: send IP_MULTICAST_IF failed: Cannot assign requested address (using defualt)
after applying this patch this operation works and it looks like IoTivity
with IP works on the Android phone.

In parameter imr_ifindex the interface index should be provided, but if
it is set to 0 it gets ignored and should behave like the old code.

Change-Id: I6e8ad376357eee49b2cd29dc792092fe3f7af0b6
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4651
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agofixed CoAP/TCP header type check logic from the size.
hyuna0213.jo [Thu, 10 Dec 2015 00:51:10 +0000 (00:51 +0000)]
fixed CoAP/TCP header type check logic from the size.

The first nibble of coap over tcp message format is used
to indicate the length of the options/payload.
if the first nibble is 13, An 8-bit unsigned integer follows
the initial byte and indicates the length of options/payload minus 13.
(14: 16-bit unsigned integer,
     indicates the length of options/payload minus 269.
 15: 32-bit unsigned interger,
     indicates the length of options/payload minus 65805)

Change-Id: I2a88eb161584fb0104d2b533e3456c19a4b99304
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoRefactored 'RCSDiscoveryManager'
coderhyme [Tue, 5 Jan 2016 06:12:27 +0000 (22:12 -0800)]
Refactored 'RCSDiscoveryManager'

The class is refactored for readability and better structure.

Change-Id: Iefb4b71fb074358e833d779139fbb646c759f022
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix get platform info issue when ROUTING_GATEWAY
youngman [Mon, 9 Nov 2015 02:49:50 +0000 (11:49 +0900)]
Fix get platform info issue when ROUTING_GATEWAY

Change-Id: I6356ee398b5c435f8c0a6d08e3032e78d83420a1
Signed-off-by: youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix provisioning unittest SConscript path
Jongmin Choi [Tue, 5 Jan 2016 09:07:35 +0000 (18:07 +0900)]
Fix provisioning unittest SConscript path

When built with TEST option enabled, the wrong path in provisioning SConscript caused an error.
The path in the SConscript has been corrected to reflect its location.

Change-Id: Iedecd4867255ea68e936c2bc20d9e97ae41ce909
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4753
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoUpdate secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples)
leechul [Thu, 24 Dec 2015 08:13:37 +0000 (17:13 +0900)]
Update secure resource related modules(SRM,OTM,SRP,CKM,unit tests,samples)
according to spec B.

* NOTE : https://gerrit.iotivity.org/gerrit/#/c/4733/ required,
         in order to provisioning tool works in debug mode.

1. Change the security resource name according to spec B.

2. Remove unnecessary security resource according to spec B.

3. Remove the entity of resource name from coap/coaps payload as follows :
  [Before]
  {
    "doxm":
    {
      "oxm":[0],
      "oxmsel":0,
      "sct":1,
      "owned":true,
      "deviceid":"anVzdHdvcmtzRGV2VVVJRA==",
      "devowner":"YWRtaW5EZXZpY2VVVUlEMA==",
      "rowner":"YWRtaW5EZXZpY2VVVUlEMA=="
    }
  }

  [After]
  {
    "oxm":[0],
    "oxmsel":0,
    "sct":1,
    "owned":true,
    "deviceid":"anVzdHdvcmtzRGV2VVVJRA==",
    "devowner":"YWRtaW5EZXZpY2VVVUlEMA==",
    "rowner":"YWRtaW5EZXZpY2VVVUlEMA=="
  }

4. Modify the sample SVR DB(.json) according to above modifications.

5. Modify the unittest according to above modifications.

[Patch #1] Initial upload
[Patch #2] Update commit message
[Patch #3] Retrigger
[Patch #4] Upload missing file.
[Patch #5,#6] Modify according to comments.
[Patch #7,#8] Update commit message.

Change-Id: Ic6842af77c7098f30e7823597f807bb8a55d4541
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: sangsu choi <sangsu.choi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoFix CKM's unit test issue
Andrii Shtompel [Mon, 28 Dec 2015 11:17:50 +0000 (13:17 +0200)]
Fix CKM's unit test issue

Details:
1. Fix SetNumberOfRevoked() API to use value instead of pointer
2. Fix SetCRLSerialNumber() API to use value instead of pointer
3. Fix SetNextSerialNumber() API to use value instead of pointer
4. Fix all places where those functions were called

Change-Id: I35000d84391399c1fd915678bc3bbed31761bcc5
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4731
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: sangsu choi <sangsu.choi@samsung.com>
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoOICSensorBoard: rename resource type to comply RFC-6690
Philippe Coval [Thu, 31 Dec 2015 17:19:59 +0000 (17:19 +0000)]
OICSensorBoard: rename resource type to comply RFC-6690

Change-Id: I72bacb30803b8947eb5cf37ced83b0a088d64ae2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoModify OCParseSecurityPayload() to prevent core-dump in debug mode.
leechul [Mon, 28 Dec 2015 23:19:33 +0000 (08:19 +0900)]
Modify OCParseSecurityPayload() to prevent core-dump in debug mode.

   1. Add cbor value verification code
   2. Remove the cbor_value_leave_container() invoking.

Change-Id: Iaa0b784c1688eddff8d1a1eec6406f396e508db7
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4733
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoModify the remove device related API to use client UUID of OCClientResponse
leechul [Tue, 15 Dec 2015 01:05:47 +0000 (10:05 +0900)]
Modify the remove device related API to use client UUID of OCClientResponse

If we failed remove deivce, PM API will set device status as stale.
We need to add mechanism to clean up the stale status of device.
It will be uploaded to the next.

[Patch #1] : Intial upload
[Patch #2] : Update commit message
[Patch #3] : Modify according to comment.
[Patch #4,#5] : Modify according to Sachin's comments.
[Patch #6] : Modify typo

Change-Id: I0268b0820e2e0dbddeeba247bbc14d679d6fd7bb
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoDTLS handshake retransmission
Andrii Shtompel [Thu, 17 Dec 2015 08:51:37 +0000 (10:51 +0200)]
DTLS handshake retransmission

DTLS retransmission initiated after dtls context successfully created.
After that it starts each 2 seconds (using Timer) and call dtls_check_retransmission()
It stops when global dtls session was destroyed

Change-Id: Idc2216a4773feea44a306fcee78b8c779b595abe
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: sangsu choi <sangsu.choi@samsung.com>
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years agoCorrect some defects detected by Static Code Analysis Tool in things manager
Jihun Ha [Tue, 15 Dec 2015 00:53:48 +0000 (09:53 +0900)]
Correct some defects detected by Static Code Analysis Tool in things manager

After running Static Code Analysis Tool(Svace) for things manager codes, some defects have been
detected. Most of the defects are about null pointer handling and variable
initialization. This patchset is for covering these defects.

Change-Id: I97c3a58f08576ef50b636e52027311e7e9e1d04c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4465
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[easysetup] Static code analysis fix in provisioning
lankamadan [Thu, 10 Dec 2015 10:49:04 +0000 (19:49 +0900)]
[easysetup] Static code analysis fix in provisioning

- Static code analysis bug is fixed

Change-Id: I7b7c5b3dd284de20a48aaf90a3b5bcbb72565714
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix for defects detected by static analysis for resource-container
Minji Park [Thu, 17 Dec 2015 03:02:28 +0000 (12:02 +0900)]
Fix for defects detected by static analysis for resource-container

modify resource container sample and unittest to fix defects detected

Change-Id: I7c6520d3ca5d4576f4bf1525e42a9f4e983cca87
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4633
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'simulator'
G S Senthil Kumar [Fri, 18 Dec 2015 13:44:30 +0000 (19:14 +0530)]
Merge branch 'simulator'

Change-Id: Iee9352bd3bf67c5db6aa07f0ea10639b180bfedc
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
8 years agoMerge branch 'master' into simulator.
G S Senthil Kumar [Fri, 18 Dec 2015 10:21:44 +0000 (15:51 +0530)]
Merge branch 'master' into simulator.

Change-Id: Ib0054018e0b27b9eb84ac8bb4dd7955c98ec731a
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
8 years agoAdd wrong PIN defence codes in case of PIN based OxM
leechul [Wed, 11 Nov 2015 07:33:32 +0000 (16:33 +0900)]
Add wrong PIN defence codes in case of PIN based OxM

 * Add CAErrorCallback in OTM to handle result of DTLS handshake.
 * Our implementation as follows :
    1. Implemente CAErrorCallback(DTLSHandshakeCB) in OTM to handle result of DTLS handshake.
    2. Try dtls handshake.
    3. Wait for handshake result.
    4. Invoke CAErrorCallback(DTLSHandshakeCB) at CAHandleSecureEvent() when handshake is finished.
    5. Handle handshake result in DTLSHandshakeCB.
        - in case of success, we can send next coaps request.
        - in case of failure, return the error value or restart ownership transfer.

Related jira : https://jira.iotivity.org/browse/IOT-831

[Patch #1] Intial upload
[Patch #2] Remove white-space
[Patch #3] Update comment
[Patch #4] Update according to comments
[Patch #5] Revert extlibs/tinydtls/crypto.c to seprate changeset
[Patch #6] Rebase
[Patch #7] Modify the stCADtlsContext_t to save the OTMContext.
[Patch #8] Remove white-space.
[Patch #9] Modify according to sachin's comment.
[Patch #10] Modify according to comments.
[Patch #11] Remove whitespace
[Patch #12] Rebase by sachin
[Patch #13] Update commit message

Change-Id: I034b0e9ad267cb6998ce3df3ce50629583740608
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
8 years ago/oic/res response for the RD
Habib Virji [Tue, 15 Dec 2015 18:26:57 +0000 (18:26 +0000)]
/oic/res response for the RD

Earlier collection payload was added in discovery payload to handle RD response in
a separate way in form of tags and links. But with recent changes and discussion
baseURI is mvoed to discovery payload.

With this change there is one response for /oic/res with an additional field for RD.

Change-Id: Ia29cc64ffb48062d72ee4b9a9b59013480f13ff1
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4611
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoRemoved collection resource and device support from simulator plug-in.
G S Senthil Kumar [Thu, 17 Dec 2015 03:14:49 +0000 (08:44 +0530)]
Removed collection resource and device support from simulator plug-in.

1. Collection resource and device related UI has been removed
   from service provider eclipse plug-in.
2. This check-in also includes refactoring and fixing of minor UI bugs.

Change-Id: I1b12620202d3a861c251afb8ae4e14c5a96b7b44
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4635
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoIoTivity Simulator System testing bug fixes.
G S Senthil Kumar [Mon, 7 Dec 2015 10:03:50 +0000 (15:33 +0530)]
IoTivity Simulator System testing bug fixes.

1. Resolved issues found during stress testing.
2. Limiting the maximum number of resources that can be created
   from server to 200(Considering block-wise transfer and application
   stability).
3. Includes minor optimization and code clean-up.

Change-Id: If196b72b5221e3795b4693f00a99d33650c0a8d0
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Radha Bhavani <radha.p@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed simple fixes according to static code analysis for resource-container
Markus Jung [Thu, 10 Dec 2015 07:18:30 +0000 (16:18 +0900)]
Fixed simple fixes according to static code analysis for resource-container

- Prohibit implicit copy-contructor and assignment operator for certain classes.
- Update copyright note

Change-Id: I0893aa2a4de23832fb9d540128f106fd7b45bafa
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMake sure the Platform Resource and Device Resource have 2 interfaces.
Joseph Morrow [Tue, 15 Dec 2015 06:11:36 +0000 (22:11 -0800)]
Make sure the Platform Resource and Device Resource have 2 interfaces.

The /oic/d and /oic/p resources must have oic.if.r and oic.if.baseline
interfaces specified.

This is also for IOT-874.

Change-Id: Ia6a666c03e954634d4589c2bbe8a3a4d72ad8a86
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4587
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoModified discovery payload to be spec compliant.
Mandeep Shetty [Mon, 14 Dec 2015 22:52:53 +0000 (14:52 -0800)]
Modified discovery payload to be spec compliant.

The discovery oic/res payload had the device id "di" and "links"
being repeated for every resource. The payload itself was not structured
in a spec compliant way.

Plucked out di and links from every resource and put in the root map.
The format for the payload is "modelled" as JSON.
[
    {
        "di" : UUID,
        links :[
                    {
                        href, rt, if, policy        // Resource 1
                    },
                    {
                        href, rt, if, policy        // Resource 2
                    },
                    .
                    .
                    .
                ]
    }
]

Change-Id: I2c50a7cc1ee46df633810372e446ac92c5e496f5
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4543
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdd /oic/d and /oic/p discovery response messaging to IoTivity.
Joseph Morrow [Mon, 14 Dec 2015 11:04:03 +0000 (03:04 -0800)]
Add /oic/d and /oic/p discovery response messaging to IoTivity.

Prior to this, Clients could only perform a GET request directly on
/oic/d and /oic/p. This commit also enables performing DISCOVERY
requests on /oic/d and /oic/p as well.

This aligns with OIC spec compliancy.

This fixes Jira Ticket IOT-874.

Change-Id: I29693a67bb245b3fae8d1ed54833eacd1397884e
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoUpdate index of Zigbee Resources when a NodeId changes.
Joseph Morrow [Wed, 9 Dec 2015 18:21:32 +0000 (10:21 -0800)]
Update index of Zigbee Resources when a NodeId changes.

Change-Id: Ia1ffd7ebb7bba51fdb211a33000713c7e1daab32
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3937
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoReplaced zigbee nodeId in URI with zigbee eui.
Joseph Morrow [Wed, 9 Dec 2015 18:08:53 +0000 (10:08 -0800)]
Replaced zigbee nodeId in URI with zigbee eui.

Change-Id: Ib2df8d45ceb9ecd62bc8fab3978ac8d30f3571e8
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3785
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded context for callbacks.
Thuyen Tran [Fri, 23 Oct 2015 23:10:48 +0000 (16:10 -0700)]
Added context for callbacks.

Change-Id: Ia20cae8abc1e4a4112bc70608fb482174701abbb
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3939
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded context parameter.
Thuyen Tran [Sat, 12 Dec 2015 00:56:09 +0000 (16:56 -0800)]
Added context parameter.

Change-Id: Ic4616d69ff78fdef4897fd7ca47f0192a4f9420e
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3927
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agocheck the method type of request info.
hyuna0213.jo [Mon, 14 Dec 2015 11:01:14 +0000 (20:01 +0900)]
check the method type of request info.

if method type of request info is invalid,
CA has to return error code to RI Layer.

Change-Id: Ic34da1c13e63172885a44a114a86f52cbbb34f6f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: MyeongGi Jeong <myeong.jeong@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>