nikhil.a [Thu, 25 Aug 2016 08:44:57 +0000 (14:14 +0530)]
Sconscript and Android sample app update
1) Sconscript update to build android code
2) onProviderChanged callback name update in consumer sample app
Change-Id: Ic74bf7315f31b734cb854d4e0b3d59a01420d74d
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Tue, 23 Aug 2016 06:14:22 +0000 (15:14 +0900)]
Modify Consumer Logic to call the Provider Changed CB
- remove if statement which should be modified when change to Provider Changed CB from Accepted CB
Conflicts:
service/notification/src/consumer/NSConsumerInternalTaskController.c
Change-Id: Icb4b0afe55f2589a9d5bdcc6b8655f8f3a59fdd5
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Wed, 24 Aug 2016 08:48:59 +0000 (17:48 +0900)]
Modify response logic for NSTopicEntityHandler.
two times, send response.
second patch included,
remove the DoResponse for error case.
Change-Id: Ife6e8b87868afa6307ed82ca41430b1837c56798
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10879
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
nikhil.a [Wed, 24 Aug 2016 15:53:08 +0000 (21:23 +0530)]
Updated JAVA and JNI API's for Topic Resource
1. Added JAVA APIs related to topic resource for provider and consumer
2. Added JNI for respective Java API's
3. Minor changes for cpp-wrapper
Change-Id: I459c70b64529040010d099bf239d42863b1417c2
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10883
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
abitha.s [Fri, 12 Aug 2016 08:47:21 +0000 (14:17 +0530)]
Updated Topic resource changes for C++ wrapper
1. Modified the Topic resource and Topic LL changes in Provider and Consumer
2. Updated the APIs for Topic resource in C++ wrapper
3. Updated the sample application for calling Topic APIs
patch 1 : initial commit
patch 2 : updated commit message
patch 3 : updated review comments
patch 4 : updated commit message
patch 5 : removed NSAccessPolicy struct
Change-Id: I737bef2eebb129c5f13034d990398d75dd13b3b7
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Wed, 24 Aug 2016 04:41:12 +0000 (13:41 +0900)]
Fix bug for Find provider using Address.
When finding provider using address,
search logic do invalid type casting for provider connection information.
For the above reason, Provider was never finding with address on storage.
In this patch, invalid type casting is fixed.
Change-Id: I6cde6c9b85e589501cb3ae7567246e631d5e9a65
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10845
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
cc [Mon, 22 Aug 2016 07:00:12 +0000 (16:00 +0900)]
Modify cloud interface
Cloud interface and APIs are modified according to cloud module changes.
And configurations related to the interface are changed.
Conflicts:
service/notification/examples/linux/notificationconsumer.c
Change-Id: I0c7cb16dd19596cda90c0eef2a6332cc6a5532ae
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10717
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Wed, 24 Aug 2016 08:42:09 +0000 (17:42 +0900)]
Bug fixes for unlock mutex.
Add unlock mutex NSStorageDelete.
Change-Id: I52795aff7395051b00f60f764163cda85e318be1
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10877
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Wed, 24 Aug 2016 05:10:58 +0000 (14:10 +0900)]
Add Consumer Logic to update observe result for each connections
- Modify to update result additionally in case of observe fail during while loop
Change-Id: I272db06e182e0ded3c227de571fa15cd736feabe
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 23 Aug 2016 09:44:00 +0000 (18:44 +0900)]
Restrict topic list control when Provider does not have permission.
If provider does not have the comsumer subscription accept capability
following topic related API should not work.
1. NSProviderSelectTopic
2. NSProviderUnselectTopic
Change-Id: I197a60a0aae5eef3226f3766f1b793594628a9f9
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10795
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 23 Aug 2016 09:27:04 +0000 (18:27 +0900)]
Modify invalid type for NSPostConsumerTopics.
change int to int64_t.
Change-Id: Iba4a1897cfb1e234da8574849e3fa739eaaaad8c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10793
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jaesick.shin [Tue, 23 Aug 2016 07:21:41 +0000 (16:21 +0900)]
modify logic for OC_REST_POST of topic.
1. Accepter is provider case :
- our service is not support sendtopiclist from OC_REST_POST
2. // Accepter is consumer.
- our service is support sendtopiclist from OC_REST_POST
Change-Id: I4e2090197f388892e831071e7d3ff600494261c7
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 23 Aug 2016 06:25:17 +0000 (15:25 +0900)]
Modify logic for related Topic.
This patch included
add OCDoReponse for NSEntityHandlerTopicCb.
add DeleteConsumerTopicList.
When the topic entityhandler OC_REST_POST is requested,
the function is called NSPostConsumerTopics.
At this time, delete a list of consumer who have a provider,
and make a new selection topiclist.
second patch included.
modify comment out.
Change-Id: Ib5eba3809dfc199bc2ab93008e32591da1312060
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10773
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Wed, 24 Aug 2016 04:57:41 +0000 (13:57 +0900)]
Modify Consumer example & Logic to copy provider
- Modify example code to test Topic
- Modify Logic to copy provider during processing topic
Change-Id: I4a6ca0d2d0c203fcfb76af00cc4c05b745d498e0
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10783
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Tue, 23 Aug 2016 11:58:11 +0000 (20:58 +0900)]
Add Logic to store NSProvider subscribe information after subscribing
- fix bug for non-storing issue
- fix bug logic which does not push task into the queue when received presence stopped
Change-Id: I0ba93229bfa02361def5bfbf357043ec05e5a4f1
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 23 Aug 2016 12:33:59 +0000 (21:33 +0900)]
Modify MessagId for type.
The OIC specification supports 32 bits only for int type.
Change-Id: I6485f6657c4de50340727b244b5fe22f71da5816
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10805
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 23 Aug 2016 07:10:10 +0000 (16:10 +0900)]
Add deallocation memory for related topic.
This patch included,
Add deallocation memory for remaining task.
Change-Id: I344ae1f65eb8385959a832baf9e09454833cc611
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Mon, 22 Aug 2016 08:05:08 +0000 (17:05 +0900)]
Fix bug for copy of provider informations.
When provider information was stored,
storage module copy whole of provider connections,
but first pointer of connection information was wrongly redefine with next connection information.
For the reason, first connection information was ignored.
In this patch wrongly calculation of pointer was fixed.
Change-Id: Ic91abd458979c2b113e641b3d9c28e6894dd5b7f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10723
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Uze Choi [Tue, 23 Aug 2016 11:25:34 +0000 (11:25 +0000)]
Merge "Merge remote-tracking branch 'origin/master' into notification-service" into notification-service
jaesick.shin [Tue, 23 Aug 2016 00:57:47 +0000 (09:57 +0900)]
Bug fixes unittest for ExpectCallNotifyOnConsumerByAcceptIsTrue.
change new NSMessage to NSCreateMessage.
Change-Id: Ic6639f936504a40fe5b40a2ed0efdabf4d6121c7
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 23 Aug 2016 05:44:00 +0000 (14:44 +0900)]
Remove not required function.
this patch included
remove not required function in NSProviderMemoryCache.
and refactoring code about related NSStorageDelete function.
Change-Id: Iee2e6bbfb149a4cf3d1a0908974d0c752e54be0b
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10765
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Mon, 22 Aug 2016 07:15:55 +0000 (16:15 +0900)]
bug fixes logic for subscription cache update.
If consumer have controlled access
then provider always allowed for subscription.
Added call function of subscription updateState.
second patch included,
remove not required code.
change NSSendSubscriptionResponse to NSSendConsumerSubResponse.
Change-Id: Ia39766e814130bd492193e5c3a57436493b9e409
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10719
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Hun-je Yeon [Tue, 23 Aug 2016 03:55:18 +0000 (12:55 +0900)]
Merge remote-tracking branch 'origin/master' into notification-service
Change-Id: Ifc4d229deb7d96800790c617536d96b9ad25136c
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
KIM JungYong [Mon, 22 Aug 2016 02:03:59 +0000 (11:03 +0900)]
Fix build fail of consumer unittest.
When notification service build,
before unittest is commented why unittest has fail case and build error.
Fail case is resolved other patch by Jaesick.shin.
In this patch, build error is fixed.
Change-Id: Id5a588f719ae8b6eb1ac78bf987dd793da208c14
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
hyuna0213.jo [Thu, 11 Aug 2016 00:30:47 +0000 (09:30 +0900)]
Removed the duplicated code in catcpserver.c
removed the duplicated code caused by merge of
https://gerrit.iotivity.org/gerrit/#/c/8027/
Change-Id: Id9429af0959cae4a2cc9d508a007c7b26a7e0c31
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10243
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Ziran Sun [Mon, 8 Aug 2016 10:05:48 +0000 (11:05 +0100)]
Correct wrong use of API for creating resources in unittests.
Change-Id: Ib05481a2a87c2eb4714832d453a8455a80c1456f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10139
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Oleksii Beketov [Thu, 18 Aug 2016 11:04:36 +0000 (14:04 +0300)]
Modify TLS adapter implementation to store subjectAltName
CAdecryptTls() from ca_adapter_net_tls.c modified to check certificate
for subject alternative name (SAN) optional field. It will be stored
as userId.
Change-Id: I5a018f1030873f031966d785658db8c9b36f2839
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jaesick.shin [Mon, 22 Aug 2016 03:45:10 +0000 (12:45 +0900)]
Modify unittest for ExpectCallNotifyOnConsumerByAcceptIsTrue.
this unittest is sometimes success or fail.
Change-Id: I5db819e90919c9db1281b0853c44214cbf58cc43
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10701
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Sat, 20 Aug 2016 06:20:37 +0000 (15:20 +0900)]
Modify some internal functions' name in easy setup
This patch change names of some funtions more readable.
Additionally, update the codes to remove warning messages in building
Change-Id: Ifaf31b0bc99641110a79f199bea753fa4e4597dd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Sat, 20 Aug 2016 05:32:01 +0000 (14:32 +0900)]
Remove ESCloudProvState in Jni and Android
Followed by https://gerrit.iotivity.org/gerrit/#/c/10685/,
this change is applied to jni and Android.
Change-Id: I0f716706f65ef4f455a61ccbd9f79ae4854458ed
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Sat, 20 Aug 2016 04:52:03 +0000 (13:52 +0900)]
Remove ESCloudProvState due to duplication
ESCloudProvState and ESResult can produce a similar result in easy setup.
So ESCloudProvState is decided to be merged into ESResult for consistency
with the other provisioning API like deviceProvisioning.
Change-Id: Ic937688f0f47eac9b7f4ce2b257ea7c3c6306eba
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10685
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
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>
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>
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>
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>
KIM JungYong [Mon, 22 Aug 2016 02:03:59 +0000 (11:03 +0900)]
Fix build fail of consumer unittest.
When notification service build,
before unittest is commented why unittest has fail case and build error.
Fail case is resolved other patch by Jaesick.shin.
In this patch, build error is fixed.
Change-Id: Id5a588f719ae8b6eb1ac78bf987dd793da208c14
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
projects / platform / upstream / iotivity.git / log