contrib/iotivity.git
8 years agoInitial prototype for optimized Telegesis read/write layer.
Joseph Morrow [Mon, 5 Oct 2015 23:13:25 +0000 (16:13 -0700)]
Initial prototype for optimized Telegesis read/write layer.

Change-Id: I3dd818103b6c60c9815b0735df1c3b6a652b22b6
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2945
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3527
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoAdd a missing file of cherry-pick from master.
coderhyme [Tue, 6 Oct 2015 05:02:28 +0000 (22:02 -0700)]
Add a missing file of cherry-pick from master.

RcsResourceObject.java must be merged into 1.0.0-dev from https://gerrit.iotivity.org/gerrit/#/c/3189/2.
The commit was regarding javadoc comments.
But the file was omitted when it was cherry-picked. (https://gerrit.iotivity.org/gerrit/#/c/3337/)

Change-Id: I8baced2588a3779ca73a6e98f1f2ca6c0e14aaa4
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoSpeed up linux ocserver to fix apparent instabilities.
Mandeep Shetty [Thu, 1 Oct 2015 00:55:50 +0000 (17:55 -0700)]
Speed up linux ocserver to fix apparent instabilities.

The linux ocserver had three threads running uncluding the main thread.
All three had sleeps in it and there was a delay of 2 seconds between
every call to OCProcess ().
This caused the ocserver to be slow and the server appeared to be
unstable specially when there were many clients sending in requests to
one server.

- Changed ocserver to start the observation thread only when observation
is requested similar to the C++ sample simpleserver.
- Removed the sleep between calls to OCProcess ()
- Moved stopping presence logic to the presence thread from the
  observation thread.

This may be cherrypicked to 1.0.0-dev.

Change-Id: Ib1c9fd732d0973435b556adb8a42610447f1ae7b
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoFix logic in zigbee wrapper to correctly evaluate boolean values.
Joseph Morrow [Mon, 5 Oct 2015 23:13:13 +0000 (16:13 -0700)]
Fix logic in zigbee wrapper to correctly evaluate boolean values.

Boolean values could be read as either "0" or "00" and thus a simple
strcmp with "0" would not suffice.
Additionally, sometimes, bitmasks are read and so we need the entire
numeric value of the string.

Changed strcmp operations to convert to numeric operations.
Also extracted duplicate code into it's own function

Change-Id: I9ab20ba5b4f2e9eb335a9dd51503fe19ceca7158
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3157
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3525

8 years ago[IOT-762] Something wrong with handling unicast presence response - client always...
daeken.kwon [Tue, 6 Oct 2015 05:32:32 +0000 (14:32 +0900)]
[IOT-762] Something wrong with handling unicast presence response - client always get "PRESENCE_TIMEOUT"

< Cause >
ocstack don't do ResetPresenceTTL() after getting presence response from server because there was no change in sequnceNumber

< Solution >
To resolve this case, it is just needed to put ResetPresenceTTL() before exit in this caseTo resolve this case, it seems that we just put ResetPresenceTTL() before exit in this case

Change-Id: If1e32692d3b859cea84382bded0cceecf42874d5
Signed-off-by: daeken.kwon <daeken.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3595
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoPrevent and Klockwork Fixes in Routingmanager and CA
vimala.v [Tue, 6 Oct 2015 03:37:10 +0000 (09:07 +0530)]
Prevent and Klockwork Fixes in Routingmanager and CA

As cherry-pick from master branch failed,
following commits are pushed as a standalone commit to 1.0.0-dev branch.
1) https://gerrit.iotivity.org/gerrit/#/c/2867/
2) https://gerrit.iotivity.org/gerrit/#/c/3277/
3) https://gerrit.iotivity.org/gerrit/#/c/2807/

Change-Id: I3a66dae476509f0f57995d8792e49ed5a5b6fe94
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3563
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoEasySetup:Enrollee implementation optimization
Vinil Jain [Tue, 6 Oct 2015 06:03:16 +0000 (11:33 +0530)]
EasySetup:Enrollee implementation optimization

- for handling error cases like SoftAP disconnect

Change-Id: I64abbb147c9d223d92e007f11a80c98ef36dea35
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoRemoving message logger from android examples as each app
Rahul Rahul [Mon, 5 Oct 2015 23:01:00 +0000 (16:01 -0700)]
Removing message logger from android examples as each app
is self contained.

Change-Id: I3c1bec113444fc8138bb237ad254430839bcf5dd
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3561
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years ago[easy-setup] Fix for IOT-785
lankamadan [Tue, 6 Oct 2015 08:16:23 +0000 (17:16 +0900)]
[easy-setup] Fix for IOT-785

- Fix in Arduino build instructions

Change-Id: Iba558c43f118f6a449202f0d354a8fee0bf19174
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3603
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[TZIEN] Resource-Hosting Sample Application file name changes.
arya.k [Tue, 6 Oct 2015 05:02:45 +0000 (10:32 +0530)]
[TZIEN] Resource-Hosting Sample Application file name changes.

Change-Id: I0a2f197683ede0b49ca5db47bab8cbfe253be9d3
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3575
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[TIZEN] ContainerClient Application.
arya.k [Tue, 6 Oct 2015 04:06:39 +0000 (09:36 +0530)]
[TIZEN] ContainerClient Application.
- Removed container module from RESampleClient Application.

Change-Id: I0ae7f346b1dfdd1313109b0741676828f7a654af
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix wrong comments in groupmanager.h for doxygen
Jihun Ha [Mon, 5 Oct 2015 12:55:30 +0000 (21:55 +0900)]
Fix wrong comments in groupmanager.h for doxygen

A name of parameter in a function prototype should be matched with
a name following *@param* keyword for doxygen.

Change-Id: I892de77f163bbf5781735fce897ee11f850718b5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 9f0a4365d7303da64b6ea7cad9851ff0b6fc6475)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3537

8 years ago/oic/res response as per Spec1.0
Habib Virji [Tue, 29 Sep 2015 14:24:31 +0000 (15:24 +0100)]
/oic/res response as per Spec1.0

Corrects the format as per the specification.

Issue: IOT-717
Change-Id: Ic03d67541ef5afdfd6acc3820dc224b61484bd83
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3283
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3591
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Resource-Encapsulation] Prevent fixes for Linux Sample applications.
Jay Sharma [Tue, 6 Oct 2015 03:39:03 +0000 (09:09 +0530)]
[Resource-Encapsulation] Prevent fixes for Linux Sample applications.

Change-Id: Iddfee00e904f3370b45f7fece7e9f89a3ee9a4e0
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Things-Manager] Added unit test cases.
Jay Sharma [Thu, 1 Oct 2015 22:20:04 +0000 (03:50 +0530)]
[Things-Manager] Added unit test cases.

- gtest cases for Things Manager.

Change-Id: I4e4fc5376f006ede62e25fbdabc2eda337d34aa8
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b2e2bdc2d5f3d03ebd0353c7e6f5d5f7a03a938b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3557
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[resource-hosting] Updated the Java SDK as per new folder structure.
Jay Sharma [Tue, 29 Sep 2015 07:03:35 +0000 (12:33 +0530)]
[resource-hosting] Updated the Java SDK as per new folder structure.

- Updated SDK.
- Updated Android Sample Applications.

Change-Id: Ifea8bb81528dceea0879729b06bf0f90fe9beb05
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3251
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1231ae73db59795d2571d9f67e7c6a72e0d443a9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3559

8 years agoAdded Junit test cases for Simulator Java APIs.
spurthi.segu [Tue, 6 Oct 2015 06:19:10 +0000 (11:49 +0530)]
Added Junit test cases for Simulator Java APIs.

Change-Id: I5ce72d2ed3ade45e984deb9dc0d50c0983344baa
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[TIZEN] Added Resource Container Sample Application.
arya.k [Thu, 1 Oct 2015 09:40:37 +0000 (15:10 +0530)]
[TIZEN] Added Resource Container Sample Application.
- Removed Contianer module from RESampleServer Application.

Change-Id: Ie2226d0235aa893f00c9bd63b343d2ec0c69c6b3
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3359
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit c332e217753c8ce352b1ab3bc91b7b41b786cc28)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3555
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoEnabled resource container to build for TIZEN.
arya.k [Thu, 1 Oct 2015 04:21:41 +0000 (09:51 +0530)]
Enabled resource container to build for TIZEN.

Change-Id: I0238dbbec873b9041c87de1967bc9c928a753ebc
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3341
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit fac6b8d05c516049ddff6cdf135cbc21387d97af)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3553

8 years ago[JIRA IOT-780,782,783] fixed an error logic in sampleApp of Resource-Encapsulation.
Heewon Park [Mon, 5 Oct 2015 14:24:21 +0000 (23:24 +0900)]
[JIRA IOT-780,782,783] fixed an error logic in sampleApp of Resource-Encapsulation.

-When server is created for Light-Sensor,the server can't response for Get-Request.
-When user inserts invalid input, sample app was not work normally.
-Fixed sampleApp input logics.

Change-Id: I94d1ba4b1293f730ba185af847976b0e9d13d816
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 358cbad6184d3fd33ac96fc0f34c2ca4992bccfc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3549
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoClarify resource container API
Markus Jung [Mon, 5 Oct 2015 13:22:33 +0000 (22:22 +0900)]
Clarify resource container API

Clarify the API for listing bundle information.

Change-Id: I959ac95bb7992105ea308a24480b1ebdaa0f8f77
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 6a15ff6cb5c8c9790dbe480c7a9cf09a21e0e8cf)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3541

8 years agomodify description of resource container apis to correct doxygen warnings
Minji Park [Mon, 5 Oct 2015 11:21:10 +0000 (20:21 +0900)]
modify description of resource container apis to correct doxygen warnings

- fix doxygen comments of container apis to remove warnings

Change-Id: I917d3b48dd44943c803581145fa82af9ab9fb775
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3479
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit e1ec415d1ae3b1c32561ff471cde7a15b314b6eb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3539

8 years ago[easy-setup]Fixed doxygen warnings and renamed a file
lankamadan [Mon, 5 Oct 2015 11:58:44 +0000 (20:58 +0900)]
[easy-setup]Fixed doxygen warnings and renamed a file

- Fixed doxygen warnings and included a file in Doxyfile
- Renamed common.h to escommon.h

Reviewed-on: https://gerrit.iotivity.org/gerrit/3481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Conflicts:
resource/docs/Doxyfile

Change-Id: Ia499ee77059fa9034ee71ecbd61d972060103800
Signed-off-by: lankamadan<lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoCorrected doxygen issues for RD
Habib Virji [Mon, 5 Oct 2015 14:36:04 +0000 (15:36 +0100)]
Corrected doxygen issues for RD

Minor updates with correct param names.

Change-Id: If57f5f998758b9c716ac409735e7610db04dd839
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoExclude private types from doxygen
coderhyme [Mon, 5 Oct 2015 11:20:03 +0000 (04:20 -0700)]
Exclude private types from doxygen

Older doxygens document private types if definitions for them are outside of the outer class.
cond command is one way to prevent them from being documented.

Change-Id: I151180a0724eca6ecf8f5682cbcbab4ca5ee42e6
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3477
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit e81c0d8908b8f63eaeb521523d48f27a24116acb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3505

8 years agomodified some code to make tcp header.
jihwan.seo [Fri, 2 Oct 2015 04:42:15 +0000 (13:42 +0900)]
modified some code to make tcp header.

I have modified for tcp header which
has 0 ~ 12 length or 8bit message length.
since previous code has potential issue for byte ordering.

Change-Id: Id2f63608442ccf85558c61dbfd631a01f59ad8b9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 27f18c55a2d55c5f9b3e3006d5ca8845f27d69a5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3519

8 years agoAdd Android interface set Display pin callback server API to
Sandeep Sharma [Mon, 28 Sep 2015 09:09:32 +0000 (14:39 +0530)]
Add Android interface set Display pin callback server API to
display for RANDOM_PIN provisioning.

[Patch #4] Added malloc failed check and Renaming of variable
           to be more consistent.
[Patch #5] Addressed Randeep's review comments and upated
           provisioning sample's build.gradle
[Patch #8] Addressed review comment.

Note: This change depends upon patch set #3047
      This can be cherry picked for 1.0.0-dev

Change-Id: If704a01a760ec0880ea6e1a89f7e856d2f1ba3e5
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 90bc3c562ddb9646269f9646a4d97dc6d8f1b7d5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3515

8 years agoMerged "fixed the dependency issue between RM and BWT (IOT-731/IOT-712)"
jihwan.seo [Mon, 5 Oct 2015 13:35:46 +0000 (22:35 +0900)]
Merged "fixed the dependency issue between RM and BWT (IOT-731/IOT-712)"

I have fixed to conflict with Change 2825,
when Change 3347 is failed to merge for v1.0.0 branch.

https://gerrit.iotivity.org/gerrit/#/c/2825/
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Change-Id: I5b781d24ff8a7c18f4e479e854cd416b9d173b29
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3497
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[JIRA IOT-778] fixed the jira issue related to CASendNotification API.
hyuna0213.jo [Mon, 5 Oct 2015 03:54:16 +0000 (12:54 +0900)]
[JIRA IOT-778] fixed the jira issue related to CASendNotification API.

CASendNotification API is not used by RI layer.
RI layer is using CASendRequest API to send notification.
so we removed the CASendNotification API and modified the CA sample.

Change-Id: I90d490814dcd5e250564ca4f221911fb1c365128
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 3196c7c8e637f2601450371ee909dba9f1fe7a04)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3489

8 years agoFixed the start adapter bug in ip/tcp adapter. (IOT-753/ IOT-453)
Ashok Channa [Fri, 25 Sep 2015 01:01:16 +0000 (10:01 +0900)]
Fixed the start adapter bug in ip/tcp adapter. (IOT-753/ IOT-453)

After multiple terminate initialization, CASendRequest API
is not working. because we didn't set the start flag with false
after stopping adapter. Both JIRA issues are related.

Change-Id: If855c4f689ce6979ae13591f2d4048113148d150
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit e6a9b33034b37e116d8bca5679292fd597fcb5cd)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3485

8 years agoFix cppcheck issues in resource-encapsulation dir
Markus Jung [Fri, 2 Oct 2015 02:09:06 +0000 (11:09 +0900)]
Fix cppcheck issues in resource-encapsulation dir

This patch fixes the "(error) Returning reference to auto variable" issue reported
by cppcheck tool in resource-encapsulation/src/resourceContainer/src dir.

Change-Id: Idade3fb288f7571276274cccb30728cf46851ac6
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3397
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 3a681a107a78bd3d36201bcd3cbfcb46500cc813)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3473

8 years agoIOT-787 issue fix.
arya.k [Mon, 5 Oct 2015 05:22:43 +0000 (10:52 +0530)]
IOT-787 issue fix.

Change-Id: Ic1e9105a2529c6864f6eae6159f31a6d86642146
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3465
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated android fridgeclient and fridgeserver example.
Rahul Rahul [Fri, 2 Oct 2015 23:40:16 +0000 (16:40 -0700)]
Updated android fridgeclient and fridgeserver example.

Added a new fridgegroupserver and fridgegroupclient example.
This creates proxy child resources from the fridgeResource.

Change-Id: I235ea32a2a9dd2d596cfd1a3407f2a012d6fe3cd
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agocaipserver now reports correctly whether a received message is multicast.
John Light [Tue, 8 Sep 2015 12:55:15 +0000 (05:55 -0700)]
caipserver now reports correctly whether a received message is multicast.

It uses IP_PKTINFO to determine the address used to send the message.
Resolves JIRA 589 P1.

Change-Id: Ia9d9f271421fe232ad4939e23cccf715ed30ab90
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3293
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 0595dc899f90f76f6ef7df6684b8664bf5ee9700)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3419

8 years ago[Easy-Setup] Arduino Enrollee Doxygen update and api folder change
Madan Lanka [Fri, 2 Oct 2015 09:13:15 +0000 (05:13 -0400)]
[Easy-Setup] Arduino Enrollee Doxygen update and api folder change

- Reused OCConnectivityType struct instead of defining new struct
- Updated the Enrollee Device doxygen comments
- Enrollee EasySetup API folder is changed
- License header contribution year is updated

Change-Id: I72e095c5c886fb10dd365b72c80944f8864685ee
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3413
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 67ecf55a724ba906e12e9986bb8e04f77a4f6a06)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3455

8 years agoRefinements to: Hardware abstraction for ECC, RND and encrypted storage
Steve Clark [Sun, 20 Sep 2015 22:25:48 +0000 (16:25 -0600)]
Refinements to: Hardware abstraction for ECC, RND and encrypted storage

Change-Id: I01aaebe96588314e6aebf1f8adcc20ede8d0d6d4
Signed-off-by: Steve Clark <steve.clark@atmel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2801
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 4940a9dc23a0a6a2123c727a51128d0f935fe35b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3437
(cherry picked from commit bc96b99b612774141edc9d5bffc225370453127c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3445

8 years agoFix an issue of resource-encapsulation android regarding loading native libs
coderhyme [Thu, 1 Oct 2015 10:25:15 +0000 (03:25 -0700)]
Fix an issue of resource-encapsulation android regarding loading native libs

Loading ResourceContainer native lib make the aar can't be loaded because android re doesn't contain it.

Change-Id: I9ff82a2248b514bb305cb746a3820d7ee45ebe5f
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3365
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b0561c06cdcaa5ce4a7b480988ef283307559d71)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3399

8 years agoModify the OxM callback implementation to select the appropriate cipher suite
leechul [Thu, 1 Oct 2015 05:40:40 +0000 (14:40 +0900)]
Modify the OxM callback implementation to select the appropriate cipher suite
for creating secure session

[NOTE] I will modify the tinyDTLS cipher suite selection and enable/disable mechanism
       according to comments of https://gerrit.iotivity.org/gerrit/#/c/2456/

[Patch #1] Intial upload
[Patch #2] Modify the comment according to doxygen format.
[Patch #3] Modify the oxmjustworks.c according to comment.

Change-Id: I6fb555d486f21f3851a7f2da9964381863128240
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 5ba35c69c279c73b908324c99408fe5fc35a52fc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3447

8 years agoFix tinydtls implementation of sign & verify
Steve Clark [Fri, 2 Oct 2015 13:06:02 +0000 (07:06 -0600)]
Fix tinydtls implementation of sign & verify

Change-Id: Id9b721a12e517fb0fe5adae76b380acb04b467cd
Signed-off-by: Steve Clark <steve.clark@atmel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 28fd8b67657cdbe3860302a3ea92d83515c1a688)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3435
(cherry picked from commit f2da5d0b80c95fac89caae6dcc9b3d567ea82c8f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3443

8 years agoimplement validation tools for CK manager
Oleksandr Dmytrenko [Thu, 24 Sep 2015 13:44:15 +0000 (16:44 +0300)]
implement validation tools for CK manager

[Pathc Set 6]: added getopt parser
[Patch Set 7]: code astyled
[Patch Set 8]: initialization fixed
[Patch Set 11]: add init macros
[Patch Set 13]: comments(clear)
[Patch Set 13-]: replace malloc to OICMalloc

Change-Id: Ifb2ac78454de87ff7f82aedeb1dbfaae8d20f372
Signed-off-by: Oleksii Udod <o.udod@samsung.com>
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2448
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit abb0f6000a00e7c1fb32204a0939deeb4cf48bbe)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agotinydtls: add android logging support
Hauke Mehrtens [Tue, 22 Sep 2015 09:46:53 +0000 (11:46 +0200)]
tinydtls: add android logging support

This patch forwards the logging messages form tinydtls to the normal
android logging system instead of writing them to stdout and stderr.
This is activated in non release builds.

Change-Id: I56cf6752267dc512bf8252dfaaf957d0f87e5bf1
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit f713811ed4f6c7ecbb0d328759ef37c12bfca4a6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3433

8 years agoAdd Set display pin callback method for server to display
Ashwini Kumar [Thu, 24 Sep 2015 12:06:33 +0000 (17:36 +0530)]
Add Set display pin callback method for server to display
PIN for RANDOM_PIN provisioning

Note: this change can be picked for 1.0.0-dev

Change-Id: I7fc9b2ff66205c27fc6f41ebc0cadb4cd592abab
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3047
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit c98c653ca4aeab2e0a359041468795c2d3860cf8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3429

8 years agotinydtls: fix and activate android debug.c build
Hauke Mehrtens [Mon, 28 Sep 2015 09:02:53 +0000 (11:02 +0200)]
tinydtls: fix and activate android debug.c build

This patch activates the build of debug.c on android and also fixes one
build issue with this code in android.

in_port_t is not defined in <netinet/in.h> in the android NDK, use
"unsigned short int" instead because this is also used by sin_port in
the Android NDK.
There is already a bug for Android open to fix this problem in Android
here: https://code.google.com/p/android/issues/detail?id=80713

With this change the tinydtls debug.c file compiles for me for Android.

Change-Id: Id03a319768357ea1bef3f86ac2342e61e2b26b79
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit f4e4f56a631a82ce65815a461461883fd0e04911)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3427

8 years agoCorrected DB query of PDM
Randeep Singh [Thu, 1 Oct 2015 09:59:57 +0000 (18:59 +0900)]
Corrected DB query of PDM

To check the existence of link between two devices, We should use query with
‘and’ not â€˜or’.
Previously link  was checked with â€˜or’ thats why if we try to create multiple
links involving one same device and other different devices then it was showing
link already exists. for example if we create link between A-B then if we try
to create link between A-C then we are getting error that link already exists.

Change-Id: I408658af4f423a641bab077439435711ecac876e
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3361
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 370c560720ef374672d6a91d57cb7c72311c2182)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3425

8 years agoSynchronize PKIX with provisioning API
Dmitrii Zhuravlev [Tue, 29 Sep 2015 15:55:07 +0000 (18:55 +0300)]
Synchronize PKIX with provisioning API

Certificate based provisioning does not use sql database now

Change-Id: I5dbceea998f24bfd449efbf108640fc80dd02be7
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 5e45de70ec8d17402c4d3327e5a5c18d3c74f7cd)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3423

8 years agoAdd archive libs into RPM package in Tizen build
js126.lee [Thu, 1 Oct 2015 12:57:16 +0000 (21:57 +0900)]
Add archive libs into RPM package in Tizen build

-Issue : libocpmapi.a is not included in RPM package,
     after Tizen build with "secure_mode=1". So, we can't use that lib on tizen.
-Solution : Add libocpmapi.a into RPM package when Tizen build with "secure_mode=1"

Change-Id: I568407c16e27abc09843a785a457738527ff3057
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 9c30781c011a8a5de3caff97722663247759fc00)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3421

8 years agoAdded JUnit test case
Vinil Jain [Thu, 1 Oct 2015 10:04:39 +0000 (15:34 +0530)]
Added JUnit test case

-added test case for easysetupstatus
-changed signature of easysetupstatus api
-Updated comments
-Added new states and changed some states

Change-Id: I4afd9318f9f8c8ddf9189f856dbab8307946e8e5
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 25fc0875be77e18e8d4c8d221325d631cd1737ca)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3395

8 years agochange location of resource container directory
Minji Park [Wed, 30 Sep 2015 07:45:24 +0000 (16:45 +0900)]
change location of resource container directory

- relocate the directory of resource container out of resource-encapsulation directory
- change sconscript for changed directory location

Change-Id: I912149cb7f3fe6b640b07108570c2fe9dd78fd1d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3313
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoDisable checking parameters for non symmetric key
Dmitrii Zhuravlev [Tue, 22 Sep 2015 13:18:32 +0000 (16:18 +0300)]
Disable checking parameters for non symmetric key

Disables the second device and key length checking,
in the case of credential provisioning based on the types
that are different from SYMMETRIC_PAIR_WISE_KEY.

Change-Id: I8dc8581e7af7ef104e7e2dd473c53d60acc1c9d9
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 84a8188c7d02881a46dc1f682e046463fed74c14)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3379
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
8 years agoAndroid: Added/Updated JavaDocs
Tim Kourt [Wed, 30 Sep 2015 21:31:56 +0000 (14:31 -0700)]
Android: Added/Updated JavaDocs

In addition it adds a couple of missing ENUM
values that have been introduced recently

Change-Id: Iddd1eefec7b59f041036093e51ae336d28778487
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoMerge "Merge Resource Directory into the master" into 1.0.0-dev 1.0.0-RC2
Uze Choi [Thu, 1 Oct 2015 11:37:23 +0000 (11:37 +0000)]
Merge "Merge Resource Directory into the master" into 1.0.0-dev

8 years agoMerge Resource Directory into the master
Habib Virji [Thu, 1 Oct 2015 00:38:02 +0000 (01:38 +0100)]
Merge Resource Directory into the master

Resource Directory Server:
• Hosting of RD (Server side)
• Respond to discovery request with the bias factor.
• Response after receiving publish resource and payload handling (Server side)
• Storage of resources at RD (Server side)
• /oic/res querying support with  a response in collection format.
Resource Directory Clients:
• API to initiate discovery of RD
• Publish resources to RD using the collection format.
• Stop Multicast API suport
Sample Applications:
• Server side application to start resource directory
• Thin-client side application to discover and publish resources to resource directory.
• Client to query resource published at the resource directory.

Change-Id: Iecd03cb26b231dc58ae1f5c30353c5a2514260bf
Signed-off-by: Habib Virji <habib.virji@samsung.com>
8 years agoRefine comments for android apis of resource-encapsulation.
Minji Park [Thu, 1 Oct 2015 01:09:08 +0000 (10:09 +0900)]
Refine comments for android apis of resource-encapsulation.

Incorrect tags are fixed.
Links for types and methods in comments are added for convenience.

Change-Id: I8f4bbc31dfb4ead6b4b5fd0f80046002f8e80589
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3337
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAndroid: fixing scons build for the examples
Tim Kourt [Wed, 30 Sep 2015 20:28:11 +0000 (13:28 -0700)]
Android: fixing scons build for the examples

The issue in scons script introduced in
https://gerrit.iotivity.org/gerrit/#/c/3135/ and consequently
in https://gerrit.iotivity.org/gerrit/#/c/3287/ has caused
the long build times for the Android examples by rebuilding
it multiple times.

Change-Id: I978ac3459dbd0e42e231f8d70a0374558e85f9e8
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3329
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix duplicate observer registrations due to slow server or network.
Mandeep Shetty [Fri, 25 Sep 2015 20:52:54 +0000 (13:52 -0700)]
Fix duplicate observer registrations due to slow server or network.

This fixes IOT-720 and IOT-612.

The client retransmits a confirmable request before the 1st timeout for
un-acknowledged confirmable request. The server is occasionally too slow
to respond or the network is slow sometimes.
In case of OBSERVE registrations, a retransmit means two or more  observers will
be added for one observe request the client sent.
This leads to lot's of extra notifications being sent out and only one
of observers from the multiple clones are deleted if the client
de-registers.

Fix is to check with the token if observer was already added and ignore
the request if it was as the client was likely already ACKED for the
first request the server fully processed.

This should be cherrypicked to 1.0.0-dev.

Change-Id: I7ecfe1a6e8009606a9430515cbcedef2516507d7
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 758e307a204b5b66dbf81ab6ed73463d7024f44d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3325

8 years ago[TIZEN] RE NestedAttributes Sample Application discovery fix.
arya.k [Wed, 30 Sep 2015 10:52:19 +0000 (16:22 +0530)]
[TIZEN] RE NestedAttributes Sample Application discovery fix.

Change-Id: I4f184d42f60ba3baacfde3aea4feec890e17b260
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit bee72560c33c5bb0148e06789b673aabcc91439c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3317
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed wrong return type in PDM
Randeep Singh [Fri, 18 Sep 2015 10:36:25 +0000 (19:36 +0900)]
Fixed wrong return type in PDM

PDMIsDuplicateDevice API declaration returns null but function defination
have conditions which returns other values.

Change-Id: I3bab66243fb03908072d16dbc64cc4e8823755ad
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit e54f027eef9acbd018925b6b30325dfe13b27b44)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3321

8 years agoCorrecting the INPUT in Doxygen file.
Ravi Nanjundappa [Tue, 29 Sep 2015 10:11:27 +0000 (15:41 +0530)]
Correcting the INPUT in Doxygen file.

Changed to include the relevant header files as per the updated
source code structure.

Change-Id: I2ceb54f2f7d7614008a4d0073b7964a8a44c27a5
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 65552dc7ccb251e6ea69f9dedf6c8706c50b4683)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3309

8 years agoExtend the coverage of building Tizen
Rami Jung [Thu, 24 Sep 2015 04:36:28 +0000 (13:36 +0900)]
Extend the coverage of building Tizen

Given that the former area of Tizen  cannot cover up all the Tizen build,
sometimes it missed the compile errors in Tizen.
Therefore it allows Iotivity to run the whole Tizen build
to avoid the mistakes

Change-Id: I026746f0850fe96186f044ac375176276d80a53e
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 50df871e5c1815394031cb9c1864c6671b1159ab)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3303

8 years ago[TIZEN] RESampleApplication bug fixes taken from master branch.
arya.k [Wed, 30 Sep 2015 07:18:16 +0000 (12:48 +0530)]
[TIZEN] RESampleApplication bug fixes taken from master branch.

Change-Id: Ia25f7b2c53187f33e14cbc7804f026c318767e3e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix out-of-bounds access to the array
Thiago Macieira [Thu, 24 Sep 2015 01:09:22 +0000 (18:09 -0700)]
Fix out-of-bounds access to the array

The array has TIMEOUTS elements, so timeout_list[TIMEOUTS] is one
element past the end.

Change-Id: I42e7ef1a481840699a8dffff1406c4b42d42fde1
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoChange file permission of RCSResourceObject.h file
Ravi Nanjundappa [Tue, 29 Sep 2015 09:42:52 +0000 (15:12 +0530)]
Change file permission of RCSResourceObject.h file

Removed the execute permission for the RCSResourceObject.h file
in resource-encapsulation dir.

Change-Id: Ic4a3e1f3ab2766e461c7308ee1d0bf16a4eedbf2
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit cae7b2a72ac6b7fd7de2707d7d609535a31f1be4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3279

8 years agomodify timing issue and add test case for DiscoveryManagerUnitTest
doil.kwon [Tue, 29 Sep 2015 06:59:05 +0000 (15:59 +0900)]
modify timing issue and add test case for DiscoveryManagerUnitTest

- default waiting time is 3sec as each test.
- change discovery checking way from using sleep method to condition_variable.
: just unlock waiting mutex when is called callback function.
- request multiple discovery that have equal contents, and just one canceled.
  other request will be received callback function.

modify createId's logic for RCSDiscoveryManagerImpl.

modify Sconscript
- directory location for DiscoveryMaanger' unittest code is changed.

Change-Id: I3dfd5b1440959eac200746eba098ebd1ff93b69b
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 244d7b436e11f8705c79165ba67d26d6db3b6d0a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3275

8 years agoAdd check for expired symmetric keys
Sachin Agrawal [Wed, 23 Sep 2015 21:28:53 +0000 (14:28 -0700)]
Add check for expired symmetric keys

Iotivity should refuse DTLS session formation with devices whose
credentials have been expired.

Change-Id: Ic4708fbdd50ebc59e57f09c37211e7f36dbcf931
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 7fc33d509a8de4dd328386a7f155a52d4c347833)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3291

8 years agoAdded APK generation to build scripts
Rahul Rahul [Fri, 25 Sep 2015 16:58:50 +0000 (09:58 -0700)]
Added APK generation to build scripts

Updated android_api SConscript and Gradle files to generate
the APK of android examples with the existing scons command.
If trying to build examples from android studio, the user might
need to update the default TARGET_ARCH, RELEASE and SECURED flags
in <iotivity>/android/examples/gradle.properties

Updated the gradle versions to 1.3.0 in all gradle files.

Change-Id: Id9da3594ac83a4d27b3b1272a5aef6d893b305f9
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3135
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 6551c29a57983bc797f44da5a560778336480554)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3287

8 years agoOCMulticast start and stop APIs
Habib Virji [Fri, 25 Sep 2015 01:25:39 +0000 (02:25 +0100)]
OCMulticast start and stop APIs

APIs to start and stop multicast traffic. For stopping and staring multicast traffic
it manipulates multicast fd and IP_DROP_MEMBERSHIP.

OCStopMulticastTraffic interface is called from rd_client. It stops the multicast traffic.

OCStartMulticastTraffic is implemented but it is not called as this functionality is
not yet implemented.

Change-Id: If56c7af074cbba097b7b23d1abd787093872418a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2387
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoRefactor PSK Credential retrieval interface
Sachin Agrawal [Fri, 25 Sep 2015 18:20:29 +0000 (11:20 -0700)]
Refactor PSK Credential retrieval interface

When CA requests PSK credentials during DTLS handshake, SRM retrieves
credential for all devices and provides it to CA. This is un-necessary
and is in-efficient approach. Updated code to only provide credential
which has been requested by tinydtls.

Change-Id: Ie9bdc0ff1236b9f1f198215d211a682df416e731
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3009
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 134d702757cb17c888a6700ebd93bfc00a92f02e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3281

8 years agoUpdated Tizen GBS build script to fix tinycbor clone error
Abhishek Pandey [Tue, 29 Sep 2015 06:44:41 +0000 (12:14 +0530)]
Updated Tizen GBS  build script to fix tinycbor clone error

During Jenkins build, tinycbor library is copied as a soft link in extlibs folder.
For Tizen build, we copy from this location to tmp folder, which in turn
is copied to GBS-ROOT during build. While copying from extlibs/tinycbor
which is present as a soft link, error appear during jenkins build.

Fixed the error by giving -L option during in copy command.
Also, added error return clause in gbs build script to enable
jenkins catch the error in case of build break.

Change-Id: I24c149dabd3ac3c382adf8aa11a60b0adae38a68
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 8004fc298636d66b236dd527c981b7f34845b0e7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3269

8 years ago[Easysetup]Fixed an issue found in internal testing
Hemant Mahsky [Tue, 29 Sep 2015 08:32:21 +0000 (14:02 +0530)]
[Easysetup]Fixed an issue found in internal testing

Change-Id: I5a0bf9e5782765e72c2cc7528a66d241728db07e
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 6a363a38519075f2158965e98cab7db57705ccd8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3267

8 years agoAndroid: Removed a null entity handler initializer from OcPlatform
Tim Kourt [Wed, 23 Sep 2015 17:09:28 +0000 (10:09 -0700)]
Android: Removed a null entity handler initializer from OcPlatform

This should have been removed as a part of the
https://gerrit.iotivity.org/gerrit/#/c/2346/

Change-Id: I3fd6de963b21174a41627ffdfe6b4e822bf313ee
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 3c369f1215c428337da5568fa14d0efaeb62fba7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3143
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoTizen build fix. Resource Hosting library name changed.
arya.k [Tue, 29 Sep 2015 06:16:34 +0000 (11:46 +0530)]
Tizen build fix. Resource Hosting library name changed.

Change-Id: I7bdc05b230ecf807a36823ed6a9a7ca3f0d0040e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3245
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 27c83cb8975399c1e173f9fec3453fb713b1ef22)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3253

8 years agorename to resource-hosting from notification-manager.
jyong2.kim [Mon, 28 Sep 2015 09:29:32 +0000 (18:29 +0900)]
rename to resource-hosting from notification-manager.

notification manager is only provide resource hosting feature.
and resource hosting feature break off notifcation manager.

resource type name is modified to follow naming convention.

Change-Id: I96a0a60df60e60c44ecb9935cb73250949993fb6
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3205
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3243

8 years ago/oic/res response based on the collection response structure
Habib Virji [Fri, 18 Sep 2015 22:15:25 +0000 (23:15 +0100)]
/oic/res response based on the collection response structure

This is based on the new strucutre of the /oic/res as currently being defined
by Ravi. This is useful for the resource directory as it needs to include
multiple links maps inside links array.

It differs with the current /oic/res response as it includes links array with
multiple links map object.

The strucutre of the payload appears in this format:
Array
  TagsObject
    di
    baseURI
    bitmap
    ins
  LinksArray
    LinkMapObject
      href
      rt
      itf
      ins

Change-Id: Ifc61a70ede1fc44e9b2321604907d99961eea13b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoAdded Multi PHY EasySetup Service
Hemant Mahsky [Mon, 28 Sep 2015 16:54:14 +0000 (22:24 +0530)]
Added Multi PHY EasySetup Service

Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Updated SConscript to build EasySetup

Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 95818b037e2b8e3c2a738f47a107fe4088ba40b1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3237

8 years agoFix for Jira issues IOT-733,739 and 727
koushik.girijala [Mon, 28 Sep 2015 09:11:13 +0000 (14:41 +0530)]
Fix for Jira issues IOT-733,739 and 727

Fixed double free corruptions and errors in freeing static memory

If accepted, this changeset should be cherrypicked to 1.0.0-dev.

Change-Id: I5b37f5090b68b45156b5965f715b68daebfe9e37
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3191
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 6c022b836ecb8331f719700ac405d57751f19db4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3227

8 years agoMerge branch 'security-CKM' into 'master'
Sachin Agrawal [Mon, 28 Sep 2015 16:38:19 +0000 (09:38 -0700)]
Merge branch 'security-CKM' into 'master'

* security-CKM:
  Removed automatic switching to X.509 in CA
  implement unit tests for CK manager
  Add sample of PKIX provisioning

Conflicts:
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c

Change-Id: If1e8367e3729b152602d1585bc433f083354c5e1
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix issue w.r.t URI comparison when querystring is used
Sachin Agrawal [Fri, 25 Sep 2015 05:27:49 +0000 (22:27 -0700)]
Fix issue w.r.t URI comparison when querystring is used

If a query string is attached to URI, URI comparison fails
and packets are dropped. Updated the code to only compare the
URI part excluding querystring.

Change-Id: Iee81e6fb7851d3a3ce5b8410fecd14645e134713
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3081
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
(cherry picked from commit c5b381b150e93da6c906fc4c655c6bdb94beaf59)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3221

8 years agoAdded function to config terminal for read/write.
Thuyen Tran [Sat, 26 Sep 2015 18:45:19 +0000 (11:45 -0700)]
Added function to config terminal for read/write.

Change-Id: I816c23cfd68bd85ff32bf4dbc5cadba5a4c708c8
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3065
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
(cherry picked from commit 42bbf60e6bdbaec05a2d26cbc1571885ccfa093b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3213
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoFix segfault when calling OCCancel ()
Mandeep Shetty [Thu, 24 Sep 2015 20:42:39 +0000 (13:42 -0700)]
Fix segfault when calling OCCancel ()

This fixes the client side crash in IOT-733.
OCCancel () allocates a pointer that is free'd in routingutility.c.
Although the pointer was passed in as reference into routingutility and
is re-assigned with a new malloc'ed pointer, OCCancel() free's the old
pointer.
This is because there two structs that are being passed around. The
pointer that is double free'd is free'd twice as part of two DIFFERENT
structs. Got rid of the extra struct to keep things consistent and
resolve the crash.

If accepted, this changeset should be cherrypicked to 1.0.0-dev.

Change-Id: I8c961776406c02dbe7706a787bb19db53ba83853
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 96d4834e2dc6cf926cad639bb232b8b787cb8d3e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3141

8 years agofixed the jira IOT-712 issue in blockwise-transfer
hyuna0213.jo [Thu, 24 Sep 2015 11:20:28 +0000 (20:20 +0900)]
fixed the jira IOT-712 issue in blockwise-transfer

if request data is bulk data with block option1 and
response data is not bulk data, response data will
be sent with only block option1. this case we have to
add the received data to receive queue.
This patch addresses the first part of IOT-712.

Change-Id: I62645ae9592f59ed16758e4ff4a2b635cb834e04
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
(cherry picked from commit b56fb32a396a0553a3334b54eebbcaf505207483)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3133
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
8 years agoAndroid: fix for IOT-755
Tim Kourt [Thu, 24 Sep 2015 23:47:08 +0000 (16:47 -0700)]
Android: fix for IOT-755

1. Moved a number of function implementations from OCResource.h into OCResource.cpp to make Android happy
2. Updated android smoke tests

Change-Id: I0bf0edfae7490204d2f4ca44052066fc2dd9af12
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nagabharan Nagendran <nagabharan.nagendran@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 24cda274e3050433677518b94dfb15d0bae59db5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3131

8 years ago[JIRA IOT-737] fixed to prevent send coap pdu for no uri
jihwan.seo [Thu, 24 Sep 2015 11:31:13 +0000 (20:31 +0900)]
[JIRA IOT-737] fixed to prevent send coap pdu for no uri

if some case is need it to check. the case have to check it.
pdu have to be passed even though there is no uri.

Change-Id: I95ba9b2bb64f7733fcfb3d06b896032c0e3feeef
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3041
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>
(cherry picked from commit a993c18612ba08e00df46926a177f23017d5c614)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3129

8 years agoFix crash when discovering devices & platforms.
Mandeep Shetty [Thu, 24 Sep 2015 21:52:23 +0000 (14:52 -0700)]
Fix crash when discovering devices & platforms.

This fixes IOT-714

Iotivity does not currently enforce the mandatory fields of device and
platform be set by applications.
As a result, servers that do NOT set device and platform info segfault
when encoding device and platform info into CBOR as CBOR expects the
fields to be present.

Modified cbor payload to work with NULL fields in device and platform
payloads.

This changed also needs to go into 1.0.0-dev.

Change-Id: Ia626422bd441069febd47a5f44dd12aa42b1d46e
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit bf098fcea98bcc7a8ccd490a512f8aee320bcce7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3127

8 years agothings-manager: change file permission of .h files
Ravi Nanjundappa [Mon, 28 Sep 2015 10:26:25 +0000 (15:56 +0530)]
things-manager: change file permission of .h files

Removed the execute permission for the .h files from things-manager.

Change-Id: I4ebedbcc84114edcacc67dcaf373d6563f465bc1
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3209
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b725411d17dd973e8d0e91c2ac8a35b03b217535)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3215

8 years agoAdded support for proactive link checking
Randeep Singh [Tue, 22 Sep 2015 01:44:31 +0000 (10:44 +0900)]
Added support for proactive link checking

In current implementation whenever user tries to add link between two devices
which already exists apis logs error and doesn't return callback.
In this change, link api first checks that link between two intended devices
exists or not, if it exists then api return error and doesn't move ahead.

Change-Id: Iac02a44542235b962de2fe965f45548d96f9c625
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2899
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 6aa9d7eb1a93cdac934be8a4ff834de5f27ede3d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3181

8 years ago[Things-Manager]Fixed junit testcases issues and jira IOT-745
Jay Sharma [Fri, 25 Sep 2015 14:29:58 +0000 (19:59 +0530)]
[Things-Manager]Fixed junit testcases issues and jira IOT-745

- Updated Java SDK
- Updated sample Application

Change-Id: Ife6e1d3a00ff76d4c68f96949787fab1724092dc
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3115
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit e896af014916446b5098094af994885a76526337)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3211

8 years agoAlign resource container Java bundle APIs with new naming scheme
Minji Park [Fri, 25 Sep 2015 04:29:39 +0000 (13:29 +0900)]
Align resource container Java bundle APIs with new naming scheme

Updating Java bundle resource to follow the new naming scheme (handleSetAttributeRequest,
handleGetAttributeRequest). Latest changes in the resource container APIs
are now also updated in the Java related code.

Change-Id: I7b28c830c2dc6f2dd1c7ad31405851b6d94def54
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3031
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>
(cherry picked from commit ba2c9a84f7700c4778645bfd07e59d9bd8f40395)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3201

8 years agoModify directory location and code refactoring "RCSDiscoveryManager"
ChaJiwon [Fri, 25 Sep 2015 12:10:13 +0000 (21:10 +0900)]
Modify directory location and code refactoring "RCSDiscoveryManager"

- change directory location for "RCSDiscoveryManager.h" into resource-encapsulation/src/resourceClient
- code refactoring about RCSDiscoveryManager and RCSDiscoveryManagerImpl

Change-Id: I6790e5aec8cb80a1b62c8767e71256fb582c58bf
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit db190254d8421cdbcea1c5c9292bb07d7fe29800)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3199

8 years agoFix a possible segmentation fault of ExpiryTimer.
coderhyme [Mon, 28 Sep 2015 07:49:29 +0000 (00:49 -0700)]
Fix a possible segmentation fault of ExpiryTimer.

The thread for ExpiryTimer might be started before members are initialized.

Change-Id: I2d83a60bb84422e033f6165aef3cb0136edbeae7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 735bf9c001146666d86f5e744e3a0cce6a5aa860)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3197

8 years agoRemove delete request of notification sampleconsumer.
jyong2.kim [Fri, 25 Sep 2015 04:25:32 +0000 (13:25 +0900)]
Remove delete request of notification sampleconsumer.

notification manager(resource hosting) is not service for delete request.

notification manager use to resource-encapsulation APIs.
but resource encapsulation APIs is not service for delete request to remote resource.
so, unsupported function about delete request is removed in sample application.

Change-Id: I1280b1fa647b57eadc80ff064d121593fdc88526
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3079
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>
(cherry picked from commit af23adaed8225157cac63389e81dbe4a2885f837)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3183

8 years agoFix the size calculation bugs while calling memset in secureresourceprovider.c
leechul [Tue, 22 Sep 2015 01:23:05 +0000 (10:23 +0900)]
Fix the size calculation bugs while calling memset in secureresourceprovider.c

 1. Fix the 'sizeof(sizeof(...))' whiling calling memset().
 2. Change the 'OICMalloc + memset' to 'OICCalloc'.

Change-Id: Idbb14de5a3d4517bc55324f7a8a58d2079bf12e8
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit b4a723f299b3ccf44f7bc047eff06bb29abbed93)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3179

8 years agoAdd CRL resource URI to SRM checking
Dmitrii Zhuravlev [Wed, 23 Sep 2015 19:36:20 +0000 (22:36 +0300)]
Add CRL resource URI to SRM checking

Enables CRL resource URI to be secure while SRM checking

Change-Id: Ie0e5bfc0a08e16730ff9a1f9ff1b52525545ca86
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit fcd6ddcf05f9a77c2b364afe1b13a9d22a6cb0a0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3177

8 years agoIn resource-encapsulation android api, ResourceContainer related files are removed.
coderhyme [Fri, 25 Sep 2015 04:16:26 +0000 (21:16 -0700)]
In resource-encapsulation android api, ResourceContainer related files are removed.

It is not part of service api any more.
And manifest is modified to eliminate lint issues.

Change-Id: I80adb6784bd3a1667aa1b71f6f6b978c1148988c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 2d396d6ea3aa15c0a98cbded7c11d5eee7776346)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3111

8 years agoCode formatting for unit tests for resource-encapsulation android api.
coderhyme [Fri, 25 Sep 2015 04:20:09 +0000 (21:20 -0700)]
Code formatting for unit tests for resource-encapsulation android api.

It is to conform with java code style for iotivity.

Change-Id: I70c824606b76025d2b7ddb517c426ebef2faf740
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b5215661fe93472908ee8b7b55378bcee75e055c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3109

8 years agoRemove a wrong memory free in oicgroup
Jihun Ha [Thu, 24 Sep 2015 10:05:51 +0000 (19:05 +0900)]
Remove a wrong memory free in oicgroup

Schedule information for scheduled group action should be not freed until
it is canceled.

Change-Id: I9c92908b4425795603a98d649f6be2d48d96645e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3035
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 9144f5288fe01dd82dd09df22b8dc5769d2e257a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3099

8 years agoConvert android examples of resource-encapsulation into android-studio project.
coderhyme [Wed, 23 Sep 2015 14:31:12 +0000 (07:31 -0700)]
Convert android examples of resource-encapsulation into android-studio project.

Additionally source is modified to align with new version of apis.
Project names are changed as well to align with tizen samples.

ResourceContainer examples are removed because it will be excluded from service api.

JIRA issue : https://jira.iotivity.org/i#browse/IOT-744

Change-Id: Ie26dcef2ba373cde796099c4f6e5c32fbcf8aa03
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1697ec12d449b7e583ade370ff05d3d6adb5b564)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3095

8 years agoModify discoveryMap's cancel logic in order to keep data intergrity.
doil.kwon [Thu, 24 Sep 2015 08:20:12 +0000 (17:20 +0900)]
Modify discoveryMap's cancel logic in order to keep data intergrity.

- lock guard mutex before erasing data in discoveryMap.

Change-Id: I71f2a63797e417148a670a1d9e880d0c2a6515d4
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 404a997993bfba1289279683f7b6c6534f3a651d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3093

8 years agomodify BundleResource template api for handling attributes update
Minji Park [Thu, 24 Sep 2015 08:18:03 +0000 (17:18 +0900)]
modify BundleResource template api for handling attributes update

- remove set,get request handle apis for handling single attribute in bundle resource template to make template simple
- reorder the apis
- modify samples due to the change of resource template apis
- modify bundle resource to make container and bundle use shared pointer

Change-Id: I7b87ffc2e405aedd290a13b3b392063d785f8814
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3027
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1d699397819badb51dfa4ca3adac1fae58be0af4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3089

8 years agoAdd API explained comments for RCSDiscoveryManager and RCSDiscoveryManagerImpl
ChaJiwon [Thu, 24 Sep 2015 06:29:41 +0000 (15:29 +0900)]
Add API explained comments for RCSDiscoveryManager and RCSDiscoveryManagerImpl

- Modify return type (void -> unique_ptr<DiscoveryTask>) in RCSDiscoveryManager
- Add new API in RCSDiscoveryManagerImpl

Need to be cherry picked master branch into 1.0.0-dev branch

Change-Id: I69c90a7448efa325941c2aef53ea4a252e2ab6c8
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 40309df462cfde1717a467bbda6cb77fa6de6adb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3087
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoresource: check for valid pointers
Ravi Nanjundappa [Wed, 23 Sep 2015 03:14:35 +0000 (08:44 +0530)]
resource: check for valid pointers

This is patch is in continuation of the patchset
As mentioned by Madhan, this patch checks for the validity of
the pointers before their dereferences.

Change-Id: I9c1cd15bbcbd0a77bb34898ce3bc55c7d87b05f4
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2971
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c9f56d7146b8c9e9fb69b9b0e4fa59cd3fbbb85d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3085