iotivity.git
3 years agoComment out unittest of resource hosting. 05/10705/4
KIM JungYong [Mon, 22 Aug 2016 04:45:55 +0000 (13:45 +0900)]
Comment out unittest of resource hosting.

When unittest of resource hosting running,
lead to crash because pure virtual method called.
some of resource hosting class has OCResource as shared pointer.
When the termination of application
OCResource as shared pointer call destructors on RH's instance termination,
but RI c++ alread terminated, so RH app(unittest) lead to crash.

Change-Id: I297300a16ecd0e4dd7f9a1db8557d7167a59c5a5
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10705
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoFix unittest of things manager to wait a certain time to discover resources 03/10703/2
Jihun Ha [Mon, 22 Aug 2016 04:26:23 +0000 (13:26 +0900)]
Fix unittest of things manager to wait a certain time to discover resources

findCandidateResources can have the third parameter which is a waitTime
for discovering resources. If it is not specified, it acts like findResource.
It means, once any resource is discovered, it is immediately called, which
makes the test case failed if wrong resource is discovered.
To resolve this issue, we wait until a right resource id discovered.

Change-Id: Ib3d6f5595c955c8565d031d5fd2faf2ee904abe5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10703
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agofixed bug for setValue in refreshAccessToken 39/10539/2
Jaewook Jung [Wed, 17 Aug 2016 08:00:43 +0000 (17:00 +0900)]
fixed bug for setValue in refreshAccessToken

Since OCRepresentation doesn't perceive a const string as std::string value,
need to clarify a type of parameter.
Otherwise, it is passed as a true boolean value whatever it is.

Change-Id: I3db677f6bdf59bf23036dc678781b35af95025e6
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10539
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
3 years agoFix TLS-related Build error 93/10693/2
Jongmin Choi [Sat, 20 Aug 2016 10:28:03 +0000 (19:28 +0900)]
Fix TLS-related Build error

Fix service build error related to TLS support

Change-Id: If0c9884ed2e21e8810c4a9d8b2e79b6cbf38dd90
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoMerge branch 'notification-service' 81/10681/1
Hun-je Yeon [Fri, 19 Aug 2016 16:15:18 +0000 (01:15 +0900)]
Merge branch 'notification-service'

Notification topic is added.
After this patch, notification provider could distinguish
the notification according to its topics, and consumer
could receive the selected notification from provider

Change-Id: I66a8c3d6aec28c0e8d20ccdb4f00b77850e374f7
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
3 years agoFix Consumer's bug & support to non topic scenario 69/10669/2
YounghyunJoo [Fri, 19 Aug 2016 08:50:47 +0000 (17:50 +0900)]
Fix Consumer's bug & support to non topic scenario

Change-Id: Iaf704defc826147d85762095ebb0981398e77cac
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10669
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: jaesick shin <jaesick.shin@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
3 years agoFix bug for prevent crash when access null pointer string. 75/10675/2
KIM JungYong [Fri, 19 Aug 2016 13:04:18 +0000 (22:04 +0900)]
Fix bug for prevent crash when access null pointer string.

When consumer receive responce of discovery,
we was compare uri of discovered resource with "notification".
But, sometime uri of discovered resource was null,
consumer service occur crash.
In this patch, protection code is added in discover result handling logic.

Change-Id: I9006a36874ea9e282031aa7f95609ac3ac307f02
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10675
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agocomment out for ExpectCallNotifyOnConsumerByAcceptIsTrue case. 71/10671/2
jaesick.shin [Fri, 19 Aug 2016 10:37:16 +0000 (19:37 +0900)]
comment out for ExpectCallNotifyOnConsumerByAcceptIsTrue case.

This case is sometimes failed when build with TCP=1.
Comment out for this case.
will change code.

Change-Id: I86c7092da222b2b512b292d3f66760e2f8059851
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10671
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoMerge "Merge remote-tracking branch 'origin/master' into notification-service" into...
Uze Choi [Fri, 19 Aug 2016 11:49:19 +0000 (11:49 +0000)]
Merge "Merge remote-tracking branch 'origin/master' into notification-service" into notification-service

3 years agoChange OCCloudPublish API to OCRDRublish 55/10655/2
ch79.cho [Fri, 19 Aug 2016 05:50:34 +0000 (14:50 +0900)]
Change OCCloudPublish API to OCRDRublish

Cloud publish API is changed to OCRDPublish provided by
resource directory. And the cloud login example is removed,
because the API releated to login will be changed.

Change-Id: I13dd27ca5461fb79ef1e2fc0df70d08c9a37515e
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoAdd consumer logic for provider was stopped. 87/10587/5
KIM JungYong [Thu, 18 Aug 2016 06:56:54 +0000 (15:56 +0900)]
Add consumer logic for provider was stopped.

When consumer presence listener received event of
stopped provider or deleted notification resource of provider,
consumer service does not act anything.
In this patch,
consumer service will process for canceling observe and removing provider infomation.

Change-Id: I9133ddbcbe8e341584ebaf8152c22df003cbb2ff
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10587
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoModify logic for NSProviderGetConsumerTopicsCacheData Function. 53/10653/2
jaesick.shin [Fri, 19 Aug 2016 05:35:24 +0000 (14:35 +0900)]
Modify logic for NSProviderGetConsumerTopicsCacheData Function.

This Function is direct used The User Interface function.
Changed to use a cache memory function.

Change-Id: I567e644a3890f78bb25495b2ab55d46be9f7912f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10653
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoModify for Related Topic. 45/10645/3
jaesick.shin [Fri, 19 Aug 2016 04:22:17 +0000 (13:22 +0900)]
Modify for Related Topic.

this patch included
1. bug fixes for invalid type and mutex unlock logic.
2. Add NSProviderDeleteConsumerTopic Function. This function is called when you deselect topic.
3. delete NSIsTopicSubscribed function. This function is not required.

Change-Id: I2629418f441ad0efaaee864b22150424158fa43c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10645
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoFixed wrong address conversion of ip information 95/10495/2
hyuna0213.jo [Tue, 16 Aug 2016 08:22:46 +0000 (17:22 +0900)]
Fixed wrong address conversion of ip information

Fixed wrong address conversion of ip information

Change-Id: I8c730ae9ca0efcef51d3e9f90e24f24d3a90bd8b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10495
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoChange the delimiter from '&' to ';' 35/10135/3
Jaehong Jo [Mon, 8 Aug 2016 09:52:46 +0000 (18:52 +0900)]
Change the delimiter from '&' to ';'
According to the specifications

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

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

Change-Id: Id6a99ad9ea5d03de724239e9a0d9b21ece3cbe19
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoFixed memory leak from keep-alive 23/10223/3
hyuna0213.jo [Wed, 10 Aug 2016 06:33:17 +0000 (15:33 +0900)]
Fixed memory leak from keep-alive

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

Change-Id: I80736893e472c31f9058c2d2b5c1d3c38a692c04
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10223
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years ago[IoT-1211] modified java file list for Android build 29/10529/3
jihwan.seo [Wed, 17 Aug 2016 04:46:20 +0000 (13:46 +0900)]
[IoT-1211] modified java file list for Android build

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

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

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

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

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

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

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

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

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

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

Change-Id: I972cb1386ba55279b8f961e2d6c0a76231cac872
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoUpdate Provider Example. 33/10633/2
jaesick.shin [Fri, 19 Aug 2016 02:15:48 +0000 (11:15 +0900)]
Update Provider Example.

Add User input logic for topic.

Change-Id: I0308f4bf28c222ebb164bf824668579075e058e5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10633
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoAdd send Response with DOResponse for subscription request. 41/10641/3
jaesick.shin [Fri, 19 Aug 2016 02:29:57 +0000 (11:29 +0900)]
Add send Response with DOResponse for subscription request.

observe request alwyas needs response with DoResponse.

Change-Id: Icc9d25def0aed28a48f0f34278e3bc87e6e67d9c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10641
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoModify(Fix) Logic bugs in Notification consumer 15/10615/3
YounghyunJoo [Thu, 18 Aug 2016 11:38:32 +0000 (20:38 +0900)]
Modify(Fix) Logic bugs in Notification consumer

Change-Id: Ia39dd3519f8ed0febe12b7655aaa9eb3478d33da
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10615
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoMerge remote-tracking branch 'origin/master' into notification-service 59/10659/1
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>
3 years agoAdd PMSingleDiscovery function for discover owned/unowned devices in specified endpoint 61/10461/5
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>
3 years agoAdd logic for getTopicRequest without consumer Id and Add topic in NSSendMessage... 99/10599/3
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>
3 years agoAdd exception logic for NSStorageDelete Function. 09/10609/2
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>
3 years agoAdd logic for NSIsTopicSubscribed. 69/10569/4
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>
3 years agoFix build issue about unittest and cloud interface 31/10631/2
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>
3 years agoModify notification consumer example code 19/10619/2
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>
3 years agoFix build issue about unittest and cloud interface 27/10627/5
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>
3 years agoUpdate a logic to handle response code and connectivity type in constructResourceObject 33/10333/7
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>
3 years agoFix memory issue on calling C APIs at Cpp layer. 87/10487/4
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>
3 years agoFix X.509 build issue 11/10611/2
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>
3 years agobug fixes for samle App, initialize code for Subscription. 79/10579/2
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>
3 years agoNSTopics Sturct name change into NSTopicLL 71/10571/3
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>
3 years agoAdd TOPIC_URI for notification resource. 75/10575/2
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>
3 years agoAdd Util for related Topic. 73/10573/4
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>
3 years agoAdd build for Linux with TCP (CoAP over TCP) 65/10565/2
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>
3 years agoImplementation of JNI for subscribe device presence to RD 63/10063/7
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>
3 years agoAdd mutex logic for NSProvoiderGetListSize. 67/10567/3
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>
3 years agoFix unittest of easy setup for TCP option build 59/10559/3
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>
3 years agoRemove not used function. 37/10537/3
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>
3 years agoAdd Logic to get topic value into the NSMessage Payload 55/10555/2
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>
3 years agobug fixes for NSProviderGetConsumerTopicsCacheData function. 41/10541/2
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>
3 years agoModify Consumer Topic Logic 29/10329/10
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>
3 years agofix cloud sample build error 53/10553/3
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>
3 years agoTLS support 43/10543/3
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>
3 years agoUpdated Message Queue for C++ API 91/9991/8
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>
3 years agoAdd postConsumerTopics Function and modify sendTopicList. 79/10479/7
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>
3 years agoAdd example for related Topic. 33/10533/2
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>
3 years agoadded OCAccountManager class for Android and JNI method 67/9967/20
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>
3 years agoIndent modified by static analysis 11/10311/2
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>
3 years agorevise build scripts for tizen 89/10489/2
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>
3 years agobuild: Disable provisioning logging when not wanted 41/9841/3
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>
3 years agoRemove unnecessary attribute 27/10527/2
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>
3 years agoupdated dat file for directPairing android sample app 09/10009/2
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>
3 years ago(double free) crash occurred when discovering device 31/10331/2
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>
3 years agoFix a logic to send a response even in case to wrong request 93/10493/2
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>
3 years agoAdd 'model number' and 'location' properties from mediator side 97/10497/3
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>
3 years agoAdd 'model number' and 'location' properties in DevConf resource 83/10483/3
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>
3 years agomodified setHost() in OCResource for ipv6 with scope ID 29/10129/8
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>
3 years agoImplemented MQ API for Android JNI 03/10003/5
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>
3 years agoadded MQ callback listener for android JNI. 01/10001/11
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>
3 years agoUpdate unittest for remote opertion in scene manager 51/10451/2
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>
3 years agoNotification cpp-wrapper UnitTest 45/10345/2
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>
3 years agoImplementation of JNI for deleting resource from RD 25/9925/5
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>
3 years agoImplementation of JNI for publishing resource to RD 11/9911/10
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>
3 years agoRemove not required Function of Topic. 81/10481/2
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>
3 years agoBug fixes for initialize condition of TopicList. 75/10475/3
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>
3 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'"

3 years agoupdate simpleclient sample app to support test TCP. 17/10217/3
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>
3 years agoMerge branch 'cloud-interface' 49/10449/1
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>
3 years agoMerge branch 'master' into notification-service 45/10445/1
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>
3 years agoAdd logic for Topic Scenario. 39/10339/2
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>
3 years agoFix keep-alive to filter correctly. 89/10189/6
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>
3 years agoUpdate Mediator code for more readable using const. 23/10323/2
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>
3 years agoAS unit test included 37/10137/8
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>
3 years agoadd logic related Topic List. 85/10285/3
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>
3 years agorename function for NSStoreTopics and Add NSDeleteTopics Function. 81/10281/3
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>
3 years agoCI unit test included 13/9913/16
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>
3 years agoImplement acl/invite resource in cloud account server. 75/9975/38
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>
3 years agoUpdate Common data model's Constructor & change security '.dat' files. 13/10313/2
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>
3 years agoSVACE fixes for C++ wrapper for Notification Service. 87/10287/2
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>
3 years agoRemove '/.well-known' from URI 09/10309/2
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>
3 years agoAdded Android java API for Cloud MQ Client. 99/9999/11
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>
3 years agoClean up encodeAddressForRFC6874 routine 51/10151/3
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>
3 years agoMerge "Merge branch 'notification-service'"
Madan Lanka [Thu, 11 Aug 2016 15:57:54 +0000 (15:57 +0000)]
Merge "Merge branch 'notification-service'"

3 years agoremove NSTopic state in NSCacheTopicSubData. 77/10277/2
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>
3 years agoChange constant to define. 73/10273/2
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>
3 years agoAdd logic for addTopic. 69/10269/2
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>
3 years agoModified Scene UnitTest 67/10267/2
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>
3 years agoMerge branch 'notification-service' 79/10279/1
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>
3 years agoAdd structs for topic cache. 63/10263/2
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>
3 years agoUpdate topic APIs 59/10259/2
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>
3 years agoUpdate topic subscription 49/10249/5
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>
3 years agoMove the removeDeviceWithUuid method to OCSecure class as static method. 59/10059/2
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>