platform/upstream/iotivity.git
8 years agoFix issue related SVACE in oickeepalive
Jaehong Jo [Thu, 31 Mar 2016 07:16:52 +0000 (16:16 +0900)]
Fix issue related SVACE in oickeepalive

Change-Id: I4c788411bcd8eb4251d292e0bf56ab470dfcafc1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoremove unnecessary startScan logic.
jihwan.seo [Thu, 31 Mar 2016 12:02:13 +0000 (21:02 +0900)]
remove unnecessary startScan logic.

it doesn't need to scan when disconnected LE anymore.
since scenario was changed for support manual disconnect API.

Change-Id: I9fb36953d0dc209f7c7dda5c8ad2a3a05b61f0cb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7499
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoandroid: add AUTHENTICATION_FAILURE error code
Hauke Mehrtens [Thu, 31 Mar 2016 09:47:58 +0000 (11:47 +0200)]
android: add AUTHENTICATION_FAILURE error code

This error code was added in commit abe4ddd7e4 "Add wrong PIN defence codes in
case of PIN based OxM" to IoTivity, but it was not added to the Android error
code enum.

Change-Id: Id3a0ca22b537fba1d600eecc069fbfb88fcf470d
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7495
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[IOT-1052] Resource container fixes
Markus Jung [Thu, 31 Mar 2016 07:39:54 +0000 (16:39 +0900)]
[IOT-1052] Resource container fixes

Resource container fixes:
- Using strncat instead of strcat and including a length check for
configured paths.
- Checks for non-null references in Configuration.cpp
- Member initializiation in BundleInfoInternal.cpp

Change-Id: Ifb4c50a76b22e7c2b06465187c90a8328eda5a90
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7509
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
8 years agoAdd empty string check of uuid
Joonghwan Lee [Thu, 31 Mar 2016 02:57:40 +0000 (11:57 +0900)]
Add empty string check of uuid

Add empty string check code to prevent returning true when both uuid are empty string

-Patch 1: Initial
-Patch 2: Remove 'x' file permission

Change-Id: Id9c50025593ad3bd14a74b874d442e8d3da441f7
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoResolved security issues - IOT-1058 & IOT-1059
Joonghwan Lee [Thu, 31 Mar 2016 07:10:17 +0000 (16:10 +0900)]
Resolved security issues - IOT-1058 & IOT-1059

https://jira.iotivity.org/browse/IOT-1058
[PM] [C] [Linux] [API] OCProvisionDirectPairing Fails to Provision Direct Pairing

https://jira.iotivity.org/browse/IOT-1059
[PM] [C] [Linux] [API] OCDoDirectPairing returns OC_STACK_INVALID_PARAM instead of OC_STACK_CALLBACK while resultCallback= NULL

-Patch 1: Resolved security Issues on 1.1.0-RC2
-Patch 2: Fix the expected value of OCDoDirectPairingTests.NullCallback in the stack unit test

Change-Id: I82cd3f855eeda1a65596984804fc8f1ce10cb79f
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix not to issue session if user unauthorized.
Jee Hyeok Kim [Fri, 1 Apr 2016 01:05:25 +0000 (10:05 +0900)]
Fix not to issue session if user unauthorized.

1. Check userId and return unauthorized response
   if cannot find userId

2. Code cleanup

Change-Id: I2b0053512f51168e809b2b3320dd5645ff9a4632
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agotizen: Fixed RHSampleApp project file to use SDK path separator
Philippe Coval [Thu, 3 Mar 2016 17:56:51 +0000 (18:56 +0100)]
tizen: Fixed RHSampleApp project file to use SDK path separator

This MSDOS '\' will break support on non Windows tizen-sdk

Change-Id: I83aaa2529d9d317a9f6406beba40ec6de8fddfcf
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[Easy-Setup] Fixed SVACE issues.
Jay Sharma [Thu, 31 Mar 2016 14:41:37 +0000 (20:11 +0530)]
[Easy-Setup] Fixed SVACE issues.

Change-Id: Id2722e42ac6958e57a46f6cb8480395788697b10
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoandroid: update versionName to 1.1 for the IoTivity 1.1 release
Hauke Mehrtens [Thu, 31 Mar 2016 09:47:21 +0000 (11:47 +0200)]
android: update versionName to 1.1 for the IoTivity 1.1 release

Change-Id: I6fa292c4cba715239e39d209e9ae4fa1a94d72b4
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agotizen: prevent building as seems unsuported on 32bit arch
Philippe Coval [Fri, 11 Mar 2016 12:15:40 +0000 (13:15 +0100)]
tizen: prevent building as seems unsuported on 32bit arch

Let's disable it for Tizen now, like for android or iOS.

Error was observed while building for Tizen:2.3.1:Wearable on i586 or armv7l :

  #error "Requires IEEE 754 floating point!"

Change-Id: Ibd7ccbc0e8405aa3cbace45a2a0ae65ce35c87f3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6139
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sanjeev BA <as2902.b@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed SVACE detected Code in Stack, AccountServer and CI .
Jung Seungho [Thu, 31 Mar 2016 09:44:16 +0000 (18:44 +0900)]
Fixed SVACE detected Code in Stack, AccountServer and CI .

CI remains 1 detect. and have to fix in RD

Change-Id: Ia23fbda13ef843181f5daaff97f2008b936510a8
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years ago[IOT-1049][Security][Resource Leak] Resolved possible resource leak
Randeep Singh [Thu, 31 Mar 2016 04:56:25 +0000 (10:26 +0530)]
[IOT-1049][Security][Resource Leak] Resolved possible resource leak

Change-Id: Id63ad08de60c9b6915415f356baa734f4c0a6395
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7477
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
8 years ago[IOT-1048][Security][Dangling Pointer] Address of local variable goes out of function...
js126.lee [Thu, 31 Mar 2016 02:58:30 +0000 (11:58 +0900)]
[IOT-1048][Security][Dangling Pointer] Address of local variable goes out of function scope

Related JIRA ticket : https://jira.iotivity.org/browse/IOT-1048

Patch 1: Init
Patch 2: Apply Mr. Kang's comment

Change-Id: I6f6fb829df89517fc24bed77a9f2827af10ef1de
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7471
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoUpdate pstat's device id in case of default
Yonggoo Kang [Wed, 30 Mar 2016 06:40:11 +0000 (15:40 +0900)]
Update pstat's device id in case of default

Change-Id: Ia7b7b24bbf39a42a761d9a872a62909b78064cae
Signed-off-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agolook for project header in project path and not in system one
Philippe Coval [Tue, 8 Mar 2016 11:00:52 +0000 (12:00 +0100)]
look for project header in project path and not in system one

Use #include "..." vs #include <...>
as some compilers are making the difference

This was observed when building outside main project

This message appeared while building using tizen-sdk 2.4.0 Rev4
with imported libs (built with gbs from Tizen:2.4:Mobile repo)

Change-Id: Ic89a700bf9c2b9b10c739d5706ac9b3f742b210d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sanjeev BA <as2902.b@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
8 years agoremoved CASample App for CA
jihwanseo [Mon, 28 Mar 2016 07:16:18 +0000 (16:16 +0900)]
removed CASample App for CA

since simpleserver and simpleclient can be covered it.
remove all sample sources.

Change-Id: Ib5960c0e9ee3ef8093718f0dd5f0e93b3db8e16f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7381
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[Tizen Enrollee] Removing GUI Enrollee Sample
Sandipan Patra [Tue, 29 Mar 2016 11:20:33 +0000 (16:50 +0530)]
[Tizen Enrollee] Removing GUI Enrollee Sample

Change-Id: I4c6dd1656d8ce184107e2bd5aa79a6c4b8c2475e
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7441
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Easy-Setup] Fixed arduino issue.
Jay Sharma [Wed, 30 Mar 2016 04:20:48 +0000 (09:50 +0530)]
[Easy-Setup] Fixed arduino issue.

Change-Id: I3b167eccaa5835288b5a560f070882df996aeb9e
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7453
Reviewed-by: Sandipan Patra <sandipan.p@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix a bug of RCSResourceObject.
coderhyme [Tue, 29 Mar 2016 10:06:54 +0000 (03:06 -0700)]
Fix a bug of RCSResourceObject.

The problem was that when handler is canceled, segfault ocuured.

Change-Id: I04f4bae70db986245566f97f8388dc39254fb828
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7435
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoClient Initial pstat cm value changed
Jongmin Choi [Mon, 28 Mar 2016 06:47:45 +0000 (15:47 +0900)]
Client Initial pstat cm value changed

Patch #1: Initial Client pstat cm changed (2 -> 0)
Patch #2: Client JSON and DAT files in
  resource/csdk/stack/samples/linux/secure/ changed accordingly
Patch #3: Easy-setup JSON and DAT files modified

Change-Id: Id0d1ceac5373ade28b2ee6f7a523da0fbfc1d52b
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7377
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFixed conditional Loading of ocprovision
Sandeep Sharma [Tue, 29 Mar 2016 05:27:18 +0000 (10:57 +0530)]
Fixed conditional Loading of ocprovision

Make build flag to propagate from gradle env to java runtime

Change-Id: I5e343778fe48d272cb025fddf64a7439276d75f6
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7425
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix the bug in UUID convertor.
leechul [Tue, 29 Mar 2016 07:01:42 +0000 (16:01 +0900)]
Fix the bug in UUID convertor.

Previous ConvertStrToUuid() API does not guarantee correct result in case of empty UUID.
Even if input string is empty string,the input string  may contain the garbage except first byte.

Here is bad case for ConvertStrToUuid() API :

Input : b'00 00 00 00 00 00 00 00 00 00 CC CC FF FF FF FF'
Since first byte is NULL character, the input string is empty string exactly.
The expected result is "00000000-0000-0000-0000-000000000000" in case of empty string.
But current ConvertStrToUuid() will be generated "00000000-0000-0000-0000-CCCCFFFFFFFF" for above input.

This patch is intended to fix it.

[Patch #1] Initial upload
[Patch #2] Update commit message
[Patch #3] Update according to comments.
[Patch #4] Update log message.
[Patch #5] Fix the typo on log message according to review comment.

Change-Id: I97c95a8fea30ffdf7e4c4ff6622e083b8357705a
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7431
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoModify to ignore response if edp of pconf's response is false
leechul [Mon, 28 Mar 2016 09:13:15 +0000 (18:13 +0900)]
Modify to ignore response if edp of pconf's response is false

Change-Id: I3511fdcb7be074f0591b3001d4c35af6462e13e7
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7391
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoAdd extern C to prevent name mangling in C++ layer
leechul [Tue, 29 Mar 2016 01:25:22 +0000 (10:25 +0900)]
Add extern C to prevent name mangling in C++ layer

Change-Id: I36a225ae5bb91d9bd45a1614d9acd0e9305d5fde
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7413
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoUpdate pstat init API to fill device id of pstat as doxm's uuid
leechul [Mon, 28 Mar 2016 07:16:00 +0000 (16:16 +0900)]
Update pstat init API to fill device id of pstat as doxm's uuid
in case of pstat's device id is empty.

If you want test with empty device uuid,
please use the resource/csdk/security/provisioning/sample/oic_svr_db_randompin_with_empty_deviceid.dat

Patch #1 : Intial upload
Patch #2 : Add json file according to Mr.JongSung Lee's comment.

Change-Id: I9c791074cd5abe179c2c4cccbb66e0d95d044399
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7383
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoREADME files updated for testing
Jongmin Choi [Mon, 28 Mar 2016 09:11:37 +0000 (18:11 +0900)]
README files updated for testing

Patch #1: README files updated for Ownership Transfer testing
Patch #2: LD_LIBRARY_PATH setting added
Patch #3: spaces removed

Change-Id: Ibde619776e3853ecbfed0be29388785a6e5e40e4
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7389
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoUnused Variable Warning remove
Manoj Gupta [Fri, 18 Mar 2016 04:59:43 +0000 (10:29 +0530)]
Unused Variable Warning remove

Change-Id: I0b7159842cde4864c3113a0352488d4c3a65cd7d
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoBug fixing related to slow response server
hyuna0213.jo [Tue, 29 Mar 2016 02:22:03 +0000 (11:22 +0900)]
Bug fixing related to slow response server

Change-Id: Id0cc88362af1067003b76ebda8322e409063a38c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7417
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoModified Android to resolve
Sandeep Sharma [Mon, 28 Mar 2016 15:03:25 +0000 (20:33 +0530)]
Modified Android to resolve

1. Build Issue with SECURED=1
2. Run time library loading Issue with SECURED=0
3. Updated DAT file for android sample provisioning client app.

PS: Currently both SECURED=0 and SECURED=1 build is successful
    but run time loading is failing for SECURED=1.

Change-Id: I8b88092e682f2c3095ba0ccc4f81f4f40d205490
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years ago[IOT-1026] Fix for Tizen RESampleClient Jira Issue
hunje.yeon [Tue, 29 Mar 2016 01:42:19 +0000 (10:42 +0900)]
[IOT-1026] Fix for Tizen RESampleClient Jira Issue

fix build issue caused by invalid variable.

Change-Id: Ibc57ab0498a066ebc03751a45dd37c6111d48a35
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7415
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agofix publish request parsing error
eunok.shin [Mon, 28 Mar 2016 12:26:27 +0000 (21:26 +0900)]
fix publish request parsing error

Change-Id: I814b3f1fe63f1659b3ac8d6cf6d11740fb8ea502
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7399
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years ago[Resource-Encapsulation] [IOT-1026] Fixed Jira Issue
Jay Sharma [Mon, 28 Mar 2016 11:27:00 +0000 (16:57 +0530)]
[Resource-Encapsulation] [IOT-1026] Fixed Jira Issue

Change-Id: I216c46097a85590ba927fe74c56b74b848a5611f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6293
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[Resource-Encapsulation] Fixed the Tizen sample app build issue.
Jay Sharma [Mon, 28 Mar 2016 15:57:39 +0000 (21:27 +0530)]
[Resource-Encapsulation] Fixed the Tizen sample app build issue.

- Updated "NestedAttributeClientApp" Tizen app.

Change-Id: I3cf63257fe3e23dde2cf1998ebccbb9d25de8388
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7409
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModified SceneManager Unittest
wonny [Mon, 28 Mar 2016 12:53:58 +0000 (21:53 +0900)]
Modified SceneManager Unittest

- SceneTest : fix not creating scene
- RemoteSceneActionTest : fix setup() logic

Change-Id: Ie923d766e5da8ac7a3798f5a7febfb9404e7a2d5
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7401
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoProblem regarding NON request on Slow Response server
hyuna0213.jo [Mon, 28 Mar 2016 07:29:45 +0000 (16:29 +0900)]
Problem regarding NON request on Slow Response server

When a slow responding server receives a NON type request,
it is sending back an ACK message immediately, and then later,
sending NON response. According to RFC-7252, response of NON request
should only be a NON, there should not be any ACK in between.

Change-Id: I0b00c2423660d622df8490bf03011d18a1c26126
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7385
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agofixed code to get token about the empty message
hyuna0213.jo [Mon, 28 Mar 2016 08:25:07 +0000 (17:25 +0900)]
fixed code to get token about the empty message

fixed code to get token about the empty message.

Change-Id: Ifbe334f42457c1b2ba801d92cdca540433689938
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7387
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoFix for crash in Tizen casample when message type is CA_MSG_RESET
vimala.v [Mon, 28 Mar 2016 10:36:21 +0000 (16:06 +0530)]
Fix for crash in Tizen casample when message type is CA_MSG_RESET

Change-Id: I94937968bb6e63c74d0458919cdfedce1b2b60b0
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7397
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoAdd activity for NFC Transport.
Jaehong Jo [Mon, 21 Mar 2016 00:23:00 +0000 (09:23 +0900)]
Add activity for NFC Transport.

The activity required for the NFC adapter.

Change-Id: Id735532944dfb2f496043620c0b7b3230d534957
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6111
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years ago[IOT-1045] Remove the CborEncoder initialization in security modules to remove compil...
leechul [Mon, 28 Mar 2016 00:46:44 +0000 (09:46 +0900)]
[IOT-1045] Remove the CborEncoder initialization in security modules to remove compile error.

Related JIRA ticket : https://jira.iotivity.org/browse/IOT-1045

I've modified on the basis of the following :
  1) Does not initialize CborEncoder in all other modules except security modules.
  2) Current initialization can make compile error in some other environment.
     Actually, I can't reproduce this errors in my environment.

[Patch 1] : Intial upload.
[Patch 2] : Update commit message.

Change-Id: I98ff0b7db802605a54f357064fad13e7b3888a4c
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7371
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoChanges to PolicyEngine to support rowner and isop checks.
leechul [Mon, 28 Mar 2016 04:58:25 +0000 (13:58 +0900)]
Changes to PolicyEngine to support rowner and isop checks.

Note that the pstat.isop must be set to "true" by the provisioning
tool after OTM is complete and provisioning is done!

patch #2 - added GetPstatIsop() function to pstatresource.h and .c.
Still needs to be properly provisioned by PT.

patch #3 - fixed unittest failure (workaround for now since proper
tests require device to be owned).  Also marked GetDeviceOwnerId()
function for fixing after schema updates are done.

patch #4 - change to Chul Lee's suggested design using function
array instead of case switch.  However it does not compile.  See
Reply comments please.

patch #5 - fixed compile error and also logic error (changed || to
&&)

patch #6 - implemented correct GetDoxmRownerId() in doxmresource.c.
Other entity handlers should follow this simple template after
schema update is done.

patch #7 - fixed build issue on other platforms (worked on Linux)

patch #8 - rebase

patch #9 - added correct functions for all resources with
rowner/rownerID vals.

patch #10 - changed behavior on SVRs without rownerID, since
devowner is already being checked.

patch #11 - rebase again

patch #12 - now that acl, amacl and cred have rownerID property,
added correct getRownerId() for those 3 resources

patch #13 - remove the unexpected condition in policyengine.c
            Please see my comments on line 465~473 in patch #12

Change-Id: If3c0a01f76260e10d3169fc0cfa79924175ca62d
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoAdded default security_version definition for |oic/sec/ver| resource
Kyungsun Cho [Sun, 27 Mar 2016 10:39:55 +0000 (19:39 +0900)]
Added default security_version definition for |oic/sec/ver| resource

- patch #1: initial commit
- patch #2: fixed multiple definition

Change-Id: I08572a6020653f99ea7f5922d82b51e4fd31bb22
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agofixed callback handling bug on |SecurityVersionDiscoveryHandler|
Kyungsun Cho [Sun, 27 Mar 2016 11:45:54 +0000 (20:45 +0900)]
fixed callback handling bug on |SecurityVersionDiscoveryHandler|

Change-Id: Ib07eba1221c26b7b57742d4f2c8aa2f9b9fae0dc
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoChange name of encoding type
js126.lee [Mon, 28 Mar 2016 01:30:14 +0000 (10:30 +0900)]
Change name of encoding type

There is no name of encoding type as "oic.sec.encoding.bytestream" in the spec.
But we need a type to handling priv/pub data as byte array because our db is binary.
So we define new name of encoding type as "oic.sec.encoding.none" that means no need to encoding.
And we have asked to add this type into RAML spec.

-Patch 1 : Init
-Patch 2 : Modify encoding type from encodign.none to encoding.raw.

Change-Id: I7ad3d8facd302f97426cd42f139fbc11a7682638
Signed-off-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6329
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoProvisioning Sample README updated
Jongmin Choi [Mon, 28 Mar 2016 02:02:22 +0000 (11:02 +0900)]
Provisioning Sample README updated

Patch #1: README file updated
Patch #3: CBOR change stated
Patch #4: File permission fixed

Change-Id: I04d7944aa720960777991277df94bdd9ac7018b1
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7373
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoModify to update rowner as PT's UUID when ownership transfer is done.
leechul [Fri, 25 Mar 2016 09:31:21 +0000 (18:31 +0900)]
Modify to update rowner as PT's UUID when ownership transfer is done.

  1) Modify data structure of each security resource as single instance of rowner.
  1) Add internal API to set the rowner.
  2) Modify the doxmresource.c in order to update rowner when OTM is done.
  3) Fix the minor bugs.

[Patch 1] : Intial upload
[Patch 2] : Revert the direct pairing related SVR DB files to prevent conflict.
[Patch 3] : Rebase
[Patch 4] : Remove the compile errors
[Patch 5-6] : Remove the compile errors for arduino
[Patch 7] : Update commit message
[Patch 8] : Rebase

Change-Id: I2f10786082265a2942dcadccb12f113658db8c34
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6325
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years ago[Revert] Renamed |SHA| symbol names on |tinydtls| external library
Kyungsun Cho [Thu, 24 Mar 2016 10:21:57 +0000 (19:21 +0900)]
[Revert] Renamed |SHA| symbol names on |tinydtls| external library

- patch #1: initial commit
- patch #2: rebased
- patch #3: fixed conflicts on |pkix/crypto_adaptoer.h|

Gerrit: https://gerrit.iotivity.org/gerrit/#/c/6245/
Jira: https://jira.iotivity.org/browse/IOT-977

Change-Id: Id111511a1eeab7cf83a319b9a3d87ed07bd71c7d
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6269
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoUpdate db files and Fix json2cbor tool
Yonggoo Kang [Thu, 24 Mar 2016 14:29:21 +0000 (23:29 +0900)]
Update db files and Fix json2cbor tool

patch#1 : 1. Update dat/json files.
          2. Fix json2cbor tool about CRED
patch#2 : Rebase to resolve conflict, minor fix
patch#3 : Resolve SVACE issue, check return value

Change-Id: Ibcaa8f2d0588924e42ab8985dac7b15a82579c8c
Signed-off-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6301
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoResolved Svace defect on Security folder
js126.lee [Fri, 25 Mar 2016 04:53:32 +0000 (13:53 +0900)]
Resolved Svace defect on Security folder

-Patch 1: Resolve svase defect on security folder
-Patch 2: Apply Mr.Kang's comment

Change-Id: I4c020c4081121852de0c3623f53a177fd2b474c9
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6319
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoApply device provisiong state during OTM
js126.lee [Thu, 24 Mar 2016 13:03:27 +0000 (22:03 +0900)]
Apply device provisiong state during OTM

Please just review, But don't merge this patch!!

Accoding to Device-Onborading-State, Ready for provisioning step is added during OTM.

1. Ready for OTM : The second bit of is enable, and isop is false.
2. Ready for Provisioning : The second bit of cm is disable, and isop is false.
3. Ready for Normal operation : THe second bit of cm is disable, and isop is true.

- Patch 1: Added Ready for provisioning step.
- Patch 2: Apply Chul's comment

Change-Id: I4a5aeb1b392aa35bf20a3ef960d3d30674ec40a4
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6297
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years ago[IOT-995] Fix memory reallocation for security resources
Habib Virji [Thu, 24 Mar 2016 22:26:46 +0000 (22:26 +0000)]
[IOT-995] Fix memory reallocation for security resources

When CborOutOfMemory is generated reallocation should be based on
encoder.ptr incremented value.

It also fixes allocation for security payload. It allocates value
based on the payload size.

Change-Id: I5213679d65e48bb91cd590d3cc654a6cd80b2af2
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6241
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
8 years ago[IOT-993] Remove limit of payload size handling
Habib Virji [Thu, 24 Mar 2016 22:10:42 +0000 (22:10 +0000)]
[IOT-993] Remove limit of payload size handling

It cannot go beyond two level of increasing the payload size and it a[[ear it can go for handling bigger size.

Change-Id: I303f29563b32ba25d2f5e92a28f3a0ecac46ea60
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agomodified target message type related blockwise transfer.
hyuna0213.jo [Thu, 24 Mar 2016 06:36:13 +0000 (15:36 +0900)]
modified target message type related blockwise transfer.

According to a spec, uses of the block options in conjunction
with multicast messages are for further study. so I modified to not
pass the blockwise transfer logic in case of the multicast message.

Change-Id: I2913dc7fc608e6da007071fd325c76931cf02325
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agofix configuration parsing problem in Resource Container
Minji Park [Wed, 23 Mar 2016 07:56:01 +0000 (16:56 +0900)]
fix configuration parsing problem in Resource Container

- fix configuration parsing for input information with bundle resource uri

Change-Id: I8a45b7a00179ab11a018ef1c3030df0233339090
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6217
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agofixed some crash for NFC.
jihwan.seo [Fri, 25 Mar 2016 00:25:43 +0000 (09:25 +0900)]
fixed some crash for NFC.

Change-Id: I6abdd1cd99771a73876ffb5e8d2a9da40d2f19c0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years ago[IOT-1040] Fixed for jira issue about RH android.
jyong2.kim [Thu, 24 Mar 2016 23:02:57 +0000 (08:02 +0900)]
[IOT-1040] Fixed for jira issue about RH android.

prevented crash when init is called with null String at address.

Change-Id: I390fdd036e6afae44af36d935564b2fa5045d990
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6307
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-by: Uze Choi <uzchoi@samsung.com>
8 years ago[IOT-1019] Fix for jira issue
Hun-je Yeon [Thu, 1 Oct 2015 14:17:54 +0000 (23:17 +0900)]
[IOT-1019] Fix for jira issue

Add console out when Resource Container started.

Change-Id: If262e26fcee0e9ce52fada57fec03eccf47fc69f
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[IOT-1039]Fixed for jira issue.
jyong2.kim [Thu, 24 Mar 2016 10:35:01 +0000 (19:35 +0900)]
[IOT-1039]Fixed for jira issue.

It is fix for a RH android sample application.
When the call terminate RH android sample, It expected to return success but return error.
terminate API is try to terminate a thread, but it was already terminated at other api.

Change-Id: I52b79252f1d952917729f7716d381303b57501a6
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6287
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-by: Uze Choi <uzchoi@samsung.com>
8 years ago[IOT-1032][IOT-1033][IOT-1034] Fixed for an issue with android sample application.
coderhyme [Thu, 24 Mar 2016 08:51:22 +0000 (01:51 -0700)]
[IOT-1032][IOT-1033][IOT-1034] Fixed for an issue with android sample application.

It seems discovered resource is not what it should be in sample client.
It happens because method finding resource is changed.

Change-Id: Ib820319658038f7969fbd503b374c9d1933adb09
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6265
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix terminate sequence and observe option parser
Jee Hyeok Kim [Wed, 23 Mar 2016 02:51:48 +0000 (11:51 +0900)]
Fix terminate sequence and observe option parser

1. Fix Observe option parser at stack
2. Fix terminate logic at stack
3. Add validation check to client
4. Remove JSONUtil class which multiply exist.
5. Rename Const file to Constants

Change-Id: Ib6419574151e787046b9a7fa89c351237304792a
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6203
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Glen Youngjin Kim <glen.kim@samsung.com>
8 years agoParse integers and single-precision floats in incoming CBOR streams
Thiago Macieira [Thu, 24 Mar 2016 00:04:08 +0000 (17:04 -0700)]
Parse integers and single-precision floats in incoming CBOR streams

Incoming single-precision data is automatically converted to
double-precision upon parsing. Integers are kept as is, but if the user
requests the data as floating point, we convert on the fly. That is
inefficient if the call is performed more than once, but the appication
shouldn't do that anyway to avoid memory allocations.

Fixes IOT-981.

Change-Id: I11a23ec8442c40bf9f7affff143e9edd0d17eec7
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6239
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoChanged the message transmission logic about CA_DEFAULT_ADAPTER
hyuna0213.jo [Mon, 21 Mar 2016 04:55:36 +0000 (13:55 +0900)]
Changed the message transmission logic about CA_DEFAULT_ADAPTER

if transport adapter type is set as CA_DEFAULT_ADAPTER,
CA transmit a message via all transport adapter after generating a pdu.
but CoAP over UDP and CoAP over TCP can be used to generating pdu
according to transport type. so transport type should be determined
before generating a pdu.

Change-Id: I1cd6adda7dd060239eb40d74c36a1fa69da619f5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6115
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoFix for Jira IOT-1044.
G S Senthil Kumar [Thu, 24 Mar 2016 10:15:11 +0000 (15:45 +0530)]
Fix for Jira IOT-1044.

Resolved UI issues which occurred when changing attribute values
from Simulator plug-ins in Eclipse Mars IDE.

Change-Id: Ibd2e0c7c5cfc314dddaba551958a86258d3188f0
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6267
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Easy-setup] Fixed Security feature
Jay Sharma [Thu, 24 Mar 2016 14:29:05 +0000 (19:59 +0530)]
[Easy-setup] Fixed Security feature

 - Updated Mediator and enrollee sample applications [Android, Linux,Tizen]
 - Updated iotivity.spec file
 - Updated tizen-sdb README file

Change-Id: I95a8540ced6c9b5ac5036afb2763aeb02ec24a09
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6303
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[IOT-990] Support for URI comparisons to be case-insenstive
Habib Virji [Wed, 23 Mar 2016 21:31:47 +0000 (21:31 +0000)]
[IOT-990] Support for URI comparisons to be case-insenstive

Support for rt or if in the query to be case-insensitive.

JIRA ISSUE: IOT-990
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Change-Id: Ieff5256e25b2232f25dec52e86b356a0682e3241
Reviewed-on: https://gerrit.iotivity.org/gerrit/6237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[IOT-914] Device ID to be based on DOXM GetDeviceID
Habib Virji [Thu, 24 Mar 2016 14:01:26 +0000 (14:01 +0000)]
[IOT-914] Device ID to be based on DOXM GetDeviceID

Instead of ocstack generating random device id. DOXM id is going to be used.

Change-Id: I1a780f07388ee1fe09e315c2d645f1c8ee5142de
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix PKIX provision
Dmitriy Zhuravlev [Thu, 24 Mar 2016 13:45:05 +0000 (15:45 +0200)]
Fix PKIX provision

There is an issue with payload converter

Change-Id: I6377cecd53b52986515fee7f7022680099cf05be
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoAdd security version resource
js126.lee [Thu, 24 Mar 2016 11:38:07 +0000 (20:38 +0900)]
Add security version resource

-Patch 1: To check security version, oic.sec.ver is created.
-Patch 2: Add commit description
-Patch 3.4: Apply Randeep's comment
-Patch 5: Rebase
-Patch 6-7: Fixed build error on Arduino
-Patch 8: Modify version data type of provisioningmanager
-Patch 9: Rebase
-Patch 10: Update device type
-Patch 11: 1) Modify to start version discovery in succession after secure port discovery
           2) Separate each discovery(secureport, version) process as internal function.
-Patch 12: Add null check and remove unnecessary local variables.
-Patch 13: Modify the API description according to patch 11.
-Patch 14: Update according to SVACE report
-Patch 15: Rebase

It is clone https://gerrit.iotivity.org/gerrit/#/c/6059/ of
security-cbor-conv-1.1 branch after resolved conflict.

Change-Id: I0de72d8cc35acb048acfb7136769f3c84c72c152
Signed-off-by: Jongsung Lee <js126.lee@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6105
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFixed a bug in the cache module of RE
coderhyme [Mon, 14 Mar 2016 02:57:32 +0000 (19:57 -0700)]
Fixed a bug in the cache module of RE

If observation for a resource from a client is started, it should be canceled.
But there was a logic error that it isn't.

Change-Id: I2440c20999b7076bea5987ccbad3f0710269b3d9
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
(cherry picked from commit 607ef0e262f85d164cb3b1edbcf2e5bf926a2930)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6259

8 years agoRevert "Fix PKIX provision"
Dmitriy Zhuravlev [Thu, 24 Mar 2016 11:15:53 +0000 (11:15 +0000)]
Revert "Fix PKIX provision"

This reverts commit 2e7005a00fac880b8d727cc896890f01bef26879.

Change-Id: I3e94a2c70a9c8de5e700ad9c1314b1e42ae17408
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6285

8 years agoFix PKIX provision
Dmitriy Zhuravlev [Mon, 21 Mar 2016 16:03:15 +0000 (18:03 +0200)]
Fix PKIX provision

Certificate based credential and CRL serialization
Known issues:
https://jira.iotivity.org/browse/IOT-995
https://jira.iotivity.org/browse/IOT-996

Change-Id: I27b3af58daac3dda73182c04e3109943e6765e93
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6157
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoSync-up to Changed RAML spec v1.1
Yonggoo Kang [Wed, 23 Mar 2016 11:51:00 +0000 (20:51 +0900)]
Sync-up to Changed RAML spec v1.1

Patch#1 : 1. Change "subject" to "subjectid"
          2. Add "rel" into "resources"
          3. Change "pubdata","privdata" to "data"
          4. Remove "didformat" from DOXM
          5. Fix subjectid on delete cred process
             (base64 -> canonical)
          6. Update sample json/dat files partially
             (client, justworks, randompin)
Patch#2 : Add missing file
Patch#3 : 1. Update db in security unittest
          2. Fix bug in CRED unittest
          3. Modify ReadCBIRFile function to use resource name
Patch#4 : Remove unnecessary files
Patch#5 : Change "*id" to "*uuid"
Patch#6 : Fix SVACE, Remove redundant comparison
Patch#7 : 1. Modify type of pstat->sm that multiple to single
          2. Replace tabs to spaces
Patch#8 : minor fix
Patch#9 : Modify SelectOperationMode function
Patch#10 : Remove unnecessary variable

NOTE : Please review only, do not merge.
       All of sample json/dat files should be updated after verify.

Change-Id: I97af41a99f7f898516f66c620facd2bedac949f3
Signed-off-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6223
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years ago[IOT-1020], [IOT-1024], [IOT-1029], [IOT-1030] fixes
Markus Jung [Wed, 23 Mar 2016 06:50:14 +0000 (15:50 +0900)]
[IOT-1020], [IOT-1024], [IOT-1029], [IOT-1030] fixes

- param check for getConfiguredResourceParams API
- updated example configuration for Android sample of resource container
- removed getLibraryPath API from Android wrapper

Change-Id: Ib825240a2ebec7cfa0a61e1ae63e156408904bd6
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for jira IOT-1042.
G S Senthil Kumar [Wed, 23 Mar 2016 13:06:44 +0000 (18:36 +0530)]
Fix for jira IOT-1042.

Resolving the issue of incorrectly shown allowed values in
"Modify Array Attribute Value" UI dialog of Service Provider Plug-in.

Change-Id: Ie652d5bc1185f51d2c52a55b72ded68e38c32664
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[Easy-Setup][IOT-1016] Fixed Jira issue.
Jay Sharma [Thu, 24 Mar 2016 07:27:54 +0000 (12:57 +0530)]
[Easy-Setup][IOT-1016] Fixed Jira issue.

Change-Id: I2690cd69ad35fd95759cdc66361e45c84b42a7f4
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago[IOT-977] Renamed |SHA| symbol names on |tinydtls| external library
Kyungsun Cho [Thu, 24 Mar 2016 03:02:10 +0000 (12:02 +0900)]
[IOT-977] Renamed |SHA| symbol names on |tinydtls| external library

this commit for resolving |tinydtls-SHA| symbol conflict between
|iotivity-tinydtls| and pre-installed platform library.
this symbol conflict have occurred in applying Iotivity application
on commercialized platform, like Tizen and Android

Jira: https://jira.iotivity.org/browse/IOT-977

Change-Id: I15152078231d82f17d7121b19350deabd3abe356
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoC++ Provisioning Unittest fixed
Jongmin Choi [Thu, 24 Mar 2016 06:16:54 +0000 (15:16 +0900)]
C++ Provisioning Unittest fixed

Change-Id: Ie28f6e7123994c0dc70e0988fda2b7d638a215ce
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6251
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoResolved JIRA [IOT-1011]
Randeep Singh [Wed, 23 Mar 2016 14:17:08 +0000 (19:47 +0530)]
Resolved JIRA [IOT-1011]

Change-Id: Ifb8b72f27df662569916accb9416a7bcc2fc5ed2
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6173
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[IOT-1208] fix for jira issue
coderhyme [Wed, 23 Mar 2016 06:43:44 +0000 (23:43 -0700)]
[IOT-1208] fix for jira issue

It works as expected, server sample set sensor interface as its default interface. And the sensor interface does not support set request by the core spec.

I feel server and client sample should work as pair, which means sample server needs to support set request. So sample server is modified.

Change-Id: Ib2ff696c18ba5449300dff833d2dfdc7e2d7c8bb
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6209
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years ago(IOT-1014) modified sceneCollectionResource
wonny [Wed, 23 Mar 2016 05:57:19 +0000 (14:57 +0900)]
(IOT-1014) modified sceneCollectionResource

resolved jira issue IOT-1014

When scene execute, this issue is caused by not adding scene name
in SceneCollectionResource.

modified parameter in execute API.

Change-Id: I0c78bcd9523f2f425832c0d4934a1b9abd560d81
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6199
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years ago(IOT-1006) modified sceneCollection
wonny [Wed, 23 Mar 2016 06:44:24 +0000 (15:44 +0900)]
(IOT-1006) modified sceneCollection

resolved jira issue IOT-1006

This issue is caused by checking sceneName existed or not.
modified checking logic.

Change-Id: I6ef17e1ef9c7182852ea783e71ed57dd7b81efbe
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6205
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerged constructors of the RCSResourceObject::Builder.
coderhyme [Wed, 23 Mar 2016 06:42:35 +0000 (23:42 -0700)]
Merged constructors of the RCSResourceObject::Builder.

Change-Id: I4fd030a951c7d2c655b1a1c7c01e0812328dde78
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoResolved simulator crash issue.
G S Senthil Kumar [Wed, 23 Mar 2016 09:31:57 +0000 (15:01 +0530)]
Resolved simulator crash issue.

Simulator plug-in crashed due to recent changes in the OCDeviceInfo
structure in platform layer. Handled the changes required in simulater
module.

Change-Id: I8f4b31857b25628fa0ac888aeb42ee1e5d84885c
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6221
Reviewed-by: Radha Bhavani <radha.p@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoResolved JIRA issue [IOT-999]
Randeep Singh [Wed, 23 Mar 2016 12:43:23 +0000 (18:13 +0530)]
Resolved JIRA issue [IOT-999]

Change-Id: Iba57ff1bf4f82619ec21e5f905b692608a9aff70
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoOptimization in the length of the RM Header option
vimala.v [Thu, 10 Mar 2016 11:40:57 +0000 (17:10 +0530)]
Optimization in the length of the RM Header option

Change-Id: I13caa257aede8e812e1ea1c2807668572e327f33
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoResolved JIRA [IOT-1009]
saurabh.s9 [Wed, 23 Mar 2016 04:44:48 +0000 (10:14 +0530)]
Resolved JIRA [IOT-1009]

Change-Id: Ia21ccd9c3e820aaf9eba1bdf352dbe8ec0ea65be
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoResolved security issue-IOT1003 & IOT1013
js126.lee [Wed, 23 Mar 2016 08:08:51 +0000 (17:08 +0900)]
Resolved security issue-IOT1003 & IOT1013

https://jira.iotivity.org/browse/IOT-1013
[PM C]OCProvisionPairwiseDevices returns OC_STACK_OK instead of
OC_STACK_INVALID_PARAM for provisioning same device

https://jira.iotivity.org/browse/IOT-1003
[PM C] APIs returns OC_STACK_INVALID_PARAM instead of
 OC_STACK_INVALID_CALLBACK while CB = NULL

-Patch 1: Resolved security Issue on 1.1-RC1
-Patch 2: Apply MR.Cho's review comment

Change-Id: I1a2d0265e756da41cffbcc60042e4f35de2dbcf5
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6219
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoRAML v1.1 sync-up in SVR DB
leechul [Tue, 22 Mar 2016 00:38:06 +0000 (09:38 +0900)]
RAML v1.1 sync-up in SVR DB

Patch#1 : Init
Patch#2 : add missed code
Patch#3 : sync-up ACL, change sample db file(dat, json)
Patch#4 : minor fix on ACL
Patch#5 : sync-up CRED
Patch#6 : minor fix on CRED
Patch#7 : add "didformat" into "doxm"
Patch#8 : remove "ch" and minor fix from "pstat"
Patch#9 : minor change
Patch#10 : change "oxm" to "oxms" in "doxm", minor change
Patch#11 : fix on CRED
Patch#12 : pconf sync up
Patch#13 : Remove TAB characters
Patch#14~16 : Remove the compile errors for arduino
Patch#16 : Modify the convertion funtion's error-handling logic to
           gurantee NULL termination of parameter in case of cbor error.
Patch#17 : 1. Rebase to resolve conflicts.
           2. Re-generate SVR DB(*.dat) files.
Patch#18 : 1. Resolve ownership transfer issues with two more servers.
           2. Resolve the unit test errors.
           3. Update unittest's SVR DB(*.dat) in CBOR format.
Patch#19~21 : Upload missing file.
Patch#22~23 : Update according to SVACE report.
Patch#24 : Update ocstack sample's SVR DB(*.dat) in CBOR format.
Patch#25 : Modify c++ samples SVR DB(*.dat, *.json) in correct format.
Patch#26-27 : Insert the device owner field as empty value explicitly
           into sample's default SVR DB.

Under test. Please don't merge this patch.

Change-Id: Ia3b6c65bf5c365c664e89d934042e30576f777bf
Signed-off-by: Yonggoo Kang <ygace.kang@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6099
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agofixed checking result for ServerStop in caleadapter.
jihwan.seo [Wed, 23 Mar 2016 02:29:07 +0000 (11:29 +0900)]
fixed checking result for ServerStop in caleadapter.

Change-Id: I55f68638bcd9f4ba7a045714412b56aaab368c89
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years ago[Easy-Setup] Updated Mediator Java SDK.
Jay Sharma [Tue, 22 Mar 2016 07:11:53 +0000 (12:41 +0530)]
[Easy-Setup] Updated Mediator Java SDK.

- Added NULL check.

Change-Id: I72c8e64dc72559e254a4fd30dd363673127715f5
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoWrong Comarision Between signed and unsigned value
Manoj Gupta [Wed, 16 Mar 2016 12:09:27 +0000 (17:39 +0530)]
Wrong Comarision Between signed and unsigned value

Change-Id: I5160fd7fccf4f631ce6d86c52c861aca54dcb193
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5981
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago(IOT-997) modified checking scanned device for unicast
jihwan.seo [Tue, 22 Mar 2016 08:22:18 +0000 (17:22 +0900)]
(IOT-997) modified checking scanned device for unicast

Change-Id: I48854d19c95f0af6fe3a0e0f28d35a4127262ab1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoModify incorrect return value in policy engine
leechul [Wed, 23 Mar 2016 01:39:28 +0000 (10:39 +0900)]
Modify incorrect return value in policy engine

Change-Id: I8f46cafe1898a44e71dd39e8457178819c396154
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6187
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFixed template syntax to prevent ambiguity with stream operators
Philippe Coval [Fri, 4 Mar 2016 16:06:32 +0000 (17:06 +0100)]
Fixed template syntax to prevent ambiguity with stream operators

This is a minor change but was noticed when trying to build with clang

This message appeared while building using tizen-sdk 2.4.0 Rev4
with imported libs (built with gbs from Tizen:2.4:Mobile repo)

Change-Id: Ib573d5ea9b23b29d6114d1f072210c370859fdec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6149
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoAdded "GetSvrTypeFromUri()" and supporting code.
Nathan Heldt-Sheller [Sat, 19 Mar 2016 22:25:52 +0000 (15:25 -0700)]
Added "GetSvrTypeFromUri()" and supporting code.

This is a necessary function
for v1.1 functions to handle "pstat->isop" and "rowner" checks.

Change-Id: I2b381fb6103e939bc554abaf6df0747a94f5a30e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6101
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoRemoved unnecessary files in connectivity abstraction
hyuna0213.jo [Tue, 22 Mar 2016 01:10:44 +0000 (10:10 +0900)]
Removed unnecessary files in connectivity abstraction

deletes unnecessary files from clond-interface branch.

Change-Id: I6d6e59384f4a2b792e91e6a72d750893a47628fd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years ago[IOT-921]Return correct resource type in /oic/d
Habib Virji [Fri, 11 Mar 2016 12:37:43 +0000 (12:37 +0000)]
[IOT-921]Return correct resource type in /oic/d

It adds support to add device resource type via API.

Jira Issue: IOT-921
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Change-Id: Ib47f637ff343b5bc8dbce5d5f0cc2b5f1eab46ab
Reviewed-on: https://gerrit.iotivity.org/gerrit/5747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoremove previous received data from ReceiveQueue for gatt server
jihwan.seo [Mon, 14 Mar 2016 08:12:47 +0000 (17:12 +0900)]
remove previous received data from ReceiveQueue for gatt server

and modified to adjust destroy thread.

Change-Id: I39043ae19527160a4f76d808a4a8e8b70d055f8a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoFixed bug of pstat during OTM
js126.lee [Sun, 20 Mar 2016 16:18:40 +0000 (01:18 +0900)]
Fixed bug of pstat during OTM

Issue: After completed OTM, ISOP is false.
According to Spec, The TAKE_OWNER of CM should be enabled for OTM.

-Patch 1,2: Fixed isOp issue.
-Patch 3: During OTM, CM  is only considered by PT.
-Patch 4: Modify the CM value 0 -> 2 in *.json ant *.dat for OTM.
-Patch 5,6: Fixed build error on Arduino

Change-Id: I6eb625af743adc9f559c2cc085e419d367e78949
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFixed json2cbor to handle private Data
Ashwini Kumar [Mon, 21 Mar 2016 05:16:26 +0000 (10:46 +0530)]
Fixed json2cbor to handle private Data

 - defined MAX_RANGE for file read

Change-Id: Ia7c2b30e1bb97d2aee239cf0916eab52c0d404c4
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6117
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>