William R. Dieter [Wed, 29 Apr 2015 03:19:49 +0000 (23:19 -0400)]
Added a description for the OCQualityOfService enum
Previously, there was no description of the meaning of the fields. The
description added in this commit is based on dev mailing list discussion
of the field.
Change-Id: Iba183aeab69905c226c54935c15da7aeb5d522d5
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Mandeep Shetty [Wed, 29 Apr 2015 00:15:29 +0000 (17:15 -0700)]
Fix all braces on own line violations in C stack source files.
This commit only has braces on own line and style changes.
Change-Id: I6e3cb9be2d91088a42f69debe8e0889aae9417bc
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/862
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Wed, 29 Apr 2015 00:01:51 +0000 (17:01 -0700)]
Modified sample apps for easier and automated testing.
This addresses IOT-506.
Presence sample app required keyboard input which was inconvenient for
automated testing. Modified some sleep times and counts to make sample
apps more responsive or run quicker.
Change-Id: I3ea1ae3be8e06986a78d904619c9f8860216848b
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
William R. Dieter [Thu, 23 Apr 2015 20:41:26 +0000 (16:41 -0400)]
Updated formatting of comments for better Doxygen output
Converted some end of line comments on enums and structs in the public API
from "//" to "///<" so that the comments will show up in Doxygen API docs.
Added a few comments where I figured out what the elements were.
Change-Id: I8cad63757b0a8a1f0c0f98dbee5f8e5febf5e3a4
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/866
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
vimala.v [Fri, 17 Apr 2015 12:00:01 +0000 (17:30 +0530)]
Fixed "[IOT-471] CATerminate can not clear out the previously registered handlers" issue.
Change-Id: Iffd86c2f3c24e210af4b9c33da48032cb421b4bc
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/768
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Harish Kumara Marappa [Wed, 29 Apr 2015 07:21:09 +0000 (12:51 +0530)]
Fix the issue of NM tizen sample not working with WiFi connectivity.
Modified hosting.c file for using OC_WIFI connectivity type for Tizen,
Android platform and OC_ETHERNET for other platforms.
Change-Id: Ia89423c0d27c375f319aa1b1b4e8274d9c9642e7
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/828
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jk13 [Wed, 29 Apr 2015 05:06:59 +0000 (14:06 +0900)]
Fix IOT-504 issue of soft sensor manager
1. Fix IOT-504 issue which related to negative TC.
- re-init failed after init using invalid configuration.
Change-Id: I5a3acbbed2f02a35dd055a5c823cb9dde8cc31fe
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/868
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jyong2.kim [Tue, 28 Apr 2015 08:12:19 +0000 (17:12 +0900)]
Fix exception handling in Notification Manager Sample.
1. handle exception for resource bind.
2. update multicast-request address.
3. clean up code.
Change-Id: I9cf87319cf360aaa8b483b45be34b2d520597abf
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/852
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jyong2.kim [Tue, 28 Apr 2015 11:41:47 +0000 (20:41 +0900)]
Fix for API return type of Notification Manager issues about return value of APIs.
1. fix return value of APIs.
2. handle exception about memory.
[IOT-501]
[IOT-502]
Change-Id: I77e54efe9e44572a8f7bd83849dc6215ff6daa79
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/854
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jyong2.kim [Tue, 28 Apr 2015 12:19:44 +0000 (21:19 +0900)]
Fix for following issue about Notification Manager SampleProvider.
[IOT-459] Notification Manager Sample consumer and provider app doesnot handle invalid menu option properly
Change-Id: Ibabe15fe2c6192817b4216a0050cb8711767700e
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/855
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jk13 [Fri, 24 Apr 2015 04:42:13 +0000 (13:42 +0900)]
Fix SSM JNI wrapper and android app
This commit is for master branch
1. Fix JNI wrapper which includes invalid signature and load seqeuence
2. Fix android app ui
Change-Id: I75e0ebe98000340f75987fc9e707f542ef8ea18c
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/824
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Harish Kumara Marappa [Fri, 24 Apr 2015 15:54:43 +0000 (21:24 +0530)]
Notification manager Tizen sample application
Change-Id: I5bee6c4f7ecc64e6c6085e37451ab3bedde0030f
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Mandeep Shetty [Mon, 27 Apr 2015 23:26:52 +0000 (16:26 -0700)]
Added timeouts and cleanup for zombie callbacks in NON cases.
The client maintains a callback list to pass results upto the app.
If a request, specially a NON request is lost in the network, the
callback will sit in memory forever with no one left to use it.
Added a timeout field for the callback and a default timeout value of 2
hours in ocstackconfig.h. Stack will simultaneously purge timed out callbacks
when going through the callback linked list.
Change-Id: Idbaa7c5c85a40267f101f7bba53c3f98ed29d467
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jyong2.kim [Tue, 28 Apr 2015 05:30:53 +0000 (14:30 +0900)]
Fix bug about size of string.
1. fix size of string on strncpy
Change-Id: Ia314be019be586cb56fabcf2ffebac48c367f426
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
Harish Kumara Marappa [Mon, 27 Apr 2015 14:45:31 +0000 (20:15 +0530)]
Fix for the issue of factory reset feature of things-manager not working.
Things-manager service sends factory reset request to collection using
ActionSet structure. When user calls factory reset second time it was not
working as the ActionSet executed for first request had not been deleted.
Modified the thingsDiagnostic class for deleting the factoryReset
actionset everytime after its execution.
Change-Id: I312a0126a48ebd6dda6e5e887daed6f2a797de67
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
krishna.kb [Mon, 27 Apr 2015 12:14:03 +0000 (17:44 +0530)]
Issue fix and verification of Tizen PPM Sample App after CA Integration
Change-Id: I3a13be7425e5cd7d4b9dd9c2e381ece23142d778
Signed-off-by: krishna.kb <krishna.kb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/840
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
Erich Keane [Thu, 16 Apr 2015 00:11:23 +0000 (17:11 -0700)]
Replace glib threadpool usage with a 'dumb' thread implementation.
We are attempting to remove glib as a necessity for the build, so this
patch replaces the glib threadpool implementation with a 'dumb' dispatch
thread model.
It renames u_threadpool with ca_threadpool to be more internally consistent
with naming conventions.
Finally, it removes all glib build dependencies for non-Tizen build scripts.
Change-Id: Icc64b758ae6c00ff426adda1c74d8f86e56a8fc5
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Sashi Penta <sashi.kumar.penta@intel.com>
Mandeep Shetty [Fri, 24 Apr 2015 22:07:51 +0000 (15:07 -0700)]
Rename SendResponse to SendDirectStackResponse in ocstack.c
SendResponse is only used to send out ACKs, RESETs and error conditions
caught by the stack. The CA layer and the C++ SDK have SendResponse.
Renamed the function in ocstack.c to make the intent clearer.
Change-Id: I00a089273fd536d6dd30ac5f9e87ea0dc9fbb8b7
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/833
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Tue, 21 Apr 2015 05:02:40 +0000 (14:02 +0900)]
Index variable has modified to define inside of for loop
As per coding standards,
Index variable has modified to define inside of for loop
about caprotocolmessage / canetworkconfigurator
Change-Id: Id1fa11d800b8323dbbde209c8f93e54fd07b734b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/792
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Harish Kumara Marappa [Fri, 24 Apr 2015 18:53:31 +0000 (00:23 +0530)]
Fix for issue of Tizen TM sample not working
Modified the code for selecting OC_WIFI connectivity for android and tizen
and selecting OC_ETHERNET for other platforms.
Change-Id: I8533f43690d9cd80d85b17a4e8e384406308e67e
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jyong2.kim [Thu, 23 Apr 2015 04:02:54 +0000 (13:02 +0900)]
Fix bug about memory leak and arrange code
1. add checking when malloc fail.
2. add using local variable to return value.
3. add initial variable.
5. fix code convention.
4. fix other small comments by Habib.
Change-Id: I59219b87021b36256674d09e76419ebb03c38264
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/814
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Doug Hudson [Fri, 24 Apr 2015 19:59:54 +0000 (15:59 -0400)]
Fix bug to prevent continuous presence TTL timeouts.
Change return value of static function's overflow condition to very
large value so that presence TTL timeout will not keep firing.
Change-Id: I63a79b692b13664ad62c95bec6657244df2ec9dd
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/831
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Charlie Lenahan [Mon, 20 Apr 2015 23:30:35 +0000 (19:30 -0400)]
Fix crash in csdk/sample/ocserver on resource PUT.
If a client does a resource PUT with only power OR state (not both),
then it will crash.
Change-Id: If19ce5edaf1f3538443074e8a66fa836ef5290c9
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/788
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Doug Hudson [Thu, 23 Apr 2015 20:22:00 +0000 (16:22 -0400)]
Add a maximum presence TTL of 24 hours
- Set TTL to max TTL if TTL exceeds max TTL.
- Rename static function to make name reflect what the function
actually does.
- Change function signature so that float casts can be removed.
- Add guards against overflowing a uint32_t argument.
Change-Id: Ie391f96fa153b48771187ea6b3d5cf718f52cb52
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Jon A. Cruz [Thu, 23 Apr 2015 07:35:33 +0000 (00:35 -0700)]
Fixed tests for glib mutex and condition variable testing.
Re-enabled tests that had previously been disabled due to taking too
long.
Removed sleep() calls from test code and replaced with combinations of
usleep() and volatile bools. Since condition variables are being tested
we did not want to use them in the validation process.
Retained debug printf statements, but added #define to turn them
off by default.
On one test system these changes moved the unit test from taking 24
seconds down to only 1.8 seconds.
Change-Id: I9b654a623f3aab9398b6f3aaa2366ab0fcdeb876
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/818
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Harish Kumara Marappa [Thu, 23 Apr 2015 11:00:47 +0000 (16:30 +0530)]
Fix for PPM tizen sample build issue.
PPM service files were building without TIZEN related macros as the
definitions were added only for CFLAGS. Modified the code for adding the
definitions to CCFLAGS so it will be added for compiling .c and .cpp
files.
Fixed the compilation errors getting in tizen ppmsample application.
Change-Id: I2c8cf5380c0362b7a91c60e3758bbb3ecd737f6d
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/816
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
William R. Dieter [Wed, 22 Apr 2015 19:55:11 +0000 (15:55 -0400)]
Added descriptive comments for several ocstack.h macros
Change-Id: I7112d28ff03f1fbcfdb171e51524b7ba976fe395
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/812
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Thu, 23 Apr 2015 16:33:44 +0000 (12:33 -0400)]
Removed make & configure calls on Google Test library in every build.
By checking for the binary output directory of the Make script for
Google Test, the IoTivity SCons build will stop running the Configure
and Make scripts for every build on Linux.
Change-Id: Ib7ecb52c93fc0d2765ffd0e4112244660e732846
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Jon A. Cruz [Thu, 23 Apr 2015 01:24:23 +0000 (18:24 -0700)]
Fixed problems with unit test tripping over undefined behavior.
Corrected several test cases that caused crashes under glib due
to triggering undefined behavior in locked mutex clearing. Similar
prohibitions exist for pthreads also.
Added if() checks after EXPECT_TRUE cases that checked for NULL.
Without this the code will dereference null pointers when one
of the possible failure scenarios is encountered.
Change-Id: I232b52a715e7d3c0f7952756a7e98e6522b64dae
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/813
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
YounghyunJoo [Thu, 23 Apr 2015 06:16:58 +0000 (15:16 +0900)]
Modify SConscript file for Linux Sample Application
Build Linux Sample Application
Change-Id: I07efc56a6acc2e3446a4fe98153444e9f90a742e
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
HyunJun Kim [Thu, 23 Apr 2015 02:08:32 +0000 (11:08 +0900)]
Tizen build error fix with Building coap shared libraries.
Building coap and connectivity_abstraction shared libraries.
Added network.get to TMSampleApp tizen application..
Change-Id: Idf6e7121a81f92ac5a3ad7593b8bd6c692060e49
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/808
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Charlie Lenahan [Wed, 15 Apr 2015 21:16:48 +0000 (17:16 -0400)]
Add pthread implementation for connectivity/common/umutex
Implements a pthread implementation of the u_mutex , u_cond
for platforms that can't/don't want glib.
Renames u_mutex => ca_mutex , u_cond => ca_cond
Add missing unittests.
changes u_cond_wait_until() decl because old implementation
didn't accomadate for code to handle spurious wakeups properly,
and whether condition was signaled or time expired.
Change-Id: Ibd106dad494ebac3ca85aba306f1f1fe7dcc47e2
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Wed, 22 Apr 2015 18:33:36 +0000 (14:33 -0400)]
Added rpath location to C++ SDK sample applications build.
By adding the "run-time search path" to the build flags, this tells the
application where to search for the needed libraries at run time. This
removes the need to export the output directory for the libraries into
LD_LIBRARY_PATH when executing the sample applications.
Change-Id: Ic0c35cd0f79d35e7e89113735e9f9a23c6466943
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
hyuna0213.jo [Mon, 20 Apr 2015 09:48:20 +0000 (18:48 +0900)]
Remove double underscore for the preprocessor
Names with leading double underscore are reserved for internal use.
so we should never use in CA code.
Change-Id: I2f611dcd5cdf72c77c0a576ff773a120c5a0d60a
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Charlie Lenahan [Tue, 21 Apr 2015 23:46:54 +0000 (19:46 -0400)]
remove duplicate OCSetDeviceInfo decl
looks to be a CA-master merge glitch
Change-Id: I461ecc1283ed055ee81508fce2e0f0f51bfba7df
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/799
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jyong2.kim [Wed, 22 Apr 2015 09:56:00 +0000 (18:56 +0900)]
Fix beffer overflow problem about string copy.
Add null point handling.
Change-Id: I119f01a0a1daa8c097cb1e91e9de973acd7528d5
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/805
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Mandeep Shetty [Tue, 21 Apr 2015 23:19:40 +0000 (16:19 -0700)]
Fix issue with multicast prescence subscriptions
After registering for a multicast presence, the callback handler URI,
that is searched for isn't completley formed, so callbacks don't happen.
Made uri format consistent across unicast and multicast.
Updated C++ sample app presenceclient.cpp for multicast presence cases.
Also removed repeat test case in presenceclient.cpp PrintUsage().
Updated 2 files in the service directory for multicast presence cases.
Added test in C sample occlient.cpp for a multicast presence
subscription.
Modified OCPlatform.h::subscribePresence() documentation to inform api
users of the expected format.
Change-Id: Ic1a262566f605dd0882e563b4ee2d03bd21016be
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sashi Penta <sashi.kumar.penta@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jk13 [Tue, 21 Apr 2015 12:57:39 +0000 (21:57 +0900)]
Remove rapidxml from ssm folder
Remove rapidxml from ssm folder to refer extlibs foler
Change-Id: I783eb8bb6649be5ac9749e446882106876f639a7
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Erich Keane [Tue, 21 Apr 2015 17:57:34 +0000 (10:57 -0700)]
Minor documentation changes and code improvements as per guidelines
Refactored some of the if conditions from If(ptr == NULL) to if (NULL== ptr)
Added some file name @brief for better doxygen comments
Change-Id: I1348e6e53b986fdcca508f7209ba89f807667af6
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/766
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jihwan.seo [Mon, 20 Apr 2015 08:20:07 +0000 (17:20 +0900)]
remove double/single underline type
I have removed double/single underline type
in protocolmessage/networkconfigurator.
Change-Id: I71d135bef715b2c2a73ce37450249551302b7d6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/779
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Harish Kumara Marappa [Tue, 21 Apr 2015 10:05:11 +0000 (15:35 +0530)]
Tizen build system using GBS.
"gbs.conf" file is for downloading the packages by GBS for tizen platform.
"scons-2.1.0-3.1.slp.noarch" is added because of the repository used for
downloading dependent packages does not include scons package which is
required for building.
Currently these scripts works for WIFI and BT transport.
Change-Id: I0c40853bc929945aa88921436b4ff4d14efb4eb1
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/490
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Tue, 21 Apr 2015 02:16:16 +0000 (11:16 +0900)]
Modify PPM Config files to fix memory leak
When parse the pluginmanager.xml file, memory leaks are occured
To fix memory leak, modify xml pasing function in the Config file
Change-Id: I1ee0b7a0ec6b3d09428fc18bd0006d97f81b21e3
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/790
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Joseph Morrow [Mon, 20 Apr 2015 19:27:16 +0000 (15:27 -0400)]
Fix google test sconscript on newly cloned builds (as of April 15 2015).
This commit fixes IOT-487. This commit re-enables the google test
configure and make scripts on the Linux platform. This will allow the
unit tests to link with the resulting google test libraries.
Change-Id: I97ceb33c077bf21930bacb7685ff5598fa9cd123
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/786
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Wed, 15 Apr 2015 23:27:35 +0000 (16:27 -0700)]
Fixed spelling of CAResult_t Receive Failed enum value
Changed CA_RECEVIE_FAILED to CA_RECEIVE_FAILED for the error message
used in the condition where the receive failed.
Change-Id: I5605abde94bddc74a93163b0315eb32a9ce012b4
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/744
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
jw1103.kim [Wed, 15 Apr 2015 02:52:13 +0000 (11:52 +0900)]
modified to check the size of selected network list on send_request
Change-Id: Idec4a331bee1039c8727618797f3d8468629c123
Signed-off-by: jw1103.kim <jw1103.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/724
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jaehong.jo [Tue, 14 Apr 2015 06:36:20 +0000 (15:36 +0900)]
Added project.properties file (target=android-21)
Sample app only supports Android 5.0 or higher
Signed-off-by: Jaehong <jaehong.jo@samsung.com>
Change-Id: I3cc2b52a96717738f580664db64ea1c2ec65add0
Reviewed-on: https://gerrit.iotivity.org/gerrit/714
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Thu, 16 Apr 2015 21:56:17 +0000 (14:56 -0700)]
Fix presence timeout issue.
The server was not receiving the "Are you alive?" ping from the client
on presence check because token length was not included by the client.
Added token length to fix that.
The client app was timing out on presence notfications even though
the server was online. We were not resetting the client timer when we
get the servers "I am alive" message. Added resetting timeout logic.
Change-Id: Ibded89835e62cc283882c897ffe98c0fbde7f12c
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/759
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Mandeep Shetty [Wed, 15 Apr 2015 22:25:41 +0000 (15:25 -0700)]
Added note in documentation for max payload length.
This addresses IOT-427.
We were not accounting for json suffixes and prefixes when constructing
in the stack. The C sample apps construct json repsonses too.
After discussions, changed the constants in ocstackconfig.h and
added a note in the documentation to inform api users of the affixes.
Change-Id: I790a6d837a3dabc0d1984cfeb5fb49ef881031e4
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Jihun Ha [Mon, 20 Apr 2015 05:27:19 +0000 (14:27 +0900)]
Add an exception handling logic in collection presence in Group Manager
subscribeCollectionPresence() in GroupManager is intended to be used for group
resource having remote resources as child resources, not conventional
collection resource having local resources.
After requesting a list of child resources by sending GET to a collection
resource, if the child resource has a URI without a coap prefix "coap://", \
it is obviously a local (child) resource, which is not a desired resource
we want to send a request to presence check. Thus, we're going to ignore it.
Ref: [IOT-289]
Change-Id: I517f4fc25bb6a5e964e3624eb858a15c2dbafc03
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Minji Park [Fri, 17 Apr 2015 07:32:28 +0000 (16:32 +0900)]
Modify soft sensor manager resource presence handling
Modify SSM resource finder for resource presence status handling
Change-Id: Idae7ea380189120809fca45e079493a85318c5d6
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/764
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Thiago Macieira [Sat, 11 Apr 2015 02:08:13 +0000 (19:08 -0700)]
SSM: Remove IN/OUT macros
They are not part of the coding standard for IoTivity, so they shouldn't
be there. The names are too generic, so there's a good chance of
conflicts too.
Change-Id: I27eaacb532114dd188c4ffff13d3d39cc37770da
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/695
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Fri, 17 Apr 2015 06:14:37 +0000 (15:14 +0900)]
Modify PPM linux sample application
After CA merging, it has not find resource problem.
Fix this error.
Change-Id: I0e76e1a0c7523d3ac47bab6e06236fa662274e8b
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/762
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Sachin Agrawal [Fri, 17 Apr 2015 21:33:16 +0000 (14:33 -0700)]
Updated build Server script to include building Iotivity in secure mode
This needs to be done to make sure that any new code change introduced
in Iotivity does not break building Iotivity in 'secure' mode.
Change-Id: Ia5bf0777728e4724ff005ba1731da470dcd75e54
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/770
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Thu, 16 Apr 2015 00:26:12 +0000 (20:26 -0400)]
Disabled all unit tests that ultimately make network API calls.
A commit was pushed earlier that only disabled the tests that ultimately
made networking calls in just one unit test. This commit makes similar
changes to the rest of the unit tests in this repo.
Change-Id: If49f66d010eced3d3defa93a1824ae60e63ac159
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/745
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Thu, 16 Apr 2015 19:02:42 +0000 (15:02 -0400)]
Added check to disallow more than one instance of the RI Layer's C SDK.
Without proper re-entrancy, the RI Layer's C SDK should not support or try
to support more than one instance of the stack. If it does, unknown
behavior may occur. This commit eliminates this possible cause for error.
Change-Id: Ib85d29cdd2b8fa55a7415f57e8ec7e88bc164927
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Thu, 16 Apr 2015 01:31:18 +0000 (21:31 -0400)]
Added Init and Stop wrapper to every active unit test in the CA Layer.
By adding init and stop to every active unit test, this will ensure that
all CA Layer clean up code is called. Otherwise faux memory leaks are
reported on the build system.
Change-Id: Ie62b699e7046d8044ed26040882774342132bc85
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/746
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
HyunJun Kim [Thu, 16 Apr 2015 05:18:53 +0000 (14:18 +0900)]
Update Sample application for group action.
Update c sample application for group action.
It is show what we can use group action without SDK.
Change-Id: I06c149b9f12da6187b5d385e880008343a99052d
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Heewon Park [Fri, 17 Apr 2015 01:50:59 +0000 (10:50 +0900)]
Update Multicast Presence query
- delete 'coap://' string in query of Multicast
Change-Id: I6b13368407e5d064f7b91e0c24a7467b796361a0
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/760
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
HyunJun Kim [Thu, 16 Apr 2015 10:39:53 +0000 (19:39 +0900)]
Fix soft-sensor manager build failure.
Update SConscript and android std compile error for android.
Change-Id: I285fdf63c3239f06c49b1acb535c936fe53d55d7
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/754
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Mandeep Shetty [Thu, 16 Apr 2015 00:18:01 +0000 (17:18 -0700)]
Modified ocserver to make presence flow clearer.
C sample server ocserver.cpp had messages printed out on screen that
could be and were misinterpreted. Added messages to make what is going
on more obvious.
Change-Id: Ib21a83253527d763764f0294cbd82d45fafaebc3
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/748
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
jyong2.kim [Thu, 16 Apr 2015 04:35:14 +0000 (13:35 +0900)]
Fix for following issues.
[IOT-459] [NM] NM Sample consumer and provider app doesnot handle invalid menu option properly
[IOT-460] [NM] NM Sample consumer App does not handle several observe request successfully and Application Crashes
Change-Id: I7d13109d0724ac2074b4d4b32065dfee183746d0
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/750
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
doil.kwon [Wed, 15 Apr 2015 11:29:16 +0000 (04:29 -0700)]
Fixed notification manager caused by CA merge issue
1) modify request parameters. (add ConnectivityType)
2) fix sconscript. (include glib2.0, CAlib)
Change-Id: Ie16b774438a6df9cced9f4d13c990e1f160ea0c8
Signed-off-by: doil_kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/732
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Rami Jung [Wed, 15 Apr 2015 14:41:11 +0000 (23:41 +0900)]
Update ResourceTypeName
SoftSensorManager.Sensor to SSManager.Sensor for 64bit OS linux becuase it makes errors sometimes.
Change-Id: Id653dc2b32159542a0d587ec4500a4c65218332a
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/736
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Charlie Lenahan [Tue, 14 Apr 2015 21:10:44 +0000 (17:10 -0400)]
fix crash in unittests
remove some bogus free's that look to be copy/paste from
another unittest
Change-Id: I127e9e709a6098f37e09bba93da39c9fab572949
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/721
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Thuyen Tran [Tue, 14 Apr 2015 21:57:14 +0000 (14:57 -0700)]
Added hook to unit test when build: darwin.
Added and modified scons scripts to download, set up gtest
libraries and then added hook to invoke CSDK's unit test
when build darwin target.
Change-Id: Ie169545fe143fd897fffcc25265c12648902f652
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Tue, 14 Apr 2015 23:06:44 +0000 (19:06 -0400)]
Disabled all unit tests that expect use of network.
By utilizing any network connectivity in a unit test, the tests can
fail unintentionally due to network issues. These tests should be
re-implemented as system tests and ran locally, not on the build server.
Change-Id: I26549835b95d2e79c6379515d0235a64633bd125
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/723
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jk13 [Tue, 14 Apr 2015 13:36:41 +0000 (22:36 +0900)]
Soft Sensor Manager - Fix 64bit build warnings and crash
Fix 64bit build warnings and crash due to invalid pointer value
Change-Id: I97400c77ad82d072237893da264e60afa7d36b38
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/719
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
HyunJun Kim [Wed, 15 Apr 2015 08:37:56 +0000 (17:37 +0900)]
Update sample and Group for CA.
We cannot use OC_ALL.
So we call the findResource API twice using OC_ETHERNET and OC_WIFI.
Change-Id: I303c56e7f15c36da3ee0519f9f9a00c092a83928
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/728
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
HyunJun Kim [Wed, 15 Apr 2015 05:19:29 +0000 (14:19 +0900)]
Add pointer validation logic for oicgroup.
All pointer did't check NULL.
So it can occur runtime error.
But now, we add pointer validation logic
and It will support stability.
Change-Id: I4bf6d90ef5aa47c904595c6378b77d04a9106a5e
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Wed, 15 Apr 2015 01:56:59 +0000 (10:56 +0900)]
Fix an unexpected halt problem in con-client app.
A problem in con-client app on receiving GET and PUT response was reported.
That problem was about a synchronization of global variable where two
different threads need to read/write the variable simultaneously.
With this commit, it has been resolved by using mutex.
Ref: IOT-461
Change-Id: If5ca53d937d6a8097c1f3599b27157963ca3d5cd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/718
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jihwan.seo [Mon, 13 Apr 2015 06:34:45 +0000 (15:34 +0900)]
Integrated NetworkConfigurator Multi/SighleThread in CA
Integrated NetworkConfigurator file since
there are many common code
between MultiThread and SingleThread file.
Change-Id: Ibf765df284ba250cec1f9d842d785d63fff4978e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/697
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Mon, 13 Apr 2015 13:54:36 +0000 (22:54 +0900)]
Connectivity patch to fix SCons build issues
this patch also removes hard coded sdk version
Change-Id: Iabb1cb0e261c8513d0f08469dee9842d5084d681
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Mon, 13 Apr 2015 21:31:43 +0000 (14:31 -0700)]
Added check for stale observe notifications.
When observe type is OC_REST_OBSERVE, the client should not receive
stale notifications.
Added clarification to usage message to occlient.cpp.
Increased number of notifcations to allow more notfications and to test
observe in DELETE case.
Change-Id: If1c7fbcf5bcdf67f5ed813178fbe5bf9902d2e3a
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/709
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Mon, 13 Apr 2015 23:58:45 +0000 (16:58 -0700)]
Return correct error code when server stack fails.
Previously we supressed all stack level errors to OC_STACK_ERROR even
though there are more specific errors available. Also, we always sent
out CA_BAD_REQ causing the client to think it was always its fault.
Change-Id: I225558365c7aa7ba7ad09156f5f857f8effc1490
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/710
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
HyunJun Kim [Tue, 14 Apr 2015 10:48:38 +0000 (19:48 +0900)]
Fix runtime error for Group.
The leaveGroup API was crashed when remote resource was called.
It was not handle the exception and slow response.
So we support return value and handle the exception.
Fix [IOT-325]
Change-Id: I60663263f75310aab2582a8e72c39fbdbe4ebd1f
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/717
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
youngman [Wed, 8 Apr 2015 04:48:24 +0000 (13:48 +0900)]
Add Header files on spec file for developing programs using iotivity on tizen
Change-Id: I7a634660b3a60808046c19cbc7519612087e9068
Signed-off-by: youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/672
Reviewed-by: Minchul Lee <slotus.lee@samsung.com>
Reviewed-by: saerome kim <saerome.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Minji Park [Tue, 14 Apr 2015 05:28:38 +0000 (14:28 +0900)]
update soft sensor manager into latest version before CA merging
1) modify SSM ResourceFinder
2) erase duplication in sconscript
Change-Id: I676d7377ba938bc34c3a6fd0f54478fa39b086fd
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/712
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
HyunJun Kim [Tue, 14 Apr 2015 05:00:30 +0000 (14:00 +0900)]
Fix merge issues, Group action feature omit.
Scheduled / Recursive Group Action feature was omitted
when CA and Master were Merged.
Change-Id: I0a850eef946fdc3612455fb57552e84991868bc8
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/711
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
krishna.kb [Mon, 13 Apr 2015 11:49:52 +0000 (17:19 +0530)]
Modified the config and library path in PPM Service for Tizen Platform
Change-Id: I481c4eaaac1aa184f4a2a3b7f9254ddac7702598
Signed-off-by: krishna.kb <krishna.kb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Erich Keane [Mon, 13 Apr 2015 22:37:25 +0000 (15:37 -0700)]
Fixed Android Build error caused by merge issue
Apparently while merging the Sconscript for the libcoap directory,
I managed to grab some lines from somewhere else(I have no idea
where from!). This was a mistake, so I'm reverting this file
back to have the identical functionality as the CA branch,
since this doesn't exist on the pre-merge master branch.
Change-Id: I8fcfe692e4e4ab35666ed4a5f02041faffa440c0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/708
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Charlie Lenahan [Mon, 13 Apr 2015 21:26:28 +0000 (17:26 -0400)]
fix for os x build
This is a followup to https://gerrit.iotivity.org/gerrit/#/c/677/
Apple defines _POSIX_TIMERS as (-1) , thus the need to check for
both
Change-Id: I8a852febd45133177706a1d529040fce704200f9
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/706
Reviewed-by: Thuyen Tran <thuyen.c.tran@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Mon, 13 Apr 2015 20:01:20 +0000 (16:01 -0400)]
Enabled Arduino verification build.
During the latest merge of connectivity-abstraction branch into master branch,
the Arduino verification process was disabled in order to properly verify all other code paths on the build system post-merge to enable all IoTivity
contributors' work for post-merge efforts. This changeset allows for post-
merge efforts to continue as well as continuing verification of Arduino
code paths.
Change-Id: I3d4bc738afb072371820bb24144f6582cd4afa5c
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jaehong.jo [Mon, 13 Apr 2015 07:50:26 +0000 (16:50 +0900)]
Define prefix SINGLE_THREAD, MULTI_THREAD
Currently using two separate files, like xxx.c and xxx_singlethread.c
Signed-off-by: jaehong <jaehong.jo@samsung.com>
Change-Id: I0b2f1ba23ecfd5b23ffc48266221eac2201b7745
Reviewed-on: https://gerrit.iotivity.org/gerrit/698
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Minji Park [Mon, 13 Apr 2015 10:06:35 +0000 (19:06 +0900)]
Fix build error of Soft sensor Manager after CA branch merging into master
Fix Sconscript for SSM linux Sample application due to link errors
Change-Id: Ia3d5d32b4069e669ae4d1792efd0e4d8a6c794b4
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/700
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Mon, 13 Apr 2015 08:19:17 +0000 (17:19 +0900)]
Modify Protocol Plugin Manager code files for CA adaptation
1. Modify SCons file align
2. Modify Sample Application code to the latest version
Change-Id: I673fe819335230913aad90d069c13b8d443b987c
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/696
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Erich Keane [Fri, 10 Apr 2015 21:42:24 +0000 (14:42 -0700)]
Re-enable Cereal download
The build post-CA/Master merge seems to have lost the auto-download
functionality that we put in to allow cereal to be captured
automatically.
This fix re-enables the script, which should fix a few of the
other build servers listening in.
Change-Id: Icf3d0d0ed0babaef37f2ceace55abc471a73d306
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Erich Keane [Fri, 10 Apr 2015 00:50:26 +0000 (17:50 -0700)]
Merge branch 'connectivity-abstraction' to master
Change-Id: I54ea8ab0ea7c4929576ac9b613ce19c79a5c92b8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Rahul Rahul [Thu, 9 Apr 2015 21:47:17 +0000 (14:47 -0700)]
Glib patch for Gnome-glib android build
Added boost dependency in the scons script.
The scons build script downloads the appropriate boost version for
android, unpacks and builds it.
This also builds C++ liboc library but not the examples.
Change-Id: I54d1a938e249a3e251d8508180c8cd103420d70f
Signed-off-by: jnashok <jn.ashok@samsung.com>
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Thiago Macieira [Wed, 8 Apr 2015 20:03:02 +0000 (13:03 -0700)]
Update the use of clock_gettime(2)
clock_gettime(2) is a POSIX feature, but CLOCK_REALTIME_COARSE is a
Linux extension. So instead of using clock_gettime only on Linux, try to
use the POSIX macros instead. This way, we'll use clock_gettime on
systems that support it, falling back to gettimeofday if they don't.
POSIX.1-2008 requires clock_gettime(2) functionality, so up the
_POSIX_C_SOURCE macro requirement to the 2008 version. This will request
the 2008 API if it's available on some systems (QNX is known to not
enable all the API it has available). Older versions of POSIX don't
require the timer support.
Change-Id: I27eaacb532114dd188c4ffff13d3229d285d21cb
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/677
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Thu, 9 Apr 2015 16:22:06 +0000 (12:22 -0400)]
Cleaning previous debug build before running Unit Tests to rebuild debug.
By doing this, it will cause a trigger to rebuild the appropriate modules
of the stack's logging. This will make it so that when the Unit
Tests are ran, that all logging will actually be off. Until now, the Unit
Tests were re-using the binaries from the last debug build without re-
triggering a rebuild to remove the logging symbols from the CA and RI
Layers. We need the Unit Tests to run with debug symbols to fully enable
the Valgrind pluging on the Jenkins CI System.
Change-Id: I117f583a18be0f8dd9c9f2c52b30b61ceb34ed70
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Wed, 8 Apr 2015 23:20:45 +0000 (16:20 -0700)]
Added token length to direct stack responses.
Token length is required because the stack at the client side looks at
the token field only if token length is non zero. Without the token,
client application will not receive responses.
Change-Id: If1f9e85473bd964651669640d2fe48c1821600d5
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/682
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Thu, 9 Apr 2015 07:35:05 +0000 (16:35 +0900)]
Bug Fixed CA InterfaceController for TC-33
fixed some problem in TC-33 by transport option
when OIC base code is built with 'TARGET_TRANSPORT=WIFI'
now CA can return a suitable reason for the status
that Network has disabled
Change-Id: Iaf0142cad5db4b0ee287cbeec75add1431d2a754
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/685
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
HyunJun Kim [Thu, 2 Apr 2015 08:53:41 +0000 (17:53 +0900)]
Merge Things Manager codes CA and Master branch.
It was modified base on CA for preparing for official merge.
Change-Id: If3cb90d9a1a03a8d79d95952f5dfabb07c526634
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/632
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Charlie Lenahan [Wed, 8 Apr 2015 19:58:11 +0000 (15:58 -0400)]
Resolve potential buffer overflow warning
Compiler warning generated because the value of the size argument in
'strncat' is too large.
Also, IF check was not accounting for DELIMTER size, which
could cause overflow.
Change-Id: Iee3724bb08d8254f7a99f84ec1571eeeb5974d22
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/678
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Thiago Macieira [Wed, 8 Apr 2015 20:16:36 +0000 (13:16 -0700)]
Remove unnecessary, generated files that were committed
Those files should never have been in the repository in the first place. The
commit that introduced them (
3e4087ca6843ea40863488458eed22b31df08983) should
not have been approved.
Change-Id: I27eaacb532114dd188c4ffff13d3233af112d867
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/679
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Charlie Lenahan [Tue, 7 Apr 2015 18:59:58 +0000 (14:59 -0400)]
Enable compilation and functionality on darwin(osx)
Currently, the iotivity project does not support compiling/
running on Apple Darwin platforms. This patch enables
compilation and minimal sample functionality for darwin.
It accomplishes this by adding 'darwin' as a valid
target_os in all build-scripts. glib2 compiling/linking
is also added for the darwin build, which was previously
missing and blocking building connectivity-abstraction.
Many positions in the code had #ifdef __linux__, which has
been switched to also recognize __APPLE__.
Finally, the logger time-functionality used linux-specific
clock_gettime, so this functionality has been broken up
into an osalGetTime function, with an implementation for
__APPLE__ included in this patch.
Change-Id: Iddc2462db44198be90a975536e0273f63c521ab6
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/668
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Sakthivel Samidurai [Wed, 8 Apr 2015 04:44:37 +0000 (21:44 -0700)]
Update CA layer code for tinyDTLS location
Update CA layer code to pick tinyDTLS from iotivity/extlibs
location when compiling CA shared module.
Change-Id: I2e142453a43752073938cd56878597212ff606ae
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/671
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
eunok.shin [Wed, 8 Apr 2015 11:47:19 +0000 (20:47 +0900)]
fix problem by transport option when code is build and clean up.
Now, when code is build to 'transport type = WIFI'. some TC have error.
So, I changed TC 26, 28, 33.
Change-Id: I6ef9e9ea4d8718d3005585f162eeb3652af04f17
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
hyuna0213.jo [Wed, 8 Apr 2015 01:53:37 +0000 (10:53 +0900)]
Bug fixed for logging flag to scons build parameters.
Change-Id: Iae7d52afe44d915edcf887e6c1625b95e308512e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/670
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Mon, 6 Apr 2015 13:04:33 +0000 (22:04 +0900)]
[Jira-IOT398] Fix for linux Scons build to not support BT/BLE build
Signed-off-by: jnashok <jn.ashok@samsung.com>
Change-Id: I754bce8832fd360983a0f732cde41240ea6ab4ad
Reviewed-on: https://gerrit.iotivity.org/gerrit/656
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
projects / contrib / iotivity.git / log