Yamin Al-Mousa [Wed, 7 Jan 2015 18:14:10 +0000 (10:14 -0800)]
Fixing OCCancel with High_QOS in observe isn't deleting CB.
(Bug IOT-126) Calling OCCancel should result in deleting all
associated structures including callbacks. This also should
happen when we deregister observation.
Change-Id: I34dd67288873ce27919a12a1d5fe244ef80751b7
Signed-off-by: Yamin Al-Mousa <yamin.s.al-mousa@intel.com>
Sanjeev BA [Tue, 6 Jan 2015 05:16:16 +0000 (14:16 +0900)]
Add missing dependency to readme.
Change-Id: I86cf5280edbe70dfa5c8f0076c9475ee18e5ab0b
Signed-off-by: Sanjeev BA <as2902.b@samsung.com>
Uze Choi [Mon, 5 Jan 2015 01:55:46 +0000 (01:55 +0000)]
Merge "Fix some issues of GroupManager"
Heewon Park [Tue, 30 Dec 2014 07:39:45 +0000 (16:39 +0900)]
fix "Coding convention followed in this commit"
Change-Id: Icf3085cc5767330c908ab02c855759ad004509a2
Signed-off-by: Heewon Park <h_w.park@samsung.com>
jjack.lee [Tue, 30 Dec 2014 05:22:58 +0000 (14:22 +0900)]
Fix some issues of GroupManager
- subscribeCollectionPresence()
- IOT-197 : Handle null parameter
- IOT-198 : Check that resource has child resource.
- findCandidateResources()
- IOT-210 : Handle null parameter
Change-Id: I6961aa776e5883890da226f07d3cfcf64571279c
Signed-off-by: Jack Lee <jjack.lee@samsung.com>
Patrick Lankswert [Tue, 30 Dec 2014 03:39:47 +0000 (03:39 +0000)]
Merge "This a complete version of OICMiddle. The ReST capability has limited functionality, which we hope to expand shortly after release. We believe the other parts of OICMiddle are sufficiently robust that the application will be useful as both demo and example in the OIC 0.9.0 release."
Sudarshan Prasad [Tue, 30 Dec 2014 01:20:39 +0000 (17:20 -0800)]
This a complete version of OICMiddle.
The ReST capability has limited functionality, which we hope to expand
shortly after release. We believe the other parts of OICMiddle are
sufficiently robust that the application will be useful as both demo
and example in the OIC 0.9.0 release.
In a partial review prior to moving from 01.org to IoTivity, one
reviewer provided 50 comments. All of the comments were addressed,
though not all were agreed with. In some cases, comments were added
to the code to address the concern. Others may require further
discussion.
Change-Id: I3e52de09a0737dd8dd0323fa2a20e4c94224f9c7
Signed-off-by: John.Light <john.j.light@intel.com>
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Patrick C Lankswert [Tue, 30 Dec 2014 02:33:23 +0000 (02:33 +0000)]
Merge "Updated the README files to reference the master build in root"
Patrick C Lankswert [Tue, 30 Dec 2014 02:24:59 +0000 (21:24 -0500)]
Updated the README files to reference the master build in root
Change-Id: Ibeb95e7a872ca51e29656a825c37247e48d89fe5
Signed-off-by: Patrick Lankswert <patrick.lankswert@intel.com>
Patrick C Lankswert [Tue, 30 Dec 2014 02:10:23 +0000 (02:10 +0000)]
Merge "Android SDK - Initial commit and build system updates"
Patrick C Lankswert [Sun, 28 Dec 2014 05:15:52 +0000 (00:15 -0500)]
Android SDK - Initial commit and build system updates
This commit add makes the auto_build process more complete by
adding the following:
1) Auto build now always performs the dependency check
2) Auto build now always attempts to build the Android stack artifacts.
3) Transitioned the Android build process to the v4.9 tool chain
4) Android build now depends on the internal boost dependencies
5) Add an Android compatibility layer for the code that is using
the C++ 11 basic string functions with is not supported in the
Android toolchain yet.
6) Added static libraries to many of the shared libraries for the
Android SDK
NOTE:
a) This commit conflicts with the work that Caiwen was making in the
C++11 basic_string function compatibility. I will close with him.
b) Expat is needed by the protocol plug in manager for Android.
This still needs to be closed by release. The PPM build for
Android under SCONS is currently disabled.
This is the Android SDK client API.
Validation has not been completed. However, this is all new
functionality and does not have any negative impact on any
existing features. Until validation is completed this
functionality should be considered experimental.
This code based currently uses gradle to build the SDK.
It does require that the Android libraries for IoTivity
be built previously using the appropriate SCONS scripts.
This additional patch attempts to transition the boost
build to using git instead of a download in hopes that
the build machine will be happier about it.
Final patch makes Android build optional in auto_build
Another patch to add support for 64-bit hosts
Another patch set to reduce parallel builds to 4
Another patch to add licensing header to two files that we missing
in gerrit review #72
Change-Id: I9695ebf3ea271ec28b69a4fcec509a6c2b7c46a4
Signed-off-by: Patrick Lankswert <patrick.lankswert@intel.com>
Patrick C Lankswert [Tue, 30 Dec 2014 00:48:37 +0000 (00:48 +0000)]
Merge "Added build dependencies script"
Patrick Lankswert [Mon, 29 Dec 2014 20:26:55 +0000 (20:26 +0000)]
Merge "OICSensorBoard: App for Intel Edison Platform."
Patrick C Lankswert [Sun, 28 Dec 2014 03:42:20 +0000 (22:42 -0500)]
Added build dependencies script
Created build script that prepares two dependencies (cereal and
boost) for use by the build environment. This also adds the
dependency builder in the auto build script used by the continuous
integation servers.
Change-Id: I776a3b3f208b1ea0c253cc693d639c19b603fbca
Signed-off-by: Patrick Lankswert <patrick.lankswert@intel.com>
Patrick Lankswert [Sat, 27 Dec 2014 22:56:28 +0000 (22:56 +0000)]
Merge "Add spec file for Tizen build"
Patrick Lankswert [Sat, 27 Dec 2014 22:39:49 +0000 (22:39 +0000)]
Merge "Fix soft-sensor-manager service build errors"
Patrick Lankswert [Sat, 27 Dec 2014 22:38:05 +0000 (22:38 +0000)]
Merge "Fix android build compatibility problems"
Patrick Lankswert [Sat, 27 Dec 2014 22:34:38 +0000 (22:34 +0000)]
Merge "Added services programmer's guides without DRM for June Young"
George Bowden [Fri, 26 Dec 2014 21:56:46 +0000 (13:56 -0800)]
Added services programmer's guides without DRM for June Young
Change-Id: Ifa7b359cabae84d3dcd1b48feac3fe7b4423af69
Signed-off-by: George Bowden <george.bowden@intel.com>
Patrick Lankswert [Fri, 26 Dec 2014 19:51:54 +0000 (19:51 +0000)]
Merge "Update scons build relative documents"
Uze Choi [Fri, 26 Dec 2014 06:24:19 +0000 (06:24 +0000)]
Merge "remove DMR doc"
Uze Choi [Fri, 26 Dec 2014 06:22:20 +0000 (15:22 +0900)]
remove DMR doc
Change-Id: Icc34f18a66d87ae74748e496c3f01ff94ae84aa9
Uze Choi [Fri, 26 Dec 2014 05:33:31 +0000 (05:33 +0000)]
Merge "remove DRM doc"
Uze Choi [Fri, 26 Dec 2014 05:31:20 +0000 (14:31 +0900)]
remove DRM doc
Change-Id: Idd96a81cd79d1b6c54776c6b39cb080743107f8f
Kishen Maloor [Mon, 22 Dec 2014 20:09:51 +0000 (12:09 -0800)]
OICSensorBoard: App for Intel Edison Platform.
(Please refer to https://oic-review.01.org/gerrit/#/c/668/8/
for prior review status)
Build for OICSensorBoard is NOT included in the
standard Iotivity build.
It requires the Yocto cross-toolchain for
a chosen target, and would therefore be
built separately.
It demonstrates Iotivity Server capabilities through
the integration of an add-on breadboard that hosts
temperature, ambient light and LED sensors.
In addition, there is a command-line Iotivity Client
application to test server functionality from a
separate machine.
The included scons build script expects to build
the client for Linux (tested on Ubuntu 12.04)
and the server to be built via the Yocto
cross-toolchain for Edison.
Brief instructions for constructing this
toolchain are provided in the included README.
Change-Id: I26d12c2334d84a6e0245e0f3689e09a51152fea5
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Caiwen Zhang [Fri, 26 Dec 2014 03:21:16 +0000 (11:21 +0800)]
Update scons build relative documents
Change-Id: I5296365d941d876ec20252282f8bae1cb5d8b7ff
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>
Uze Choi [Fri, 26 Dec 2014 02:55:04 +0000 (02:55 +0000)]
Merge "Fix GroupAction API of Things Manager."
Uze Choi [Fri, 26 Dec 2014 02:54:07 +0000 (02:54 +0000)]
Merge "Fix an exception handling issue in doBootStrap() function of ThingsConfiguration class."
Caiwen Zhang [Thu, 25 Dec 2014 10:37:00 +0000 (18:37 +0800)]
Fix android build compatibility problems
1. Some C++11 features are used in IoTivity. Old Android NDK may doesn't
support a part of these features directly. Implement and include it if
it is required.
2. Fix libc function missing problem. Some functions, e.g. rand, srand.
strtof ... are static inline prior to android-L(it is defined and
implemented in the header file). So before android-L libc.so doesn't
include them. If build on android-L and run on an old platform(earlier
than android-L), there will be 'can't locate xxx' problem.
e.g.:
rand, it is defined in stdlib.h as "static __inline__ int rand() { ....} in
the ndk < 10. it's defined as 'extern int rand();' from ndk-10x. With old
ndk, if a file (x.c) used 'rand' function, when build x.c, 'rand' is compiled
into x.o. 'rand' won't exit in neither libc.so nor libc.a. If build an
application with ndk-10x and run it on emulator or device(developed with
NDK < 10), it requires implement 'rand' function by owerself or there
will be be 'can't locate rand' problem.
For convenience, add these functions in a file, if necessary, build it as
library and auto link into binary.
Change-Id: If47da94db7d06fde9887eba335bc0c67762514a9
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>
Caiwen Zhang [Thu, 25 Dec 2014 10:25:56 +0000 (18:25 +0800)]
Fix soft-sensor-manager service build errors
Change-Id: I96bd2463fe5f0fd9fd09d5b31570c0bc778019a7
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>
Arron Wang [Wed, 24 Dec 2014 08:52:03 +0000 (16:52 +0800)]
Add spec file for Tizen build
Change-Id: I9d70f69b174c1fedad12116c2dba75f84773e50b
Signed-off-by: Arron Wang <arron.wang@intel.com>
jihun.ha [Wed, 24 Dec 2014 04:46:37 +0000 (13:46 +0900)]
Fix an exception handling issue in doBootStrap() function of
ThingsConfiguration class.
In the case that a callback pointer of the function is NULL,
a return value for the function call will be OC_STACK_ERROR
rather than OC_STACK_OK.
Reference issue ID : [IOT-196]
Change-Id: Ieb280bc6e5317496b96342a0374129c1e692b415
Signed-off-by: jihun.ha <jihun.ha@samsung.com>
HyunJun Kim [Wed, 24 Dec 2014 04:43:38 +0000 (13:43 +0900)]
Fix GroupAction API of Things Manager.
Crash is occurred when some api of ThingsManager is called
with null ocresource or null actionset.
It will return OC_STACK_ERROR, if ocresource or actioset is null.
Fix [IOT-199], [IOT-200], [IOT-201], [IOT-202]
Change-Id: I1bf1070caaa4d06aad21aa26011474aae263a544
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Uze Choi [Wed, 24 Dec 2014 02:57:23 +0000 (02:57 +0000)]
Merge "[service] Modify SConscript to build all services using scons"
Uze Choi [Wed, 24 Dec 2014 02:57:02 +0000 (02:57 +0000)]
Merge "[SSM] Fix scons android build failure"
jk13 [Wed, 24 Dec 2014 02:54:26 +0000 (11:54 +0900)]
[service] Modify SConscript to build all services using scons
Change-Id: I6a4ed93f7b3ac1c6fe40178d629fd22ae61093e2
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Uze Choi [Wed, 24 Dec 2014 02:40:45 +0000 (02:40 +0000)]
Merge "Add readme file about the things manager."
HyunJun Kim [Tue, 23 Dec 2014 10:42:21 +0000 (19:42 +0900)]
Add readme file about the things manager.
Change-Id: Ia58badcc20ac83babaf3e656d2b36a41844bf0de
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
jk13 [Tue, 23 Dec 2014 08:13:29 +0000 (17:13 +0900)]
[SSM] Fix scons android build failure
1. Fix scons while build errors if choose android build
Change-Id: I78f6bccc1c27689a4bf847c602e207454f20450f
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Caiwen Zhang [Tue, 23 Dec 2014 07:07:37 +0000 (15:07 +0800)]
Add 'tizen' into the target OS list
In some case, it is required to know exactly the target OS is 'tizen'.
e.g. there are linux example applications and tizen example applications.
To get to know which example applications should be built, must
distinguish 'tizen' and 'linux'.
Change-Id: Icf056cba834770f129db3b822f452088bf2e290c
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>
David Warburton [Mon, 22 Dec 2014 19:22:14 +0000 (14:22 -0500)]
Conditionaly enable android build
Change-Id: I3941abdb9b3352f0e52f320865d972ad0914ec16
Signed-off-by: David Warburton <david.warburton@intel.com>
David Warburton [Mon, 22 Dec 2014 17:50:43 +0000 (12:50 -0500)]
Fail the build if one step fails
Setting this option in the bash script will cause the
script to terminate if any of the commands returns a
with non-zero value. This is necessary for the build
server to understand when a build is failed. Without this
flag, the script will exit with the status of the last command,
which in this script is "echo" so it will be 0, regardless if
a scons build step failed.
Ideally we would try each step and then report the failures
at the end, set -e will do the job until that can be developed.
Change-Id: Ib6692d434a2e811f61d8dd1bff52766b7511abd7
Signed-off-by: David Warburton <david.warburton@intel.com>
David Warburton [Mon, 22 Dec 2014 16:52:17 +0000 (11:52 -0500)]
Remove oic-utilities as a requirement
Change-Id: I1b493439c4a202fc94f664bc7d2bcfa635b6c3e2
Signed-off-by: David Warburton <david.warburton@intel.com>
Caiwen Zhang [Mon, 22 Dec 2014 06:00:35 +0000 (14:00 +0800)]
Fix service build error
1. fix protocol-plugin service build error
2. disable the building of the services which aren't updated
Change-Id: Ic9ff2c76610c236811de5c71cb98f03ae63b1db0
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>
William Dieter [Sat, 20 Dec 2014 18:46:44 +0000 (18:46 +0000)]
Download gtest-1.7.0 rather than depending on it being installed
Making the user download and install gtest-1.7.0 is inconvenient for the
user. Also, we do not have direct access to the build machine to update
how and where gtest is stored. Downloading to the extlibs directory in
project source tree removes the need for developers to download and build
gtest and removes the need to configure the build machine.
Change-Id: I3b163c09ecdd9f12e8004a69dfa8dbcaf4ae5615
Signed-off-by: William Dieter <william.r.dieter@intel.com>
Sudarshan Prasad [Sat, 20 Dec 2014 06:05:08 +0000 (22:05 -0800)]
Added Release notes for Dec 20th release
Change-Id: I8f4e487b13fa118291803513bf8fc97cc0f1071c
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
sudarshan prasad [Sat, 20 Dec 2014 04:36:02 +0000 (20:36 -0800)]
Merge "Fixing delete issue in device discovery server sample"
heesung84.kim [Sat, 20 Dec 2014 01:05:54 +0000 (10:05 +0900)]
Fixed Scons build Error.
Before scons build is not working because of cpluff build and mqtt build.
It is resolved.
Remove null check point cpluff.
PluginManger will pass the argument to plugins later.
Currently it is not needed yet.
Comment out related code.
Modify the readme file for scons build
Before readme file is for makefile.
Comment Out Notification build in the Scons script.
Because of scons build error.
Change-Id: I1d74179ee6439535f218bb45a2f93248fb731228
Signed-off-by: heesung84.kim <heesung84.kim@samsung.com>
sudarshan prasad [Fri, 19 Dec 2014 22:38:52 +0000 (14:38 -0800)]
Merge "Replaced sprintf with snprintf in the sdk to avoid potential buffer overflows"
Patrick Lankswert [Fri, 19 Dec 2014 21:14:41 +0000 (13:14 -0800)]
Merge changes Ie4233a5c,I4d7aba08
* changes:
Ignore SCons generated files and directories.
Removed execute permissions from non-executable files.
Joseph Morrow [Fri, 19 Dec 2014 18:59:12 +0000 (13:59 -0500)]
Updated sample apps to show use of multiple presence RT filters.
Updated C sample apps and C++ sample apps to display a simple multi-
resource presence use-case. This shows a few cases which automatically
generate presence notifications.
Change-Id: Id6e5a9de6d7ed06bd3a03291bb0eade74154b7f2
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
sudarshan prasad [Fri, 19 Dec 2014 18:56:39 +0000 (10:56 -0800)]
Merge "Make all multicast coap messages sent as Low_QoS/NON."
Yamin Al-Mousa [Fri, 19 Dec 2014 18:44:34 +0000 (10:44 -0800)]
Make all multicast coap messages sent as Low_QoS/NON.
When a client in C++ is configured to use HighQoS,
then discovery request goes as CON to a multicast address.
However, responses/ACKs are coming from a unicast address.
This makes it impossible for clients to associate requests
with responses and stop retrying CON pdus.Now, CoAP layer is
making sure that all packets sent to multicast address are NON.
Change-Id: I41f351c5c9ce75fc4846d970514733bef5cdce61
Signed-off-by: Yamin Al-Mousa <yamin.s.al-mousa@intel.com>
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
sudarshan prasad [Fri, 19 Dec 2014 18:33:39 +0000 (10:33 -0800)]
Merge "Fixed Warning in OCException"
omkar [Fri, 19 Dec 2014 17:43:06 +0000 (09:43 -0800)]
Fixing delete issue in device discovery server sample
Earlier we were doing a new[] on device info and cleaning up using delete.
Changing "delete" to "delete[]".
Change-Id: I4684e0cdf4e1a38a45cd1bcc5820a980c3db14f9
Signed-off-by: omkar <omkar.m.hegde@intel.com>
HyunJun Kim [Fri, 19 Dec 2014 08:30:45 +0000 (17:30 +0900)]
[service] Update service documents.
Change-Id: Ifc39cbee3321a43c45c004099b5ba36cd4b115ac
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Uze Choi [Fri, 19 Dec 2014 08:12:11 +0000 (00:12 -0800)]
Merge "Fix issues of Things Manager"
Uze Choi [Fri, 19 Dec 2014 08:10:43 +0000 (00:10 -0800)]
Merge "Add scons script and things manager samples."
Uze Choi [Fri, 19 Dec 2014 08:05:54 +0000 (00:05 -0800)]
Merge changes I9ccf4bec,Id22df7b5
* changes:
[service] Update service documents
[SSM] Add OIC namespace and cleanup description file
Uze Choi [Fri, 19 Dec 2014 08:04:30 +0000 (00:04 -0800)]
Merge "[SSM] change soft sensor description folder path"
HyunJun Kim [Fri, 19 Dec 2014 07:59:41 +0000 (16:59 +0900)]
Implementation of response of group action (for remote resources)
There is no response when resource client send message[POST]
to a group with GROUP_INTERFACE, so client cannot receive any message.
We provide logic about the aggregation of children' response.
Then, merged response will be delivered to client.
Additionally, regarding Sudarshan Prasad's comment of previous commit.
We change the definition of GROUP_INTERFACE.
Change-Id: I6c2550472d1e02cd2606317fcb1796e59e004b78
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Uze Choi [Fri, 19 Dec 2014 07:00:38 +0000 (23:00 -0800)]
Merge "[SSM] Reference & Trackee Thing release for arduino"
jk13 [Fri, 19 Dec 2014 06:24:31 +0000 (15:24 +0900)]
[service] Update service documents
Change-Id: I9ccf4bec3ac95b9219f160a851186d431ff8b818
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
jk13 [Fri, 19 Dec 2014 06:05:40 +0000 (15:05 +0900)]
[SSM] Add OIC namespace and cleanup description file
1. Add OIC namespace at SSM interface header for application developers
2. Add description for scons build and run
Change-Id: Id22df7b59fd30d67a05703ccbafc845e94f05ff3
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
jk13 [Fri, 19 Dec 2014 00:21:57 +0000 (09:21 +0900)]
[SSM] change soft sensor description folder path
1. Change folder path
2. Set release folder for documentation
Change-Id: I2c307c813f87631122eec7e867845192739937b5
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Soyoung Youn [Fri, 19 Dec 2014 06:18:32 +0000 (15:18 +0900)]
Fix issues of Things Manager
- Bug fix
: Implementation of Things Manager feature
https://oic-review.01.org/gerrit/495
- Resolve issues detected by Prevent (static analysis tool)
Change-Id: I6a06aa5a688c75384248638b83337e1d1b2dbd56
Signed-off-by: Soyoung Youn <sy01.youn@samsung.com>
Soyoung Youn [Fri, 19 Dec 2014 06:07:44 +0000 (15:07 +0900)]
Add scons script and things manager samples.
oic-resouce/Sconscript
- Build for things manager SDK and all samples.
service/things-manager/sampleapp/
- Build for all samples.
- Sconscript
service/things-manager/sampleapp/linux/configuration
- Sample application for Device Management.
- Sconscript.
service/things-manager/sampleapp/linux/groupaction
- Sample application for Group Action.
- Sconscript.
service/things-manager/sampleapp/linux/groupsyncaction
- Sample application for Group sync.
- Sconscript.
Change-Id: I6c9975824a23deb5363b7157d64ad334bb11c915
Signed-off-by: Soyoung Youn <sy01.youn@samsung.com>
Uze Choi [Fri, 19 Dec 2014 02:51:08 +0000 (18:51 -0800)]
Merge "[SSM] Apply OIC presence feature"
omkar [Thu, 20 Nov 2014 18:55:35 +0000 (10:55 -0800)]
Device Discovery - C & C++ SDK changes
Adding API for setting device information.
Currently supports filtering of device information based on device id and
device name only.
Updated C and C++ sample applications
Change-Id: Ie2fbfac8c9444560633b9716e777d4697a146f66
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Ossama Othman [Thu, 18 Dec 2014 22:56:46 +0000 (14:56 -0800)]
Ignore SCons generated files and directories.
Change-Id: Ie4233a5c36efa09a905074b3ab5c100d96bd5033
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Ossama Othman [Thu, 18 Dec 2014 22:50:07 +0000 (14:50 -0800)]
Removed execute permissions from non-executable files.
C and C++ source files, Makefiles and non-executable
script files (e.g. those without a #!/bin/sh on the
first line) should have not execute permissions.
Change-Id: I4d7aba082041fb4da79a1ec24009460c52ac7135
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Uze Choi [Thu, 18 Dec 2014 09:20:16 +0000 (01:20 -0800)]
Merge "Fix prevent bug in the PluginManager. Fix bug in the sample app."
Uze Choi [Thu, 18 Dec 2014 09:19:26 +0000 (01:19 -0800)]
Merge changes I21ded957,Ia1308e81,If6bccb8e,I6d548404
* changes:
[SSM] Fix static analysis tool issues and 64bit build support
[SSM] Update SDK Api
[SSM] Remove document folder
[service] Publish service documents
heesung84.kim [Thu, 18 Dec 2014 05:41:00 +0000 (14:41 +0900)]
Fix prevent bug in the PluginManager.
Fix bug in the sample app.
Change-Id: Ie1eca80ba41c768374229196b368c4fa070595b1
Signed-off-by: heesung84.kim <heesung84.kim@samsung.com>
min7.choi [Thu, 18 Dec 2014 07:34:08 +0000 (16:34 +0900)]
[SSM] Reference & Trackee Thing release for arduino
1. Reference Thing code release for arduino
2. Trackee Thing code release for arduino
Change-Id: Ib05327af485289dba1b4a1d0ee2b143b5434ab15
Signed-off-by: min7.choi <min7.choi@samsung.com>
jk13 [Thu, 18 Dec 2014 06:24:30 +0000 (15:24 +0900)]
[SSM] Fix static analysis tool issues and 64bit build support
1. Fix code that detected by prevent(static analysis)
2. Fix code to support 64bit build
Change-Id: I21ded9571d2b4fc257991a534171e1931e6ba344
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
jk13 [Thu, 18 Dec 2014 06:21:24 +0000 (15:21 +0900)]
[SSM] Update SDK Api
1. Release Java API
2. Separate into cpp, java folder
Change-Id: Ia1308e814a4cb79575b11bc24ddce69376f2074a
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
jk13 [Thu, 18 Dec 2014 06:04:08 +0000 (15:04 +0900)]
[SSM] Remove document folder
Change-Id: If6bccb8e4cae72baf08b66c6febab8d40a8ac7bc
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
jk13 [Thu, 18 Dec 2014 06:01:50 +0000 (15:01 +0900)]
[service] Publish service documents
Change-Id: I6d5484042e8cef41403511fe206167ff30974fd8
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
minjii.park [Thu, 18 Dec 2014 05:18:46 +0000 (14:18 +0900)]
[SSM] Apply OIC presence feature
1. Apply OIC presence check feature to Soft Sensor Manager
2. Add OIC presence feature to Thin Device Server Example
Change-Id: Iaa65942fb7bea5d0954cb65757ccb35bb2c12708
Signed-off-by: minjii.park <minjii.park@samsung.com>
Patrick Lankswert [Wed, 17 Dec 2014 20:24:16 +0000 (12:24 -0800)]
Merge "Fixed build error"
sudarshan prasad [Wed, 17 Dec 2014 19:52:27 +0000 (11:52 -0800)]
Merge "Added code to send close_notify alert when OC stack shuts down."
Sudarshan Prasad [Wed, 17 Dec 2014 19:44:02 +0000 (11:44 -0800)]
Fixed build error
Due to a previous merge, build was failing when scons was used.
Signed-off-by:Sudarshan Prasad <sudarshan.prasad@intel.com>
Change-Id: I26ad37273f91e61bd4afb49c9c4010cde32cb3b9
Patrick Lankswert [Wed, 17 Dec 2014 16:57:22 +0000 (08:57 -0800)]
Merge "OIC scons build patch for Yocto"
Uze Choi [Wed, 17 Dec 2014 06:23:45 +0000 (22:23 -0800)]
Merge "Implementation of Things Manager feature."
Uze Choi [Wed, 17 Dec 2014 06:16:01 +0000 (22:16 -0800)]
Merge "Implementation of Group action feature for Things Manager."
Kishen Maloor [Wed, 17 Dec 2014 01:43:22 +0000 (17:43 -0800)]
OIC scons build patch for Yocto
Function:
Adds Yocto as a build target for OIC. Code is
executed ONLY when TARGET_OS=yocto.
It WILL NOT affect a build for any other target.
Background:
Yocto cross-toolchains for platforms would have
to be fetched, installed and configured in their
standard way. This configuration is done by
sourcing in an “environment setup” script that
comes with the toolchain. scons is run after this
step.
Details:
The code in this patch reads the variables set
by Yocto’s script and: 1) Learns of tool names and
build flags (varies by target and arch.), 2) Finds
absolute path of these tools (yocto’s script adds
these to PATH) by looking in PATH, 3) Modifies the
scons construction environment to point to tools
+ all their required flags, 4) Switches TARGET_OS
to Linux so that it uses the Linux build configuration
for OIC, 5) Elects to preserve debug symbols (using -g)
so that Yocto’s build process can generate both
DEBUG and RELEASE packages for OIC (This is the
default recommendation of Yocto’s BitBake)
Additional notes:
-The pre-existing TC_PREFIX/TC_PATH framework is
not sufficient to support Yocto’s cross-toolchain.
-Supported architectures for the yocto target are x86
and x86_64. These have been tested to work for Intel
Edison and Minnowboard platforms.
Usage:
From a user’s perspective, there are no unexpected
steps.
1) source <yocto-env-setup-script>
2) …/oic-resource$ scons TARGET_OS=yocto <regular options>
For eg. “scons TARGET_OS=yocto TARGET_ARCH=x86 RELEASE=1”
The results of a build will now go into “out/yocto/x86/…”.
If step 1) hasn’t been done before step 2), the build will
fail with an error message.
Change-Id: I55efab20f9c174f46446e9d59e3fca6eef3df7f2
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
sudarshan prasad [Wed, 17 Dec 2014 00:24:49 +0000 (16:24 -0800)]
Merge "Fixed usages of strtok to use strtok_r instead"
Yuliya Kamatkova [Tue, 16 Dec 2014 23:25:30 +0000 (18:25 -0500)]
Replaced sprintf with snprintf in the sdk to avoid potential buffer overflows
Defect IOT-123 stated that unsafe API sprintf was previously used in SDK and
the recommendation was given to use snprintf rather than sprintf in order to
avoid buffer overflow.
As a result sprintf was replaced with safer snprintf in multiple sdk files
Change-Id: Ic739506f160176aaeb78927745ea67e61c1c0066
Signed-off-by: Yuliya Kamatkova <yuliya.kamatkova@intel.com>
sudarshan prasad [Tue, 16 Dec 2014 22:57:21 +0000 (14:57 -0800)]
Merge "Fixed OCCreateResource return type when empty URI is passed"
sudarshan prasad [Tue, 16 Dec 2014 22:55:27 +0000 (14:55 -0800)]
Merge "Improve Buffer Size in occoaphelper"
sudarshan prasad [Tue, 16 Dec 2014 22:11:41 +0000 (14:11 -0800)]
Merge "Fixed server crash on empty client payload"
Erich Keane [Thu, 11 Dec 2014 22:02:57 +0000 (14:02 -0800)]
Fixed Warning in OCException
Added case statements for two new conditions in OCException that
were forgotten when we implemented this in the past.
Change-Id: I99ab3c2c8ad4f46d9ee35c639970ea93e69f9813
Signed-off-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Tue, 16 Dec 2014 18:30:31 +0000 (10:30 -0800)]
Fixed compile error on 'empty' in OCRepresentation.cpp
The patch for fixing the 'empty' representation object issue
was incorrectly manually merged when it (review 633) was split from
the previous C++ unit test review.
Change-Id: Ib732e5dfcda6a6d34d072d5d93c363fd731912f6
Signed-off-by: Erich Keane <erich.keane@intel.com>
sudarshan prasad [Tue, 16 Dec 2014 18:11:36 +0000 (10:11 -0800)]
Merge "Fixed UnitTest crash when getting JSON from blank object"
HyunJun Kim [Tue, 16 Dec 2014 07:50:07 +0000 (16:50 +0900)]
Implementation of Things Manager feature.
Add feature for Things Manager
- Subscribe Collection Presence
- CRUD function for ActionSet
- Finding group
- Creating group
- Join the specific group
- Let the other devices to join the specific group
- Leave from the specific group
- Delete the group
- Get all group information
- send configuration information to multiple things
- send diagnostics information(i.e. factory reset, reboot)
- Get the configuration parameter list
- Get the diagnostics functionalities list
Fix Segmentation fault.
- Bug fix : "Implementation of Things Manager feature."
https://oic-review.01.org/gerrit/495
OCPlatform_impl.cpp, InProcServerWrapper.cpp
Change-Id: I5b44fbdb034c924df4787a30a4d9c86ce4704aff
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Erich Keane [Thu, 11 Dec 2014 22:10:16 +0000 (14:10 -0800)]
Fixed warning about incorrect initializer.
The ip_mreq initialization was generating a warning. This
corrects the initializer to properly initialize it as far as
the compiler is concerned.
Change-Id: Iea663e7d198dd23f7e9f6ae1050e12d9017db053
Signed-off-by: Erich Keane <erich.keane@intel.com>
omkar [Wed, 10 Dec 2014 00:57:23 +0000 (16:57 -0800)]
Improve Buffer Size in occoaphelper
Previously, we had the BUF_SIZE set at 64. Changing it to be the
greater of MAX_URI_LENGTH and MAX_QUERY_LENGTH. So, if max length
needs to change, we need to change it only in ocstackconfig.
Change-Id: I18aeca83f82932896424d38389a872b581859860
Signed-off-by: omkar <omkar.m.hegde@intel.com>
HyunJun Kim [Mon, 15 Dec 2014 06:55:14 +0000 (15:55 +0900)]
Implementation of Group action feature for Things Manager.
Add GROUP_INTERFACE and OC_RSRVD_INTERFACE_GROUP.
These interfaces are supported Group Action.
When DefaultCollectionEntityHandler is received an message
which Using GROUP_INTERFACE,
It is called BuildCollectionGroupActionJSONResponse.
PUT : Action Create and Delete
POST : Action Read and Execute
Change-Id: I14519fa85b5319c3e9df72fa27e85a5d8df6ea87
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Uze Choi [Mon, 15 Dec 2014 05:08:09 +0000 (21:08 -0800)]
Merge "Changed plugin public setValue API to private."