jaesick.shin [Thu, 28 Jul 2016 07:31:15 +0000 (16:31 +0900)]
Add Unittest of startProvider in Provider side.
our service is two case for startProvider.
Add startProvider with NSPolicy False Case.
Change-Id: I3aa763aaf264240ba4a9122fe3071a30edb40bcb
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9821
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Wed, 27 Jul 2016 10:56:41 +0000 (19:56 +0900)]
modify the Unittests in ProviderSide.
Our notification service many changed about struct, name, api.
Modify the Unittests.
Change-Id: I77c587d1cb7f1e0644c79074b3db11f47c11e076
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9785
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Hun-je Yeon [Thu, 28 Jul 2016 09:44:15 +0000 (18:44 +0900)]
Merge branch 'master' into notification-service
Change-Id: I7888de55cc1ba0e1dc5e4a9350c67b6a2126beb0
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
jaesick.shin [Thu, 28 Jul 2016 03:37:53 +0000 (12:37 +0900)]
delete unused code of EntityHandler in Provider Side.
Our service is not using the headeroption.
second patch inlcuded delete white space.
Change-Id: Iffa8cafbc30eac8a424ff935c523d7438e441d72
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9811
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Thu, 28 Jul 2016 04:49:33 +0000 (13:49 +0900)]
No place to call the StopPresence in Provider side.
Add a logic to call StopPresence function when StopProvider function is called.
Change-Id: I37ef4549d3f4fb981510b1c479bc1b1af8921ced
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9813
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
ljsachs [Mon, 25 Jul 2016 17:22:46 +0000 (10:22 -0700)]
Add interface for onFindResourceFailed
Necessary for this change https://gerrit.iotivity.org/gerrit/#/c/8249/
Change-Id: I9440c71a758cd74327ad897f11d4016543b13499
Signed-off-by: ljsachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9705
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
KIM JungYong [Wed, 27 Jul 2016 04:07:47 +0000 (13:07 +0900)]
Remove potential defects detected in the static analyzer.
1. Applied code conventions.
2. Initialized variable when it was declared.
3. Added mutex unlock operation when consumer service is terminated.
4. Added enum class instead constant values at consumer Test code.
5. Changed enum class to NSSelector from NSAccessPolicy.
Change-Id: Icbcdb6f45bfdf41902d25c4ba5515d7318ea330a
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
hyuna0213.jo [Wed, 27 Jul 2016 04:25:56 +0000 (13:25 +0900)]
added multicast sending logic for response message
Response message type can be used for presence.
so the multicast message sending logic was added.
Change-Id: Ic2efde32f9eb3a2e2aad4514e1f75fb4e7d50cb5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Philippe Coval [Sat, 23 Jul 2016 04:52:30 +0000 (06:52 +0200)]
tizen: Dereference sqlite3 symlinks before building
If existing sqlite3 files (not dead links) are present
it will use them and prevent downloading at buildtime
and break if running in a "disconnected environment"
like Tizen GBS (chroot).
Typically, if files are not part of packaging,
this is the error message you'll face:
*** Checking for installation of SQLite 3.8.11.1 ***
Download /home/abuild/rpmbuild/BUILD/iotivity-1.1.1/extlibs/sqlite3/sqlite-amalgamation-3081101.zip
from https://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip
Downloading ...
scons: *** <urlopen error [Errno -3] Temporary failure in name resolution> [https://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip] Stop.
Here are some examples of failed jenkins sessions:
- https://gerrit.iotivity.org/gerrit/#/c/9609/1/
- https://build.iotivity.org/ci/job/iotivity-verify-tizen/364/consoleText
Bug: https://jira.iotivity.org/browse/IOT-820
Change-Id: I59ac88807a2d9222e94b841d99a9163765e8596c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
76be2fe7e4d52a21a721cfa312cd3274741bf5aa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9651
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 22 Jul 2016 04:50:23 +0000 (13:50 +0900)]
added build option for SECURE in testcase.
Change-Id: I450ddf0b21ce5a0a7eb3d139219231cc82d47908
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Ashwini Kumar [Wed, 27 Jul 2016 04:57:15 +0000 (10:27 +0530)]
Prevent restore of doxm/pstat resource
in case of owned status and retransmission.
[Patch #1] : initial upload
[Patch #2] : Update pstat resource same as doxm/cred
Change-Id: I33dbf272753ef79ad4f79c62296154500dc67e14
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9273
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9753
jaesick.shin [Tue, 26 Jul 2016 04:11:14 +0000 (13:11 +0900)]
modify NSPolicy in Provider side.
This commit included
Not used NSAccessPolicy Enum.
and move to Provider System as NSPolicy.
second patch included build failed to NSAccept Function at CPP wrapper.
NSAccept Function name is already changed to NSAcceptSubscription.
Change-Id: I418d16f0f4631617116c073e333cb7964b6c12d6
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9709
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 [Tue, 26 Jul 2016 12:08:52 +0000 (21:08 +0900)]
Destroy mutex and mutex Attribute in ProviderMemoryCache.
Added Destroy logic about NSCacheMutex and NSCacheMutex Attribute.
Second patch remove the white space.
Change-Id: I68bdbce9bcb4addf3e910f2b4929318e5308cf5c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9729
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Tue, 26 Jul 2016 11:45:40 +0000 (20:45 +0900)]
modify mutex logic in ProviderMemoryCache.
It was to modify the part that can be preempted contexts in ProviderMemoryCache.
Solve that problem using mutexAttribute.
Change-Id: Ibaa1bc34348b819f5f2bbd0d1ffd95fa95f905c4
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jihwan.seo [Mon, 25 Jul 2016 11:30:34 +0000 (20:30 +0900)]
Modified eCode checker in callback method related PUT/POST of SampleApps.
as OC_STACK_RESOURCE_CHANGED result is added,
sample application which use callback related put/post
will include checker about OC_STACK_RESOURCE_CHANGED result.
Change-Id: Ifa958fa30f943c93dfce76029d30be6744355d37
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9695
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Neil Wong <neil.d.wong.hon.chan@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
KIM JungYong [Mon, 25 Jul 2016 10:04:58 +0000 (19:04 +0900)]
Removed NSMessage_consumer structure.
NSMessage_consumer sturcture is for direct request to provider,
It is designed for excepted storage module.
But, consumer service should set a storage,
so, NSMessage_consumer information no need more.
Finally, NSMessage_consumer is deleted and internal logic is modified.
NSMessage_consumer is deleted.
NSStoreMessage is added for storage.
bug fix for copy NSMessage structure.
Null pointer checking logic is added.
Change-Id: I2eb9f9ed3e9921e978e85a299f342eac240635f0
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Randeep Singh [Tue, 26 Jul 2016 04:42:28 +0000 (10:12 +0530)]
[I0T-1159] Resolved twice response issue
Issue : The server is responding with both 4.00(ACK) & 5.00(CON) error message
Solution : If SendSRMResponse succeed, return OC_EH_OK to OCStack
Patch1: Init
Patch2: Apply review comment
Patch3: Change file mode
Change-Id: I70e2b3e0a703cd137a9244097e128b3ecbed5c77
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9251
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit
8e2f191ccbb06920d2a0aea2d10629f6e106075e)
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9315
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Ziran Sun [Wed, 20 Jul 2016 15:16:52 +0000 (16:16 +0100)]
Fix client crash caused by observe cancellation with sequence No 1.
1. Added support for sequence number starting from 1.
2. When sequence number is 1, client treats it as a normal response
rather than de-registration response.
3. Correct default sequence number value to be valid.
JIRA Issue: https://jira.iotivity.org/browse/IOT-1195
Change-Id: I2ce68d70ff5f8f0cce98234a7dbda566b8085a61
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9519
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
hyuna0213.jo [Wed, 20 Jul 2016 22:56:24 +0000 (07:56 +0900)]
RD client features in base layer
- make consistency with the revised RD spec.
- modified build command with RD_MODE=CLIENT or SERVER
- add the RD client API in base layer.
1. publish resource to resource-directory
2. delete resource from resource-directory
- remove the build script related current RD implementation
in service layer. after RD server features is implemented
in base layer, it will be removed totally.
Change-Id: I992ff34b839cc845c5e44eb1198906bdcc0e2ec0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8983
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: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
hyuna0213.jo [Tue, 12 Jul 2016 23:06:46 +0000 (08:06 +0900)]
Changed the Policy key name for TCP Discovery
If the devices can be accessed via TCP, then the "tcp" key indicates
the assigned tcp port number.
The name of "tcp" key was changed from "tcp" to "x.org.iotivity.tcp".
Change-Id: I509c0f35c6703f6eae45ce6c421df6afaa97a13f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9343
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>
(cherry picked from commit
e91ea0dd75cdc9f9b9893872b56617ed81e10001)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9535
Jaehong Jo [Fri, 22 Jul 2016 02:41:39 +0000 (11:41 +0900)]
Added preprocessor WITH_CLOUD for Subscribe device presence.
It is only used with RD in cloud.
Change-Id: Iabebe4b8b6cf33443e6114281d1ab8ceb3a1b646
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9585
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
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 [Mon, 25 Jul 2016 08:20:55 +0000 (17:20 +0900)]
Change the name of NSAccept Function.
This commit included change the name of NSAccept API.
NSAccept to NSAcceptSubscription.
Change-Id: Ifa36fe0a38ea597007c336f2f9b94c215e847773
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9681
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Mon, 25 Jul 2016 07:25:30 +0000 (16:25 +0900)]
code cleanup.
This commit included code cleanup.
1. coding idiom
2. double free.
3. warning.
4. unlock
second patch included
change the mutex_unlock in NSProviderInterface.
Change-Id: Iff615c577f0cb0e868fa29c1592c523c9bed4d6f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9679
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Uze Choi [Tue, 26 Jul 2016 00:39:12 +0000 (00:39 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service
Abitha Shankar [Fri, 22 Jul 2016 09:57:46 +0000 (15:27 +0530)]
Added C++ wrapper for the Notification Service Provider and Consumer.
1) added wrapper C++ Api's class for NS Provider and NS Resources
2) added wrapper C++ Api's class for NS Consumer
3) added sample applications to test the equivalent functionality from wrapper api's
patch 1 : initial commit for Provider code with Basic API implementation
patch 2 : Updated the code with new design of classes to be in line with API's in android.
patch 3 : Review comments addressed and updated the code.
patch 4 : added appropriate flags for build failure in android
patch 5 : Removed redundant NS prefix and added changes to reduce coupling between Provider classes.
Added Notification Consumer code changes and test application for the same.
Refractered the code with respect to folder structure
patch 6 : updated comments
patch 7 : Modified api's for changes in c api's
patch 8 : updated review comments
patch 9 : updated Doxygen comments
patch 10/11 : rebase to latest
patch 12 : review comments changes to rename files with NS* prefix and added Under OIC::Service namespace
patch 13 : added implementation for Message and SyncInfo cb to call appropriate Provider cb.
patch 14 : updated with the latest API changes with respect to refractoring listeners and added logs
patch 15 : updated with RemoteService APIs for Consumer and Provider and rebased to latest.
patch 16 : rebase to latest
Change-Id: I08c49ed2d5b1d351fc94305aa47ba9dfc18a8844
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8635
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jee Hyeok Kim [Mon, 25 Jul 2016 22:14:18 +0000 (22:14 +0000)]
Merge "Merge branch 'cloud-interface'"
Sunyoung Jung [Mon, 25 Jul 2016 02:34:10 +0000 (11:34 +0900)]
Bug fix OCRepPayloadIsNull function. All of return value is false.
Change-Id: I24596dc6d1fb1314a9ab669e8f7f63fa297ded63
Signed-off-by: Sunyoung Jung <sy0514.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9669
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Fri, 22 Jul 2016 01:54:06 +0000 (18:54 -0700)]
Remove duplicate declaration
Change-Id: Ie2153625ad5df38face8f3280d8d3ba7742f683e
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Tue, 19 Jul 2016 16:23:18 +0000 (18:23 +0200)]
tizen: defines platform for logger
Fix Fail to build for sources :
sampleserver_justworks.cpp:(.text+0x234): \
undefined reference to `OCLog'
Relates to:
https://gerrit.iotivity.org/gerrit/#/c/9311/
Change-Id: Ib721633c982aa28ec5d72dd1bd84cad7115b179c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Hun-je Yeon [Mon, 25 Jul 2016 11:08:05 +0000 (20:08 +0900)]
Merge branch 'master' into notification-service
Change-Id: Iae884afc5a68ccf650ac758191cbb504973705cb
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Jee Hyeok Kim [Mon, 25 Jul 2016 10:23:52 +0000 (19:23 +0900)]
Merge branch 'cloud-interface'
Change-Id: I5a54cf7601c8e02b2e0aa24c03a8cd5436c77404
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
eunok.shin [Fri, 22 Jul 2016 04:28:29 +0000 (13:28 +0900)]
change 3rd party(Github) code
Change-Id: Iaa28bccc46b8eef8e493cf8e99eebc939bf0db0f
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
eunok.shin [Mon, 25 Jul 2016 06:51:46 +0000 (15:51 +0900)]
change jackson version
Change-Id: If99ee4b61f0da112183ba6e484708ab8567610d0
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9677
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
jaesick.shin [Fri, 22 Jul 2016 07:51:44 +0000 (16:51 +0900)]
Fix bugs about memory free at Notification scheduler, and don't initialize observe id in NSProviderSubscription.
This commit included bug fixed.
1. double freeing of memory int stopscheduler function.
2. The code has been cleared from the prevous commit.
added initialize code of observeid.
second, third patch included
delete not required header and add required header.
Change-Id: I56b330ef99f6ef6b57c81afd0e75e25dfaf5306b
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9605
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Jaehong Jo [Fri, 22 Jul 2016 00:48:57 +0000 (09:48 +0900)]
Added the OCStackResult code related 'RESOURCE_CHANGED' in OCToCAStackResult
after merge https://gerrit.iotivity.org/gerrit/#/c/9287/
Change-Id: I5884776ce80c7550869e79b6a69c7c042f96db77
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Mon, 27 Jun 2016 23:39:32 +0000 (08:39 +0900)]
Added MessageQueue(CoAP over MQ) API about Cloud Client side.
- all APIs related MQ is called from OCResource.
(MQ Broker and Topic is handled as Resource)
- MQ publisher can use publishMQTopic API
- MQ subscriber can use subscribeMQTopic / unsubscribeMQTopic
/ requestMQPublish API
- All MQ type can use discoveryMQTopics / createMQTopic API
- publish message is sent with POST base on OCF spec
- createTopic message is sent with PUT base on OCF spec
- discoveryMQTopics / createMQTopic API is implemented through new path
of wrapper class. because their callbacks is different with others
- Local MQ(D2D) is not support. it means there is no local MQ broker for D2D scenario
- refer : https://wiki.iotivity.org/message_queue_mq_for_publish-subscribe_interactions
Change-Id: Ibc1556a389f408634832149f646cd65bf8eda154
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8975
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>
ljsachs [Tue, 19 Jul 2016 19:14:09 +0000 (12:14 -0700)]
[IOT-1196] MAX_QUERY_LENGTH is too short
Increase MAX_QUERY_LENGTH to 256.
Use #define MAX_QUERY_LENGTH in sample code.
Change-Id: Idfc74db1a18af26b2ff5811dac86585ae2b48f9c
Signed-off-by: ljsachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
YounghyunJoo [Thu, 21 Jul 2016 10:47:20 +0000 (19:47 +0900)]
Modify Logic for unsubscribing all provider.
when consumer service stop, unsubscribes all provider.
and when user call APIs, check the service is enabled.
Conflicts:
service/notification/examples/linux/notificationconsumer.c
Change-Id: Ib065b4c0644c0241fd4866119f0d209be360e352
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9495
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Fri, 22 Jul 2016 02:19:01 +0000 (11:19 +0900)]
Added logic for remove NSProvider.
When subscribe cancel API called by user,
information of target provider need to be removed in storage.
NSProvider is removed when user call subscribe cancel API.
Conflicts:
service/notification/src/consumer/NSConsumerCommunication.c
Change-Id: I480f2253d3eb52af62bab01235ba5cb2888fda8a
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Fri, 22 Jul 2016 06:28:02 +0000 (15:28 +0900)]
rollback The Provider Interface file name.
reason is same C++ wrapper file.
wNSProvider.c,h --> NSProviderInterface.c,h
Change-Id: Id5d2fee666e0f23b97f026a94af22b334b40b7ec
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9597
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Abhishek Sharma [Thu, 21 Jul 2016 12:27:20 +0000 (17:57 +0530)]
Fixed build error for Arduino Mega
Change-Id: Ie7ad30627d0bf9b8a6e99d36fc9e6064da48e566
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jaesick.shin [Wed, 20 Jul 2016 12:03:07 +0000 (21:03 +0900)]
add deregister of observe and delete subscription list from observeid
this commit included
add DeleteSubDatafromObid function in NSProviderMemoyCache.
this function is deleted from the subscription list of same observe id.
The function will be called when an observe deregister is requested.
fourth patch included add mutex unlock.
Change-Id: I47810fea34e95e1da789b5ef36ff04aa6c5bd956
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Abhishek Pandey [Thu, 21 Jul 2016 09:19:45 +0000 (14:49 +0530)]
Bug Fix for constructing RCSRepresentation from OCRepresentation.
When constructing RCSRepresentation object from OCRepresentation object
received from base layer, fromOCRepresentation() function does not attempt
to convert child representation objects in OCRepresentation object it receives
as input parameter.
This patch fixes this issue by adding code to iterate over child objects in
OCRepresentation and constructing an equivalent RCSRepresentation for them
recursively.
Change-Id: Ie9c3f6cfaebeb4ceb1c23a07647458414fef3afc
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9547
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Pandey [Thu, 21 Jul 2016 10:00:11 +0000 (15:30 +0530)]
Fixed bug during CacheID generation in resource encapsulation.
On calling startCaching API [RCSRemoteResourceObject.h] for different resources
one after another it is generating the same CacheID.
If we call the API at 1 second delay it is working fine; but it's better to use
a more accurate random generator. OCGetRandom() function provided by CSDK
seems to be more accurate here as it seeds each byte separately.
In this patch we have replaced rand() call with OCGetRandom().
This solves the problem in our test environment and generates unique random
numbers each time which can be used as Cache IDs.
Change-Id: I52858d6b6d149ec23df39920d8a767dd08d67d69
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jung Seungho [Wed, 20 Jul 2016 08:21:00 +0000 (17:21 +0900)]
Modified maven config pom files in stack and interface.
Change-Id: Ie7edd3c0db4d8504b9b1a000dd7d152eb2b3bda4
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit
3534f2a73958e991b00ea5c5c8819423eec3269d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9533
hyuna0213.jo [Thu, 21 Jul 2016 04:26:01 +0000 (13:26 +0900)]
removed defects detected by static analysis tool for linux
- initialize some variables
- adjusted code style
- modified unreached code
Change-Id: I88a5a3d097c7d7c755c06a7b33508050bcb35591
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaewook Jung [Wed, 20 Jul 2016 01:02:24 +0000 (10:02 +0900)]
modifed MAX_ADDR_STR_SIZE value
Change-Id: Ib7c5f074755a043fc9993a5f9067995fe31edb43
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Tue, 21 Jun 2016 22:29:43 +0000 (15:29 -0700)]
Use monotonic clock source for Windows in oic_time
Amend documentation of OICGetCurrentTime() function.
We must replace our GetSystemTimeAsFileTime API call because system
time updates should not impact our calculations. We should assume that
system time can change during the runtime of our programs.
Change-Id: I49246a243435f8b0b2bf7a77fcb31378dc921daf
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Wed, 13 Jul 2016 07:53:56 +0000 (16:53 +0900)]
RD Device Presence features in base layer
- make consistent with the revised RD spec.
- add the RD Device Presence API in base layer.
1. subscribe DevicePresence to resource-directory
Change-Id: Ic6635474efdd5797f41e9d8dcdb867747c93f9eb
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9351
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>
Jaewook Jung [Thu, 16 Jun 2016 11:51:46 +0000 (20:51 +0900)]
Added Cloud-connector API in base layer for account server
added APIs to support functions about account authorization
: Sign-up, Sign-in, Sign-out, Refresh Access token
one existing build option is used to inlude APIs
: WITH_CLOUD
and it is not supported on client mode for now
since device id is not generated on client mode (JIRA-1184)
Change-Id: Iefdf52545580efa4c533ff77137bce6c779bcaba
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9121
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>
KIM JungYong [Tue, 19 Jul 2016 07:39:10 +0000 (16:39 +0900)]
Fixed bug for duplicated request to subscribe and invalid storage logic.
This patch is fixed bug for
1. Duplicated request to subscribe to notification providers.
NSProviderConnectionInfo need to have boolean for subscribe status.
2. When NSConsumer is restarted, message/provider storage had invalid informations.
because they has previous address since first allocated.
3. When Provider re-discovered by consumer discovery module,
provider information never change to latest information about acceptance,
even though discovered provider information has difference information with previous.
bug fix for invalid storage logic(e.g. 2, 3) and access to null pointer.
Boolean for subscribe status is added on NSProviderConnectionInfo sturcture
and subscribe trigger point is fixed.
Macro for verify of return type(OCStackResult) is update for return Success.
Change-Id: If460a841b0bcff064eab8c0b884a06cffa7284d6
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Minji Park [Thu, 21 Jul 2016 01:36:17 +0000 (10:36 +0900)]
Add response handler in cloud interface to set uri in response
- response handler added in DiResource in interface
to make response have uri with di prefix
Change-Id: I02806e81c65b29bcf9d4b7a3ed8bcb586cc09d31
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jung Seungho [Thu, 21 Jul 2016 01:25:57 +0000 (10:25 +0900)]
Integrated log files(Logger, errLog, FileLogger) related
Change-Id: I6579edd85593a2fe005767f1ec5fb862e9c7fe9e
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Minji Park [Thu, 21 Jul 2016 00:37:00 +0000 (09:37 +0900)]
Modify Message queue to apply latest OCF resource model proposal
- uri of mq broker changed
- create and publish topic api changed
Change-Id: I81ded0bb574461f0fa07e2920085e26307749ea0
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9523
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
KIM JungYong [Wed, 20 Jul 2016 05:01:58 +0000 (14:01 +0900)]
Updated unit test of consumer.
Test flow sync with latest consumer code.
Change-Id: Iec53ec7256a1dc91f1e24eb421ba972fe1c81cab
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9489
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jung Seungho [Wed, 20 Jul 2016 08:21:00 +0000 (17:21 +0900)]
Modified maven config pom files in stack and interface.
Change-Id: Ie7edd3c0db4d8504b9b1a000dd7d152eb2b3bda4
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
jihwan.seo [Mon, 4 Jul 2016 07:06:37 +0000 (16:06 +0900)]
To Enable property value for MQ Publisher/Subscriber
client will be awared whether Resource can be supported
as MQ Publisher/Subscriber by Build Option 'WITH_MQ'
Change-Id: Id9d4db5c1d048d3fc9895ded6f0bfbf7bfbd45a8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
YounghyunJoo [Thu, 14 Jul 2016 15:20:39 +0000 (00:20 +0900)]
Add Android Notification APIs for Consumer service
- Modify Android file structure.
- Add Android Consumer Service Java files to support Android APIs.
- Modify script to build Android.
- Modify %lu->%lld to fix bugs on Android.
Change-Id: I6f1e4565482e33c3cbfb331bca5beaaac6e3276d
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9395
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Uze Choi [Wed, 20 Jul 2016 07:34:14 +0000 (07:34 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service
Jongmin Choi [Thu, 23 Jun 2016 06:46:27 +0000 (15:46 +0900)]
Remote Reset
Create Reset Profile and Remote Reset by Provisioning Tool
Patch #2: Changes according to Ashwini's Comments
Patch #3: RemoveACE prototype added to header file
Change-Id: I6f4c443e8b54c5e0640da868cf7f2c5fbd4db78d
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jaesick.shin [Tue, 19 Jul 2016 04:48:37 +0000 (13:48 +0900)]
separated the scheduler interface and added callbackresponse.
change NSProviderInterface -> NSProvider
Added NSCallbackResponse.h and .c
included that file CallbackResponseSchedule instead of interfaceSchedule.
second patch included missing header file.wq
Change-Id: I7cd263f31be62faf979c1dee131c0afa02125280
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9455
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
ch79.cho [Mon, 18 Jul 2016 08:34:11 +0000 (17:34 +0900)]
add subscriber list for remote server
The changes are modified to send messages to the subscribers from local and cloud concurrently.
The service stores subscriber list from remote server seperately as well as local subscribers.
Change-Id: Ide908a34a2c22360865df1e1f95dd131eb6d51e4
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9435
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Hun-je Yeon [Wed, 20 Jul 2016 04:56:17 +0000 (13:56 +0900)]
Merge branch 'master' into notification-service
Update sync with master in which cloud interface branch is merged.
Change-Id: Ib79964b58bb4253337524d5fb18278cc66943363
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Jee Hyeok Kim [Wed, 20 Jul 2016 00:27:51 +0000 (00:27 +0000)]
Merge "Merge branch 'cloud-interface'"
David Antler [Sun, 17 Jul 2016 01:03:16 +0000 (18:03 -0700)]
Correct encoding of ZoneIDs in URIs, as per RFC 6874
IoTivity already included the ZoneID in the URI when the
IPv6 socket address included that information, but failed
to properly encode the percent sign.
Change-Id: I3e1c5b0a267236b1187303430d1dd4f115d1332a
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9419
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jee Hyeok Kim [Tue, 19 Jul 2016 13:26:22 +0000 (13:26 +0000)]
Merge "Merge branch 'master' into cloud-interface" into cloud-interface
Jee Hyeok Kim [Tue, 19 Jul 2016 13:21:09 +0000 (22:21 +0900)]
Merge branch 'cloud-interface'
Change-Id: If8209d2318a6541104b46b4985239a8bd70388ad
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jee Hyeok Kim [Mon, 4 Jul 2016 10:46:51 +0000 (19:46 +0900)]
Implements OIC/OCF resource models for cloud.
1. Project restructured (API Naming, Callbacks and File location).
2. Add Message Queue implementation (IETF Proposal).
3. OAuth2 authcode, accesstoken, refreshtoken based authentication support.
4. Resource Directory implementation, follows latest OIC Spec.
Change-Id: I036a9d1d54b09dc995f36f8b93029fa149963744
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Ziran Sun [Mon, 18 Jul 2016 09:22:13 +0000 (10:22 +0100)]
Add OC_STACK_RESOURCE_CHANGED result code support in sample code.
Change-Id: I6f20554cb020c3723d5704f4c9c6219c25a0f5a1
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9433
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>
Chul Lee [Tue, 19 Jul 2016 12:20:45 +0000 (21:20 +0900)]
Update security module according to ocstack update
in order to guarantee OTM success.
1. Change the response check condition about POST request.
2. Prevent restore of doxm,pstat in case of owned status and retransmission.
Change-Id: I69d2b3e497517373add683e7765b3521422e329b
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9465
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
Jee Hyeok Kim [Tue, 19 Jul 2016 08:46:37 +0000 (17:46 +0900)]
Merge branch 'master' into cloud-interface
Change-Id: I6c9ce353f30bfa10b438a5eb30bfa854af0ff267
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
YounghyunJoo [Mon, 18 Jul 2016 01:04:44 +0000 (10:04 +0900)]
Add Cloud interface consumer sample example code
- modify sample example code to support cloud interface
- modify example SConscript to build with cloud interface when get WITH_TCP & WITH_CLOUD environment
Change-Id: If9ab0a30672d4a09e63169ef3d146af6cb26670a
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9413
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
David Antler [Mon, 18 Jul 2016 18:25:05 +0000 (11:25 -0700)]
Fix object directory for c_common/windows
Prior to this change, resource/c_common/windows/*.obj files were not
being created in VariantDir.
Change-Id: Ib0b59bc9adf575f3e76e0f6c7802ca0ca2ca9c3e
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9445
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Anisha Aggarwal <anisha.aggarwal@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 15 Jul 2016 06:26:58 +0000 (15:26 +0900)]
modified some params of connection state callback method of Android.
it needs to modify some params
after merge https://gerrit.iotivity.org/gerrit/#/c/9209/
Change-Id: I919acba1dde939921a9cd645d44942011d68231e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9411
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Fri, 8 Jul 2016 05:24:55 +0000 (14:24 +0900)]
Refactored Connectivity Abstraction code
- delete unnecessary code
- add new unit test case
- adjusted code style
- fix memory free issue
Change-Id: If12f5ca8e8d03af3da92f33b655c8618946c8a6c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9235
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: Jon A. Cruz <jon@joncruz.org>
G S Senthil Kumar [Fri, 15 Jul 2016 13:46:06 +0000 (19:16 +0530)]
Updated InProcClientWrapper to handle OC_STACK_RESOURCE_CHANGED error code.
OC_STACK_RESOURCE_CHANGED will be sent in the response for POST requests.
This should also be considered as a success response for POST.
Change-Id: I1b8bc97ab5df21cbf06c1cbb9fd43b38d1730379
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9415
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit
494e3cd9ae0716830b031da8e2b2f0dd08dc49eb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9429
KIM JungYong [Mon, 18 Jul 2016 10:12:55 +0000 (19:12 +0900)]
Applied CAUtil callback changes.
CAUtil callback of Provider and Consumer is changed.
Change-Id: Ibf0cc0d33def6760bce2f6e4fce9fe6b89dc2dc0
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9439
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jihwan.seo [Fri, 15 Jul 2016 06:12:53 +0000 (15:12 +0900)]
Added the return code related 'RESOURCE_CHANGED' in OCException
there was no code in OCException and Android
after merge https://gerrit.iotivity.org/gerrit/#/c/9287/
Change-Id: Ifcf28f739b106ce8ddb2e5ab162bef935c526852
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9409
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Habib Virji [Mon, 4 Jul 2016 16:04:26 +0000 (17:04 +0100)]
RD Payload memory handling
By default 255 bytes of memory is allocated for the payload, when it need
extra amount of memory, cbor library provides a size member that keeps incrementing
but no memory is allocated or written.
In case of failure this value is passed to the ocpayloadconvert.c, which allocates
the right size and calls the conversion function again. It is necessary to allow the
code to get the right size.
Change-Id: I92202a91780fcf01d4ff8fea0a3c194ac5a42e83
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9145
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
KIM JungYong [Thu, 14 Jul 2016 06:23:27 +0000 (15:23 +0900)]
Added Consumer API for enable to cloud service.
NSConsumerEnableRemoteService() is added for subscribe on cloud notification service.
Discover logic is updated for seperated TCP and cloud working flow.
Cloud flag is added on NSProviderConnectionInfo sturcture.
Change-Id: I09d5ba588ba081e0b91916554b8a13b8f8ae8467
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9387
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Hun-je Yeon [Mon, 18 Jul 2016 05:12:02 +0000 (14:12 +0900)]
Merge branch 'master' into notification-service
Add recent changes of master branch into notification-service
Exclude notification service from build,
because CA changes need to be applied both of provider and consumer.
It will be changed in next commit
Change-Id: Id9bb9391c648b76d811034b896a933f42de89328
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Daniel Ferguson [Thu, 14 Jul 2016 20:51:25 +0000 (13:51 -0700)]
Fixed conditional logging output in Routing lib
Change-Id: I5e295a016cbf7840265c92dea15ff5e9de5992b1
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
ch79.cho [Thu, 7 Jul 2016 09:37:46 +0000 (18:37 +0900)]
Publish resource to cloud
The changes are about cloud notification service on provider side.
The provider service publishes its resource through cloud interface.
An application is required to call NSEnableRemoteSerivce(..) API
to publish it after login process.
Change-Id: I271c81858f2d1e63bc49ef0fa0012dde48a9c11a
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9213
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
George Nash [Tue, 28 Jun 2016 00:51:18 +0000 (17:51 -0700)]
Clean up unused-parameter warnings
Commented out the unused parameters to prevent the -Wunused-parameter
in warning in callback functions.
For parameters that are only used in DEBUG mode the OC_UNUSED micro
is used to prevent the unused-parameter waring for the release build.
Change-Id: I72f497b15c95ddd9879bc9b92f97a66259c7e074
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
George Nash [Tue, 28 Jun 2016 00:09:36 +0000 (17:09 -0700)]
Cleaned up type-limits compiler warning
pdu.c [-Wtype-limites] the comparison was always true due
to the range of data types.
Change-Id: If7981691218a3eece4da1941d5d5679266c401a9
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8977
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Daniel Ferguson [Wed, 6 Jul 2016 17:58:13 +0000 (10:58 -0700)]
Fix warnings in caipserver.c
Change-Id: Ibda0f4201d7127043fa66d3d39df6f421f8f7caa
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Fri, 8 Jul 2016 06:53:52 +0000 (15:53 +0900)]
Parsing about a payload including resource information of multiple devices
Assuming the siatuation that many servers published their resource information into resource directory(RD),
then the RD will send response including multiple device information for the discovery request by resouce type.
That means a response payload will be comprised of multiple device list including resource information.
But now, the resource client can parse only the first device's resource information..
There is the payload I tested as follow
[
{ di=
717111ce-31c1-47a0-81a1-3e39eca,
links=[
{href=/q/resource_foo1, rt=core.foo, if=oic.if.baseline, p={bm=1}},
{href=/q/resource_foo2, rt=core.foo, if=oic.if.baseline, p={bm=1}}
]
},
{ di=
a7b77e75-e6d5-4158-af16-3a4dd95,
links=[
{href=/q/resource_foo1, rt=core.foo, if=oic.if.baseline, p={bm=1}},
{href=/q/resource_foo2, rt=core.foo, if=oic.if.baseline, p={bm=1}}
]
}
]
Change-Id: Ic1f58c473ab91a497508b2425a4ad07692120054
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Thu, 14 Jul 2016 10:36:23 +0000 (19:36 +0900)]
Add success of 'OC_STACK_RESOURCE_CHANGED' return code.
Refer to https://gerrit.iotivity.org/gerrit/#/c/9287/
Change-Id: I65682364bcf91b40e28a31006993e9d8dc90e7af
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9391
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Tue, 12 Jul 2016 22:26:52 +0000 (15:26 -0700)]
Speed up run.bat execution
Running the Visual Studio scripts can take some time, so only execute
them in a "run build" scenario.
Change-Id: I96b05072a133e124161af1c969b4ab3c5cd05aba
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9335
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Ziran Sun [Mon, 11 Jul 2016 13:38:00 +0000 (14:38 +0100)]
Add support of 'OC_STACK_RESOURCE_CHANGED' return code.
This is to map 'UPDATE' or 'CHANGED' code in coap.
JIRA Issue: https://jira.iotivity.org/browse/IOT-1191
Change-Id: Ic5b426cbb1560a989305a600070a77dbe90f01e1
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9287
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
vimala.v [Tue, 28 Jun 2016 11:23:49 +0000 (16:53 +0530)]
[ARDUINO] Resolved build error for WITH_TCP=TRUE
Change-Id: I46e116467d30b48c54d4ff51303edad95c9748a7
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
bg.chun [Fri, 8 Jul 2016 01:55:19 +0000 (10:55 +0900)]
Change as do not set CONTENT_FORMAT OPT when server response without payload.
On current impl server add CONTENT_FORMAT OPT when response to client, if CONTENT_FORMAT setted on client request.
even payload is not exist on server response.
So, change it as check payload is exist on response before put CONTENT_FORMAT.
Reported-by: byonggon chun
Change-Id: Iced9952adb55304440089c32d658359a67f1dcd5
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Wed, 13 Jul 2016 01:17:23 +0000 (10:17 +0900)]
fixed pthread build issue on linux platform
resolved the build issue caused by merge of
https://gerrit.iotivity.org/gerrit/#/c/249/
Change-Id: I4936c07340658d455491f9e90d66b734e9a59e97
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
vimala.v [Wed, 13 Jul 2016 06:21:09 +0000 (11:51 +0530)]
[JIRA 1190] Added null checks in Tizen BLE adapter
Change-Id: Id1f81a1220af86cf2fab015530246e3485a0cb6d
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Mon, 11 Jul 2016 23:39:45 +0000 (16:39 -0700)]
Remove all free'd sessions from retransmission
Change-Id: Ibeec77ccfab5200aa3787d29e1320ad22c654568
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
KIM JungYong [Mon, 11 Jul 2016 07:08:23 +0000 (16:08 +0900)]
Updated NSProvider structure for multi connections.
NSProvider can have a only UDP connection information.
But cloud notification service scenraio need to multiple connection informations.
So NSProvider struct is updated for multi connection information.
NSProviderConnectionInfo is added at NSProvider.
NAProviderConnectionInfo is list of Provider connection infomation.
Mutex is added at NSInvokeRequest().
Change-Id: Ie83527e264f93a2f5839417a61997fcdcf541a87
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Habib Virji [Tue, 12 Jul 2016 11:11:12 +0000 (12:11 +0100)]
Fix GET ocresource response for /oic/d
If an application does not set oic.wk.d, set in savedDeviceInfo to get proper response for GET message.
Change-Id: I028b821ffe29b467d0ecc2add9a7a6ebfff5e72d
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9309
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
hyuna0213.jo [Thu, 7 Jul 2016 09:28:35 +0000 (18:28 +0900)]
Changed CAConnectionStateChangedCB param to take endpoint info.
CAConnectionStateChangedCB parameter was changed from adapter,
address to CAEndpoint_t.
Change-Id: Ia4e31ad848c9eddd38b4788295841c908c65dda6
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9209
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Sat, 9 Jul 2016 17:31:09 +0000 (19:31 +0200)]
Build: add gtest libs automatically
Once gtest's sconfile is imported, build flags are propagated.
Deeper cleanup and effort to make tests less linux specific
by avoiding to add gtest's pthread dependencies
in sub scons files.
Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: I4ddbf3e1eef8648ceaeae6c62175308cb6f3fec1
Origin: https://github.com/tizenteam/iotivity/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Fri, 8 Jul 2016 06:31:56 +0000 (15:31 +0900)]
Changed Tizen 2.4 gatt API
int bt_gatt_server_notify(bt_gatt_h characteristic, bool need_confirm,
bt_gatt_server_notification_sent_cb callback, void *user_data);
Change-Id: I911475002d907efee06b0a6b40144047a49793d9
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9243
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
projects / platform / upstream / iotivity.git / log