Yuliya Kamatkova [Mon, 22 Dec 2014 23:12:40 +0000 (18:12 -0500)]
Add C++ Unit tests
Added unit tests for OCPlatform and OCResource C++ APIs.
All tests are passing
Change-Id: Ib31295db92ad3934dec1ea32e59315cea8fff2a8
Signed-off-by: Yuliya Kamatkova <yuliya.kamatkova@intel.com>
(cherry picked from commit
f488ad57ad2b45197ab5a1f4a5ed06565d7b473d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/203
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
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>
(cherry picked from commit
bd3dd4b91f1bca31402240052199f2557ad1d055)
Reviewed-on: https://gerrit.iotivity.org/gerrit/202
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
mshaver [Wed, 7 Jan 2015 00:09:18 +0000 (16:09 -0800)]
Removing getting started and how to guides from API references.
Developer content will be available on iotivity.org going forward, so
there is no need for these files in the API docs code. Direct links were
added to the Home.txt for the iotivity.org/documentation and
wiki.iotivity.org sites.
IOT-218 - Removed the "M1 release" text in title from Doxygen output
IOT-219 - Remove "About OIC" , "Programmer's guide" and "how to"
Change-Id: I28e26328a82cb6ff037ce451a5ed6fee368ad635
Signed-off-by: mshaver <michael.r.shaver@intel.com>
(cherry picked from commit
6a6e69ce6c64b2f7ec85cf2e4c28dd2558192aef)
Reviewed-on: https://gerrit.iotivity.org/gerrit/201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Soyoung Youn [Wed, 7 Jan 2015 05:02:53 +0000 (14:02 +0900)]
Fix some issues of GroupSynchronization
- findGroup() with null callback parameter issue is fixed.
: return OC_STACK_ERROR, when callback parameter is passed with a null value.
- joinGroup() failure when there is no group match with group type parameter is fixed.
- deleteGroup() failure when delete group with no child is fixed.
Erase "else" statement for guard condition in findCallback NULL checking.
Change-Id: Id00160e3b2e85e03c4e4dd5bd5fb401f6a8bbd42
Signed-off-by: Soyoung Youn <sy01.youn@samsung.com>
(cherry picked from commit
e219efd2f099557895748f081c284868c837621b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.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>
(cherry picked from commit
be736343b6afaadba39bcfd64f2b6a50a9a83858)
Reviewed-on: https://gerrit.iotivity.org/gerrit/198
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
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>
(cherry picked from commit
d59e8dcabe4a7829dbd529d7b24f44145ce0d008)
Reviewed-on: https://gerrit.iotivity.org/gerrit/197
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
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>
(cherry picked from commit
87f7589e62489e9a100fe11fa418f8ab120e2f44)
Reviewed-on: https://gerrit.iotivity.org/gerrit/196
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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>
(cherry picked from commit
6db91505bfc2c877c3bf0a41b187c1db58e2619d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
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>
(cherry picked from commit
93e87e9959d536120bedd47a837603418743cc6d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/194
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@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>
(cherry picked from commit
59a91fe583495f14e05c7c7567d4f2241c9b4498)
Reviewed-on: https://gerrit.iotivity.org/gerrit/191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
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>
(cherry picked from commit
7cd6e2214c0eb9a70ac8cb94b38f9dc682a6691e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/182
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Ashok Channa [Wed, 21 Jan 2015 09:43:07 +0000 (18:43 +0900)]
Fixed prevent and klock work issues reported.
Static analysis reported issues are fixed in this commit.
Change-Id: I1c4cefe46650a2acaafb374fbb04ca1936434ab4
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Ashok Channa [Wed, 21 Jan 2015 09:08:00 +0000 (18:08 +0900)]
Scons Script Changes for disabling debug for release mode
Scripts also changed to take current Iotivity structure changes
Change-Id: I589082e9675d99aa9dd6cc1bace26e11b1210510
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/178
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@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>
(cherry picked from commit
dc999011a116251a2275b18baddbad61a827a4bc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/181
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Erich Keane [Fri, 16 Jan 2015 22:46:53 +0000 (14:46 -0800)]
Fixed issue with HeaderOptions not correctly being sent
If HeaderOptions count was greater than 1, the sender side did not correctly
allocate and copy the memory for it, resulting in the second headeroption being
an invalid read/copy, thus resulting in garbage data in the second HeaderOption.
This fix ensures that ALL header option data is correctly copied. Validation
shows that the rst of the stack is working properly, so the correct data will
be transferred.
Change-Id: I08d9ccf8943bf7e85f6d24055b5f11881ba2bd24
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Sashi Penta <sashi.kumar.penta@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: Ashok Babu Channa <ashok.channa@samsung.com>
Ashok Channa [Fri, 16 Jan 2015 11:45:06 +0000 (20:45 +0900)]
Fixed klockwork memory leaks and modified the logs
[IoT 252] CAGenerateToken creates the same token if it
is called less than 500 milli seconds
Removed un-necessary files and added more test cases
Updated for compilation warning and klockwork fixes
Change-Id: I3710e92e9609441affcb40f10f92ef60f8d9f236
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@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: sudarshan prasad <sudarshan.prasad@intel.com>
(cherry picked from commit
1e7452670814663e4c74500956ce5661bbcedfa8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/174
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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>
(cherry picked from commit
f56a9ad5a7c86609cf8895e8a579fb192f0ebfdb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Ashok Channa [Thu, 15 Jan 2015 08:05:08 +0000 (17:05 +0900)]
API for DTLS registration and Scon script addition
A new API is added for DTLS credential registration.
SCons scripts for connectivity abstraction with secured flag.
Different platforms with secured flag ==1 can be built with modifications.
Change-Id: I6a94ce27eb8c2cdd62899b7810ebbec35b3cf385
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/145
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Ashok Channa [Thu, 15 Jan 2015 05:02:54 +0000 (14:02 +0900)]
Tizen, Android BT , BLE optimization - making similar to wifi, eth adapters
For adapting new platforms at adapter level , common logic is added for each adapter.
Platform related calls are divided into client, server and network monitor.
Change-Id: I0086619ae5207e79fee08a6776bbc1a033ac6f44
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Ashok Channa [Thu, 15 Jan 2015 04:19:00 +0000 (13:19 +0900)]
IoT-243 Connectivity Abstraction single-threaded module missing definition for CASendRequestToAll().
IoT-161 PCF Command is not used in OIC_LOG() calls under the connectivity directory.
Updated documentation and few memory leaks .
Change-Id: I10db0f4e2c50cbe1ace726a0577905ea52afcf3f
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/142
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
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>
(cherry picked from commit
943e9632dbe422c43c707c3bb9adabc0c7fd4627)
Reviewed-on: https://gerrit.iotivity.org/gerrit/173
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@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>
(cherry picked from commit
ad40c3bbcf0830033de0f312ebcf6ea2f61cd7ad)
Reviewed-on: https://gerrit.iotivity.org/gerrit/172
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Uze Choi [Fri, 26 Dec 2014 06:22:20 +0000 (15:22 +0900)]
Remove DRM doc
Change-Id: Icc34f18a66d87ae74748e496c3f01ff94ae84aa9
Signed-Off-By:Sudarshan Prasad <sudarshan.prasad@intel.com>
(cherry picked from commit
f408ac1506923ea6fcaaa3f61659b69374bc4675)
Reviewed-on: https://gerrit.iotivity.org/gerrit/170
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
omkar [Fri, 16 Jan 2015 00:31:15 +0000 (16:31 -0800)]
CA: Enable Building C++ Samples, remove hardcoded connectivity type
Modifying the C++ examples SConscript to build samples.
Modifying C++ samples to remove hard coded Connectivity Type.
Instead, accepting it as command line argument from the user.
Remove hard coded Multicast URl. Instead, added URLs for CA
in ocstack.h .
Change-Id: If7c16ae75ec9aa492f4d523cf382eb0f9930c417
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/148
Reviewed-by: Sashi Penta <sashi.kumar.penta@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Uze Choi [Fri, 26 Dec 2014 05:31:20 +0000 (14:31 +0900)]
remove DRM doc
Change-Id: Idd96a81cd79d1b6c54776c6b39cb080743107f8f
Signed-Off-By:Sudarshan Prasad<sudarshan.prasad@intel.com>
(cherry picked from commit
eac0042ba862d7f370d4e4bc03830acb5097ae30)
Reviewed-on: https://gerrit.iotivity.org/gerrit/169
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Sakthivel Samidurai [Tue, 20 Jan 2015 12:38:57 +0000 (09:38 -0300)]
Remove the magic number
Remove the magic number 4 in the CA branch code.
Change-Id: I6fdc81e5a06a2ebdca5245bbf056f5a3d6f36ed4
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/162
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sashi Penta <sashi.kumar.penta@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.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>
(cherry picked from commit
d2a9360615f1e0818f9b386c6d5b8321bd04d5c4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/166
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@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>
(cherry picked from commit
f3344c1e09c42722c023a1ae3940496e2025a97d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Sudarshan Prasad [Tue, 20 Jan 2015 01:31:28 +0000 (01:31 +0000)]
Merge "Fix build warnings" into connectivity-abstraction
Sakthivel Samidurai [Mon, 19 Jan 2015 16:35:48 +0000 (13:35 -0300)]
Fix build warnings
Fix non-token build warnings in the stack.
The token related build warnings are fixed in a separate commit.
Change-Id: Ie43db965df3c434fc5a75b5949322505532bf796
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Yuliya Kamatkova [Mon, 19 Jan 2015 16:30:11 +0000 (11:30 -0500)]
Fixed build issue in csdk samples
Fixed build issue in csdk samples scons script
Change-Id: Ibdc7cba19f295f262c35d8778beabbfc72f446b1
Signed-off-by: Yuliya Kamatkova <yuliya.kamatkova@intel.com>
Sudarshan Prasad [Mon, 19 Jan 2015 18:03:18 +0000 (18:03 +0000)]
Merge "C++ SDK Adding OCConnectivity Type" into connectivity-abstraction
omkar [Wed, 14 Jan 2015 02:11:27 +0000 (18:11 -0800)]
C++ SDK Adding OCConnectivity Type
Previously, we had connectivity type being passed as a
unsigned integer in the C++ SDK. Changing that to
OCConnectivity type.
Change-Id: I5f1690cc0295a2448515d7681a792eb6f6f5811c
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Sashi Penta [Fri, 16 Jan 2015 07:45:07 +0000 (23:45 -0800)]
Enable building C Samples using scons
Enable building C Samples using scons on CA Branch.
Added third party conditional check for glib-2.0.
Change-Id: Iecaf20645c9d7881021bacc54c756c9d5559f3b6
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Signed-off-by: Yamin Al-Mousa <yamin.s.al-mousa@intel.com>
Sudarshan Prasad [Thu, 15 Jan 2015 19:38:46 +0000 (19:38 +0000)]
Merge "Map QoS to the right Connectivity Abstraction message type" into connectivity-abstraction
Sakthivel Samidurai [Tue, 13 Jan 2015 17:53:52 +0000 (14:53 -0300)]
Map QoS to the right Connectivity Abstraction message type
Implement qualityOfServiceToMessageType function to map Qos to
Connectivity Abstraction message type.
Change-Id: I364746360f9cb6f1ae39b7ff37d8d9bcd125fa04
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
omkar [Wed, 14 Jan 2015 23:05:39 +0000 (15:05 -0800)]
C Samples removing unsupported adapter types.
Previously the logs in the sample apps
showed that the users could select adapters
such as LE or EDR which are not supported yet.
Change-Id: Id69d259037e7014be7eb4b956eb7a1c308a66510
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Sudarshan Prasad [Wed, 14 Jan 2015 08:01:23 +0000 (08:01 +0000)]
Merge "Updated Iotivity to compile DTLS modules using SCons" into connectivity-abstraction
Sachin Agrawal [Wed, 14 Jan 2015 05:16:00 +0000 (21:16 -0800)]
Updated Iotivity to compile DTLS modules using SCons
Added Scons script for compiling security samples. Also, updated
CA Scons script to compile connectivity_abstraction.so with DTLS
when scons is invoked with WITH_DTLS=1. Also updated security samples
to use updated OCDoResource API with connectivity_type argument.
Change-Id: I1561266dda1c0ff88e1ad3684a1921b44f12839d
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sudarshan Prasad [Wed, 14 Jan 2015 03:45:36 +0000 (03:45 +0000)]
Merge "Changing Malloc call in CA OCDoResource." into connectivity-abstraction
Sudarshan Prasad [Wed, 14 Jan 2015 00:50:10 +0000 (00:50 +0000)]
Merge "Adding adapter type parameter to C Samples" into connectivity-abstraction
omkar [Tue, 13 Jan 2015 23:57:12 +0000 (15:57 -0800)]
Changing Malloc call in CA OCDoResource.
Previously we were using OICMalloc() to allocate memory to copy the URI
when sending request over multiple interfaces.
During testing, I observed OICMalloc failed in some cases.
Changing the call to OCMalloc instead.
Change-Id: I88ab434d78b3525f6053363fdab7d1d59d8823ed
Signed-off-by: omkar <omkar.m.hegde@intel.com>
omkar [Mon, 12 Jan 2015 23:20:00 +0000 (15:20 -0800)]
Adding adapter type parameter to C Samples
Previously we had hard coded WIFI to be the default interface.
Added code to allow users to pass adapter type as a command line argument.
Change-Id: Id9e0cadf10746bd665212b79d36f7557ed5993d2
Signed-off-by: omkar <omkar.m.hegde@intel.com>
omkar [Thu, 8 Jan 2015 01:00:38 +0000 (17:00 -0800)]
Enabling Requests on Multiple Interfaces CA
Updated sample apps to send Discovery messages
over multiple interfaces.
Unicast Messages are sent over WIFI.
Added a new type "OC_ALL" for Multicast messages.
Resource Discovery is not done in case of multicast
device discovery.
Change-Id: Ifb3364b986e588bd95ae255acaf913ffc7f49fcc
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Sakthivel Samidurai [Mon, 12 Jan 2015 19:56:27 +0000 (16:56 -0300)]
Integrate OCStop API with CA
OCStop to call CATerminate for the CA intgeration
Change-Id: I2d408715256cce7fe6236348fd362a59dd5c60be
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Sashi Penta [Thu, 8 Jan 2015 23:04:53 +0000 (15:04 -0800)]
Enable Multicast Presence and Resource Type filtering on CA
Change-Id: Id76a0bb195af0271fcc7d0e76eee2cfc52822141
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sudarshan Prasad [Wed, 7 Jan 2015 18:44:34 +0000 (18:44 +0000)]
Merge "Fixed seg fault in Linux sample_main (Bug IOT-227)" into connectivity-abstraction
Sachin Agrawal [Mon, 5 Jan 2015 18:35:00 +0000 (10:35 -0800)]
Fixed seg fault in Linux sample_main (Bug IOT-227)
In clearDtlsCredentialInfo, free needs to be invoked on the
'pskCredsBlob' variable. Also updated code to correctly set
blob version field.
Change-Id: Iecfc22b98a430dadd072fa0ea71ddc3eec1a84d8
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sudarshan Prasad [Tue, 30 Dec 2014 19:00:40 +0000 (11:00 -0800)]
Fixed multiple declarations issue
Thanks to Sam for finding the issue.
Change-Id: I357f83c043dc9aa5a7c0f8513eddf18514188269
Signed-Off-By: Sudarshan Prasad <sudarshan.prasad@intel.com>
Sudarshan Prasad [Mon, 5 Jan 2015 21:28:59 +0000 (13:28 -0800)]
Fixed build error when scons is used.
Added required LIBS in the SConscript to get through the build errors.
Change-Id: Ida0a11fd83609ee0aa40db64ffa05efd437abd1d
Signed-Off-By:Sudarshan Prasad<sudarshan.prasad@intel.com>
Uze Choi [Fri, 26 Dec 2014 05:10:32 +0000 (05:10 +0000)]
Merge "Soft Sensor Manager Build Error fix" into connectivity-abstraction
Uze Choi [Fri, 26 Dec 2014 02:25:57 +0000 (11:25 +0900)]
Soft Sensor Manager Build Error fix
Change-Id: Ib65f912526f3f33b764f691209b51e7b22181f44
Sudarshan Prasad [Thu, 25 Dec 2014 11:03:15 +0000 (11:03 +0000)]
Merge "Merge from master to CA branch" into connectivity-abstraction
omkar [Thu, 25 Dec 2014 10:49:53 +0000 (02:49 -0800)]
Fixing Token Length issue in HandleCARequests
This change also enable Device Discovery.
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Change-Id: I0dfb51dcdba1dbf2dc8f70d71bbaefe79bac1a37
Sudarshan Prasad [Thu, 25 Dec 2014 10:31:14 +0000 (02:31 -0800)]
Merge from master to CA branch
Change-Id: If6c0c7db4d8212ce74e523ca03c0ebd7eca024d1
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Sashi Penta [Thu, 25 Dec 2014 08:55:43 +0000 (00:55 -0800)]
Fix to copy the header options from CA to Stack correctly.
Change-Id: I203333fc30eba89a8f56a7af1652cb96bd172c21
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sashi Penta [Thu, 25 Dec 2014 08:05:48 +0000 (00:05 -0800)]
Fixes to send the correct sender info when a presence notification is sent
Change-Id: Id903483a5f329692fc57275076af2c36d0d1adf0
Signed-off-by: Sashi Penat <sashi.kumar.penta@intel.com>
Sudarshan Prasad [Thu, 25 Dec 2014 08:06:31 +0000 (08:06 +0000)]
Merge "Enabling Multiple Interfaces in CStack." into connectivity-abstraction
Sudarshan Prasad [Thu, 25 Dec 2014 07:57:53 +0000 (07:57 +0000)]
Merge "[CA-Integration] Added code to get connectivity type from C to C++ layer" into connectivity-abstraction
Sudarshan Prasad [Thu, 25 Dec 2014 07:53:34 +0000 (07:53 +0000)]
Merge "enable C++ presence samples" into connectivity-abstraction
Sudarshan Prasad [Thu, 25 Dec 2014 06:51:42 +0000 (22:51 -0800)]
[CA-Integration] Added code to get connectivity type from C to C++ layer
Change-Id: I5afd5269595c5d45b355e10e6c9400f66dc74ef9
Signed-off-by:Sudarshan Prasad<sudarshan.prasad@intel.com>
omkar [Thu, 25 Dec 2014 06:50:34 +0000 (22:50 -0800)]
Enabling Multiple Interfaces in CStack.
The stack is initialized with WIFI & ETHERNET
Discovery Messages are sent over WIFI and ETHERNET
CA_LE is not supported
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Change-Id: Id7ec568f2d2effb45727c75958288de4690c9343
Sashi Penta [Thu, 25 Dec 2014 07:36:02 +0000 (23:36 -0800)]
enable C++ presence samples
Change-Id: I51aadf193b504c3bc88e12544f19f63d636a136b
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Vijay [Thu, 25 Dec 2014 04:26:28 +0000 (20:26 -0800)]
[CA Integration] Pass connectivity type on which response is received
Change-Id: I2f8377ca88a79f9502465a40c5003505e5001ec6
Signed-off-by: Vijay <vijay.s.kesavan@intel.com>
Sudarshan Prasad [Thu, 25 Dec 2014 07:24:04 +0000 (07:24 +0000)]
Merge "[CA-Integration] Initial changes to enable CPP stack." into connectivity-abstraction
Sashi Penta [Thu, 25 Dec 2014 06:18:37 +0000 (22:18 -0800)]
[CA-Integration] Initial changes to enable CPP stack.
Change-Id: I10cb4cb26782008b30a69d4a5ab49ec6b7c74b5f
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sashi Penta [Thu, 25 Dec 2014 05:46:54 +0000 (21:46 -0800)]
Enable log for csdk samples
Change-Id: I1344484e918ef3eb54a8a26d2ecc225a1172d4bc
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
omkar [Thu, 25 Dec 2014 01:22:32 +0000 (17:22 -0800)]
Initial Push to Integrate Presence With CA branch.
Filtering based on rt and TLL changes are needed
Signed-off-by: omkar <omkar.m.hegde@intel.com>
Change-Id: Ie7c02f7c96fa9feb3622dd969a121a46d06b0020
Sudarshan Prasad [Thu, 25 Dec 2014 03:44:03 +0000 (19:44 -0800)]
Implement ServerID parsing and sample app
This changeset will correctly parse the Connectivity abstraction
ServerID and provide it as a unique identifier to the client implementer.
This change also includes a sample app that shows off this functionality.
Note: this change was brought from https://oic-review.01.org/gerrit/#/c/624
Change-Id: I0151744d3481da806f5345c0798f7b951fb91394
Signed-off-by: Yuliya Kamatkova <yuliya.kamatkova@intel.com>
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Sashi Penta [Thu, 25 Dec 2014 02:12:41 +0000 (18:12 -0800)]
Fix build issue
Change-Id: Ie0d491d47417db82cf0ee2511e86efc6079c83be
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sudarshan Prasad [Thu, 25 Dec 2014 01:20:14 +0000 (01:20 +0000)]
Merge "[CA Integration] Updated C sample apps to accept connectivity type param" into connectivity-abstraction
Vijay [Thu, 25 Dec 2014 00:36:06 +0000 (16:36 -0800)]
[CA Integration] Updated C sample apps to accept connectivity type param
Change-Id: Ibb6ed2142e9f26981538c386ff38eeeca91f4f8e
Signed-off-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
Sudarshan Prasad [Thu, 25 Dec 2014 00:15:29 +0000 (00:15 +0000)]
Merge "[CA-Integration] Added connectivity type param in APIs" into connectivity-abstraction
Sudarshan Prasad [Thu, 25 Dec 2014 00:11:13 +0000 (00:11 +0000)]
Merge "scons changes for connectivity-abstraction branch" into connectivity-abstraction
Sashi Penta [Tue, 23 Dec 2014 23:41:18 +0000 (15:41 -0800)]
scons changes for connectivity-abstraction branch
Change-Id: Ib433a03454ac543cfcf189e596778414377ffe2a
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sudarshan Prasad [Wed, 24 Dec 2014 01:51:05 +0000 (17:51 -0800)]
[CA-Integration] Added connectivity type param in APIs
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Change-Id: I368885126b5db6182708627312776b9d6da1f7f6
Sudarshan Prasad [Tue, 23 Dec 2014 00:35:38 +0000 (16:35 -0800)]
[CA-Integration] Support query parameters
Change-Id: Idc539fdac6f0424c8c8e33defb99646fe355a879
Signed-off-by:Sudarshan Prasad <sudarshan.prasad@intel.com>
Abhishek Pandey [Wed, 24 Dec 2014 13:50:19 +0000 (19:20 +0530)]
[IOT-209][CA Block] CASendRequestToAll from client changes NON-CON messages as CON on server side - fixed
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Change-Id: Ibbd93ffb758e512bb77181fba71d5d02c05de0d8
Sudarshan Prasad [Wed, 24 Dec 2014 01:38:17 +0000 (01:38 +0000)]
Merge "Updates occlientbasicops to include (resource, SID) detection." into connectivity-abstraction
Sudarshan Prasad [Wed, 24 Dec 2014 01:24:12 +0000 (01:24 +0000)]
Merge "[CA-Integration] fix for presence." into connectivity-abstraction
Sudarshan Prasad [Wed, 24 Dec 2014 00:58:53 +0000 (16:58 -0800)]
Updates occlientbasicops to include (resource, SID) detection.
I've updated the occlientbasicops demo to show that
previously-observed resources can be detected using a
combintation of the resource and SID fields to demonstrate
that a client can see if a given (resource, SID) pair has
been encountered before.
Note: This change was moved from oic-review.01.org/gerrit/#/c/634
Change-Id: Ia2531f3c86773aeac177eb2b063777aa0365a2c4
Signed-off-by: Yuliya Kamatkova <yuliya.kamatkova@intel.com>
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Sudarshan Prasad [Tue, 23 Dec 2014 23:50:01 +0000 (23:50 +0000)]
Merge "Remove the dead code" into connectivity-abstraction
Sudarshan Prasad [Tue, 23 Dec 2014 22:49:30 +0000 (14:49 -0800)]
Merge from master to connectivity-abstraction branch
Change-Id: Ib27785b3f8681b37885a94e608650eed871f9051
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Sashi Penta [Tue, 23 Dec 2014 19:05:57 +0000 (11:05 -0800)]
[CA-Integration] fix for presence.
One of the fix for presence.
Code to replace method type with REST_GET for REST_PRESENCE is moved up into common code.
Change-Id: Ib55d8536f41622649abd3c8d7df024590b6eb9c1
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Patrick Lankswert [Tue, 23 Dec 2014 15:46:26 +0000 (15:46 +0000)]
Merge "Fixed bug in array navigation in CA Adapter DTLS module" into connectivity-abstraction
Sashi Penta [Tue, 23 Dec 2014 00:16:21 +0000 (16:16 -0800)]
Remove the dead code
Change-Id: I564a957a8daa1ce7df92c135f5f914b014103b81
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
David Warburton [Mon, 22 Dec 2014 16:52:17 +0000 (11:52 -0500)]
Fixes for scons builds
1) Remove oic-utilities as a requirement
2) 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.
3) Conditionaly enable android build
4) Correct a build issue in occoap.c with typecasting
Change-Id: I2711db6ff0814cff64b170cba20455e8ef52f905
Signed-off-by: David Warburton <david.warburton@intel.com>
Sachin Agrawal [Sun, 21 Dec 2014 23:48:39 +0000 (15:48 -0800)]
Updated security sample apps to add "/" in front of resource URI.
Gerrit Review 712 in 01.org updated CA layer to mandate "/" in front
of resource URI's. Current change updates security sample apps
to co-exist with 712 change.
Change-Id: I133eeab9092aac9d74f536065f5e10e91f621a4e
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Sun, 21 Dec 2014 21:57:26 +0000 (13:57 -0800)]
Fixed bug in array navigation in CA Adapter DTLS module
If there are multiple packets in the cached array list, only first
packet is send. Updated code to continue sending other packets.
Change-Id: I124e6b9f9477e0cdf9047b410acc11181f1f811e
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
sudarshan prasad [Sat, 20 Dec 2014 10:57:45 +0000 (02:57 -0800)]
Merge "[CA-Integration] Use 5298 port for MC query since CA uses 5298 as MC port" into connectivity-abstraction
Vijay [Sat, 20 Dec 2014 10:11:43 +0000 (02:11 -0800)]
CA Integration: Adding observe cancellation support
Change-Id: Ib34b27fac26de63ccee75f03dc336f23ff3303a0
Signed-off-by: Vijay <vijay.s.kesavan@intel.com>
Sashi Penta [Sat, 20 Dec 2014 10:16:37 +0000 (02:16 -0800)]
[CA-Integration] Use 5298 port for MC query since CA uses 5298 as MC port
Change-Id: Id29c3c4fa52e3f1b4c49fb1652e16cc6485d951c
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
sudarshan prasad [Sat, 20 Dec 2014 09:21:50 +0000 (01:21 -0800)]
Merge "Removed a printf statement in ocstack.c" into connectivity-abstraction
Sachin Agrawal [Sat, 20 Dec 2014 06:52:17 +0000 (22:52 -0800)]
Integrated CA layer and RI layer for DTLS security
Integrated OCSecurityConfig data structure with CA DTLS implementation.
Also updated RI layer to use security data structure variables from CA.
Change-Id: Ia708c8a61f3a8e56442c7acfa927cf2512024452
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sashi Penta [Sat, 20 Dec 2014 09:01:55 +0000 (01:01 -0800)]
Removed a printf statement in ocstack.c
Change-Id: I564b52a57d0c676b1baaf3150df3d2594d5662f6
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sashi Penta [Sat, 20 Dec 2014 08:51:27 +0000 (00:51 -0800)]
[CA-Integration] Fix Get working
We were not setting the numOPtions correctly for operations other than observe.
Change-Id: Iff3dd8e31d1278429ab1e42e97333eacd684190b
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
Sashi Penta [Sat, 20 Dec 2014 07:48:07 +0000 (23:48 -0800)]
[CA-Integration]: Temporary fix for stack smashing and fix support for "/"
Change-Id: I54b9e4f8b51981094c8d78145510d3e865413f58
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
sudarshan prasad [Sat, 20 Dec 2014 07:35:47 +0000 (23:35 -0800)]
Merge "[CA] [All] URI support , Optimization , License verification" into connectivity-abstraction
Sashi Penta [Sat, 20 Dec 2014 05:59:10 +0000 (21:59 -0800)]
[CA-Integration] : Add support for sequence number for observe
Change-Id: I776308ad20911da52ca408c1cbca406bf9747353
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>