platform/upstream/iotivity.git
7 years agoChange the delimiter from '&' to ';'
Jaehong Jo [Mon, 8 Aug 2016 09:52:46 +0000 (18:52 +0900)]
Change the delimiter from '&' to ';'
According to the specifications

Change-Id: I6c4afcd312515e71b5d9702b2edaa154bce7f2ea
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10135
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix wrong network interface length when secured option is true
hyuna0213.jo [Tue, 16 Aug 2016 22:54:59 +0000 (07:54 +0900)]
Fix wrong network interface length when secured option is true

If secured option is true, network interface length contain
invalid values.

Change-Id: Id6a99ad9ea5d03de724239e9a0d9b21ece3cbe19
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10525
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 agoFixed memory leak from keep-alive
hyuna0213.jo [Wed, 10 Aug 2016 06:33:17 +0000 (15:33 +0900)]
Fixed memory leak from keep-alive

The keep-alive mechanism was not properly deleting the payload
that was created for keep-alive.

Change-Id: I80736893e472c31f9058c2d2b5c1d3c38a692c04
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10223
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
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 ago[IoT-1211] modified java file list for Android build
jihwan.seo [Wed, 17 Aug 2016 04:46:20 +0000 (13:46 +0900)]
[IoT-1211] modified java file list for Android build

https://jira.iotivity.org/browse/IOT-1211
Some interfaces including EDR, BLE, NFC will be excluded,
when there is no target option in scons build

Change-Id: I5d488b5cd7b5641c1db75e249b82a8199b46b35f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agomodified scan interval logic when BT adapter is on.
jihwan.seo [Tue, 16 Aug 2016 04:12:39 +0000 (13:12 +0900)]
modified scan interval logic when BT adapter is on.

when BT adapter is off -> on,
scan logic is not working
because condition variable was freed.

Change-Id: Ifa244c44d57d60fea84ab42f58b100ab3cf8d147
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10477
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix unittest of Things manager for TCP build
Jihun Ha [Fri, 19 Aug 2016 07:14:44 +0000 (16:14 +0900)]
Fix unittest of Things manager for TCP build

If a found resource has TCP connectivity, it would be not used for unittest.

Change-Id: I2a1aa34ee399474c122208e7133fee8dc89267e6
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10661
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoTizen Enrollee Sample App. and its script files are updated. EasySetup logic and...
sy01.youn [Thu, 18 Aug 2016 23:12:22 +0000 (08:12 +0900)]
Tizen Enrollee Sample App. and its script files are updated. EasySetup logic and Wifi Connection implementation (targeted mobile tizen) are newly updated.
It works fine when tested on tizen mobile Z3.

Change-Id: Iff140fc33bb22ec83fd9c4ee26e6ba5fb05ab91c
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10531
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd & fix unittest of easy setup.
sy01.youn [Thu, 18 Aug 2016 08:20:17 +0000 (17:20 +0900)]
Add & fix unittest of easy setup.

- Add unit test cases
(1) Enrollee handles individual get request from client.
(2) Enrollee handles put request from client.
(3) ESSetCallbackForUserdata API unit test is added.

- Remove GetTargetNetworkInfoFromProvResource API in resourcehandler.
  . This API is not need anymore.

Change-Id: If634923b0daaf9760b78b3d7e853c823769db6ba
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10603
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFixed memory-leak of |cJSON| object on |json2cbor|
Kyungsun Cho [Thu, 18 Aug 2016 07:22:56 +0000 (16:22 +0900)]
Fixed memory-leak of |cJSON| object on |json2cbor|

Change-Id: I972cb1386ba55279b8f961e2d6c0a76231cac872
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoAdd PMSingleDiscovery function for discover owned/unowned devices in specified endpoint
Sijae Kim [Mon, 15 Aug 2016 11:04:59 +0000 (20:04 +0900)]
Add PMSingleDiscovery function for discover owned/unowned devices in specified endpoint
this function will return when found one or more device even though timeout is not exceeded

Change-Id: Ib03a775bb4142466274bb38517433803971a4213
Signed-off-by: Sijae Kim <sijae.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10461
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongho Park <jh8397.park@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix build issue about unittest and cloud interface
ch79.cho [Thu, 18 Aug 2016 13:43:03 +0000 (22:43 +0900)]
Fix build issue about unittest and cloud interface

When notification service unittest build with '-Wl, --as-needed' LDFLAGS,
some build machine returns build fail.(this flag is default option.)
The default of passing --as-needed can be undone by passing --no-as-needed to the linker.
So, 'Wl, --no-as-needed' flag is added in notification unittest SConscript.

CloudPublish is removed, because it is not used by sample application.

Change-Id: Ibeeb0ec60d80da1e216c43ba635e2efc0f193b7e
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10627
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate a logic to handle response code and connectivity type in constructResourceObject
Jihun Ha [Thu, 18 Aug 2016 05:33:48 +0000 (14:33 +0900)]
Update a logic to handle response code and connectivity type in constructResourceObject

OC_STACK_RESOURCE_CHANGED is also dealt as a success response code.
And (CT_ADAPTER_IP | CT_IP_USE_V4) or  (CT_ADAPTER_IP | CT_IP_USE_V6)
should be used in constructResourceObject function.
And the access mode of files has been changed to 644

Change-Id: Iadbffd045f6baab87aa42dc88f5221abc9940b20
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10333
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix X.509 build issue
Dmitriy Zhuravlev [Thu, 18 Aug 2016 10:00:09 +0000 (13:00 +0300)]
Fix X.509 build issue

Added adapter type to CASelectCipherSuite

Change-Id: I1f140be0fdd5508ccc1ed64b8307a232798376cd
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10611
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
7 years agoAdd build for Linux with TCP (CoAP over TCP)
Trevor Bramwell [Wed, 17 Aug 2016 20:48:21 +0000 (13:48 -0700)]
Add build for Linux with TCP (CoAP over TCP)

Change-Id: I42ce6af1d4615a41fc2da58db8f8101017a34ca5
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoImplementation of JNI for subscribe device presence to RD
Jaehong Jo [Wed, 17 Aug 2016 08:25:53 +0000 (17:25 +0900)]
Implementation of JNI for subscribe device presence to RD

Added JNI code for subscribeDevicePresence() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: I852116b06c8b59ee16593572b47aaa80eb2fd1b5
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10063
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoFix unittest of easy setup for TCP option build
Jihun Ha [Thu, 18 Aug 2016 00:06:57 +0000 (09:06 +0900)]
Fix unittest of easy setup for TCP option build

With TCP option build, two resources per each network interface are
discovered. We have to filter out the resource with TCP flag.
Additionally, Easysetup unittest tries to discover a real provisioning
resource in a network to the test. So if there is other provisioning
resources in a network, the test would fails. To resolve the problem,
we have to filter out resources running on difference machine.

Change-Id: I130f134b051b598d6f783a6ffa9d0365fec2c172
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10559
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agofix cloud sample build error
eunok.shin [Wed, 17 Aug 2016 10:16:21 +0000 (19:16 +0900)]
fix cloud sample build error

Change-Id: Ic748c38b49a2083725b81f6144229762bef11a20
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10553
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: MyeongGi Jeong <myeong.jeong@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoTLS support
Andrii Shtompel [Wed, 17 Aug 2016 08:39:50 +0000 (11:39 +0300)]
TLS support

Provide TLS connection using mbedTLS

1. Changed TCP adapter to support CoAP and TLS
2. Provisioning works via TLS and DTLS
3. Integrated mbedTLS
4. Added device ID to CASecureEndpoint_t
5. Reset to patch#16 for merging to master

Change-Id: I4c8f2f4f1a21dea984fc2239a31382052c223dfe
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/10543
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoUpdated Message Queue for C++ API
jihwan.seo [Wed, 3 Aug 2016 11:01:33 +0000 (20:01 +0900)]
Updated Message Queue for C++ API

- add quality of service param in Cloud MQ client.
- combine callbacks for some APIs like 'createMQTopic','discoveryTopics'
  because both APIs need same callback format which give OCResource Obj.

Change-Id: Ie6eb734e10387216f6b1b6d1e5c122668ddcee6b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9991
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 agoadded OCAccountManager class for Android and JNI method
Jaewook Jung [Mon, 1 Aug 2016 08:50:44 +0000 (17:50 +0900)]
added OCAccountManager class for Android and JNI method

Since OCAccountManager C++ class has been merged, I added implementation of the java class.
(https://gerrit.iotivity.org/gerrit/#/c/9835/)

Change-Id: I2a20dd976fa4ec6167d68f72d5dff3f2c123089d
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9967
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 agoIndent modified by static analysis
Jaehong Jo [Thu, 11 Aug 2016 23:23:06 +0000 (08:23 +0900)]
Indent modified by static analysis

Change-Id: I402335bc40cbc8b570a7317139f02f765d918956
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agorevise build scripts for tizen
Youngjae Shin [Tue, 16 Aug 2016 05:29:56 +0000 (14:29 +0900)]
revise build scripts for tizen

  1. remove the build of SQLite because tizen has already been the
  SQLite library.
  2. include provision example on the build of Tizen

Change-Id: I51bf970a84e5402eab835310ef5f9c0bb76e8f21
Signed-off-by: Youngjae Shin <yj99.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: MyeongGi Jeong <myeong.jeong@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agobuild: Disable provisioning logging when not wanted
Philippe Coval [Thu, 28 Jul 2016 16:06:50 +0000 (18:06 +0200)]
build: Disable provisioning logging when not wanted

- Also polish use of LOGGING / TB_LOG option.
- When using scons CPPDEFINES there is no need to add -D prefix.
- Add machine readable header in python files (to avoid tabs).

Bug: https://jira.iotivity.org/browse/IOT-1203
Change-Id: Ibfae4ee23b6b157e891e9792c464cd9a481f9eef
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoupdated dat file for directPairing android sample app
Sunil Kumar K R [Thu, 28 Jul 2016 05:37:22 +0000 (11:07 +0530)]
updated dat file for directPairing android sample app

Change-Id: If4cfc00a57c07f52556f3938271c4f1f2f42f498
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10009
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago(double free) crash occurred when discovering device
youngman [Fri, 12 Aug 2016 07:20:33 +0000 (16:20 +0900)]
(double free) crash occurred when discovering device

Change-Id: I5ae6cbe8e62e5b0aeb0dd34a5d239cc7761b2ea9
Signed-off-by: youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Youngjae Shin <yj99.shin@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix a logic to send a response even in case to wrong request
Jihun Ha [Tue, 16 Aug 2016 07:10:40 +0000 (16:10 +0900)]
Fix a logic to send a response even in case to wrong request

Even if request handling fails for some reasons, a response for the request
should be sent back to Mediator.

Change-Id: I70db07e9fb58f00613e7613de4d7ae06cc9b5bf9
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd 'model number' and 'location' properties from mediator side
Jihun Ha [Tue, 16 Aug 2016 10:07:03 +0000 (19:07 +0900)]
Add 'model number' and 'location' properties from mediator side

 - 'setDevConfProp' function is added parameter which is information of location
 - add 'getModelNumber' function.

Change-Id: I48a028dd77310d690035f348cb721fa52adfc462
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10497
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd 'model number' and 'location' properties in DevConf resource
Jihun Ha [Tue, 16 Aug 2016 07:30:51 +0000 (16:30 +0900)]
Add 'model number' and 'location' properties in DevConf resource

'Model number' property is set by Enrollee. Contrarily, 'Location' property
is given by Mediator, which is GPS information in JSON format.

Change-Id: I21d4d91705913702645cbadcd687d3b098b77e83
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agomodified setHost() in OCResource for ipv6 with scope ID
Jaewook Jung [Mon, 8 Aug 2016 08:17:59 +0000 (17:17 +0900)]
modified setHost() in OCResource for ipv6 with scope ID

Since scope ID info has been appended to address info of resource object,
checking address validity logic should be modified
to check only address part of full string but not scope ID.

and added unit tests to check validation of host for constructResourceObject.

Change-Id: I6d1771a5573bf6324c8565adb3ff2abb53c2ac76
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10129
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoImplemented MQ API for Android JNI
jihwan.seo [Thu, 4 Aug 2016 00:59:35 +0000 (09:59 +0900)]
Implemented MQ API for Android JNI

connected from Android JNI to C++ API of OcResource.

Change-Id: I377d786dfa2bf7f06fb43a82b6bb1955f19dbcb1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoadded MQ callback listener for android JNI.
jihwan.seo [Thu, 4 Aug 2016 00:25:14 +0000 (09:25 +0900)]
added MQ callback listener for android JNI.

- subscribe callback listener.
- discoveryTopic/createTopic callback listener

Change-Id: I50959c54423c6bed0e9622c6c64ce1a1e91dc16c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10001
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 agoUpdate unittest for remote opertion in scene manager
Jihun Ha [Sat, 13 Aug 2016 05:43:38 +0000 (14:43 +0900)]
Update unittest for remote opertion in scene manager

In some cases, unittest would produces unexpected results especially when
creation and deletion of scene objects are repeated in continuous unittests.
This patch fixes this issue.

Change-Id: I0294215e5f2578145b4398808146bee1c8199a73
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoImplementation of JNI for deleting resource from RD
hyuna0213.jo [Tue, 2 Aug 2016 09:10:47 +0000 (18:10 +0900)]
Implementation of JNI for deleting resource from RD

Added JNI code for deleteResourceFromRD() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: I7fb825817db4fbfc4734087222162e3b022e1f51
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoImplementation of JNI for publishing resource to RD
hyuna0213.jo [Sun, 7 Aug 2016 23:44:12 +0000 (08:44 +0900)]
Implementation of JNI for publishing resource to RD

Added JNI code for publishResourceToRD() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: Ieb941ab2ce37c1aa39f44c8e51bbf49e3025a273
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoMerge "Merge branch 'cloud-interface'"
Jee Hyeok Kim [Mon, 15 Aug 2016 12:12:28 +0000 (12:12 +0000)]
Merge "Merge branch 'cloud-interface'"

7 years agoupdate simpleclient sample app to support test TCP.
jihwan.seo [Wed, 10 Aug 2016 04:34:19 +0000 (13:34 +0900)]
update simpleclient sample app to support test TCP.

Change-Id: I23feba350fb80fb625161ae28077010767a172ba
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10217
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoMerge branch 'cloud-interface'
Jee Hyeok Kim [Sat, 13 Aug 2016 04:52:48 +0000 (13:52 +0900)]
Merge branch 'cloud-interface'

Change-Id: If7c53ffecdbc4c9c4386ce996e7e746edb673b7c
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoFix keep-alive to filter correctly.
Jee Hyeok Kim [Tue, 9 Aug 2016 07:29:25 +0000 (16:29 +0900)]
Fix keep-alive to filter correctly.

1. Fix keep-alive to filter correctly.
2. Cleanup netty pipeline.

Change-Id: Id99916f22c62f43ace4ae1a605e4b8adf7a65c92
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10189
Reviewed-by: Minji Park <minjii.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoUpdate Mediator code for more readable using const.
Heewon Park [Fri, 12 Aug 2016 05:44:50 +0000 (14:44 +0900)]
Update Mediator code for more readable using const.

Change-Id: I87f6222908c30e14f5c7963859a0310dd06ac03f
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10323
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAS unit test included
yeonghun.nam [Thu, 11 Aug 2016 07:44:12 +0000 (16:44 +0900)]
AS unit test included

Change-Id: I0a0e56f12817843d14f82f361ad0e52c5496045f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoCI unit test included
Jung Seungho [Wed, 10 Aug 2016 02:15:16 +0000 (11:15 +0900)]
CI unit test included

Change-Id: I68b655f2a07db01ea4fca4c580702eb4a10ae66f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoImplement acl/invite resource in cloud account server.
Jung Seungho [Wed, 10 Aug 2016 09:52:35 +0000 (18:52 +0900)]
Implement acl/invite resource in cloud account server.

Add invite feature to invite user

Change-Id: I7a4c1922de4b312afda92423338092423fa573c7
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoUpdate Common data model's Constructor & change security '.dat' files.
Heewon Park [Fri, 12 Aug 2016 01:55:32 +0000 (10:55 +0900)]
Update Common data model's Constructor & change security '.dat' files.

Change-Id: I30a6aa0abe2b52b637fd86045bd0a81ababcb921
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoRemove '/.well-known' from URI
Jaehong Jo [Thu, 11 Aug 2016 23:15:02 +0000 (08:15 +0900)]
Remove '/.well-known' from URI

According to a OCF spec

Change-Id: I54167589ba4fc03282944ecf4ba06e24d83b1de7
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdded Android java API for Cloud MQ Client.
jihwan.seo [Thu, 4 Aug 2016 00:13:08 +0000 (09:13 +0900)]
Added Android java API for Cloud MQ Client.

- added Native Caller for MQ API

Change-Id: I7a15877cd041b8321088c9f8ec530fe77b390b2f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoClean up encodeAddressForRFC6874 routine
David Antler [Mon, 8 Aug 2016 12:25:39 +0000 (05:25 -0700)]
Clean up encodeAddressForRFC6874 routine

Change-Id: Ie4b816186dc7bb808f6fdb3a2836552bfdf32772
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoMerge "Merge branch 'notification-service'"
Madan Lanka [Thu, 11 Aug 2016 15:57:54 +0000 (15:57 +0000)]
Merge "Merge branch 'notification-service'"

7 years agoModified Scene UnitTest
ChaJiWon [Wed, 6 Jul 2016 04:23:24 +0000 (13:23 +0900)]
Modified Scene UnitTest

Scene container is changed to unordered_map in SceneCollection.
Apply the change to 'getAllSceneInstance' logic.

Change-Id: I48916883b115c7eb57cfe63d1ae55d6d2ee1c430
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f162cb2234428750943373d939415fb09fd103d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/10267
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge branch 'notification-service'
ch79.cho [Thu, 11 Aug 2016 11:24:15 +0000 (20:24 +0900)]
Merge branch 'notification-service'

Notification service feature is added newly.

Change-Id: I3ec6e84ea7ad9c247f0f444889bf7e326b6c8e11
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
7 years agoMove the removeDeviceWithUuid method to OCSecure class as static method.
Chul Lee [Fri, 5 Aug 2016 01:15:12 +0000 (10:15 +0900)]
Move the removeDeviceWithUuid method to OCSecure class as static method.

Change-Id: Ic8a9904990b3bbd27c82e43f1b1105aa60b00087
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoMerge "Merge remote-tracking branch 'origin/extended-easysetup'"
Madan Lanka [Thu, 11 Aug 2016 05:11:55 +0000 (05:11 +0000)]
Merge "Merge remote-tracking branch 'origin/extended-easysetup'"

7 years ago[IOT-1204] Add zero terminator before logging
Dan Mihai [Wed, 27 Jul 2016 22:13:20 +0000 (15:13 -0700)]
[IOT-1204] Add zero terminator before logging

Change-Id: I8a8b94aad4b00e22a59a728a2f6802a3d18bff24
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoMerge remote-tracking branch 'origin/extended-easysetup'
Jihun Ha [Thu, 11 Aug 2016 02:06:17 +0000 (11:06 +0900)]
Merge remote-tracking branch 'origin/extended-easysetup'

Change-Id: I9d846ee6afcfa18a53081c606401ffe4b8d4d18c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
7 years agoImplement x509 certeficate resource in cloud account server.
Joonghwan Lee [Wed, 10 Aug 2016 09:52:35 +0000 (18:52 +0900)]
Implement x509 certeficate resource in cloud account server.
 - Certeficate builder modify.
 - Added Certeficate resource to account server.
 - Added Certrficate configuration.
 - TODO: Implement Certeficate storage.

Patch #7: Rebase with the latest branch

Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Change-Id: I4a350ff96bc4d4c3f086d0790715576026192ee3
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoUpdate Mediator sample App.
Jihun Ha [Wed, 10 Aug 2016 12:45:13 +0000 (21:45 +0900)]
Update Mediator sample App.

 - Add Cloud feature (using Iotivity Cloud)

Change-Id: I651121b8cd83e83178d3cfce6ff49e9f1dee0ec5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoupdate mediator unittest and implement validation check logic.
Heewon Park [Wed, 10 Aug 2016 09:22:53 +0000 (18:22 +0900)]
update mediator unittest and implement validation check logic.

Change-Id: Ieb53eb1a659d7ddf2152ac2d3b8494a80943c62a
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10197
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoResolved tizen build issue regarding ip network
hyuna0213.jo [Wed, 10 Aug 2016 05:23:55 +0000 (14:23 +0900)]
Resolved tizen build issue regarding ip network

Resolved tizen build issue regarding ip network.

Change-Id: I8f18efd4fdeff40fdb5e6a3c13522be461ba8bd8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years ago[Enrollee] DeleteEasySetupResourcess() is fixed in resource handler.
sy01.youn [Wed, 10 Aug 2016 00:28:17 +0000 (09:28 +0900)]
[Enrollee] DeleteEasySetupResourcess() is fixed in resource handler.
   . Unbind logic is added
   . Check whether handle is NULL or not

Change-Id: I0b69d29735af06b75b4e775484cf835ca12007f0
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10207
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoImplement acl/group resource in cloud account server.
Glen Youngjin Kim [Fri, 29 Jul 2016 15:12:34 +0000 (18:12 +0300)]
Implement acl/group resource in cloud account server.

1. Account server restructured. (API design, naming)
2. Modify to use the tokens issued by OAuth2 providers.
3. Add group feature to share devices.

Change-Id: I1b15aadcb0b7715a41bce7a96363b8ab7f612d0a
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9665
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoadded APIs related to account in OCAccountManager
Jaewook Jung [Tue, 9 Aug 2016 07:39:08 +0000 (16:39 +0900)]
added APIs related to account in OCAccountManager

added 2 APIs related to account
: searchUser, deleteDevice

and modified signOut API due to the change of the specification
that signOut message has no more any payload but only login property.

Change-Id: Ida9abb953d1bed0dae0fb4f0cb2bed522bc8a3dd
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoDARWIN BUGFIX: [-Wreturn-type] error void fn returns 0
Gregg Reynolds [Wed, 15 Jun 2016 15:27:08 +0000 (10:27 -0500)]
DARWIN BUGFIX: [-Wreturn-type] error void fn returns 0

Two void functions have "return 0;", chg to "return;"

Change-Id: Icdbb91891f01e8d56427d952722da776d4a34f78
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoCleanup Maven build script
Jee Hyeok Kim [Tue, 2 Aug 2016 00:00:34 +0000 (09:00 +0900)]
Cleanup Maven build script

1. Cleanup Maven build script

Change-Id: Ibf455e52f064b7b0cc5e4cd00beda51d25c8950d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
7 years agoFix error response and error code
Jee Hyeok Kim [Mon, 8 Aug 2016 07:07:32 +0000 (16:07 +0900)]
Fix error response and error code

1. Fix packet forawrding to client correctly
   when resource find receives error from account server,

2. Change response code to use CHANGED when POST method succeed.

Change-Id: Ibf7b1ba6996c2bcef086f3c4361f38036f4a8c71
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
7 years agoupdated Readme.scons files for Message Queue(MQ)
jihwan.seo [Mon, 8 Aug 2016 11:02:02 +0000 (20:02 +0900)]
updated Readme.scons files for Message Queue(MQ)

Change-Id: I2143d908e7323acd8505a4024faf4f60ac009f43
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdd setLocation API for PUT response
Jee Hyeok Kim [Mon, 8 Aug 2016 08:03:42 +0000 (17:03 +0900)]
Add setLocation API for PUT response

1. Add setLocation for resource creator
2. Apply setLocation to MQ server

Change-Id: I143dd14471bb9b8055f7d3a60e9e58c22697d481
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
7 years agoAdd RD C++ API to supporting QoS in OCPlatform
hyuna0213.jo [Mon, 1 Aug 2016 22:51:39 +0000 (07:51 +0900)]
Add RD C++ API to supporting QoS in OCPlatform

- add publishResourceToRD() overload function
- add deleteResourceFromRD() overload function
- remove unnecessary code
- add null check logic for input parameter

Change-Id: Ib3ad9d196af4a1b1662a4fca0dce40e963dc78f5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9907
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoEnable gradle build for Easy setup app for Android with scons
Jihun Ha [Mon, 8 Aug 2016 09:25:09 +0000 (18:25 +0900)]
Enable gradle build for Easy setup app for Android with scons

Along with the patch 10093, this is for build easy setup
Android app with gradle build in scons.

Change-Id: Ib99cb63cfe8859766b8263e5669cb2cd9d9ddba9
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10095
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoEnabled IP CAGetNetworkInformation() API
hyuna0213.jo [Fri, 29 Jul 2016 08:43:52 +0000 (17:43 +0900)]
Enabled IP CAGetNetworkInformation() API

currently CAGetNetworkInformation is not working on linux platform.
because stack doesn't set the device address.

Change-Id: Ia80c9e61d4c9180f3abbe7234e512fa475132da5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoEnable gradle build of easy setup SDK for Android with scons
Jihun Ha [Mon, 8 Aug 2016 09:10:34 +0000 (18:10 +0900)]
Enable gradle build of easy setup SDK for Android with scons

For building SDK of easy setup for Android, this patch utilizes gradle
executed in scons build.

Change-Id: I0de946b2e95f00051248418148deaa7fbd77e8c3
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFix OTM Unittest
Chul Lee [Fri, 5 Aug 2016 06:39:50 +0000 (15:39 +0900)]
Fix OTM Unittest

Fix OTM Unittest error

Patch #1-3: PT SVR DB modified to use x.org.iotivity.dpc
Patch #4-6: sample server's SVR DB modified to use x.org.iotivity.dpc.
           Also otmunittest.cpp updated to ignore the unknown server.
Patch #7: Updated to exit the unittest
          in case of two more devices are running on the subnet.

Change-Id: Ifd0c8c6043a6967f0e936da0086ee0fb7ed7e0b3
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agofixed library loading issue at Android(API23)
Heewon Park [Mon, 8 Aug 2016 07:31:37 +0000 (16:31 +0900)]
fixed library loading issue at Android(API23)

Change-Id: I055c3f3a2537346bc285ec8825350317156fe4e7
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge branch 'master' into cloud-interface
Jee Hyeok Kim [Mon, 8 Aug 2016 08:54:21 +0000 (17:54 +0900)]
Merge branch 'master' into cloud-interface

Change-Id: I9baa52a9dcff36aec179677400cb5a8ee985d410
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdd specified response type into RM
jihwan.seo [Mon, 8 Aug 2016 04:19:38 +0000 (13:19 +0900)]
Add specified response type into RM

As 'dataType' has added in CAResponseInfo_t,
RM also applied it in its code

refer change : https://gerrit.iotivity.org/gerrit/#/c/9255/.

Change-Id: I1484c9967e5f902b20967c5a94c1e04ca14bfada
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge branch 'master' into extended-easysetup
Heewon Park [Mon, 8 Aug 2016 06:08:10 +0000 (15:08 +0900)]
Merge branch 'master' into extended-easysetup

Change-Id: I300f1038ef9795499f328bf844939757702dcdeb
Signed-off-by: Heewon Park <h_w.park@samsung.com>
7 years agoFix a logic in linking child representation payload in batch interface
Jihun Ha [Sat, 6 Aug 2016 01:32:46 +0000 (10:32 +0900)]
Fix a logic in linking child representation payload in batch interface

If provisioning resource receives a GET request with BATCH interface and
cloud resource is not created by user's decision, device configuration
resource's representation will not delivered even if device configuration
resource exists. This patch fixes this issue.

Change-Id: I90a43e58cf12dab0732857418fae7f4a7ef9dc1a
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd specified response type
Chul Lee [Fri, 5 Aug 2016 01:09:27 +0000 (10:09 +0900)]
Add specified response type
according to https://gerrit.iotivity.org/gerrit/#/c/9255/.

Change-Id: I4b5a23f8c42084de369dbb5af7a64b7a8d0679c8
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd exception handling in MQ
Minji Park [Wed, 3 Aug 2016 05:39:04 +0000 (14:39 +0900)]
Add exception handling in MQ

exception handling added to give proper error responses in MQ

Change-Id: Idb6ba4c90707b490b854788a5f06120a46652d6f
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9977
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoRD unit test included
yeonghun.nam [Wed, 3 Aug 2016 04:55:18 +0000 (13:55 +0900)]
RD unit test included

Change-Id: If8c2354aa3c32b628b6ec5dc5fbead1faca1e9aa
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9719
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoFix defects detected by SVACE system in easy setup
Jihun Ha [Fri, 5 Aug 2016 07:40:09 +0000 (16:40 +0900)]
Fix defects detected by SVACE system in easy setup

SVACE which is one of static code analysis tools detects several defects
in easy setup. This patch fixes them.

Change-Id: Ie7e3eb692c58c586b6d0964cf6af24829c39eb11
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate common data class.
Heewon Park [Fri, 5 Aug 2016 02:26:38 +0000 (11:26 +0900)]
Update common data class.

 - implement move & copy constructor.

Change-Id: I8b27beb016e463db30142b80fe6e06aa282e76f5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoadded Testcase for MQ Client API
jihwan.seo [Thu, 21 Jul 2016 07:40:35 +0000 (16:40 +0900)]
added Testcase for MQ Client API

Change-Id: Iee8e98a922288f90a79e3fd006b797e5c745d107
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9539
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoTo Enable MQ Cloud Client API for Android
jihwan.seo [Wed, 3 Aug 2016 23:45:49 +0000 (08:45 +0900)]
To Enable MQ Cloud Client API for Android

Change-Id: Ic785552ec5737849e9c7a18035de7d81e74303c9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoReplace handling RM routeData
Abhishek Sharma [Fri, 29 Jul 2016 02:29:24 +0000 (11:29 +0900)]
Replace handling RM routeData

Change-Id: Iae81e35edb4988edb9701014ef2813751ff03a41
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9853
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoMerge branch 'master' into extended-easysetup
Jihun Ha [Thu, 4 Aug 2016 22:19:46 +0000 (07:19 +0900)]
Merge branch 'master' into extended-easysetup

Change-Id: Ica3dc6b70f2021c7f26d002ae9a0f50ea1fd82b2
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
7 years agoChange APIs for Subscribe device presence.
Jaehong Jo [Tue, 2 Aug 2016 02:44:53 +0000 (11:44 +0900)]
Change APIs for Subscribe device presence.

Application developers have to pass devices id instead of the list of queries.
It will make them more convenient.

As-Is
const QueryParamsList& queryParams

To-Be
const std::vector<std::string>& di

Change-Id: I2c8231a58425227333c2a9c672c086409e2e51be
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agotizen: set verbose mode for building
Philippe Coval [Tue, 19 Jul 2016 16:23:17 +0000 (18:23 +0200)]
tizen: set verbose mode for building

Change-Id: If87868e716291445df754b7e567f87e49c444cce
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit cc96473a6b3cb03748549fce47d851cefc3177ef)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9477
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoSeparated transmission logic for data on Both Mode.
jihwan.seo [Fri, 8 Jul 2016 11:12:49 +0000 (20:12 +0900)]
Separated transmission logic for data on Both Mode.

Since BLE transport has gatt server and client.
there are two sender and receiver
such as notifyCharacteristic / writeCharacteristic in BLE transport.
(while other transport has only one sender and receiver.)

thur, message has to be sent by message type which whether
it is a request or response message.

Change-Id: I7f77d86c13115138082b72a6371ce5bd49f1f0c6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoInclude a new tinycbor file to iotivity build
Otavio Pontes [Mon, 11 Jul 2016 13:23:33 +0000 (10:23 -0300)]
Include a new tinycbor file to iotivity build

In tinycbor a function was moved from cborparser.c to
cborparser_dup_string.c file. As we need this function in IoTivity we
need to include cborparser_dup_string.c in tinycbor SConscript.

Change-Id: Ic0b7598b525c61005bc07b3efcef0270f20bfc28
Signed-off-by: Otavio Pontes <otavio.pontes@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9285
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
7 years agoadded OCAccountManager class
Jaewook Jung [Thu, 28 Jul 2016 01:37:26 +0000 (10:37 +0900)]
added OCAccountManager class

As there is need for API about Cloud server on client side, I added it
on OCPlatform.
(https://gerrit.iotivity.org/gerrit/#/c/9121/)
However there are plenty of APIs to be added more and just adding them
all on OCPlatform is not fine for usability.
So I make them a class like OCResource.

Below APIs will be added after this patchset.
: searchUser, createGroup, searchGroup, deleteGroup, addGroupMember,
  searchGroupMember, deleteGroupMember

Change-Id: I45e1f08b13d821346b364d38bf212b8040205a46
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agomodified network interface monitoring logic in tizen
hyuna0213.jo [Thu, 21 Jul 2016 01:34:16 +0000 (10:34 +0900)]
modified network interface monitoring logic in tizen

To detect network interface changes in tizen,
CAFindInterfaceChange() function was modified.

Change-Id: I325c59205b090f9715d72f533faf27831e114792
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit c5ec8565783a5be30d8089bafa2ede7466641837)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9599
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdded CRL issuer (move from x.509 to x509 folder and restructure)
Andrii Shtompel [Mon, 1 Aug 2016 15:02:59 +0000 (18:02 +0300)]
Added CRL issuer (move from x.509 to x509 folder and restructure)

Change-Id: I8c2daa4c5d7a0a9bebaaed9765bc3622871b1dd0
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9899
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoremoved c++ warning for initialize
jihwan.seo [Wed, 27 Jul 2016 23:30:00 +0000 (08:30 +0900)]
removed c++ warning for initialize

Change-Id: I9381c79f661f5e517badfb42682525985faa7cd1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoremoved potential invalid return value in BWT
jihwan.seo [Fri, 29 Jul 2016 04:32:45 +0000 (13:32 +0900)]
removed potential invalid return value in BWT

Change-Id: I33b552f79d18322d60e188420e57c13976218531
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdded API to obtain OCResourceObject from RCSRemoteResourceObject.
Abhishek Pandey [Thu, 21 Jul 2016 10:31:23 +0000 (16:01 +0530)]
Added API to obtain OCResourceObject from RCSRemoteResourceObject.

Resource Encapsulation layer's RCSRemoteResourceObject class does not provide
all the operations (e.g. PUT, DELETE) that IoTivity base layer provides.

If application wants to invoke base layer API's directly, it needs to obtain
OCResoureObject. Obtaining this object is not possible without calling base
layer discovery. However, if application wants to use both RE layer and Base
layer there will be redundant discovery going on.

To avoid this problem, we added an API that returns OCResoureObject maintained
in RE layer. Using this object, application can call base layer APIs without
additional discovery.

Change-Id: I87757d70bd5df3463c3573831d7392e7b45c670a
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdded API for setting representation in RCS Client of Resource Encapsulation.
Abhishek Pandey [Thu, 21 Jul 2016 08:57:52 +0000 (14:27 +0530)]
Added API for setting representation in RCS Client of Resource Encapsulation.

RCSRemoteResourceObject of RE layer provides an API to get remote resource
representation using RCSRepresentation Object, but it is missing the API to
set RCSRepresentation.

Setting of RCSRepresentation is required for collection resources.

In this patch I have added the set API which accepts RCSRepresentation as input
parameter so it can be used to send POST request on collection resources where
payload contains attributes to be set on multiple child resources.

Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Change-Id: Ic8957296b3cfe3e6abe1218ef060614d9cdc5618
Reviewed-on: https://gerrit.iotivity.org/gerrit/9545
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofixed bug.
Heewon Park [Wed, 3 Aug 2016 09:20:34 +0000 (18:20 +0900)]
fixed bug.

 - when the security provisioning failed, devUUID which is using for callback is set nullptr.
   so ouccured some bug.

Change-Id: I9ddd7617c349ebbca5750125e5c94f382881b193
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9941
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFix a logic to copy userdata in ESReadUserdataCb
Jihun Ha [Wed, 3 Aug 2016 08:22:37 +0000 (17:22 +0900)]
Fix a logic to copy userdata in ESReadUserdataCb

userdata parameter should be passed as double pointer type variable in
ESReadUserdataCb function so that user can assign a memory to the
variable and copy an user data to it inside the function.

Change-Id: Ic005d83c07256b83d8547069e908cbea11d54bec
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate garageclient status checking
David Antler [Wed, 27 Jul 2016 16:22:16 +0000 (09:22 -0700)]
Update garageclient status checking

OC_STACK_OK is the eCode that should really be matched.  STATUS_SUCCESS
was only coincidentially set to the same value.

Also added whitespace after 'if' keyword.

Change-Id: I2f9ccb19d2da0911acbef0a420fecd8ed6199177
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9799
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoIOT-1091: Add auto_build.py
Ajay Saini [Mon, 23 May 2016 21:18:42 +0000 (14:18 -0700)]
IOT-1091: Add auto_build.py

This will replace auto_build.sh as a cross platform solution.

Change-Id: I36afaba8e8935da8322322e2e8c70efde6e22e52
Signed-off-by: Ajay Saini <ajay.saini@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8287
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoImprove run.bat
David Antler [Thu, 14 Jul 2016 18:55:03 +0000 (11:55 -0700)]
Improve run.bat

* For SECURED=1, the samples are sensitive to the directory from which
  they are executed.
* Combined the build arguments into a single spot.
* Add new binary runners.
   * provisioningclient (provclient) and
   * sampleserver_justworks (justworks)

Change-Id: Id744569f282a5adb892958be9dcdc46e3b153773
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9399
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>