jaesick.shin [Mon, 8 Aug 2016 00:51:43 +0000 (09:51 +0900)]
Modify about Provider Configuration.
1. NSStartProvider API modify arguments in proivder side.
2. comments out about jni, unittest in SConscript.
Change-Id: I5d890690f472c4ff9e1ffa22772ddf658d2dca4c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jaesick.shin [Mon, 8 Aug 2016 02:16:50 +0000 (11:16 +0900)]
Add NSProviderConfig struct.
this struct included
policy, subscribeRequestCallback, syncInfoCallback, user information.
next commit, i will modify startProvider API(NSProviderConfig).
Change-Id: Iab6dc04083b20719259599e36ca903c90489b148
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ch79.cho [Wed, 27 Jul 2016 04:32:40 +0000 (13:32 +0900)]
Update API comments
provider and consumer API comments are updated
Change-Id: Ie7f48010f4f26688aef99d5c8bfe5e4144713b4c
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jaesick.shin [Wed, 3 Aug 2016 02:19:37 +0000 (11:19 +0900)]
Modify folder path with sconscript about memorycache.
our service use memorycache in service side only.
so, move related memorycache files to each of src folder.
second patch included
remove not required comment out in sconScript.
Change-Id: I20b85d824c6ecbd792ab961844d014053a3f4da0
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9961
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Madan Lanka [Fri, 5 Aug 2016 05:18:03 +0000 (05:18 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service
jaesick.shin [Thu, 4 Aug 2016 08:23:22 +0000 (17:23 +0900)]
Add userInfo field in NSProviderInfo Struct.
This commit enables the UserInfo concept in notification provider
in which contains application layer information for filtering.
If application start notification provider with UserInfo set,
Notification provider could send the notification to the consumer which
has the same UserInfo, otherwise, set as NULL value, the provider operates
as before.
Change-Id: I5eb114cd615dabed6a63e1b0099e6c3306f77b2d
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hun-je Yeon [Fri, 5 Aug 2016 02:18:20 +0000 (11:18 +0900)]
Merge branch 'master' into notification-service
Update latest master changes into notificaton-service branch
Change-Id: Icc7d996110d14508153dce8e7124573758e7fe09
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Jaehong Jo [Tue, 2 Aug 2016 02:44:53 +0000 (11:44 +0900)]
Change APIs for Subscribe device presence.
Application developers have to pass devices id instead of the list of queries.
It will make them more convenient.
As-Is
const QueryParamsList& queryParams
To-Be
const std::vector<std::string>& di
Change-Id: I2c8231a58425227333c2a9c672c086409e2e51be
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Tue, 19 Jul 2016 16:23:17 +0000 (18:23 +0200)]
tizen: set verbose mode for building
Change-Id: If87868e716291445df754b7e567f87e49c444cce
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
cc96473a6b3cb03748549fce47d851cefc3177ef)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9477
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 8 Jul 2016 11:12:49 +0000 (20:12 +0900)]
Separated transmission logic for data on Both Mode.
Since BLE transport has gatt server and client.
there are two sender and receiver
such as notifyCharacteristic / writeCharacteristic in BLE transport.
(while other transport has only one sender and receiver.)
thur, message has to be sent by message type which whether
it is a request or response message.
Change-Id: I7f77d86c13115138082b72a6371ce5bd49f1f0c6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Otavio Pontes [Mon, 11 Jul 2016 13:23:33 +0000 (10:23 -0300)]
Include a new tinycbor file to iotivity build
In tinycbor a function was moved from cborparser.c to
cborparser_dup_string.c file. As we need this function in IoTivity we
need to include cborparser_dup_string.c in tinycbor SConscript.
Change-Id: Ic0b7598b525c61005bc07b3efcef0270f20bfc28
Signed-off-by: Otavio Pontes <otavio.pontes@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9285
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
jaesick.shin [Mon, 1 Aug 2016 02:28:04 +0000 (11:28 +0900)]
bug fixes for check null in NSProviderMemoryCache.
Added check null about list and list->head.
Change-Id: Ie1df2395a14d20a012383d7f5865e96fc2405b91
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jaewook Jung [Thu, 28 Jul 2016 01:37:26 +0000 (10:37 +0900)]
added OCAccountManager class
As there is need for API about Cloud server on client side, I added it
on OCPlatform.
(https://gerrit.iotivity.org/gerrit/#/c/9121/)
However there are plenty of APIs to be added more and just adding them
all on OCPlatform is not fine for usability.
So I make them a class like OCResource.
Below APIs will be added after this patchset.
: searchUser, createGroup, searchGroup, deleteGroup, addGroupMember,
searchGroupMember, deleteGroupMember
Change-Id: I45e1f08b13d821346b364d38bf212b8040205a46
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
hyuna0213.jo [Thu, 21 Jul 2016 01:34:16 +0000 (10:34 +0900)]
modified network interface monitoring logic in tizen
To detect network interface changes in tizen,
CAFindInterfaceChange() function was modified.
Change-Id: I325c59205b090f9715d72f533faf27831e114792
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit
c5ec8565783a5be30d8089bafa2ede7466641837)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9599
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Wed, 27 Jul 2016 23:30:00 +0000 (08:30 +0900)]
removed c++ warning for initialize
Change-Id: I9381c79f661f5e517badfb42682525985faa7cd1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Fri, 29 Jul 2016 04:32:45 +0000 (13:32 +0900)]
removed potential invalid return value in BWT
Change-Id: I33b552f79d18322d60e188420e57c13976218531
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Pandey [Thu, 21 Jul 2016 10:31:23 +0000 (16:01 +0530)]
Added API to obtain OCResourceObject from RCSRemoteResourceObject.
Resource Encapsulation layer's RCSRemoteResourceObject class does not provide
all the operations (e.g. PUT, DELETE) that IoTivity base layer provides.
If application wants to invoke base layer API's directly, it needs to obtain
OCResoureObject. Obtaining this object is not possible without calling base
layer discovery. However, if application wants to use both RE layer and Base
layer there will be redundant discovery going on.
To avoid this problem, we added an API that returns OCResoureObject maintained
in RE layer. Using this object, application can call base layer APIs without
additional discovery.
Change-Id: I87757d70bd5df3463c3573831d7392e7b45c670a
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Pandey [Thu, 21 Jul 2016 08:57:52 +0000 (14:27 +0530)]
Added API for setting representation in RCS Client of Resource Encapsulation.
RCSRemoteResourceObject of RE layer provides an API to get remote resource
representation using RCSRepresentation Object, but it is missing the API to
set RCSRepresentation.
Setting of RCSRepresentation is required for collection resources.
In this patch I have added the set API which accepts RCSRepresentation as input
parameter so it can be used to send POST request on collection resources where
payload contains attributes to be set on multiple child resources.
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Change-Id: Ic8957296b3cfe3e6abe1218ef060614d9cdc5618
Reviewed-on: https://gerrit.iotivity.org/gerrit/9545
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
abitha.s [Wed, 3 Aug 2016 13:49:28 +0000 (19:19 +0530)]
Dividing Cloud related services under separate Flag
1)Moved cloud services in NS Wrapper code inside WITH_CLOUD option built in scons.
2)Refractered the code to move the includes into cpp files.
patch 1 : initial commit
patch 2 : updated with review comments
Change-Id: Icce8f9dbbbec17cea944a8db0aa3ec284b3bf5d4
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9981
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
David Antler [Wed, 27 Jul 2016 16:22:16 +0000 (09:22 -0700)]
Update garageclient status checking
OC_STACK_OK is the eCode that should really be matched. STATUS_SUCCESS
was only coincidentially set to the same value.
Also added whitespace after 'if' keyword.
Change-Id: I2f9ccb19d2da0911acbef0a420fecd8ed6199177
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9799
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Ajay Saini [Mon, 23 May 2016 21:18:42 +0000 (14:18 -0700)]
IOT-1091: Add auto_build.py
This will replace auto_build.sh as a cross platform solution.
Change-Id: I36afaba8e8935da8322322e2e8c70efde6e22e52
Signed-off-by: Ajay Saini <ajay.saini@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8287
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Thu, 14 Jul 2016 18:55:03 +0000 (11:55 -0700)]
Improve run.bat
* For SECURED=1, the samples are sensitive to the directory from which
they are executed.
* Combined the build arguments into a single spot.
* Add new binary runners.
* provisioningclient (provclient) and
* sampleserver_justworks (justworks)
Change-Id: Id744569f282a5adb892958be9dcdc46e3b153773
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9399
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jaesick.shin [Mon, 1 Aug 2016 06:03:56 +0000 (15:03 +0900)]
Move macro from consumer common to NSConstant.h
Move the location of "Macro function" from
NCConsumerCommon.h to NSConstants.h.
Because, provider will use the macros also.
Change-Id: I00b6fcba65ae491eb2a5457ddcf80f6c42df6cde
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9883
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Philippe Coval [Wed, 20 Jul 2016 15:12:14 +0000 (17:12 +0200)]
csdk: fix minimal linux tests
Update to current API, and make them build by default.
Those samples files are good candidates
to illustrate C API in plain C and not C++,
specially for systems without recent g++ (ie: Tizen:2.2-)
Change-Id: I22e18903037a249e1dce4d29c2580ffe865caf50
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9515
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
jaesick.shin [Tue, 2 Aug 2016 04:24:30 +0000 (13:24 +0900)]
divide code about related cloud service.
while scons builds, cloud service code is
not required without WITH_CLOUD option in scons options.
It was modified as follows, #ifdef WITH_CLOUD #endif in code.
we should modify cpp_wrapper layer.
so, this commit makes the related build script of cpp_wrapper being commented out.
Change-Id: I9172b32e9242cc8d9ed038f024437dbd3b28da43
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jaewook Jung [Tue, 2 Aug 2016 04:23:10 +0000 (13:23 +0900)]
fixed segmentation fault issue when parsing query with rt including period
fixed segmentation fault issue when parsing query with rt including period
Change-Id: Ibff0067acc8ac4df0b608c691dadedd50d320d3b
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9919
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Hauke Mehrtens [Wed, 22 Jun 2016 09:41:43 +0000 (11:41 +0200)]
Fix memory corruption when reading integers from cbor
When the cbor_value_get_*() function is called with a pointer to some int, it
should have the correct size. When we cast it to something else it is treated
as a pointer to an uint64_t in the function for example and them 64 bits gets
written to memory even with the real type is only 32 bit long. When the real
type is only 32 bit long some other memory gets overwritten. On Big endian
systems the least significant bits are cut of so in most cases 0 is read.
With this patch a value cast is used and the value is converted to the other size.
This is the same as in commit
0d64c7c95a5c11a9fb5201e729fd8c75da210c80
"security: fix reading of permission attribute from configuration"
Change-Id: If5965491241e25ebf60a22dc45d37d74a33cb02f
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jaesick.shin [Thu, 28 Jul 2016 08:29:05 +0000 (17:29 +0900)]
do code optimization of EntityHandler.
our service has three entityHandler.
almost, which of operation same is response.
second patch included one more optimization.
our service not using the response value in EntityHandler.
so, i remove related response value.
third patch included remove set ehResultValue.
because of, our service is ehResult value always return OC_EH_OK.
fifth patch included remove comments and not required value.
remove unnecessary comments and not required value in NSProviderListener.c
payload value is not used.
Change-Id: I719a65e70f3ad51da0ed0488be48b973e8a61ab7
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9825
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jaesick.shin [Mon, 1 Aug 2016 04:20:54 +0000 (13:20 +0900)]
Remove unused function and Related MessageList.
Remove NSStorageDelete Function.
Remove Related MessageList in NSProviderMemoryCache.
MessagList is not required at current scenario.
Change-Id: I751bd66a5b6b255c3fb1317ff5350cd008ae7496
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9881
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hun-je Yeon [Mon, 1 Aug 2016 01:02:32 +0000 (10:02 +0900)]
Merge branch 'master' into notification-service
Merged changes
1. https://gerrit.iotivity.org/gerrit/#/c/9801/
2. https://gerrit.iotivity.org/gerrit/#/c/9289/
3. https://gerrit.iotivity.org/gerrit/#/c/9839/
4. https://gerrit.iotivity.org/gerrit/#/c/9609/
5. https://gerrit.iotivity.org/gerrit/#/c/9601/
Change-Id: Ib56507b1830041fec457b1f8c718584166093c85
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Sandeep Sharma [Fri, 22 Jul 2016 07:01:18 +0000 (12:31 +0530)]
RAML spec gap updation for ACL (Android)
Update Java/JNI and provisioningClient App following
https://gerrit.iotivity.org/gerrit/#/c/8241 change.
patch #2: Memory Cleanup code and License inclusion.
Change-Id: Ia2509eef21ba4e54a7ee79378cb143a0e8616772
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9601
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Ashwini Kumar [Tue, 19 Jul 2016 08:44:07 +0000 (14:14 +0530)]
Add sample provisioning servers in package
Added sample provisioning servers into the test package built
Corresponding .dat files are also added to same location as binary file
,i.e. /usr/bin/provision-sample
Server opens the dat file from the current location of the binary file.
This needs to be updated for tizen, to be in a place out of bin, where Read-Write
is possible.
Change-Id: I0d13386976d2d4910934064d6092e1b360dcf919
Credit-to: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9609
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Randeep Singh [Thu, 28 Jul 2016 14:03:49 +0000 (19:33 +0530)]
Sync master with 1.1-rel
Merged changes of:
https://gerrit.iotivity.org/gerrit/#/c/9305/
https://gerrit.iotivity.org/gerrit/#/c/9317/
https://gerrit.iotivity.org/gerrit/#/c/9325/
https://gerrit.iotivity.org/gerrit/#/c/9327/
https://gerrit.iotivity.org/gerrit/#/c/9307/
https://gerrit.iotivity.org/gerrit/#/c/9385/
https://gerrit.iotivity.org/gerrit/#/c/9249/
https://gerrit.iotivity.org/gerrit/#/c/9417/
https://gerrit.iotivity.org/gerrit/#/c/9553/
https://gerrit.iotivity.org/gerrit/#/c/9457/
https://gerrit.iotivity.org/gerrit/#/c/9425/
Change-Id: I9b156226e7544ffb1bdc142c6c8fed87ff9b53b3
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
KIM JungYong [Thu, 28 Jul 2016 09:49:44 +0000 (18:49 +0900)]
Added memory deallocation of Consumer main thread handle.
When consumer service stopped,
consumer thread handle should de-allocate at memory
because it was allocated the way of dynamic-allocation.
Thread handle is de-allocated on NSDestroyThreadHandle().
Change-Id: I01d773892c6f6d79b833036df8f078a4f6df0ce7
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9831
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
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>
ljsachs [Wed, 27 Jul 2016 18:50:31 +0000 (11:50 -0700)]
Handle OC_STACK_RESOURCE_CHANGED as success in Jni Layer
Change-Id: Ifbf030ed08424b901f47e58aafac02aff3e60031
Signed-off-by: ljsachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9801
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Stephane Lejeune [Mon, 11 Jul 2016 15:00:12 +0000 (17:00 +0200)]
Use the IANA assigned IPv6 multicast addresses for "All OCF Nodes".
In order to avoid processing incompatible messages with CoAP application
syntax in constrained devices, OCF has registered its own IPv6 multicast
address. This patch changes the IPv6 multicast address used for
discovery and group messages from “All CoAP Nodes” to “All OCF Nodes”.
See
http://www.iana.org/assignments/ipv6-multicast-addresses/ipv6-multicast-addresses.xhtml
Change-Id: I6ff4069bde6bdcfc40bd5aa216108f2de6a18ed5
Signed-off-by: Stephane Lejeune <stlejeun@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
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'"
projects / platform / upstream / iotivity.git / log