platform/upstream/iotivity.git
7 years agoMerge remote-tracking branch 'origin/master' into notification-service
ch79.cho [Fri, 19 Aug 2016 06:42:13 +0000 (15:42 +0900)]
Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: Ia655d39bb0e4a4c14072cb9a98566fe15bc4f6b1
Signed-off-by: ch79.cho <ch79.cho@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 agoAdd logic for getTopicRequest without consumer Id and Add topic in NSSendMessage...
jaesick.shin [Thu, 18 Aug 2016 08:12:22 +0000 (17:12 +0900)]
Add logic for getTopicRequest without consumer Id and Add topic in NSSendMessage Payload.

1. Add exception logic of getRequest(consumer Id == NULL) for Topic case.
2. Add topic attribute for NSSendMessage Payload.

Change-Id: I7db3c6432d02cd96390b5d71677fb3f20281607d
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10599
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd exception logic for NSStorageDelete Function.
jaesick.shin [Thu, 18 Aug 2016 09:57:40 +0000 (18:57 +0900)]
Add exception logic for NSStorageDelete Function.

Add exception When the list header is null of NSStorageDelete Function.

Change-Id: I080152cba762831ad71856fc7d87137dc4c4d3e5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd logic for NSIsTopicSubscribed.
jaesick.shin [Thu, 18 Aug 2016 02:11:46 +0000 (11:11 +0900)]
Add logic for NSIsTopicSubscribed.

this function is checking the each of consumer subscribe.

second patch included,
modify invalid types.

Change-Id: I2cb1adfc5af804ed59207244638985f5b67bd754
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@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>
(cherry picked from commit 90959b0f2675d2e39770c1e6a02bff0e05d1a9ab)
Reviewed-on: https://gerrit.iotivity.org/gerrit/10631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoModify notification consumer example code
YounghyunJoo [Thu, 18 Aug 2016 11:42:19 +0000 (20:42 +0900)]
Modify notification consumer example code

- to support topic functionality

Change-Id: I3a76d2a5eb80ddf67780ae1707e1097c3930d6a8
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10619
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 memory issue on calling C APIs at Cpp layer.
KIM JungYong [Tue, 16 Aug 2016 05:15:31 +0000 (14:15 +0900)]
Fix memory issue on calling C APIs at Cpp layer.

When the calling APIs with NSProvider parameter at Cpp layer,
lead to crash by illegal access of memory.
This problem is due to type-cast of NSProvider between NSProvider_internal.
So, type-casting of structure is removed.

Conflicts:
service/notification/src/consumer/NSConsumerCommunication.c
service/notification/src/consumer/NSConsumerInterface.c
service/notification/src/consumer/NSConsumerInternalTaskController.c

Change-Id: I32c61b56510886f9f3be341d2ba497e211f0cad6
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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 agobug fixes for samle App, initialize code for Subscription.
jaesick.shin [Thu, 18 Aug 2016 05:41:24 +0000 (14:41 +0900)]
bug fixes for samle App, initialize code for Subscription.

1. startProvider invalid set in sample App.
2. not initialize observe ids of subscription list.

Change-Id: I91551ac3b6a6b1b19d98a6ed9ab0e4ec5563c661
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoNSTopics Sturct name change into NSTopicLL
jaesick.shin [Thu, 18 Aug 2016 02:40:46 +0000 (11:40 +0900)]
NSTopics Sturct name change into NSTopicLL

This patch included,
1. remove comment out for related provider in SConscript.
2. change NSTopics Sturct to NSTopicLL.
3. bug fixes for related topic logic.

Change-Id: I848b7cf2f85f4b23b8cbd51485bc6a01e4e04b4f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10571
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd TOPIC_URI for notification resource.
jaesick.shin [Thu, 18 Aug 2016 04:08:54 +0000 (13:08 +0900)]
Add TOPIC_URI for notification resource.

Add TOPIC_URI for notification resource in NSSendAccessPolicyResponse.

Change-Id: Ia51f83ceced1bb6e6357cf8bcff11db350a5f6f5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10575
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd Util for related Topic.
jaesick.shin [Thu, 18 Aug 2016 03:54:23 +0000 (12:54 +0900)]
Add Util for related Topic.

NSMessage include topic.
so Add util for related topic in NSUtil.c

Change-Id: I5be2dd86667508e999af08c7634755cdbffd7885
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoAdd mutex logic for NSProvoiderGetListSize.
jaesick.shin [Thu, 18 Aug 2016 01:59:10 +0000 (10:59 +0900)]
Add mutex logic for NSProvoiderGetListSize.

Add logic for mutex in NSProviderGetListSize function.

Change-Id: I2414eaec6271edcf3899df94bc480adeda123b77
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoRemove not used function.
jaesick.shin [Wed, 17 Aug 2016 07:35:05 +0000 (16:35 +0900)]
Remove not used function.

not required that function.

Change-Id: Iabca8bbe212139c1e7e90a3cc2b0ddac53ec955c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10537
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd Logic to get topic value into the NSMessage Payload
YounghyunJoo [Wed, 17 Aug 2016 10:36:54 +0000 (19:36 +0900)]
Add Logic to get topic value into the NSMessage Payload

Change-Id: If11332e5d5721b10f2a1e6085f28fd0d77f9b5c4
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobug fixes for NSProviderGetConsumerTopicsCacheData function.
jaesick.shin [Wed, 17 Aug 2016 08:10:36 +0000 (17:10 +0900)]
bug fixes for NSProviderGetConsumerTopicsCacheData function.

bug fixes for NSProviderGetConsumerToicsCacheData logic.

Change-Id: I5ceea03e463250e2d970c21c009a13a4c602f10c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10541
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoModify Consumer Topic Logic
YounghyunJoo [Wed, 17 Aug 2016 08:09:16 +0000 (17:09 +0900)]
Modify Consumer Topic Logic

- Modify Topic Logic as changing Topics structure
- Remove consumerId value in the Topics structure
- Remove comment block in consumer codes

Change-Id: I256b6d5b18fd757957b4fbd58ebd631c2236ebf1
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10329
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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 agoAdd postConsumerTopics Function and modify sendTopicList.
jaesick.shin [Tue, 16 Aug 2016 04:13:34 +0000 (13:13 +0900)]
Add postConsumerTopics Function and modify sendTopicList.

this patch included,
1. Add postConsumerTopics, postConsumerTopics function is called when received OC_REST_POST.
2. Modify sendTopicList Logic.

second patch included,
modify invalid type for topic state.

third patch included,
modify invalid type for NSProviderGetListSize arg.

fourth patch included,
modify invalid type for cacheElement iterator.

Change-Id: Ief1ca496972e90819f04afc50c3849a83bb051e9
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10479
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoAdd example for related Topic.
jaesick.shin [Wed, 17 Aug 2016 06:56:23 +0000 (15:56 +0900)]
Add example for related Topic.

Add example for related Topic API.

Change-Id: Ibf87b8b6b58e81a7b3e7a582116d60cfd5446b00
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10533
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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 agoRemove unnecessary attribute
ch79.cho [Wed, 17 Aug 2016 04:15:00 +0000 (13:15 +0900)]
Remove unnecessary attribute

An attribute, NS_ATTRIBUTE_ACCEPTANCE, is removed as the usage has
been changed. Instead the value of MessageID is set to NS_ALLOW(1)
or NS_DENY(2) for the response of subscription.

Change-Id: I48d6b34449602fec9e083620273f991a52ef4bbe
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10527
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@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 agoNotification cpp-wrapper UnitTest
nikhil.a [Fri, 12 Aug 2016 11:46:19 +0000 (17:16 +0530)]
Notification cpp-wrapper UnitTest

1)Added ProviderService unittest
2)Added ConsumerService unittest

Change-Id: Ibb510f4e1e6407ca3ecab791ea4d2e76f03e669c
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10345
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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 agoRemove not required Function of Topic.
jaesick.shin [Tue, 16 Aug 2016 04:20:42 +0000 (13:20 +0900)]
Remove not required Function of Topic.

This function is not used.

Change-Id: I5d18bd0a1083446baf32f32aed1f865454f2e289
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10481
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoBug fixes for initialize condition of TopicList.
jaesick.shin [Tue, 16 Aug 2016 01:50:14 +0000 (10:50 +0900)]
Bug fixes for initialize condition of TopicList.

Remove initialize condition variable for topiclist.
not required that variable.

Change-Id: Ia63540bbff0998729797e51019f5a288f9702641
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10475
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@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 agoMerge branch 'master' into notification-service
Hun-je Yeon [Sat, 13 Aug 2016 00:17:23 +0000 (09:17 +0900)]
Merge branch 'master' into notification-service

Change-Id: I8147d601975024dc986317b87e7eaec2d60e527a
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
7 years agoAdd logic for Topic Scenario.
jaesick.shin [Fri, 12 Aug 2016 08:27:33 +0000 (17:27 +0900)]
Add logic for Topic Scenario.

1. If the user cancels the selection,
delete cache about topic.

2. If the user the selection,
add cache about topic.

3.
add logic for NSProviderGetConsumerTopics function.

4.
Move related topic function to memoryCache.
Add NSProviderGetTopicsCacheData, NSProviderGetConsumerTopicsCacheData
function in NSProviderMemoryCache.
because of, this function logic is access cache.

5.
bug fixes about mutex unlock and Add null check.
bug fixes about mutext unlock(initMutex) in NSProviderInterface.c.
Addt null check in Function.

6.
Bug fixes for wrong data type.
TASK_SUBSCRIBE_TOPIC case in NSTopicSchedule,
Use the Wrong second parameter of NSStorageWrite.
re modify second parameter and remove not required freelogic.

Change-Id: I24458847640b8c47e22fd47c7162a01c5dcff412
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10339
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@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 agoadd logic related Topic List.
jaesick.shin [Thu, 11 Aug 2016 13:07:29 +0000 (22:07 +0900)]
add logic related Topic List.

this patch inlcuded
delete related topic in MemoryCache.

second patch included
bug fixes for wrong define value.

Change-Id: Iea1cb4b80d88fcdc8a1a7ab506c13d51f7de9814
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agorename function for NSStoreTopics and Add NSDeleteTopics Function.
jaesick.shin [Thu, 11 Aug 2016 12:30:51 +0000 (21:30 +0900)]
rename function for NSStoreTopics and Add NSDeleteTopics Function.

this patch included
change NSStoreTopics Function name to NSAddTopics.
add NSDeleteTopics Function(only function)
next commit, i will add logic.

second patch included
remove not required define for NSStoreTopics.

Change-Id: I3ab2a910de12a252a4fd82edd22bcdf0c65ca87a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@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 agoSVACE fixes for C++ wrapper for Notification Service.
abitha.s [Thu, 11 Aug 2016 13:35:29 +0000 (19:05 +0530)]
SVACE fixes for C++ wrapper for Notification Service.

Change-Id: I54d9508e5d79cb2579057d1346d1fd0b8be2c24a
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10287
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 agoremove NSTopic state in NSCacheTopicSubData.
jaesick.shin [Thu, 11 Aug 2016 12:24:22 +0000 (21:24 +0900)]
remove NSTopic state in NSCacheTopicSubData.

NSTopic state variable is not required in NSCacheTopicSubData.

Change-Id: Ifd76a6638604fab432215f7134e08adc051e1d1d
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoChange constant to define.
jaesick.shin [Thu, 11 Aug 2016 11:18:30 +0000 (20:18 +0900)]
Change constant to define.

change constant to NS_UUID_STRING_SIZE(define) in NSStruct.h

Change-Id: I6f401a61edbdc1fc4f39917bf2cd73be40c02ed6
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd logic for addTopic.
jaesick.shin [Thu, 11 Aug 2016 11:02:36 +0000 (20:02 +0900)]
Add logic for addTopic.

this patch included
Added topics store to cache.

Change-Id: I766f566b406d4697b99d01b1b859d54fcfd9ad03
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10269
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
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 agoAdd structs for topic cache.
jaesick.shin [Thu, 11 Aug 2016 09:55:14 +0000 (18:55 +0900)]
Add structs for topic cache.

Add NSCacheTopicData struct, NSCacheTopicSubData struct.
structs will use memory cache.

Change-Id: I18dbaea45782f8910dbe0120182fa414b463b976
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate topic APIs
ch79.cho [Thu, 11 Aug 2016 08:10:55 +0000 (17:10 +0900)]
Update topic APIs

The APIs for topic are updated.
And the name of task attributes are upgraded regarding to the APIs.

Change-Id: Ia570afc768a9466019ac08013c817fa17cbe964a
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate topic subscription
ch79.cho [Thu, 11 Aug 2016 04:49:37 +0000 (13:49 +0900)]
Update topic subscription

Topic subscription function is added.
And registration feature and transmission of the topic array
are updated.
Plus, the name of NSTopic is changed to NSTopics.

Change-Id: I87d4102b461fe3ee471487a8574b7f32ca40e9d1
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@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 agoModify Callback function in cpp wrapper for Notification Service.
abitha.s [Wed, 10 Aug 2016 13:34:24 +0000 (19:04 +0530)]
Modify Callback function in cpp wrapper for Notification Service.

1) changed Subscribe Accepted CB to Provider Changed CB.
2) Provider Changed CB is invoked when Provider status is changed.
3) enabled c++ wrapper

Change-Id: If07c8c71d764bd87d57f2aa519a09525bd5ef286
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@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 agoremove consumerId field in NSTopicList struct.
jaesick.shin [Wed, 10 Aug 2016 13:28:23 +0000 (22:28 +0900)]
remove consumerId field in NSTopicList struct.

remove not required consumerId field.

Change-Id: I592aaf3056157f2eaa99eea38e88a07613ce5dab
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd list for registered topic.
jaesick.shin [Wed, 10 Aug 2016 13:02:53 +0000 (22:02 +0900)]
Add list for registered topic.

We manage the two lists on the topic.

Change-Id: I1aeed85d0d04fabb9e0e896e0988f96c0c73ecff
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd Topic List into the NSProvider to support topic Functionality
YounghyunJoo [Tue, 9 Aug 2016 08:11:40 +0000 (17:11 +0900)]
Add Topic List into the NSProvider to support topic Functionality

Conflicts:
        service/notification/src/consumer/NSConsumerCommon.h

Change-Id: I83d197f20bd33d063aa25416b9f0682dd56e6c83
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify related topiclist.
jaesick.shin [Tue, 9 Aug 2016 12:37:07 +0000 (21:37 +0900)]
Modify related topiclist.

first patch included
1. Rename function and variables related TopicList.
2. Destory TopicList.

second patch inlcuded
remove the white spaces.

third pacth included
remove duplicated initTopiList.

four patch updated commit message only.

Change-Id: Id13c4442546c0659eb4f8c73a4f2a7fc832d330e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@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 agoResponse topic list for GET request
ch79.cho [Wed, 10 Aug 2016 04:48:20 +0000 (13:48 +0900)]
Response topic list for GET request

Response function is added for GET request of topic resource.

Change-Id: I846cd424aca475091182e9eece2bed9e1a359a0e
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10219
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoImplement APIs for topic notification.
jaesick.shin [Tue, 9 Aug 2016 12:03:21 +0000 (21:03 +0900)]
Implement APIs for topic notification.

The changes are about implementation of APIs for topic notification.
TODO tasks will be complete with next commits.

four patch included comment out about related Topic in Consumer Side.
because of, It has already been modified about NSTopic, NSTopicList.

Conflicts:
        service/notification/include/NSCommon.h

Change-Id: I6cea362cce5fbc0bf7623853fa4c87c7de854321
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10201
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 agoSend topic notification
ch79.cho [Wed, 10 Aug 2016 03:40:23 +0000 (12:40 +0900)]
Send topic notification

Change-Id: Iaa85682a09c2b99542191df0df063ac94584e98d
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10215
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 agobug fixes for deallocate memory logic of "NotificationMessage".
jaesick.shin [Wed, 10 Aug 2016 01:13:50 +0000 (10:13 +0900)]
bug fixes for deallocate memory logic of "NotificationMessage".

added deallocate memory logic for
NotificationMessage when send notification failed.

Change-Id: I3feca075a06df9f6ba5cc90bdf9ff51cde279b60
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify Callback function.
YounghyunJoo [Wed, 10 Aug 2016 01:37:46 +0000 (10:37 +0900)]
Modify Callback function.

- change Subscribe Accepted CB to Provider Changed CB.
- Provider Changed CB is invoked when Provider status is changed.

Change-Id: Ifdbc68cd8e41898761739515cf9e6310e8ad23b2
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10183
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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 agoadded start logic for NSTopicSchedule.
jaesick.shin [Tue, 9 Aug 2016 12:12:33 +0000 (21:12 +0900)]
added start logic for NSTopicSchedule.

1. pthread_create about NSTopicSchedule.
2. define extern function.

Change-Id: I3f4f23aa624f31ba698e959a39b8cee3d51c901c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10203
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFix memory leak at thread termination.
KIM JungYong [Tue, 9 Aug 2016 07:17:11 +0000 (16:17 +0900)]
Fix memory leak at thread termination.

When push thread done one's works, thread handle does not deallocated.
So, push thread was detached from consumer thread,
and allocated push thread handle was deallocated.

This issue was found on valgrind.

Change-Id: Ia99f960adc8131f2f97f99aa455c19a021abf70f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify Consumer to support Topic functionality
YounghyunJoo [Tue, 9 Aug 2016 10:07:09 +0000 (19:07 +0900)]
Modify Consumer to support Topic functionality

- Add 2 APIs for Topic
- Add Logic flow to support Topic

Change-Id: If44abf508a22aed6a70d4497eed214c4f610792d
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoCode divide for cloud variable.
jaesick.shin [Wed, 10 Aug 2016 01:42:58 +0000 (10:42 +0900)]
Code divide for cloud variable.

add #ifdef WITH_CLOUD #endif for cloud variable.

Change-Id: I9368eb81be8131bf33fba4887a1c1d86bdef2727
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10213
Reviewed-by: Chihyun Cho <ch79.cho@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 agoCreate topic module running with scheduler
ch79.cho [Mon, 8 Aug 2016 12:41:12 +0000 (21:41 +0900)]
Create topic module running with scheduler

Add topic feature module that works with its scheduler.
Three tasks for topic notification are created.

Change-Id: Ie68595fe0d9a1c63a802aef64e94f61482b19286
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoNotification ProviderService Java API Updation
nikhil.a [Tue, 9 Aug 2016 07:36:14 +0000 (13:06 +0530)]
Notification ProviderService Java API Updation

1) Updated the JAVA API's for the NS ProviderService using C++ wrapper
2) Modified the JNI API's for NS ProviderService
3) Added the sample Android application for testing the Java API for Provider.

Change-Id: I1df1509e9f95d5c7df3d6711dadd0889d1997045
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>