platform/upstream/iotivity.git
7 years agoRemove unused file related to ck_manager
js126.lee [Tue, 1 Nov 2016 06:43:06 +0000 (15:43 +0900)]
Remove unused file related to ck_manager

Change-Id: Ib77dd5547d32f9bc2fc03d379f657990a8bffea6
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago[IOT-1469] Fix MOT build issues for Windows
Alex Kelley [Tue, 1 Nov 2016 02:51:00 +0000 (19:51 -0700)]
[IOT-1469] Fix MOT build issues for Windows

- Added new .def file for MOT exports
- Fixed samples to use public APIs
- Updated PreconfigPin API names to align

Change-Id: Ib9b473b8b70eed243c8a7dbbd19e27eaa49a4edd
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoExport more functions in octbstack.dll
David Antler [Thu, 3 Nov 2016 19:32:10 +0000 (12:32 -0700)]
Export more functions in octbstack.dll

Some new functions needed to be exported for iotivity-node support.
This patch adds those functions, and sorts the section
alphabetically.

The following functions were added to octbstack.dll:
  - OCRepPayloadSetIntArray
  - OCRepPayloadSetBoolArray
  - OCRepPayloadSetStringArray
  - OCRepPayloadSetDoubleArray

Change-Id: I37e317c077750b78c1f992df4e7670ba9311ffab
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agobuild: Export mbedtls defines with iotivity.pc
Philippe Coval [Wed, 2 Nov 2016 10:22:53 +0000 (11:22 +0100)]
build: Export mbedtls defines with iotivity.pc

Change-Id: Ic15661d9300b56e93b0ae53c4d71d85430af31b8
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
7 years ago[IOT-1477] fix presenceclient sample for linux.
jihwan.seo [Wed, 26 Oct 2016 00:02:19 +0000 (09:02 +0900)]
[IOT-1477] fix presenceclient sample for linux.

There was some miss codes from
https://gerrit.iotivity.org/gerrit/#/c/13261

Change-Id: I04814c14084acbca13c40c983e2fe9addc29cc4d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13669
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 4a0e8ff523c2266633580f6ec0f1ddc2a9c0d58b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13735
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agotizen: Use tag and not upstream branch
Philippe Coval [Wed, 19 Oct 2016 18:09:52 +0000 (20:09 +0200)]
tizen: Use tag and not upstream branch

Change-Id: Ib45d37341fe326d42e9bdd8a81a6d479623fd8c0
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13463
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agotizen: Only package libuuid1.so if present 11/95211/2
Philippe Coval [Fri, 28 Oct 2016 13:29:46 +0000 (15:29 +0200)]
tizen: Only package libuuid1.so if present

As this trick is a workaround for current version of Tizen SDK,
avoid to break on failure to ship copied lib.

Change-Id: Idad5dd5ab3e24a569bffe22b1f83badb1906978f
Bug: https://jira.iotivity.org/browse/IOT-1343
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13827
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 6cc3ae595f9e77c210323116656649ab2af71056)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13937

7 years agoRemove oc library dependency on resource-directory module
hyuna0213.jo [Mon, 31 Oct 2016 06:28:29 +0000 (15:28 +0900)]
Remove oc library dependency on resource-directory module

Remove oc library dependency on resource-directory module

Change-Id: I0ca8b791a79debf880b953794986ad81e5523338
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[IOT-1482] fix getPlatformInfo and getDeviceInfo of C++-SDK sample app.
jihwan.seo [Wed, 26 Oct 2016 04:21:59 +0000 (13:21 +0900)]
[IOT-1482] fix getPlatformInfo and getDeviceInfo of C++-SDK sample app.

cause patch : https://gerrit.iotivity.org/gerrit/#/c/12909/

Change-Id: If50cba713a67239619047ccb012678f73fb42682
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13677
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit dfb723819d6a26571df5b7c8e308eb8944bd24d6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13875

7 years ago[IOT-1386] Update ins value after deleting resource from rd
Habib Virji [Mon, 31 Oct 2016 12:27:46 +0000 (12:27 +0000)]
[IOT-1386] Update ins value after deleting resource from rd

- Support multiple ins query for deleting resource.
- Reset ins value of deleted resource.
- Enable RD build in all platforms.
- https://jira.iotivity.org/browse/IOT-1386

Change-Id: I9540061add94ea325f7b5261f53159d88ad0fee9
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoAddressed format specifier, unused variable, etc, build warnings.
Ossama Othman [Wed, 26 Oct 2016 20:44:53 +0000 (13:44 -0700)]
Addressed format specifier, unused variable, etc, build warnings.

Change-Id: I8ccfc5e185cfea2555ac5337eb2afa897f1984e4
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 329265241170fa97589cc9dd39131886267ad93e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13819

7 years agoChange a timeout for resource discovery in cloud provisioning
Parkhi [Fri, 28 Oct 2016 07:51:28 +0000 (16:51 +0900)]
Change a timeout for resource discovery in cloud provisioning

Change-Id: Id211ff2afab83cdeaaaf68162ca9d5cdbffeca8a
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13851
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd including headers description.
KIM JungYong [Mon, 31 Oct 2016 07:31:39 +0000 (16:31 +0900)]
Add including headers description.

Change-Id: I304790db3f9346e7eb80a1e662dcbe4ba6d4a616
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13869
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoRemove the liboc link from PM's SConcript.
Chul Lee [Mon, 31 Oct 2016 01:52:14 +0000 (10:52 +0900)]
Remove the liboc link from PM's SConcript.

Change-Id: Ieb3f8ecb87233869242817eeb83e979bf9d50eb9
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix bug for can not callback on consumer cpp layer.
KIM JungYong [Mon, 31 Oct 2016 02:49:12 +0000 (11:49 +0900)]
Fix bug for can not callback on consumer cpp layer.

When starting consumer service, getTopic callback fisrt
and then discover callback due to can not call both changed callback and discover callback.
because when callback getTopic, NSProvider instance does not set the listener,
and when callback discover after, NSProvider instance already create, so can not callback discover.
This point is invalid logic on CPP layer.

With this patch, altough call getTopic first, can callback discover callback.

Change-Id: Ib7a3c8cf3e78edf24d0251227c5d3c225c3ba3a4
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13855
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix bugs for no catch std::out_of_range exceptions.
KIM JungYong [Mon, 31 Oct 2016 02:34:02 +0000 (11:34 +0900)]
Fix bugs for no catch std::out_of_range exceptions.

Samples of serveral services, no catch exception about out_of_range.
With this patch, all of exception was caught.

Change-Id: I18b9cf7633ac6c6ad3d5a8b9e37a5110ffd9d68f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoDoxyGen file update.
Jaehong Jo [Wed, 26 Oct 2016 09:51:18 +0000 (18:51 +0900)]
DoxyGen file update.

Add Connectivity Abstraction docs.

Change-Id: If4bf501e0dcaa609c2011c40bf848552ff984450
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13709
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit fab7f2948658a97d1e7367d57681789431ea0591)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13843

7 years agoUpdate CPP Doxygen file for NS
cc [Thu, 27 Oct 2016 09:01:22 +0000 (18:01 +0900)]
Update CPP Doxygen file for NS

CPP doxygen file is updated

Change-Id: I3b582956f290ea25266e183945397f6963d05fc7
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b9885b46f1db70f8eb6544454adb6f3f7a4de0e1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13845
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
7 years agoUse third_party_libs.scons of resource in resource-directory
Habib Virji [Fri, 28 Oct 2016 13:21:33 +0000 (14:21 +0100)]
Use third_party_libs.scons of resource in resource-directory

resource-directory was moved to resource layer from service
layer. so third_party_libs.scons of resource should be used.

Change-Id: I9d1f06f041318443b62d78242b8bc04f77a6f4f3
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13769
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate the random PIN generator module to provide high entropy.
Chul Lee [Thu, 8 Sep 2016 13:26:01 +0000 (22:26 +0900)]
Update the random PIN generator module to provide high entropy.

After this patch,
Server developer can choose the policy of random PIN generation
through SetRandomPinPolicy API.

Updated Random PIN module provides flexibility
in the PIN length and PIN type as following :
  PIN length : 4 bytes ~ 32 bytes
  PIN Type : Bitmask :
             NUM_PIN            = (0x1 << 0),    //Numeric PIN
             UPPERCASE_CHAR_PIN = (0x1 << 1),    //uppercase character PIN
             LOWERCASE_CHAR_PIN = (0x1 << 2)     //lowercase character PIN

Here is example for SetRandomPinPolicy API :

    //Now, Server will generate the 10 bytes PIN
    //which is nummeric and lowercase mixed PIN.
    if(OC_STACK_OK != SetRandomPinPolicy(10, NUM_PIN | LOWERCASE_CAHR_PIN))
    {
        OIC_LOG(ERROR, TAG, "Failed to setting PIN policy");
        return 0;
    }

Change-Id: I0f6b56a037a85a0d7c8e6d1db85f4a9808989964
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13825

7 years agoUpdate to improve the performance of the OCRemoveDeviceWithUuid API.
Chul Lee [Wed, 26 Oct 2016 10:31:56 +0000 (19:31 +0900)]
Update to improve the performance of the OCRemoveDeviceWithUuid API.

If linked device not exist when remove the device,
Device discovery is not required.
So I've modify the OCRemoveDeviceWithUuid API
to skip the device discovery in case of linked device not exist.

Change-Id: I004266860f99e9fa22b837a37296fc81743a8cab
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13713
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 5695ec7bbd056f50964570835929bdae428e3997)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13815

7 years agotizen: Reformat subpackages specs files to align master one
Philippe Coval [Tue, 4 Oct 2016 12:41:58 +0000 (14:41 +0200)]
tizen: Reformat subpackages specs files to align master one

To avoid confusion, of configuration flags,
 each configuration change is welcome to be done in all spec files at once.

Change-Id: I4a35d7129719c8bfa29455f41624e1231158c62d
Origin: https://gerrit.iotivity.org/gerrit/#/c/12773/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
7 years agoAdd function to unset the PIN related user callback.
Chul Lee [Tue, 20 Sep 2016 11:23:19 +0000 (20:23 +0900)]
Add function to unset the PIN related user callback.

Change-Id: I4dc3d01d6d11de187aaddd3f556135d516d32028
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 3a92e3476f2009b646d4fc02818e456c74a0e757)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13813

7 years agoModify the SRMRequestHandler to use the CAEndpoint_t's infomation
Chul Lee [Fri, 28 Oct 2016 05:51:16 +0000 (14:51 +0900)]
Modify the SRMRequestHandler to use the CAEndpoint_t's infomation
for identify a secure channel connection.

Change-Id: I91caf27ba7b08ee69623a960bb8df4da0acfefd9
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFixed static analysis issues in RI.
Jaehong Jo [Wed, 12 Oct 2016 07:18:39 +0000 (16:18 +0900)]
Fixed static analysis issues in RI.

Change-Id: Id6a1b8edb41b3863ba722db43285d28e264dfda8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13133
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 07dbd388c00fb4aa122f13d59b5373854a64176f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13823

7 years agotizen: cbor headers are no more needed
Philippe Coval [Thu, 27 Oct 2016 10:14:35 +0000 (12:14 +0200)]
tizen: cbor headers are no more needed

Change-Id: I1c9df13d1b05a9b0aa0f8d60de8519c0c44b2486
Bug: https://jira.iotivity.org/browse/IOT-1460
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-1480] Remove the internal API from subownerclient sample.
Chul Lee [Thu, 27 Oct 2016 13:11:37 +0000 (22:11 +0900)]
[IOT-1480] Remove the internal API from subownerclient sample.

Change-Id: Ied92b38aa451d3ae0c9eb406b759b282f098204a
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13785
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 71e467fc875e757902b5eca06c777e8934ec6d75)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13807

7 years agoAdd function to save a ACL into local SVR DB
Joonghwan Lee [Wed, 19 Oct 2016 05:41:18 +0000 (14:41 +0900)]
Add function to save a ACL into local SVR DB

This patch adds an API to insert new ACL with duplication check into local SVR database and sample menu added.

Change-Id: I71ba806ae1b5d169bb3fa875836143565b8b1acb
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13427
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit fef21899b621739349050eb50fe904001013bb86)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13803

7 years agoAdd rt query parameter to reduce response packet size when discovery
Joonghwan Lee [Wed, 19 Oct 2016 07:11:20 +0000 (16:11 +0900)]
Add rt query parameter to reduce response packet size when discovery

This patch add rt=oic.r.doxm query parameter in order to reduce response packet size when secure port discovery.

Change-Id: I96f127ca757256c882d9bc3a97906a0c3b6e05c3
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13437
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 28c6ab3d9f116cefb365373069e00cee895f490a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13805

7 years ago[IOT-1454] Change the Preconfigured-PIN OxM related defines to prevent conflict with...
Chul Lee [Wed, 26 Oct 2016 05:22:41 +0000 (14:22 +0900)]
[IOT-1454] Change the Preconfigured-PIN OxM related defines to prevent conflict with DCAP method.

  - Preconfigured-PIN OxM constant changed to 0xFF00
  - According to changes Preconfig-PIN OxM constant,
    OxM Callback array can't use anymore.
    So, Callback pointers are moved into the OTMContext.

Change-Id: Iefaf9de29bdb98809506df3b2efae35024cae4de
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13681
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7827b3a896e14c17d5e19bb225480f43fc7c6ec4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13801

7 years ago[IOT-1460] Remove cbor.h dependency
Habib Virji [Tue, 25 Oct 2016 14:49:59 +0000 (15:49 +0100)]
[IOT-1460] Remove cbor.h dependency

Patch removes cbor.h by removing it from ocpayload.h. It is now moved
to ocpayloadcbor.h.

https://jira.iotivity.org/browse/IOT-1460

Change-Id: I23ae035804840a327e2764ed64559b82247ab8e8
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13759
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>
7 years ago[IOT-1473] Modify the return value of MOT related API.
Chul Lee [Wed, 26 Oct 2016 05:46:15 +0000 (14:46 +0900)]
[IOT-1473] Modify the return value of MOT related API.

Change-Id: I9e2a6d79358538896c64e5870d96c0ca796a0b6e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit bbe7232e50edc0e1db38a45f17fba8e5da26612a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13793

7 years agoUpdate json2cbor tool to support optional data conversion.
Chul Lee [Thu, 27 Oct 2016 06:15:36 +0000 (15:15 +0900)]
Update json2cbor tool to support optional data conversion.

Change-Id: I02e79ef1e6522d63f6e5e51d86e2cb45d6545c28
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoModify the SetDoxmDeviceID API to provide the variability of UUID on the client side.
Chul Lee [Wed, 26 Oct 2016 06:00:57 +0000 (15:00 +0900)]
Modify the SetDoxmDeviceID API to provide the variability of UUID on the client side.

Change-Id: Ia3488c67935166d17e65da11f27d25b88be59959
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13691
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 2704cda8385fd6c974cccaa58c588c6298809326)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13795

7 years agoAdd credential verification API and add logs for debugging.
Chul Lee [Thu, 20 Oct 2016 06:49:28 +0000 (15:49 +0900)]
Add credential verification API and add logs for debugging.

Patch #1 : Cherry-pick from master
Patch #2 : Modify the unittest of secure resource provider to remove error.

Change-Id: Ib23f99acd7e82fa1dc9fec42cc08c5179294a5eb
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13477
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 06b7dc1f47482238a3e4f987bc81ef23c417dfdd)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13777

7 years agoAdd more descriptive log messages in easy setup
Jihun Ha [Thu, 27 Oct 2016 07:39:25 +0000 (16:39 +0900)]
Add more descriptive log messages in easy setup

This patch is for removing mis-used log messages and
adding one for more convenient debugging.

Change-Id: I354292210a18e16e74d8ae3c0d66b91a90f31ab9
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12963
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 13f06a192eac3c8fd6ef76fbfba9d64eb2f8e78f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13745
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoRemove not required OCStopMulticastServer() function call in RD
hyuna0213.jo [Tue, 25 Oct 2016 10:59:33 +0000 (19:59 +0900)]
Remove not required OCStopMulticastServer() function call in RD

this is required but it is being moved to app layer, as it is
conflicting with the local and cloud scenarios. It would require
update to the local rd sample to call this function instead.
Also OCStopMulticastServer has to be made available to the
application developer, right now it is just a C API.

Change-Id: I7a51c29b7bc88416df81966f9d98898bc2b3ab08
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13743
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years ago[IOT-1468] fix unicast presence issue which get error response.
jihwan.seo [Wed, 26 Oct 2016 01:55:20 +0000 (10:55 +0900)]
[IOT-1468] fix unicast presence issue which get error response.

unicast presence subcribe should not send oic/ad message to presence server.

Change-Id: I3b1798b705b58646873de02e6d8a882fe84e1b64
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13673
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit e33caeb66dfa94e5a5ab9c15600857bf42c71989)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13729

7 years agoFix to get only single credential entry
Joonghwan Lee [Fri, 21 Oct 2016 06:58:39 +0000 (15:58 +0900)]
Fix to get only single credential entry

Old function(GetCredResourceDataByCredId) return not only the indicated credential entry but also all linked entries.

Change-Id: I0466b4c25a21395f08664a11ecfa6fd51a94b258
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13547
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit f849ddefea68e5668900f274976d440931818ef3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13693
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
7 years ago[IOT-1237] Client discovers all resources sending discovery request with "rt" query...
Harish Kumara Marappa [Wed, 12 Oct 2016 03:39:04 +0000 (12:39 +0900)]
[IOT-1237] Client discovers all resources sending discovery request with "rt" query param.

Change-Id: I54904ef0789c5ee4655c20e4c8c82eb9b7d0ac0a
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13595
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Remove the build macro for RELEASE flag
Philippe Coval [Mon, 5 Sep 2016 01:31:38 +0000 (10:31 +0900)]
tizen: Remove the build macro for RELEASE flag

(tizen_build_binary_release_type_eng)

 - always enable RELEASE to TRUE

Change-Id: Iac9caa72d6747e65f73040eeea7046bd462d251f
Bug: https://jira.iotivity.org/browse/IOT-1320
Author: Jooseok Park <jooseok.park@samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/86784/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
7 years agotizen: Don't build sqlite sources 14/95214/2
Philippe Coval [Thu, 6 Oct 2016 11:46:03 +0000 (13:46 +0200)]
tizen: Don't build sqlite sources

As Tizen already ship sqlite package

Change-Id: Ic39c41f5ae07fab2c2ff820283c871489d3fd15c
Bug: https://jira.iotivity.org/browse/IOT-1296
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
7 years agotizen: install more headers needed for iotcon
Philippe Coval [Thu, 20 Oct 2016 01:45:10 +0000 (03:45 +0200)]
tizen: install more headers needed for iotcon

Change-Id: I5ae3d61c97e1d4e0138e40d77add85edc132f4a3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
7 years agoCheck payload length of CoAP PDU before TLS encryption
hyuna0213.jo [Fri, 21 Oct 2016 07:36:37 +0000 (16:36 +0900)]
Check payload length of CoAP PDU before TLS encryption

Check payload length of CoAP PDU before TLS encryption

Change-Id: I85880aaf3b81a4ebdefe491943e22b896db1f162
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix for bug while building x86_64 architecture
abitha.s [Tue, 25 Oct 2016 12:50:12 +0000 (18:20 +0530)]
Fix for bug while building x86_64 architecture

Change-Id: I9c2538617a897c2b1c4e9129f55bf9623053308b
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13671
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd missing tests for Secure Resource Provider
Andrii Shtompel [Mon, 24 Oct 2016 15:45:18 +0000 (18:45 +0300)]
Add missing tests for Secure Resource Provider

Change-Id: Ib65bbbe69a09cb371fa22b536b0b1ea8a64cfac6
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13625
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agotizen: Declare used licenses using SPDX convention
Philippe Coval [Thu, 20 Oct 2016 08:25:13 +0000 (10:25 +0200)]
tizen: Declare used licenses using SPDX convention

Change-Id: I6f016165739f57e33fd950f07f1d379b6fa3da69
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13523
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
7 years agoFix IOT-1465
Dmitriy Zhuravlev [Tue, 25 Oct 2016 07:45:55 +0000 (10:45 +0300)]
Fix IOT-1465

Ownership transfer manager expects the CA_DTLS_AUTHENTICATION_FAILURE
in case of handshake error

Change-Id: I984ec32de52a0547e449d6b0580fa8299d678d8e
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agobuild: pkgconfig should link ocmapi too
Philippe Coval [Thu, 20 Oct 2016 11:54:36 +0000 (13:54 +0200)]
build: pkgconfig should link ocmapi too

Change-Id: Ide4901338ba919b36cf129be5ecefc6f4f71d519
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agotizen: Scons sqlite puller should not be used 13/95213/2
Philippe Coval [Thu, 6 Oct 2016 09:35:36 +0000 (11:35 +0200)]
tizen: Scons sqlite puller should not be used

Tizen wants to link with system's sqlite package

Change-Id: I685af2816d21c592e7ef67be3451bb42c4ff338d
Bug: https://jira.iotivity.org/browse/IOT-1296
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13043
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 9f37ad8a227163c11867967d6acb0180e59d281b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12893

7 years ago[IOT-1463] Fix for getting and setting host address from secured OCResource object.
Harish Kumara Marappa [Thu, 20 Oct 2016 09:26:47 +0000 (18:26 +0900)]
[IOT-1463] Fix for getting and setting host address from secured OCResource object.

OCResource object was returning "coap+tcp" even if it is secured resource.
OCResource::setHost() fails to create OCDevAddr for host containing "coaps+tcp".

Change-Id: I2273d08b40e94f66fe95e339e876c2c316986c71
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13489
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoBug fixes.
nikhil.a [Mon, 24 Oct 2016 13:36:46 +0000 (19:06 +0530)]
Bug fixes.

1)Fixing logic related to conversion of MediaContents to consider NULL object.
2) Fixing bug in switch statement .

Change-Id: I615aca6e55d2bf39b7686331ec59d50f72deb5c4
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd macro about registered topic data.
jaesick.shin [Thu, 20 Oct 2016 05:39:33 +0000 (14:39 +0900)]
Add macro about registered topic data.

This patch include,
It added a macro to delete the data that was registered topic.

Change-Id: Ie83b23b7276bb5aaf07388c0faba34b47bce7f16
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1464] Set NULL after deleting dataQueue of queueing thread
hyuna0213.jo [Mon, 24 Oct 2016 04:39:29 +0000 (13:39 +0900)]
[IOT-1464] Set NULL after deleting dataQueue of queueing thread

Set NULL after deleting dataQueue of queueing thread

Change-Id: Ia32df8a988503f4ef4bd01f51005102cddc1a301
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13591
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>
7 years ago[IOT-1346] Enable network status monitoring for tcp network
hyuna0213.jo [Tue, 11 Oct 2016 23:25:20 +0000 (08:25 +0900)]
[IOT-1346] Enable network status monitoring for tcp network

In case a connected wifi ap is changed, we have to close
the connected session previously. Otherwise we will use the
invalid session. If network status is down, we try to close
the session. and If network status is up, we create new socket
for listening.

Change-Id: I662df1a9a28d0ca629a8b23f83f94833787c5312
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13097
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoChanged the property of /oic/ping resource
hyuna0213.jo [Wed, 19 Oct 2016 07:26:22 +0000 (16:26 +0900)]
Changed the property of /oic/ping resource

The resource property of /oic/ping is changed from DISCOVERABLE to
NONE.

Change-Id: Ibb1d8d80f859fdbb34a75a22b19bd66979fa6b13
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13439
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
7 years agoFix aircon_controller crash issue
Jee Hyeok Kim [Mon, 24 Oct 2016 02:57:14 +0000 (11:57 +0900)]
Fix aircon_controller crash issue

1. Fix crash issue

Change-Id: I6033e3272ce8f085730e1b579e026ef079bd7097
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13581
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Glen Youngjin Kim <glen.kim@samsung.com>
7 years agoFix enrollee sample application's crach issue
Jihun Ha [Mon, 24 Oct 2016 03:06:35 +0000 (12:06 +0900)]
Fix enrollee sample application's crach issue

Before OCStop() is called, listen thread for calling OCProcess() should
be terminated.

Change-Id: Ibe4f702bb7c71beaf8bb58a8fe21acb873ad06d6
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13583
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoChanges to SSL adapter unit tests
Oleksii Beketov [Fri, 21 Oct 2016 09:58:12 +0000 (12:58 +0300)]
Changes to SSL adapter unit tests
caTrustedCrl discarded due to needlessness

Change-Id: I7b7e9bb0d85474a6f0ecf8f23019b072715c08bd
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13553
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoLicense added to cloud codes
Jongmin Choi [Fri, 21 Oct 2016 07:58:54 +0000 (16:58 +0900)]
License added to cloud codes

License information added to clous codes

Change-Id: Ic16fbb9f76a858e6c98a01389dfdd55e50b4de1e
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13551
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoBug fix about semicolon of if statement.
jaesick.shin [Thu, 20 Oct 2016 05:54:08 +0000 (14:54 +0900)]
Bug fix about semicolon of if statement.

this patch include,
bug fix about invalid statement.

Change-Id: Ifd9762161058ab1381be2341bf92f0a5184371d9
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Apply mbedtls ocf.patch only once 12/95212/2
Philippe Coval [Sat, 8 Oct 2016 07:42:50 +0000 (09:42 +0200)]
tizen: Apply mbedtls ocf.patch only once

It has been tested with:
  scons -f resource/csdk/stack/samples/tizen/build/SConscript \
    TARGET_OS=tizen LOGGING=TRUE RELEASE=0 \
    SECURED=1 WITH_TCP=1 TARGET_TRANSPORT=IP,BT

Related to:
  https://gerrit.iotivity.org/gerrit/#/c/12029

Change-Id: I1b140503a1e4b3c52cc95d41c27c00bdd4a47ccf
Credit-to: Randeep Singh <randeep.s@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/12965/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoCloud ACE update 1.2.0
Jongmin Choi [Thu, 20 Oct 2016 02:03:41 +0000 (11:03 +0900)]
Cloud ACE update

- APIs added to update Cloud ACE using aclid and acid
- aceid input removed from device side update API

Patch #1: initial upload
Patch #2: update ACE fix
Patch #4: Issue fixed related to update ACE and individual ACE update.
          Also Acl modification
Patch #5: Rebased to latest 1.2-rel
Patch #7: isValidACE method added and other issue fix
Patch #8-9: delete logic fix, getAclACE added, unnecessary code deleted

Change-Id: I8b15fe4556536b4af4d597564ccab4cf66c55e44
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13049
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoUpdated NS sample App to allow/deny consumer subscription.
abitha.s [Wed, 19 Oct 2016 13:49:46 +0000 (19:19 +0530)]
Updated NS sample App to allow/deny consumer subscription.

Change-Id: Icdcc0b71fb865fbbb5dd472045e71cef2689d2c6
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13455
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agofix issues relates to wrong syncInfo received
nikhil.a [Wed, 19 Oct 2016 12:33:32 +0000 (18:03 +0530)]
fix issues relates to wrong syncInfo received

Change-Id: I77f9ce5d0fa3e7c40e0fe390b42f210e5a188a50
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13451
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 5c7427328a1757f9555be3b4f0a6292c53ac933c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoModify the subownerclient sample for IPv6
Chul Lee [Tue, 18 Oct 2016 07:54:18 +0000 (16:54 +0900)]
Modify the subownerclient sample for IPv6

Change-Id: Ic04f1139ab482dc6082976eb39b6f15f79f71b8a
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13375
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoUpdate the return value of MOT releated API.
Chul Lee [Wed, 19 Oct 2016 11:00:31 +0000 (20:00 +0900)]
Update the return value of MOT releated API.

Change-Id: I97a6ee6f0b9eecafd2a28e717887a04decd9209d
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13449
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoPrevent empty credential to be added
Jongmin Choi [Tue, 18 Oct 2016 09:28:42 +0000 (18:28 +0900)]
Prevent empty credential to be added

Prevent empty credential to be added
(e.g. only rowneruuid is sent)

Patch #1: initial upload
Patch #2-3: fix arduino build error

Change-Id: I7802dcb76daab3269eb0a9638659087643b0c141
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13379
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoSVACE issue fixes
Chul Lee [Wed, 19 Oct 2016 06:42:12 +0000 (15:42 +0900)]
SVACE issue fixes

Change-Id: I4cd1fb23818a560449ae1ff3f2635c14ef093da7
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13435
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>
7 years agoFix bug for invalid return variable.
KIM JungYong [Sun, 16 Oct 2016 23:13:26 +0000 (08:13 +0900)]
Fix bug for invalid return variable.

Invalid return variable is fixed.
1. invalid boolean -> pointer
2. invalid pointer -> boolean

Change-Id: I16cb2338b28ba5bb725ed6eb8d640f04216f7933
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13429
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate discovery when connection was changed.
KIM JungYong [Sun, 16 Oct 2016 23:54:46 +0000 (08:54 +0900)]
Update discovery when connection was changed.

When connection state was changed try to unicast discovery.

Change-Id: I7fe8f16039e9ead5002282742d6e51d805fc9225
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13319
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b615d00bc6f51c44dd2a22dbcc4079ea5879049f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13431

7 years agoDoxyGen file update
uzchoi [Tue, 18 Oct 2016 07:27:53 +0000 (16:27 +0900)]
DoxyGen file update

Change-Id: I5eb473f98b4815a1189a219424888c814f5223ad
Signed-off-by: uzchoi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13373
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoUpdated NS Sample App for testing Sync and sending complete NSMessage
abitha.s [Tue, 18 Oct 2016 13:31:46 +0000 (19:01 +0530)]
Updated NS Sample App for testing Sync and sending complete NSMessage

Change-Id: I8bf14b020b1e5ec42dcf5710fe30a1b6beefbe4b
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 307953f025c470abc8ea8b6f2ea8297fa38cc42f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13425

7 years agoAdded null check logic for JniOnPublishResourceListener
hyuna0213.jo [Tue, 18 Oct 2016 12:49:22 +0000 (21:49 +0900)]
Added null check logic for JniOnPublishResourceListener

Added null check logic for JniOnPublishResourceListener

Change-Id: I8967028583b951d2af049a46eb618ba0963db72f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13399
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix issue related to wrong messageId
nikhil.a [Tue, 18 Oct 2016 10:41:22 +0000 (16:11 +0530)]
fix issue related to wrong messageId

Change-Id: I6008dfe8fc3dc648841f0527e993bd698275f7e4
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13385
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit a8e1605955b5f7fdf9ed1b59cfb3eb54c4e6d8ac)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13411
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoFix for Memory leak results from static analyzer for NS C++ Wrapper.
abitha.s [Fri, 14 Oct 2016 13:29:03 +0000 (18:59 +0530)]
Fix for Memory leak results from static analyzer for NS C++ Wrapper.

Change-Id: I97ca331ce6fcd7352350fd36426366433a5521a2
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 1b4cea1ba6bb1b57214e0c3bbb6e84f214dda971)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13403
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agosetting received ttl value by consumer.
nikhil.a [Tue, 18 Oct 2016 11:05:49 +0000 (16:35 +0530)]
setting received  ttl value  by consumer.

Change-Id: I1de504edf851d39d761dfa2a189a77116fca8a85
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13387
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f25946d028fa420573093f03fcbb2aa94eecfcf8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13409
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoFix Build issue for soname for NS Libraries
abitha.s [Tue, 18 Oct 2016 15:12:21 +0000 (20:42 +0530)]
Fix Build issue for soname for NS Libraries

Change-Id: I07416d904e5ac63bbb389081e99f6849acfff842
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13415
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Ignore tmp folder as used for local building
Philippe Coval [Fri, 15 Jul 2016 08:57:29 +0000 (10:57 +0200)]
tizen: Ignore tmp folder as used for local building

This temporary folder is used to build out of sources.

Change-Id: I88dedd1f019cb67196d1980a6171f513c82b19cb
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12715

7 years agotizen: Use sqlite from system not scon puller
Philippe Coval [Thu, 6 Oct 2016 13:45:15 +0000 (15:45 +0200)]
tizen: Use sqlite from system not scon puller

Change-Id: Id4382d37d34e5ac7d023e38bebd60228c6e6860e
Bug: https://jira.iotivity.org/browse/IOT-1296
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agotizen: Ship only BSD licence from libcoap
Philippe Coval [Sat, 8 Oct 2016 13:06:30 +0000 (15:06 +0200)]
tizen: Ship only BSD licence from libcoap

libcoap-4.1.1 is also licenced LICENSE.GPL,
to avoid ambiguity, tizen use the more permissive one, BSD.

This patch can be reverted,
 if Tizen wants to ship all upstream licences

Change-Id: Idc77605c48322f36887cc502dc0be570e2562486
Origin: https://gerrit.iotivity.org/gerrit/#/c/12969/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12805
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 2bf870bae3451743f0dee3d35735994785e1b15c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12969
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
7 years agotizen: Ship renamed libuuid into RPM for SDK
Philippe Coval [Wed, 28 Sep 2016 15:44:35 +0000 (17:44 +0200)]
tizen: Ship renamed libuuid into RPM for SDK

This way produced RPM can be installed on target or imported in SDK.

libuuid.so.1 is pulled by pkgconfig from com-oic-ri.spec
 then it will be installed correctly if using "rpm -i *.rpm",

Overiding system libs in packaging, is not encouraged:
Observed issue on Tizen:2.4:Mobile (TM1) :

  sdb shell su -c "rpm -i /opt/usr/media/Others/GBS-ROOT-RI-OIC/*.rpm"
  file /usr/lib/libuuid.so.1 from install of com-oic-ri-1.2.0-0.armv7l \
  conflicts with file from package libuuid-2.20.2-4.139.slp.armv7l

But if we want to unpack RPM contents to be used along Tizen-sdk,
 as app, then uuid is also needed
 (because SDK is missing it from its sysroot).
 So application need to be linked with -luuid1 (same just renamed),
 to avoid collision.

For more details about building IoTivity for Tizen along SDK,
 please check:

https://wiki.iotivity.org/tizen

Change-Id: Iabed0221618d0d602f440e3527e1824177395ee1
Bug: https://jira.iotivity.org/browse/IOT-1343
Origin: https://gerrit.iotivity.org/gerrit/#/c/12471
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12471
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>
7 years agoJavaDoc script update
uzchoi [Mon, 17 Oct 2016 10:47:15 +0000 (19:47 +0900)]
JavaDoc script update

correct primitive service package and path

Change-Id: I59ed31c14c2286a7565b7a01f26ed213ef39bd55
Reviewed-on: https://gerrit.iotivity.org/gerrit/13361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUnit tests for SSL adapter update
Oleksii Beketov [Mon, 17 Oct 2016 17:05:01 +0000 (20:05 +0300)]
Unit tests for SSL adapter update

Change-Id: Ib108dd1ce76632f1393383e6402e73c7ba2e60d7
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix crash in Android provisioning client App.
Sandeep Sharma [Mon, 17 Oct 2016 14:39:11 +0000 (20:09 +0530)]
Fix crash in Android provisioning client App.

Catch exception in provision Android client for setDeviceId API.

Change-Id: I19918e47eac9f040d490e3805964c6cc7d5d3fba
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13345
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoRemove unnecessary files for MOT
Chul Lee [Mon, 17 Oct 2016 14:35:21 +0000 (23:35 +0900)]
Remove unnecessary files for MOT

Change-Id: I9dbfab89b3c6cac1f82514dbb42c82c23808fc7e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13343
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago[Hotfix] Remove the segmentation fault while MOT.
Chul Lee [Mon, 17 Oct 2016 12:09:46 +0000 (21:09 +0900)]
[Hotfix] Remove the segmentation fault while MOT.

Segmentation fault was occured by https://gerrit.iotivity.org/gerrit/#/c/13299/

In this patch,
MOT device discovery will use the pCandidateList
to handle discovered device according to patch 13229.

Change-Id: I57d9a603602d49bb3f8e287ae1599f450a044731
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13341
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoadded error code (4.03 / 5.00) in ocstack result
jihwan.seo [Wed, 12 Oct 2016 07:53:46 +0000 (16:53 +0900)]
added error code (4.03 / 5.00) in ocstack result

Change-Id: I311c0b76a2faa7704be8f4a8b89088a0ae471c6a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoModify /oic/res response
Jee Hyeok Kim [Mon, 17 Oct 2016 06:34:17 +0000 (15:34 +0900)]
Modify /oic/res response

1. Modify /oic/res response from cloud side.
   Return 4.04 Not found if no resources found.

Change-Id: I5a8bf56ff5a3c07c2dc489dc2721b76716d9f6fd
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13335
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Glen Youngjin Kim <glen.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoUpdate a logic to check an availability of cloud server resource
Jihun Ha [Mon, 17 Oct 2016 05:31:09 +0000 (14:31 +0900)]
Update a logic to check an availability of cloud server resource

Rather than URI, resource type of the cloud server resource is more
confirmable to check the availability.

Change-Id: I61f3b63412b39fc56e993a3041ac007d0886368b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd null checking for observe request in easy setup
Jihun Ha [Mon, 17 Oct 2016 02:42:57 +0000 (11:42 +0900)]
Add null checking for observe request in easy setup

Checking if entityHandlerRequest is NULL is added.

Change-Id: I79bf75c9f53f28b9c0c679a5dd7371552764b5cd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13327
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Simplify missing license macro for Tizen:2.3
Philippe Coval [Thu, 6 Oct 2016 11:39:13 +0000 (13:39 +0200)]
tizen: Simplify missing license macro for Tizen:2.3

Change-Id: I6c2ceec4f37589db6c110a0f04df501c689a3fde
Origin: https://gerrit.iotivity.org/gerrit/#/c/12897/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoRevert wrong removal of proxy client sample build
Abhishek Sharma [Fri, 14 Oct 2016 13:01:22 +0000 (18:31 +0530)]
Revert wrong removal of proxy client sample build

A DTLS related change has wrongly removed build for
proxy client sample.

Change-Id: I1f65c1cadf6a84a69691ad02bc1227793ca2fce7
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix for all discovered devices to include a secure port 1.2.0+RC4 1.2.0-RC4
Joonghwan Lee [Fri, 14 Oct 2016 11:59:46 +0000 (20:59 +0900)]
Fix for all discovered devices to include a secure port

This patch prevent to add the device that does not have a secure port to discovered device list

Change-Id: Ia7283b37b7820e045f4a51ad03395205b4240dd3
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13299
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoMultiple Ownership Transfer support.
Chul Lee [Fri, 14 Oct 2016 11:25:42 +0000 (20:25 +0900)]
Multiple Ownership Transfer support.

  - Patch #1 : Initial upload
  - Patch #2 : Apply the conditional compilation for Multiple Owner features.
               e.g.) scons SECURED=1 MULTIPLE_OWNER=1
  - Patch #3 : Remove compile error for arduino
  - Patch #4-5 : Rebased for latest 1.2-rel branch
  - Patch #6 : Updated according to comment.
  - Patch #7 : Updated according to comments.
  - Patch #8 : Fixed unittest error.
  - Patch #9-10 : Fix svace issues
  - Patch #11 : Rebased with latest 1.2-rel
  - Patch #12 : Updated according to Kevin's comments.
  - Patch #13 : Rebased with latest 1.2-rel
  - Patch #14-15 : Fix svace issues
  - Patch #16 : Rebased with latest 1.2-rel
  - Patch #17 : Apply the optional compile for CA layer.

[Overview]
This patch is to support the multiple ownership transfer(MOT).
We assume the MOT authenticated client is the SubOwner.
SubOwner can access the ALL resources with full permsion except the DOXM, ACL and CRED.

This patch includes following changes :
1. Update the doxm resource to include MOT related properties.
   - New Properties
     . x.org.iotivity.mom : Mode of MOT
     . x.org.iotivity.subowneruuid : List of SubOwner
   - SubOwner has READ permission for DOXM.
   - The resource server will be update subowner list of doxm
     when MOT authentication successfully done.

2. Update the cred, acl resource to include MOT related property.
   - New Properties
     . x.org.iotivity.eowneruuid : entry owner uuid for each entry.
   - SubOwner should set the eowner as subowner's UUID
     when provision the ACL and CRED.
   - SubOwner can access only those resources that registered as eowner.

3. Update the PolicyEngine for SubOwner's access control as following :
   - DOXM : READ ONLY
   - CRED/ACL : SubOwner can access only those resources that registerd as eowner.
     . SubOwner can not provision ACL which is include the DOXM, CRED, ACL, PSTAT.
   - PSTAT : FULL permission
   - Application Resources : FULL permission

4. Add Preconfigured-PIN OxM

5. Update the sample codes
   - Test Preconfigured PIN based MOT
     1. Run the sampleserver_justworks
     2. Run the provisioningclient
     [On the provisioningclient]
     3. Perform the UnOwned Device discovery [Menu:11]
     4. Perform the OTM [Menu:20]
     5. Perform the Owned Device Discovery [Menu:12]
     6. Change the server's 'mode of MOT' [Menu:70]
     7. Perform the MOT enabled device discovery [Menu:13]
        - Check the discovered device list.
     8. POST the preconfigured-PIN credential [Menu:71]
         - sample's preconfigured-PIN is '12341234'
     9. Change the server's 'oxmsel' [Menu:72]
         - '3' is preconfigured-PIN OxM
     10. Run the subownerclient
     [On the subownerclient]
     11. Perform the MOT enabled device discovery [Menu:10]
         - Check the discovered device list.
     12. Perform the MOT [Menu:20]
     13. Perform the Multiple Owned device discovery [Menu:11]
         - Check the discovered device list.
     14. Perform the ACL provisioning TEST [Menu:40]

   - Test Random PIN based MOT
     1. Run the sampleserver_randompin
     2. Run the provisioningclient
     [On the provisioningclient]
     3. Perform the UnOwned Device discovery [Menu:11]
     4. Perform the OTM [Menu:20]
     5. Perform the Owned Device Discovery [Menu:12]
     6. Change the server's 'mode of MOT' [Menu:70]
     7. Run the subownerclient
     [On the subownerclient]
     8. Perform the MOT enabled device discovery [Menu:10]
         - Check the discovered device list.
     9. Perform the MOT [Menu:20]
         In case of random PIN based MOT, PIN input required.
     [On the sampleserver_randompin]
     10. Press 'G' or 'g' on the sampleserver_randompin.
         server will generate and display the random PIN.
     11. Input the server's PIN number on the subownerclient side.
     12. Perform the Multiple Owned device discovery [Menu:11]
         - Check the discovered device list.
     13. Perform the ACL provisioning TEST [Menu:40]
     14. Press 'E' or 'e' on the sampleserver_randompin to exit server.

Change-Id: I5449834e766d256495537d9fb469eb4d597f4c7a
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12063
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoUpdate the ACL delete mechanism as determined by OSWG.
Chul Lee [Fri, 14 Oct 2016 05:00:23 +0000 (14:00 +0900)]
Update the ACL delete mechanism as determined by OSWG.

After this patch,
If 'subject' not exist in the query string of DELETE request,
All ACE data will be removed.

Change-Id: Ife12c457b2029991168bf048bbfb90278ea4b3a2
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13265
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoAdd license comment
Parkhi [Fri, 14 Oct 2016 08:43:50 +0000 (17:43 +0900)]
Add license comment

Change-Id: I1374b2ee45e120bae756e1e2f975eba23fee24f4
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13293
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1440] findResource() to return list of discovered resources.
Harish Kumara Marappa [Tue, 11 Oct 2016 15:27:41 +0000 (00:27 +0900)]
[IOT-1440] findResource() to return list of discovered resources.

OCPlatform::findResource() does not return all the discovered resources in single callback
even though it gets the whole discovery payload from RI C layer.

This change implements OCPlatform::findResourceList() API which does return all the parsed
resources in discovery payload in single callback.

Change-Id: Ic95541f7303a15eb676029e6f2ea4952e5e3ca3e
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13111
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoBug fix about result of static anlayzer.
jaesick.shin [Fri, 14 Oct 2016 06:07:54 +0000 (15:07 +0900)]
Bug fix about result of static anlayzer.

this patch include,
bug fix about memory leak and coding idiom.

Change-Id: I6fba4a8b182ce88cda44571ebb490c7573812c01
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13269
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoModified connectivityType on calling getDeviceInfo API at CPP Sample
hyuna0213.jo [Fri, 14 Oct 2016 05:22:26 +0000 (14:22 +0900)]
Modified connectivityType on calling getDeviceInfo API at CPP Sample

Modified connectivityType on calling getDeviceInfo API at CPP Sample
Invalid connectivityType is used after merging below patch.
https://gerrit.iotivity.org/gerrit/#/c/13143

Change-Id: Ia881159af02f1eae984d4cda770e23cf6205741a
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>