platform/upstream/iotivity.git
7 years agofix crash issue related resource directory in android.
jihwan.seo [Fri, 4 Nov 2016 07:29:13 +0000 (16:29 +0900)]
fix crash issue related resource directory in android.

there was some unsatisfiedLinkError issue of RD library.
after merge https://gerrit.iotivity.org/gerrit/#/c/13657/

Change-Id: Ib9f9fc3e14200cc9f1e97b6d04ef71fa27f7499f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14025
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@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>
(cherry picked from commit 52ea58a005ffea5615af4df51958b388cfe41dd4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14013

7 years ago[IOT-1400] Remove multicast presence node list in client side.
jihwan.seo [Wed, 12 Oct 2016 01:10:26 +0000 (10:10 +0900)]
[IOT-1400] Remove multicast presence node list in client side.

MCPresenceNode(multicast presence list) never remove.
it causes a big memory leak.
and since checking sequence number not required.
it is better to remove for simple stack logic.

Change-Id: I000772b12c88b30bd771fc759ac2ffaacedd0cc0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: daeken kwon <daeken.kwon@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdd delay before OcPlatform.startPresence().
Larry Sachs [Wed, 2 Nov 2016 19:19:07 +0000 (12:19 -0700)]
Add delay before OcPlatform.startPresence().

Added a two second delay before calling OcPlatform.startPresence() on the server side.
This gives the client side ample time to have the presence listener in place for expected
good behavior.

Change-Id: I0bc63b157c756abb510c3e2fb9651c3e14503b31
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13971
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agobuild: Rewrite sqlite SConscript a more portable way
Philippe Coval [Sat, 23 Jul 2016 05:31:05 +0000 (07:31 +0200)]
build: Rewrite sqlite SConscript a more portable way

Windows support should be improved.

Fixed weird indentation that looked strange
 when I was investigating if files were present in Tizen builder.

Change-Id: I80c9667a502a1115fdfbcd5ecd50b1e799ff5fdb
Bug: https://jira.iotivity.org/browse/IOT-820
Origin: https://gerrit.iotivity.org/gerrit/#/c/9641/1/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9653
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoUpdate build scripts for changes to RD for Windows
Mike Fenelon [Mon, 31 Oct 2016 22:27:55 +0000 (15:27 -0700)]
Update build scripts for changes to RD for Windows

These changes allow Windows to build correctly with
Resource Directory code. Changes from WITH_RD to RD_MODE were
introduced in early October, but the RUN.BAT file that builds
Windows was not updated, so Windows has been building with a
broken mix of RD and not RD to this point. Changes to RUN.BAT and
SCONS scripts bring Windows builds up-to-date.

Change-Id: I9ba789a11fa0ca1865822578f7da8d4a56439660
Signed-off-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agolinux: Use sqlite from system like Tizen does
Philippe Coval [Mon, 10 Oct 2016 09:49:28 +0000 (11:49 +0200)]
linux: Use sqlite from system like Tizen does

It must be installed before building,
 For instance on debian and derived:
 apt-get install libsqlite3-dev

Note for later, it would make sense to move
 all those platform tests into sqlite sconfile.

Bug: https://jira.iotivity.org/browse/IOT-1296
Change-Id: I431a11821844bef8eabba30e1111b1ebf0799d66
Origin: https://gerrit.iotivity.org/gerrit/#/c/9135/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9135
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years ago[IOT-1506] fix unsubscribe presence handler.
jihwan.seo [Mon, 31 Oct 2016 23:53:24 +0000 (08:53 +0900)]
[IOT-1506] fix unsubscribe presence handler.

To set handle for unsubscribe presence is missed.

Change-Id: Ie98c10d97265e70b2b09d6fef7957e4ecb83e49b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1481] Fix app crash when stop iotivity.
jaehyun Cho [Mon, 31 Oct 2016 02:28:25 +0000 (11:28 +0900)]
[IOT-1481] Fix app crash when stop iotivity.

When create portList, assigned port should be pointer.

Change-Id: Ie6e820ec76186fa5295ec4da384d027450dc62f4
Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13811
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 agoprovisioning: Support older g++ (for Tizen)
Philippe Coval [Wed, 21 Sep 2016 10:26:49 +0000 (12:26 +0200)]
provisioning: Support older g++ (for Tizen)

It was successfully tested with gcc-4.6.4
 on Tizen:2.3.1:Wearable.

Change-Id: Ib97c4bfe73d1d40ee8a029a016b7d69e2b3e3d99
Origin: https://gerrit.iotivity.org/gerrit/#/c/12059/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit c20fd6b9217ac3f0331ad708211d15a5e2be3120)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12161

7 years agoupdate presence sample app for android.
jihwan.seo [Fri, 28 Oct 2016 04:13:03 +0000 (13:13 +0900)]
update presence sample app for android.

- enable multicast presecne in client
- start presence can be triggered for several times
  after initialize step like createResource(..).
- this change is realted to IOT-1468.
  but it's not resolve patch for that.

Change-Id: Ia896b93eb0b10386cfe87969cebd8e2b18531f45
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13799
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@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>
(cherry picked from commit 1f75e2636e71cc0a59570fb39f97d4474d6e9c51)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13839

7 years agoUrgent Fix (in ocstack.c)
hyuna0213.jo [Fri, 28 Oct 2016 10:45:34 +0000 (19:45 +0900)]
Urgent Fix (in ocstack.c)

Fix error in ocstack.c which prevents us to Sign Up to cloud
It was appeared in next patchset
[IOT-1413,IOT-1415] Fixed request handling bugs for /oic/ping resource

Change-Id: Icf193a19107ce2cb044537f6a0a5058944c39afd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13241
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit de0b348a1cb56a2a04b9a7640262fe00e8c3c13b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13689
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdded to obtain an address from a domain.
Jaehong Jo [Thu, 27 Oct 2016 11:52:44 +0000 (20:52 +0900)]
Added to obtain an address from a domain.

For connect to cloud using domain.

Change-Id: I3afc2f86f3b9e02bc048354cf9c209df095af21f
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoResolve circular dependency for resource directory server
Habib Virji [Tue, 1 Nov 2016 17:39:23 +0000 (17:39 +0000)]
Resolve circular dependency for resource directory server

RD Shared Library creates a circular dependency between
resource_directory and octbstack. This patch resolves this dependency by
creating a seprating findResource part of the resource_directory.

Change-Id: I653b9130e10f22dd61f4f1bd0b6ff4c47a69606a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13935
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[IOT-1426] Clean android examples with scons clean option
George Nash [Fri, 28 Oct 2016 21:59:31 +0000 (14:59 -0700)]
[IOT-1426] Clean android examples with scons clean option

Change-Id: I29d57c2759d6073c01a9f888b2f7b9930c16590e
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agotizen: Only package libuuid1.so if present
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>
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13889

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/13771
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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>
(cherry picked from commit ae4c031dd2af6f05ed18d55f2d5c196e042f9bf6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13565
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
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>
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/13767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[IOT-1462] Generate shared library for resource directory
Habib Virji [Tue, 25 Oct 2016 14:06:15 +0000 (15:06 +0100)]
[IOT-1462] Generate shared library for resource directory

Generate shared library for all platforms. Require update to all example
and unittest as test uses shared library.

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

Change-Id: I9d169d8e4e08835f3e57f1771789fe5b90636da7
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13657
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
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>
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>
7 years agoRemove the rubbish code in pmutility.c
Chul Lee [Fri, 28 Oct 2016 15:28:28 +0000 (00:28 +0900)]
Remove the rubbish code in pmutility.c

Change-Id: I7a37d7c1b5960c779b051b894c3e79c9ba9fdc50
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago[IOT-1386] Update ins value after deleting resource from rd
Habib Virji [Thu, 27 Oct 2016 15:29:10 +0000 (16:29 +0100)]
[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: If7f19f63592ccfa6d298561da5ad173b0965d32c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12183
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>
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>
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>
(cherry picked from commit be211042f6ceb0b8f24003f4edae2966958122d2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13797

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>
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>
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>
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>
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>
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/13659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
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>
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>
7 years agoFixed unittest error of secure resource provider.
Chul Lee [Thu, 27 Oct 2016 14:58:01 +0000 (23:58 +0900)]
Fixed unittest error of secure resource provider.

Change-Id: If0a7be512046ab14e7539a6ad2d03a3078d98550
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix for "UNUSED" redefined warning
George Nash [Mon, 17 Oct 2016 22:37:11 +0000 (15:37 -0700)]
Fix for "UNUSED" redefined warning

The #define UNUSED is present in openjdk's jni.h and
in the arduino libraries. Resulting in the compilar
warning.

We already have OC_UNUSED defined in octypes.h which
was already avalible for all of the files that were
using UNUSED from logger.h.

The #define UNUSED was deleted from logger.h.
Any place UNUSED was used was renamed to OC_UNUSED.

Change-Id: If94ac13dc29eb3323e036eec750a18893895fb3d
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13353
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.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>
(cherry picked from commit 9b4069da2add23ddc9dd0488465f994ac761e275)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13563

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

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>
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>
7 years agoAdd missing SVR DB for MOT sample client.
Chul Lee [Thu, 20 Oct 2016 07:11:49 +0000 (16:11 +0900)]
Add missing SVR DB for MOT sample client.

Change-Id: I299782b9d4f94d66b88348d69b26587c9f1344ce
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13485
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 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/13645
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agofix process onPut message of roomclient app
jihwan.seo [Thu, 27 Oct 2016 04:12:25 +0000 (13:12 +0900)]
fix process onPut message of roomclient app

Change-Id: I465fe65db563f9784ff0c3a2c41d861f5521a403
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFixed static analysis issues in RI.
Jaehong Jo [Wed, 26 Oct 2016 04:41:59 +0000 (13:41 +0900)]
Fixed static analysis issues in RI.

Add null check and initial value

Change-Id: I25121862916dabd1771bbd578f3b506d01272e05
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13679
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoRemove Routing check from OCDevAddr
Abhishek Sharma [Tue, 25 Oct 2016 06:36:02 +0000 (12:06 +0530)]
Remove Routing check from OCDevAddr

Applications had a dependency to either define EP or GW
in build scripts.
Its required to be removed only in octypes.h as its
automatically taken care-of in other files by csdk build
scripts.

Change-Id: I4570aa63681779b463dc250cdb53ab90c4338a40
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1478] add stop scan logic for BLE, when stack is terminated
jihwan.seo [Wed, 26 Oct 2016 11:14:57 +0000 (20:14 +0900)]
[IOT-1478] add stop scan logic for BLE, when stack is terminated

Change-Id: I2454bb3f24c0aa3f821a24d494d8ab7db2d52bf2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13717
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix to calculate the length of the remain data segment for BLE adapter.
jihwan.seo [Wed, 26 Oct 2016 10:37:09 +0000 (19:37 +0900)]
fix to calculate the length of the remain data segment for BLE adapter.

Change-Id: I12c7b639c3429ac1bf97f29d77265bbffb5fd1e3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13715
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agomodified CAReceiveBlockWiseData() to skip unnecessary logic
Jaewook Jung [Mon, 24 Oct 2016 07:38:48 +0000 (16:38 +0900)]
modified CAReceiveBlockWiseData() to skip unnecessary logic

Unless there is not error code on the received message,
it is not needed to create a CABlockDataID.

Change-Id: I8dfc581ca802f51d12a36c07644df24110eb7d06
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13605
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@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>
(cherry picked from commit af80659dbee1c692df602697d4bdac806a794cb4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13651

7 years agoUpdated with Valgrind memory leak fixes for Notification Provider and consumer.
Abitha Shankar [Wed, 26 Oct 2016 07:07:29 +0000 (12:37 +0530)]
Updated with Valgrind memory leak fixes for Notification Provider and consumer.
Updated NS sample App to allow/deny consumer subscription.

Patch 2 : updated valgrind fixes and updated review comments
patch 3 : rebased the code.
patch 4 : resolved merge conflicts

Change-Id: Icdcc0b71fb865fbbb5dd472045e71cef2689d2c6
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13733

7 years agoAdd store app workaround for Windows network monitor
Dave Thaler [Fri, 21 Oct 2016 21:34:13 +0000 (14:34 -0700)]
Add store app workaround for Windows network monitor

Also fix some typos in run.bat

Change-Id: I0060b833a5c984bfb0555168927db845bee76c3e
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13635
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
7 years ago[IOT-1361][Tizen]Using getifaddrs for get ipaddr instead of ioctl
bg.chun [Tue, 27 Sep 2016 01:54:58 +0000 (10:54 +0900)]
[IOT-1361][Tizen]Using getifaddrs for get ipaddr instead of ioctl

Using getifaddrs to support getting ipv6 address in CAGetNetworkInfo()
Remove ioctl code and using getifaddrs for get ipv6 address.

Change-Id: I31816d605424833ed9324a05ab3b1e1492aab5c7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@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>
7 years ago[IOT-1361][Android]Using netlink for get ipaddr instead of ioctl
bg.chun [Thu, 6 Oct 2016 10:23:10 +0000 (19:23 +0900)]
[IOT-1361][Android]Using netlink for get ipaddr instead of ioctl

Using netlink to support getting ipv6 address in CAGetNetworkInfo()
Remove ioctl code and using netlink.

Change-Id: I94dd5bebd2f8dde95cb589e4f64a44c2a1a428f1
https://jira.iotivity.org/browse/IOT-1361
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@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>
7 years ago[IOT-1361]Change "CAFindInterfaceChange()" to support IPv4/6
bg.chun [Tue, 4 Oct 2016 02:44:58 +0000 (11:44 +0900)]
[IOT-1361]Change "CAFindInterfaceChange()" to support IPv4/6

Change "CAFindInterfaceChange" return type to listen for multicast packets from
both of IPv4/IPv6 Address bind in one physical Network Interface.
As is: CAInterface_t *CAFindInterfaceChange();
To be: u_arraylist_t *CAFindInterfaceChange();

Change-Id: I8c30f46669ca5c22962c4f629c2e2e4649cb54b5
https://jira.iotivity.org/browse/IOT-1361
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agotizen: Don't build sqlite sources
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>
(cherry picked from commit 3756f85ca83901e16cca09f1258f51afb28d1e99)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13045
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
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>
(cherry picked from commit ae38269f723939c2e3c8c8a722185067bdb783d1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13637

7 years ago[IOT-1371] Use both addr and port to identify the endpoint of the
Todd Malsbary [Wed, 28 Sep 2016 21:35:18 +0000 (14:35 -0700)]
[IOT-1371] Use both addr and port to identify the endpoint of the
block transfer data.

Change-Id: I11a378aa611adb6b1cbfe5eacd4e45f34f1a649f
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12505
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>
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>
(cherry picked from commit 2f553451724239cdbd32d0a128134bd3ed433066)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13675

7 years ago[IOT-1413,IOT-1415] Fixed request handling bugs for /oic/ping resource
hyuna0213.jo [Tue, 11 Oct 2016 06:41:47 +0000 (15:41 +0900)]
[IOT-1413,IOT-1415] Fixed request handling bugs for /oic/ping resource

- /oic/ping resource is responding with 5.00(internal server error)
when it receives a GET/POST/PUT request with baseline query
- /oic/ping resource is successfully registering and deregistering
observe requests, even though it is shown as non observable resource
in discovery response.

Change-Id: I86db52f17b0b42750906fdfa8b377c78a85ef822
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13089
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>
(cherry picked from commit 41e04322a0b5684ed05e3b7968f44fc172a664a6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13223
Reviewed-by: jihwan seo <jihwan.seo@samsung.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>
(cherry picked from commit a23f545b5ed285d51e34f4faea939db847959e92)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13601

7 years ago[IOT-1451] Keep client callback when receiving error result
hyuna0213.jo [Thu, 13 Oct 2016 13:48:55 +0000 (22:48 +0900)]
[IOT-1451] Keep client callback when receiving error result

when Client receive error code from some server after request
oic/res. clientCB is removed by return value "OC_STACK_DELETE_
TRANSACTION"

Change-Id: Ibf42740078f0ed6a97ee3b18d22559b0d2fbdf43
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13237
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: MyeongGi Jeong <myeong.jeong@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 2cfef2e49066614eaed9aed40806d9cebc0b5cb5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13599

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/13653
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
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>
7 years agocoap: use upstream libcoap header if desired
Philippe Coval [Mon, 24 Oct 2016 08:13:55 +0000 (10:13 +0200)]
coap: use upstream libcoap header if desired

Change-Id: I94540c72d320ebf87b996d5ddd614c898b8c157f
Origin: https://gerrit.iotivity.org/gerrit/#/c/13615/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13615
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
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>
(cherry picked from commit 86c3e7a2500b689a074d2099017cb96a5ea1f0e9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13603
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agofix jenkins build failure related setErrorCode
jihwan.seo [Tue, 25 Oct 2016 09:40:33 +0000 (18:40 +0900)]
fix jenkins build failure related setErrorCode

this issue causes by https://gerrit.iotivity.org/gerrit/#/c/13151/

Change-Id: I7eb1a208f65bd6a1f6a207de85363fd540bd2705
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13647
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@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/11031
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agocoap-http-proxy: Fix coap headers path
Philippe Coval [Wed, 21 Sep 2016 10:26:49 +0000 (12:26 +0200)]
coap-http-proxy: Fix coap headers path

It failed to build on Tizen:2.3.1:Wearable

Change-Id: I1069ab17f11a946605093454b89205a6c208c902
Origin: https://gerrit.iotivity.org/gerrit/#/c/12061/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12487

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/13629
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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>
(cherry picked from commit 9331e5eddab194f9f17bf09c3b0c70da5c87ab77)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13593
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoRemove unnecessary setter/getter related errorcode for response
jihwan.seo [Wed, 12 Oct 2016 09:41:05 +0000 (18:41 +0900)]
Remove unnecessary setter/getter related errorcode for response

There are invalid APIs setErrorCode/getErrorCode in C++ layer.
It can be caused a big confusion to user.
Since the value never transfer on network. it just set in class inside.
Thur, It is better to remove the methods.

Change-Id: Iab863b1c16095ec77b9733bd3ff0ea38167b2dba
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
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/13473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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>
(cherry picked from commit 4c6b0de1730df1addff1a85410f3de7a83ac0271)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13575

7 years agoFixed sign-compare warning
George Nash [Thu, 20 Oct 2016 16:03:21 +0000 (09:03 -0700)]
Fixed sign-compare warning

In the ParseChain function the bufLen and pos varaible were
changed from int to size_t.  Every location that ParseChain
is called is passing in a size_t as the bufLen an unsigned
type. The pos variable is never negative and should be the
same type as the bufLen.

While in the function the documentation was cleaned up and
comemnts were added to quickly identify the contents of the
pemCertHeader and pemCerFooter byte arrays. As well as clarify
the need of the goto `exit:` label when using the
CHECK_MBEDTLS_RET macro.

Change-Id: I1f063dddea29a2a00ae6e47c7b2240794bcaf5bb
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13519
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agolinux: Support also armeabi-v7a TARGET_ARCH
Philippe Coval [Wed, 28 Sep 2016 12:07:16 +0000 (14:07 +0200)]
linux: Support also armeabi-v7a TARGET_ARCH

This EABI is used in Tizen, this way iotivity
 can be rebuild on Tizen using "linux" profile (TARGET_OS).

For instance unsupported older tizen profiles can be rebuilt using gbs
 (ie Tizen:2.3:Wearable).

Change-Id: Ia84cb173add8efbb10cb2a9632a7637cf6202114
Origin: https://gerrit.iotivity.org/gerrit/#/c/12417/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13613

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>
7 years ago[IOT-1458] fix to handle unexpected disconnected state for BLE
jihwan.seo [Tue, 18 Oct 2016 07:27:43 +0000 (16:27 +0900)]
[IOT-1458] fix to handle unexpected disconnected state for BLE

Change-Id: I83ba76e61eb57fce91c42d32c434a3b2735d2aa3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agotizen: Scons sqlite puller should not be used
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>
7 years agoAdd a maximum observer TTL of 24 hours
hyuna0213.jo [Wed, 7 Sep 2016 07:30:45 +0000 (16:30 +0900)]
Add a maximum observer TTL of 24 hours

A server that transmits notifications mostly in non-confirmable
messages MUST send a notification in a confirmable message instead of
a non-confirmable message at least every 24 hours. This prevents a
client that went away or is no longer interested from remaining in the
list of observers indefinitely.

Change-Id: Ie676f9f5f394fa094b4f2d9fd3a72e2d38d21b24
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11497
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>
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/13585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[IOT-1459]Add CA API which returns selected transport adapter
bg.chun [Tue, 18 Oct 2016 11:35:55 +0000 (20:35 +0900)]
[IOT-1459]Add CA API which returns selected transport adapter

Add CA API which returns selected transport adapter.
Returns bit combinations of CATransportAdapter_t enumeration
which indicate enabled adapter.
CATransportAdapter_t CAGetSelectedNetwork();

Change-Id: If9116991585ab20b56303875d2d83a79316d2387
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13391
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1445] Add ins value when publishing a resource to rd
hyuna0213.jo [Wed, 12 Oct 2016 10:22:48 +0000 (19:22 +0900)]
[IOT-1445] Add ins value when publishing a resource to rd

The ins value has to be included when publishing a resource
to resource-directory. Otherwise resource-directory will
return error code.
Currently, The ins is not included because the return value
of OCGetResourceIns() was not checked properly.

Change-Id: I11b1f405e000f36bb76ca7d24c8dbbbd6e7586fe
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit b5d331d2d779172bceebb9b92cc73eecc6d6cdae)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13225

7 years agoStart building json2cbor for Windows.
Dan Mihai [Thu, 20 Oct 2016 00:22:37 +0000 (17:22 -0700)]
Start building json2cbor for Windows.

Change-Id: I9a1e43969c597eed68eac0df28b90571c67de931
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13521
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
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>
(cherry picked from commit f188154d6af64981563f2dc4499ea9759613468b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13557

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/13475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Apply mbedtls ocf.patch only once
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>
(cherry picked from commit 54966d90b2cf9f8c844bbaa1b1aa4f876fc91a7e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13517

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>
(cherry picked from commit d1ee9e78d898746b842a2439f88d26fd30a377bc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13041

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>
(cherry picked from commit 0ba523056a0174479befe2a147d420be63f62d35)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13541
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@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>
(cherry picked from commit 8a3ea331f4c08296a2e11185a780de7f17d42956)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12719

7 years agotizen: Disable Bluetooth transport for Tizen:2.3
Philippe Coval [Wed, 28 Sep 2016 14:41:51 +0000 (16:41 +0200)]
tizen: Disable Bluetooth transport for Tizen:2.3

Tizen:2.3:Wearable (Samsung GearS) builds at least.
Because it's not building using outdated capi BT packages.

Change-Id: Id1b37df55bbdebd7ada1413935f5306ccd1e0002
Bug: https://jira.iotivity.org/browse/IOT-1320
Origin: https://gerrit.iotivity.org/gerrit/#/c/12475/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 8fe95f36541c5191439af915396055c667404269)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13511

7 years agotizen: Disable Bluetooth for Tizen:IVI (capi outdated)
Philippe Coval [Tue, 27 Sep 2016 13:55:29 +0000 (15:55 +0200)]
tizen: Disable Bluetooth for Tizen:IVI (capi outdated)

Make sure capi-network-bluetooth-devel
 is shipping bluetooth_internal.h.

For instance, 0.1.39 does not have it, while 0.1.52 have it.

In that case it will fail to build and report a message like:

   resource/csdk/connectivity/src/bt_edr_adapter/tizen/\
   caedrclient.c:30:32: \
   fatal error: bluetooth_internal.h: No such file or directory

This need to be checked for other Tizen profiles:
 Tizen:2.3.1:Wearable, Tizen:2.4:Mobile have it.

Bug: https://jira.iotivity.org/browse/IOT-1343
Change-Id: I028f3c4fd8c9526b5d06a55b0f2a5f5c6c113d3d
Origin: https://gerrit.iotivity.org/gerrit/#/c/12355/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 61382c1df95115ef595b06e023d59bcca8bad22c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13509

7 years agoMerge 1.2-rel cloud project into master
Jee Hyeok Kim [Thu, 20 Oct 2016 09:00:19 +0000 (18:00 +0900)]
Merge 1.2-rel cloud project into master

1. Overwrite 1.2-rel cloud project into master

Change-Id: I9271607595166fce4bda9011f028a40514908fec
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
7 years agotizen: Enable Bluetooth along IP
Philippe Coval [Tue, 22 Mar 2016 02:41:52 +0000 (19:41 -0700)]
tizen: Enable Bluetooth along IP

Revert "Change build option - IP only"

This reverts commit 28d898d2dab5a4463ba5f7ea380258a4f4362578.

Change-Id: Ia3223a2ab09ba219bf8048aa28014744e19ed4b0
Author: Yungjae Shin <yj99.shin@samsung.com>
Origin: https://review.tizen.org/gerrit/#/c/63051/
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/12353
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit cf0b4cbec478e84f4f6a4cc4fa118a96f6cdffb2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13507

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>
(cherry picked from commit 0d1a98d360977b8d967129282ff8644f363c5e79)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13513