platform/upstream/iotivity.git
8 years agoAdd ifdef the code which utilizes TLS-supported APIs
Heewon Park [Fri, 2 Sep 2016 05:33:37 +0000 (14:33 +0900)]
Add ifdef the code which utilizes TLS-supported APIs

provisionTrustCertChain API of Provisioning Manager is ONLY defined where TLS is supported. In easy setup, that API is used for transferring a certificate to Enrollee. So if TLS is not supported, this procedure SHOULD be skiped and not defined, even.

Change-Id: I2006d2025c794aab616cea8fb3e6144cace86b49
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoResolved Tizen build issue
Ashwini Kumar [Thu, 1 Sep 2016 14:20:44 +0000 (19:50 +0530)]
Resolved Tizen build issue

Link issue for privisioning sample in C++
undefined reference to OCLog

Change-Id: I49b0d5197dc164c7d132af88e9a3250387850b14
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11297
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix for build of resource container.
KIM JungYong [Sun, 4 Sep 2016 23:06:10 +0000 (08:06 +0900)]
Fix for build of resource container.

When build of resource container occurred build fail
by reason of can not found strlen function.
For the above reason, Standard string header is included on Configuration file.

Change-Id: I102d0e7ca5925fba59ebe95ae860517dc65328ab
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[RE] Android Application build error fix.
Jay Sharma [Thu, 1 Sep 2016 11:02:50 +0000 (16:32 +0530)]
[RE] Android Application build error fix.

Change-Id: Id04435b3a34ebcc0fb06f001c16b6fa63674a57a
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11275
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRequired to check consumer unitest
cc [Fri, 2 Sep 2016 13:57:35 +0000 (22:57 +0900)]
Required to check consumer unitest

Consumer unittest will be upgraded.

Change-Id: I758fa0ffc1e54874858fda23e76d34293c18dbd2
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'notification-service'
Hun-je Yeon [Sat, 3 Sep 2016 15:57:18 +0000 (00:57 +0900)]
Merge branch 'notification-service'

This patch includes the updated C++ and Android API for notification-service

Change-Id: Id25a4c1aed886a1e77c29625aac895054cb397cc
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
8 years agoUpdated Android for new API Changes
nikhil.a [Sat, 3 Sep 2016 13:33:53 +0000 (19:03 +0530)]
Updated Android for new API Changes

1. Modified the Consumer and Provider design and callbacks mechanism in JAVA and JNI.
2. Updated the API name changes.
3. Refracted the code

Change-Id: I51ea2eab73b575e67f336c46af9d330d0f8f8941
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated C++ wrapper for new API Changes
abitha.s [Sat, 3 Sep 2016 07:08:39 +0000 (12:38 +0530)]
Updated C++ wrapper for new API Changes

1. Modified the Consumer and Provider design and callbacks mechanism for adding subscribtion controlability .
2. Updated the API name changes.
3. Refracted the code
4. Added Provider State and Policy Info for Provider Object.
5. Added copy constructors for Topic and Provider object
6. Added Doxygen comments
7. Updated the Sample application to use Updated APIs

Change-Id: If071b098a9dd836c335d1d621e2e561845b593e6
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11353
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agobuild: Propagate log facilities using pkgconfig
Philippe Coval [Tue, 26 Jul 2016 17:10:02 +0000 (19:10 +0200)]
build: Propagate log facilities using pkgconfig

If built with LOGGING option,
 logging facilities will be available to user using pkgconfig.

Refactored SConscript to be more extensible using a defines list too.

Bug: http://lists.iotivity.org/pipermail/iotivity-dev/2016-July/005104.html
Change-Id: I93c92dd35f4060e46d31bbe80e773b548d92fcd8
Origin: https://gerrit.iotivity.org/gerrit/#/c/9783/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agobuild: Update version to 1.2.0
Philippe Coval [Thu, 1 Sep 2016 07:30:34 +0000 (09:30 +0200)]
build: Update version to 1.2.0

As master is now based on 1.2.0-RC1, match planned release number.

Change-Id: Id16c97b76b92aabf0699ca81d70a3abb3bdb0cf0
Bug: https://jira.iotivity.org/browse/IOT/fixforversion/10501
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoclean up some string parameter for MQ callback
jihwan.seo [Thu, 1 Sep 2016 12:02:49 +0000 (21:02 +0900)]
clean up some string parameter for MQ callback

Change-Id: Ia721b4efd2d9c18514f8e1ce3025f63952902b6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoGenerate iotivity_config.h at build time
David Antler [Fri, 26 Aug 2016 21:39:56 +0000 (14:39 -0700)]
Generate iotivity_config.h at build time

This patch lightens the burden for those wishing to integrate the
IoTivity CSDK into their project.

 - Remove (almost) all HAVE_*_H from the command line.
 - Build new file: resource/c_common/iotivity_config.h
 - Include "iotivity_config.h" in headers which #include
   platform-specific header files.
 - Added out/*/*/*/include/c_common/iotivity_config.h which will
   include the HAVE_*_H build flags.
 - Export files from out/*/*/*/include/c_common/windows/include/*.h

Change-Id: Ib8a7e83c8ceb025c29b11284ee2912f95c930ca6
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10989
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoMerge "Merge branch 'master' into notification-service" into notification-service
Uze Choi [Fri, 2 Sep 2016 13:02:03 +0000 (13:02 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service

8 years agoFix bug about string input
cc [Fri, 2 Sep 2016 11:35:26 +0000 (20:35 +0900)]
Fix bug about string input

Unexpected topic message is set by fgets operation.

Change-Id: I4a7ac3d1a91baa0025426967fb54a13d3f58156d
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11341
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate resource protocol specification
cc [Thu, 1 Sep 2016 13:53:53 +0000 (22:53 +0900)]
Update resource protocol specification

Resource attributes are updated as the resource model
defined by spec document.

Change-Id: Ia20601345c4b327bf002c515696837bd84893fa5
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11293
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'master' into notification-service
cc [Fri, 2 Sep 2016 11:57:41 +0000 (20:57 +0900)]
Merge branch 'master' into notification-service

Presence patch is adapted

Change-Id: Id4aa4ac5e0ff7dbbec2ca788f215b7d329a3a29e
Signed-off-by: cc <ch79.cho@samsung.com>
8 years agoUpdate Consumer C APIs.
KIM JungYong [Fri, 2 Sep 2016 09:58:29 +0000 (18:58 +0900)]
Update Consumer C APIs.

1) Parameter as NSProvider structure is changed C string providerId.
2) NSTopicLL is seperated from NSProvider structure.
3) Topic releated API is renamed and changed return type.
4) NSUnsubscribe API is commented out.

Conflicts:
        service/notification/examples/linux/notificationconsumer.c

Change-Id: Ib46ed952cdab58cb9f95eaeb4e405b7da4adeb2f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11335
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify to call of provider state callback.
KIM JungYong [Fri, 2 Sep 2016 05:23:42 +0000 (14:23 +0900)]
Modify to call of provider state callback.

When incomming the subscription result,
consumer service callback to upper layer every result message
although some of message was duplicated.

Provider state callback is fixed for call once as provider state(allow/deny) changed.

Change-Id: I5a8094092b33e569716475aa60b574ee5eb0e913
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11325
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify Notification Consumer Example
YounghyunJoo [Fri, 2 Sep 2016 04:05:44 +0000 (13:05 +0900)]
Modify Notification Consumer Example

- After deciding to remove discovry callback, discovery info is notified throgh the Provider Changed CallBack.
- we modify example code to possible to check its functionality.

Change-Id: I36af6597fa15b31d5665f2e4a0c4db2c11a8319c
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11315
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agochange strcpy to strncpy.
jaesick.shin [Fri, 2 Sep 2016 06:17:59 +0000 (15:17 +0900)]
change strcpy to strncpy.

strcpy function is unsafe.

Change-Id: Ifd679a4b9804861da409d4318b69502992d8ef90
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11327
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd logic for NS_FAIL Case in API.
jaesick.shin [Fri, 2 Sep 2016 05:43:02 +0000 (14:43 +0900)]
Add logic for NS_FAIL Case in API.

Add NS_FAIL case in API.

Change-Id: I597cf9ed3c76aa2621aacef36305beb01130d11a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11323
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoBug fixes for Unlock.
jaesick.shin [Fri, 2 Sep 2016 04:40:48 +0000 (13:40 +0900)]
Bug fixes for Unlock.

Bug fixes unlock logic for NSProviderDeleteConsumerTopic Function.

Change-Id: Ibe27134f38b8e12b0d767df03aabd049f16431b9
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11317
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoChange dereference code.
jaesick.shin [Fri, 2 Sep 2016 04:02:22 +0000 (13:02 +0900)]
Change dereference code.

Added check logic for dereference code.

Change-Id: If34fe346803b7ccc9c3eb21056790c1e030bd14a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11313
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoReplace conditional compilation marcro WITH_CLOUD and bug fixed.
jaesick.shin [Fri, 2 Sep 2016 03:50:56 +0000 (12:50 +0900)]
Replace conditional compilation marcro WITH_CLOUD and bug fixed.

Macro RD_CLIENT is replaced with WITH_CLOUD.
The codes related to cloud service is not compiled according to
the conditional compilation with the marcro.

modify topic notification filter for remote message
This patch is bug-fix which adds topic notification filter for remote msg.

Change-Id: Ib61957dac3a193706386be5e121e5efdb2bbada8
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11311
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoResolve memory leak for unittest.
jaesick.shin [Thu, 1 Sep 2016 01:18:59 +0000 (10:18 +0900)]
Resolve memory leak for unittest.

change strdup to global variables.

Change-Id: Ida35b98ad5fb5be8add9fa12b481cb8a2bee4dcb
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11235
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify subscribe presence query.
KIM JungYong [Thu, 1 Sep 2016 11:53:11 +0000 (20:53 +0900)]
Modify subscribe presence query.

Changed query is calculated to receive presence message on ipv6.

Change-Id: I53db76230b96dc12a3174de37b14fa0044eafc67
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11279
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
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 44e8750f7f2aa96d8c313cd757c96211ddc65571)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11321

8 years agoFix bug for Cloud service of consumer service.
KIM JungYong [Tue, 30 Aug 2016 07:04:29 +0000 (16:04 +0900)]
Fix bug for Cloud service of consumer service.

For connect to Cloud, making uri, parsing address, constructing query was fixed.

Address converter is modified for TCP requests.

Change-Id: I714ce22e53ba05aab7f1be1512ccddfe46cdeb78
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11113
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded CreateMessage API in Android APIs
nikhil.a [Mon, 29 Aug 2016 12:49:21 +0000 (18:19 +0530)]
Added CreateMessage API in Android APIs

1) CreateMessage API added for ProviderService
2) Addition of JNI code for the respective API
3)Refactoring of code

Change-Id: I53c44c09580028b4ec0631b47f31c5b8abb47535
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit dfb5ff844c058fdbbafb530326e1935cae17673e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11277
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMove non-public struct
cc [Thu, 1 Sep 2016 05:41:23 +0000 (14:41 +0900)]
Move non-public struct

TopicList struct and Attribute keys are moved to internal struct module.

Change-Id: Iab8d9c7a308eb107f12f59cc5cf999d092f58642
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify Svace Issue
YounghyunJoo [Thu, 1 Sep 2016 05:46:28 +0000 (14:46 +0900)]
Modify Svace Issue

- Fix bug for checking NSResult is validate
- Fix bug for value null check

Change-Id: Ie0cab2ae4d7487a3f0ef310fda938893f4fe84ef
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11251
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify subscribe presence query.
KIM JungYong [Thu, 1 Sep 2016 11:53:11 +0000 (20:53 +0900)]
Modify subscribe presence query.

Changed query is calculated to receive presence message on ipv6.

Change-Id: I53db76230b96dc12a3174de37b14fa0044eafc67
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11279
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify consumer logic for updating provider information
YounghyunJoo [Mon, 29 Aug 2016 12:56:43 +0000 (21:56 +0900)]
Modify consumer logic for updating provider information

- Add synchronization logic for cache update in NSConsumerInternalTaskController.
- Adapt its synchronization logic, when subscription succeed is checked/updated.

Change-Id: I746a3d3602eab3ac570a6d2ddfcdd4b7dce8e18a
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate consumer logic for stopped provider.
KIM JungYong [Tue, 30 Aug 2016 00:22:53 +0000 (09:22 +0900)]
Update consumer logic for stopped provider.

When the provider was stopped service,
consumer service will feedback to upperlayer on ProviderChangedCallback but non-feedback before.
This patch enable feedback when stopped provider service.

And enum value of NS_STOPPED is added.
NSResponse enum structure is renamed with NSProviderState.

Change-Id: I7fdd2ca1d3ba0b534c74b0fbc6719616daab2f67
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoCoap Over TCP support for Tizen
Abhishek Sharma [Thu, 18 Aug 2016 05:50:50 +0000 (11:20 +0530)]
Coap Over TCP support for Tizen

Change-Id: If1a7d61aa6499282182138d188b0e600133f49c1
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10583
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>
8 years agoUpdate QoS configuration to HIGH in Mediator android app
Jihun Ha [Wed, 31 Aug 2016 14:15:31 +0000 (23:15 +0900)]
Update QoS configuration to HIGH in Mediator android app

High QoS makes CoAP request to be CON message.

Change-Id: I14cfcf0304a095cdc5947a224f734856a72629da
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11223
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoCAIsTlsMessage fix
Andrii Shtompel [Thu, 1 Sep 2016 02:12:49 +0000 (11:12 +0900)]
CAIsTlsMessage fix

Wrong param was put to CAIsTlsMessage
This causes problems with TLS

Change-Id: Ie65bc9c2fea10d7741ce14c24b0d723b58f098f1
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11239
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoAdd unittest for NSUnregistertopic Case.
jaesick.shin [Wed, 31 Aug 2016 08:00:36 +0000 (17:00 +0900)]
Add unittest for NSUnregistertopic Case.

check the Unregistertopic case.

Change-Id: I0f182ce9b9e8b60b708740a35ea0880f1c537344
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd unitest and change invalid function name.
jaesick.shin [Wed, 31 Aug 2016 06:57:04 +0000 (15:57 +0900)]
Add unitest and change invalid function name.

1. Add unittest for NSProviderRegisterTopic case.
2. change invalid function name in NSProviderInterface.h

second patch is comment changed only.

third patch included,
change invalid testcase name.

Change-Id: Iacbc8466c1f2f204b81ff5db28015ef9f5762858
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRemove warning code in Provider Side.
jaesick.shin [Wed, 31 Aug 2016 08:05:21 +0000 (17:05 +0900)]
Remove warning code in Provider Side.

remove warning code only.

Change-Id: I12f4ffc235817110e8a71c42f80d642569efb7f2
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoBug fixes for mutex unlock.
jaesick.shin [Thu, 1 Sep 2016 00:56:05 +0000 (09:56 +0900)]
Bug fixes for mutex unlock.

Add mutex unlock for NSProviderDeleteConsumerTopic function
in NSPrvoiderMemoryCache.c

Change-Id: I9286c3fdb897409f298defab40d7479db13a2f06
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate response payload parser for samples
Jee Hyeok Kim [Thu, 1 Sep 2016 06:43:09 +0000 (15:43 +0900)]
Update response payload parser for samples

1. Update response payload parser for samples
   to print all variables

2. Cleanup code

Change-Id: I7fc6f583c43ce4dd6f5a4bf43a3990b4f86d5371
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoChanged OcException message in JniOcPlatform
hyuna0213.jo [Wed, 31 Aug 2016 04:39:01 +0000 (13:39 +0900)]
Changed OcException message in JniOcPlatform

If the function is not supported, we return Not supported message
not fail.

Change-Id: I43b96d6a7c1948a629dfc07a0b557e67987c8733
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11175
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: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoModify topic notification filter for remote message
cc [Thu, 1 Sep 2016 01:45:29 +0000 (10:45 +0900)]
Modify topic notification filter for remote message

This patch is bug-fix which adds topic notification filter for remote msg.

Change-Id: I90ae060ab2a5385fdd3c66c2614c5dd4933d83ab
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify consumer logic for updating provider information
YounghyunJoo [Mon, 29 Aug 2016 12:56:43 +0000 (21:56 +0900)]
Modify consumer logic for updating provider information

- Add synchronization logic for cache update in NSConsumerInternalTaskController.
- Adapt its synchronization logic, when subscription succeed is checked/updated.

Change-Id: I746a3d3602eab3ac570a6d2ddfcdd4b7dce8e18a
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix bugs for copy provider
YounghyunJoo [Wed, 31 Aug 2016 08:50:55 +0000 (17:50 +0900)]
Fix bugs for copy provider

- Modify incompatible type casting

Change-Id: Ic2695c85c1b4c6070089d46dbb9179d6cb9baae1
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify bug which is related provider copy issue
YounghyunJoo [Tue, 30 Aug 2016 05:32:03 +0000 (14:32 +0900)]
Modify bug which is related provider copy issue

some APIs which is received NSProvider pointer as an API parameter
after calling and Processing these APIs, NSProvider was removed.
to prevent this problem, as a first step in the API, we added the logic to copy provider.

Change-Id: I3523691ec4992dc9dbf0b0824a4e2ff4df133568
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago1. Modified the Accepted Providers Consumers list to return references
abitha.s [Fri, 26 Aug 2016 11:52:21 +0000 (17:22 +0530)]
1. Modified the Accepted Providers Consumers list to return references

2. Added API to setTopic in Message for setting via application

3. Updated Logs

Change-Id: Id3b37c148c3e96d391224ccb5cf75a57c40ced6f
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 4bc6feed319d383524a70662318d25eb4bb14266)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11041

8 years agoAdded CA BLE packet format changed codes
jaehyun Cho [Fri, 5 Aug 2016 02:16:15 +0000 (11:16 +0900)]
Added CA BLE packet format changed codes
description : https://jira.iotivity.org/browse/IOT-1210

Change-Id: I6f886989e8fdc14fd5128e0c96f1de3f7687bffe
Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9979
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoUpdate Android sample app related to group&invite
Jaewook Jung [Tue, 30 Aug 2016 11:29:38 +0000 (20:29 +0900)]
Update Android sample app related to group&invite

Change-Id: I5b0fd0e1c2297b50bd72cbcba53745cfc6b58329
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11143
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: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoFix crash issue when called unsubscribePresence.
hyuna0213.jo [Thu, 1 Sep 2016 00:12:08 +0000 (09:12 +0900)]
Fix crash issue when called unsubscribePresence.

Adding null initialization code.

Change-Id: I2d52b1fa479dd1956f089d202aa01fcc7da09e52
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11069
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoModify cloud URI for sample
cc [Tue, 30 Aug 2016 05:04:59 +0000 (14:04 +0900)]
Modify cloud URI for sample

The default URIs are changed for sign-up, sign-in, token and refresh.

Change-Id: I06e60ba7733b59089c89fd031ab811e7a4191760
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11103
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix defects detected by SVACE system in easy setup
Heewon Park [Wed, 31 Aug 2016 06:25:51 +0000 (15:25 +0900)]
Fix defects detected by SVACE system in easy setup

Change-Id: I8f69f7d083bd5b7a77c146e67b471614a911b7a3
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11191
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix wrong comparison statement in Easy setup.
Jihun Ha [Tue, 30 Aug 2016 13:15:04 +0000 (22:15 +0900)]
Fix wrong comparison statement in Easy setup.

mRemoteEnrollee can not be converted to boolean. Thus, it should
be changed to null checking statement.

Change-Id: Iec38fa2995fbc70b97e37e7b9318a19a82f0c2fb
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11157
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd message queue, group&invite sample for cloud
Jee Hyeok Kim [Mon, 29 Aug 2016 03:56:35 +0000 (12:56 +0900)]
Add message queue, group&invite sample for cloud

1. Add message queue clients
2. Add group & invite samples
3. cleanup existing clients

Change-Id: Ibe107a979e3cee253c4a74bbbc991da934371bc2
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11099
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoUpdate unit test for cloud RD
Minji Park [Tue, 30 Aug 2016 08:35:51 +0000 (17:35 +0900)]
Update unit test for cloud RD

- fix unit test for resource presence in RD

Change-Id: I658e8952723d49a849a8c8b148790546979e2fd3
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11123
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>
8 years agoUpdate SConscript of connectivity-abstraction
hyuna0213.jo [Tue, 30 Aug 2016 04:20:17 +0000 (13:20 +0900)]
Update SConscript of connectivity-abstraction

currently bt_edr_adapter is not supported on linux platform.
but if TARGET_TRANSPORT=ALL is used, all adapters are included.

Change-Id: I4439154a4f08c5e040b7a63f104052c6a5aa1097
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11111
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoremoved #ifdef preprocessor wrapping #define
Jaewook Jung [Thu, 11 Aug 2016 08:28:50 +0000 (17:28 +0900)]
removed #ifdef preprocessor wrapping #define

Wrapping #define preprocessor with #ifdef doesn't have any influence.
It is unnecessary. Rather it could have a riskiness for redefinition.

Change-Id: I8262b288d75988de0b96d6879358d830d5de848a
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoPort simpleserverHQ and simpleclientHQ to Windows
Anisha Aggarwal [Tue, 23 Aug 2016 21:02:06 +0000 (14:02 -0700)]
Port simpleserverHQ and simpleclientHQ to Windows

Change-Id: I481987321f27b52780d6c907886dd1d1276039c8
Signed-off-by: Anisha Aggarwal <anisha.aggarwal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10829
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>
8 years agofix bug on JniOnObserveListener related to AccountManager
Jaewook Jung [Tue, 30 Aug 2016 09:29:33 +0000 (18:29 +0900)]
fix bug on JniOnObserveListener related to AccountManager

Change-Id: I5d5f77838c66aff4cfe1c4bbf7d04d5386a222f2
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11129
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed potential issue for Android JNI
jihwan.seo [Wed, 31 Aug 2016 04:11:48 +0000 (13:11 +0900)]
fixed potential issue for Android JNI

Change-Id: I798b87fde00886061f53536c8c464e1cf7861e0d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoresolve build warnings in base layer related to logging
Jaewook Jung [Wed, 31 Aug 2016 04:36:42 +0000 (13:36 +0900)]
resolve build warnings in base layer related to logging

resolve build warnings in base layer related to logging

Change-Id: Ia80a4f05d563e4ae8f7d65b4407cc66092caf20e
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11173
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoAdded CreateMessage API in Android APIs
nikhil.a [Mon, 29 Aug 2016 12:49:21 +0000 (18:19 +0530)]
Added CreateMessage API in Android APIs

1) CreateMessage API added for ProviderService
2) Addition of JNI code for the respective API
3)Refactoring of code

Change-Id: I53c44c09580028b4ec0631b47f31c5b8abb47535
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years ago1) Modified JNI to fix few issues.
nikhil.a [Sun, 28 Aug 2016 16:08:10 +0000 (21:38 +0530)]
1) Modified JNI to fix few issues.

2) Update cpp-wrapper code causing issue with JAVA API's.

Change-Id: I55b5b0d85fce9011287868773e17144f9ce4ea61
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11005
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 dfd2b5b33435d137d2344482bba6d9d5710e8823)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11039
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agofixed string coverter for callback parameter related MQ APIs
jihwan.seo [Tue, 30 Aug 2016 08:04:31 +0000 (17:04 +0900)]
fixed string coverter for callback parameter related MQ APIs

both CreateMQTopic and DiscoveryMQTopics callback
had wrong coverter for uri parameter.

Change-Id: I71f01a473ed5133880e2e50c2d0df7c1c7a7cad6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11117
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoUpdate Android Sample App for MQ in simplebase
jihwan.seo [Wed, 24 Aug 2016 06:48:57 +0000 (15:48 +0900)]
Update Android Sample App for MQ in simplebase

Change-Id: I6a2373e7a97b67ff8723491843fa3959cb0cc840
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoRemoving unit test Error
sahil bansal [Wed, 31 Aug 2016 10:42:28 +0000 (16:12 +0530)]
Removing unit test Error

Change-Id: I49a5bf51b5ee7aeb1b74fc4386964f609834266c
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11215
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoAdded C++ wrapper for cert provisioning apis
Randeep Singh [Sat, 27 Aug 2016 09:02:12 +0000 (14:32 +0530)]
Added C++ wrapper for cert provisioning apis

[Patch #2,#3] Updated code according to review comments.
           Moved saveTrustCertChain to OCSecure as static api.

Change-Id: I8fe3fa316a6c4822f642ad0094d97585f77253d5
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10997
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoRemove MessagList in Provider side.
jaesick.shin [Mon, 29 Aug 2016 04:45:55 +0000 (13:45 +0900)]
Remove MessagList in Provider side.

MessageList is unused in provider side.
second patch remove the white space.

Change-Id: I078166aa44eaaa0886edab1832536911352abbda
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11037
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoBug fixes for memory leak in NSProviderMemoryCache.
jaesick.shin [Thu, 25 Aug 2016 07:20:00 +0000 (16:20 +0900)]
Bug fixes for memory leak in NSProviderMemoryCache.

Add free logic for memory leak in NSStorageWrite function.

Change-Id: Ifd8ef3b08cc61e798255be5f472df6e9d4e3575a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10901
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 2f8564431591e37493985629ffee7a90dfbfe4f6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11035

8 years agoModify bug which is related provider copy issue
YounghyunJoo [Tue, 30 Aug 2016 05:32:03 +0000 (14:32 +0900)]
Modify bug which is related provider copy issue

some APIs which is received NSProvider pointer as an API parameter
after calling and Processing these APIs, NSProvider was removed.
to prevent this problem, as a first step in the API, we added the logic to copy provider.

Change-Id: I3523691ec4992dc9dbf0b0824a4e2ff4df133568
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years ago[IoTivity Simulator] Updated the eclipse plugins to load the 1.2.0+RC1 1.2.0-RC1
Senthil Kumar G S [Tue, 30 Aug 2016 15:38:42 +0000 (21:08 +0530)]
[IoTivity Simulator] Updated the eclipse plugins to load the
connectivity abstraction library.

Previouly CA was built as a static library but now its built as a
shared library.
Due to this, simulator eclipse plugins should explicitly load it
and update the manifest file.

Also the run-time path should be specified to help the loader to find the
dependent libraries of octbstack in resource/csdk/SConscript
for simulator to avoid the need to set the LD_LIBRARY_PATH
to run the plugins (Similar to one of our previous changes
https://gerrit.iotivity.org/gerrit/#/c/7673/).

Change-Id: I153934ecff71e9978e4726c017cdb816c96b96d6
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11163
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate mediator android sample app.
Heewon Park [Tue, 30 Aug 2016 07:24:02 +0000 (16:24 +0900)]
Update mediator android sample app.

     - chage sign in/up logic using accountmanager.
     - add cloud security logic.

Conflicts:

        service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat

Change-Id: I88784ca27a13fdf841fcba73a460c78baf46415f
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11059
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate certificate-provisioin & acl-provision
Heewon Park [Mon, 29 Aug 2016 08:30:25 +0000 (17:30 +0900)]
Update certificate-provisioin & acl-provision

Conflicts:

        service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/CloudProp.java

Change-Id: Iddb5023ddfee34190502223a7f63c15c7230d988
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/10905
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix a faulty logic in parsing a received query and in setting a URI string
sy01.youn [Tue, 30 Aug 2016 06:03:58 +0000 (15:03 +0900)]
Fix a faulty logic in parsing a received query and in setting a URI string

When the request is sent with an empty query string, ehRequest->query is
empty string, which is interpreted as a default interface. This patch adds
a conditional statement to handle this case.
Additionally, due to https://gerrit.iotivity.org/gerrit/#/c/9111/ patch,
OCRepPayloadSetUri API is going not to be used in a simple resource like
wifi, cloudserver, and devConf resource. So, OCRepPayloadSetPropString
is used to write an URI of the resource.

Change-Id: Ie815e752007767881cef51018453e52c1a0e5863
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11045
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agocomment out the cpp-layer unittest in notificiation service.
jaesick.shin [Tue, 30 Aug 2016 10:35:13 +0000 (19:35 +0900)]
comment out the cpp-layer unittest in notificiation service.

unittest is failed.
after resolve and then commit.

Change-Id: I99dcc4189e4b1b0205c51c17a87b5513efc74c61
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11139
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoresolve build warnings in base layer for linux
Jaewook Jung [Thu, 25 Aug 2016 06:25:04 +0000 (15:25 +0900)]
resolve build warnings in base layer for linux

resolve build warnings in base layer for linux
(unused parameter, comparison warning..)

Change-Id: I91e69af57ec653260ebddf4d89d5a5d5fcc0ffe4
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoadd with_tcp in auto build
jihwan.seo [Thu, 11 Aug 2016 07:07:13 +0000 (16:07 +0900)]
add with_tcp in auto build

Change-Id: I1aa7dfebe8d971f6ea45ddeb362f25d0e3a66d5f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10251
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoIOT-1213 Fix build failure for test build
George Nash [Fri, 12 Aug 2016 21:49:27 +0000 (14:49 -0700)]
IOT-1213 Fix build failure for test build

When building with TEST=1 the build failed reporting
multiple environments were trying to build the target 'ut'

This was a hardcoded dummy target that is used to force the
unit tests to run.  The dummy target was switched from the
hardcoded 'ut' name to use the name of the unit test so two
environments don't think they are building the same target.

Change-Id: I9ac35752f0a1c7acf902bf0087a212833bf5a6a5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10443
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed presence for multicast
jihwan.seo [Thu, 25 Aug 2016 08:37:05 +0000 (17:37 +0900)]
fixed presence for multicast

Change-Id: Ifed4256e1a2dfe66e70d53afb9d624dc5d406d80
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoTCPServer's CAReceiveMessage fix
Andrii Shtompel [Wed, 10 Aug 2016 15:12:08 +0000 (18:12 +0300)]
TCPServer's CAReceiveMessage fix

Details:
1. This change allows to correctly receive data even if some senders
   do not send all required data

[Patch #3] Return KeepAlive support

Cherry-pick to master https://gerrit.iotivity.org/gerrit/#/c/10235/
It was already reviewed by several people including module maintainer

Change-Id: I42831d75dd39d8c3ca91607157807cf022f01231
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10839
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: Jon A. Cruz <jon@joncruz.org>
8 years agoadd specific comment for entity handler result usage.
jihwan.seo [Tue, 23 Aug 2016 06:40:15 +0000 (15:40 +0900)]
add specific comment for entity handler result usage.

Change-Id: I08ba3a5c529ed82da23c43e97ff2e5cc79c4c92a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoyocto: use LDFLAGS if defined in build environment
Philippe Coval [Mon, 29 Aug 2016 13:16:13 +0000 (15:16 +0200)]
yocto: use LDFLAGS if defined in build environment

Without this change, extra flags like "--hash-style=gnu"
 will be ignored and quality checks will fail.

Reported message is:
  ERROR: iotivity-* do_package_qa: QA Issue:
  No GNU_HASH in the elf binary:
  '*/samples/opt/iotivity/examples/plugins/zigbee/iotivityandzigbeeserver'
  (...)
  ERROR: iotivity-* do_package_qa: QA run found fatal errors. Please consider fixing them.
  ERROR: iotivity-* do_package_qa: Function failed: do_package_qa
  (...)
  Summary: There were 8 ERROR messages shown, returning a non-zero exit code.

Bug: https://lists.yoctoproject.org/pipermail/yocto/2016-August/031442.html
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: Ifa240817c768df3a7d154d36b699de8ca0f0307a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11073
Reviewed-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: Dave Thaler <dthaler@microsoft.com>
8 years agoAdd Fragment for cloud test
jihwanseo [Fri, 19 Aug 2016 07:46:48 +0000 (16:46 +0900)]
Add Fragment for cloud test

Include AccountManager, Resource Directory, Message Queue

Change-Id: I9bf2c582b817152880c26d5bcd5d2e7d1d7186af
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agofix android Build Scons for Security
jihwan.seo [Mon, 29 Aug 2016 09:58:50 +0000 (18:58 +0900)]
fix android Build Scons for Security

Change-Id: I30a868beac8e1268ccc73da1f8a1c61a206f819e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11033
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
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>
8 years agoUpdate TestCase for MQ C++ API
jihwan.seo [Mon, 29 Aug 2016 06:51:57 +0000 (15:51 +0900)]
Update TestCase for MQ C++ API

As some MQ APIs are changed, update their TC.

Change-Id: I93eb31b2efba0d635db493aefb8817922f4f9538
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11023
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years agoModify logic for related topic.
jaesick.shin [Tue, 30 Aug 2016 04:58:44 +0000 (13:58 +0900)]
Modify logic for related topic.

this patch included,
1. Modify logic for NSSendTopicList.
2-1. change NSProviderTopicListSize to NSProviderGetTopicListSize.
2-2. and move NSProviderMemoryCache to NSProviderTopic.c
3. rename Function for NSProviderRegisterTopic.

Change-Id: I829435e5504b117f1f4d71453b5c9ca6ab02c511
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11101
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoOCRepPayloadSetUri API can use before OCRepPayloadAppend().
Jack Lee [Tue, 30 Aug 2016 02:17:33 +0000 (11:17 +0900)]
OCRepPayloadSetUri API can use before OCRepPayloadAppend().
OCRepPayloadSetUri API can not decide whether Payload is
collection or not.

Change-Id: I5790e5c3b0a4eb88451ad759cb6ec441c15d5ec9
Signed-off-by: Jack Lee <jjack.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11095
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: Habib Virji <habib.virji@samsung.com>
8 years agoRename Function and arguments for API.
jaesick.shin [Mon, 29 Aug 2016 13:51:30 +0000 (22:51 +0900)]
Rename Function and arguments for API.

this patch included,
1. Rename function for API.
2. Modify the unittested by the first.
3. comment out the cpp-wrapper in SConscript.

Change-Id: I5f7ba966e757dc14389eab58d96ed3e5cfa521fe
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11071
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[IOT-1226] Updating code for reset case without client knowledge
saurabh.s9 [Thu, 25 Aug 2016 12:20:51 +0000 (17:50 +0530)]
[IOT-1226] Updating code for reset case without client knowledge

Change-Id: I24af255c499dd6502d5a4186c4bad7a2ede7225a
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10919
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoModify cloud URI for sample
cc [Tue, 30 Aug 2016 05:04:59 +0000 (14:04 +0900)]
Modify cloud URI for sample

The default URIs are changed for sign-up, sign-in, token and refresh.

Change-Id: I06e60ba7733b59089c89fd031ab811e7a4191760
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11105
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoRemove consumer callback for discovered provider.
KIM JungYong [Fri, 26 Aug 2016 09:47:25 +0000 (18:47 +0900)]
Remove consumer callback for discovered provider.

Consumer service has two type of callback within parameter as provider object.
One of callback is called when the provider discovered,
and others is called the provider changed.
But, discovered callback is imprecise called owing to provider policy.
So, discovered event is added in provider changed callback.
Two of callback is united as changed name of ProviderStateCallback
and removed discovered callback.

Change-Id: I60eebaf78aaae78a61b3772138b582df3748910c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10973
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agonotifypaylaod format fixed in InviteManager
Jung Seungho [Tue, 30 Aug 2016 01:26:23 +0000 (10:26 +0900)]
notifypaylaod format fixed in InviteManager

Change-Id: If85652d2eca70bd6ba5b02b74cb75947d201df10
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11093
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>
8 years agoFix bug for storage update to provider.
KIM JungYong [Mon, 29 Aug 2016 12:20:43 +0000 (21:20 +0900)]
Fix bug for storage update to provider.

The provider will update two type of information,
one of information is connection information, and others is topic list.
It is problem that whole infomation was updated although just one of information updated.
In this patch, update logic is seperated updating infomation.

Change-Id: I0fe1062791ac43fadadbba04311b903c44678a1e
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11047
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix bug for storage update to provider.
KIM JungYong [Mon, 29 Aug 2016 12:20:43 +0000 (21:20 +0900)]
Fix bug for storage update to provider.

The provider will update two type of information,
one of information is connection information, and others is topic list.
It is problem that whole infomation was updated although just one of information updated.
In this patch, update logic is seperated updating infomation.

Change-Id: I0fe1062791ac43fadadbba04311b903c44678a1e
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11051
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoUpdate validation check logic on Android SDK.
Heewon Park [Mon, 29 Aug 2016 06:13:24 +0000 (15:13 +0900)]
Update validation check logic on Android SDK.

Change-Id: Ia0b2d1f7027ee68343a8de715ece26267a0c4dbf
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoUsing shared library instead of static on linux platform
hyuna0213.jo [Wed, 10 Aug 2016 01:00:43 +0000 (10:00 +0900)]
Using shared library instead of static on linux platform

Using shared library instead of static on linux platform

Change-Id: Ie6023095990150f4f840a41ad8fac9f7ef89482f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10209
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoUpdate createRemoteEnrollee function.
Heewon Park [Mon, 29 Aug 2016 06:07:31 +0000 (15:07 +0900)]
Update createRemoteEnrollee function.

 - easy-setup support only OCResource which is through UDP Adapter.

Change-Id: I97fb7b63d5bd78cf613bf2d0049859361e28b8b5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10949
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoUpdate a CBOR encoding logic for RD publish payload
hyuna0213.jo [Thu, 25 Aug 2016 23:58:39 +0000 (08:58 +0900)]
Update a CBOR encoding logic for RD publish payload

- ins value has to be included to publish resouce even in case of zero
- update rdclient sample

Change-Id: I84eef889b90bea2d814e336a3ad77de952b59f6a
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10927
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoRemove unused enum eAccessPolicy
cc [Fri, 26 Aug 2016 13:12:01 +0000 (22:12 +0900)]
Remove unused enum eAccessPolicy

The unnessary enum data is removed.

Change-Id: I6d55405827a365689a5a8d452dd400464b1fbd16
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10971
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix Default ACL
Jongmin Choi [Wed, 17 Aug 2016 09:47:45 +0000 (18:47 +0900)]
Fix Default ACL

Remove unnecessary entries from ACL
Remove "ad", "amacl", "dpairing", "pconf"

Patch #1: Initial upload

Change-Id: Id7cd0c2f7d6891332499decc8acd378eda6a5f5f
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>