Jon A. Cruz [Fri, 21 Aug 2015 22:16:33 +0000 (22:16 +0000)]
Merge "Merge branch 'security-basecamp' into master"
Omkar Hegde [Thu, 20 Aug 2015 17:59:11 +0000 (10:59 -0700)]
Fix presence with ipv6 changes
Previously, the CA layer code was assuming that
all responses are always sent as unicast messages. But, in
the case of presence, it is always multicast. As a result,
the server sent presence notifications only to the ipv4
address and the clients subscribed to server's ipv6 address ignored
the notification. Adding isMulticast flag to the CAResponseInfo_t
structure and changing camessagehandler to handle multicast responses.
Change-Id: I4a0991aca6cf60b4b1ad3f0dfcda683284680adc
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2252
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Tue, 18 Aug 2015 11:36:16 +0000 (20:36 +0900)]
Fix Android EDR crash issues.
CAEDRServerStop is called twice.
So occure reference to invalid global.
Change-Id: I5652b53cf78257a8c59a9ffcf67cfe58879855a1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sachin Agrawal [Fri, 21 Aug 2015 19:28:37 +0000 (12:28 -0700)]
Merge branch 'security-basecamp' into master
Conflicts:
resource/csdk/connectivity/api/cainterface.h
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
Change-Id: I3f49aaa0a1e23f1e361f9f2aa3ceaa5a2acd6aef
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
jihwan.seo [Tue, 18 Aug 2015 15:31:37 +0000 (00:31 +0900)]
to check max token length by coap spec
token lengths 9~15 are reserved.
it must be preocessed as a message format error.
Change-Id: I84b2e51b7364fef4e4dae0d60b1b5010fd059ad2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2235
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sachin Agrawal [Thu, 20 Aug 2015 18:21:57 +0000 (11:21 -0700)]
Removed some warnings from security code.
Removed warnings related to missing-field-initializers.
Change-Id: If4af332ba8f7995c5657dc052763e1bd4089682c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Sachin Agrawal [Fri, 21 Aug 2015 16:00:42 +0000 (09:00 -0700)]
Removed warnings from provisioning module
Removed all unused variable warnings coming from provisioning module
Change-Id: I6183c9413ea495d2969d0e94aa6152a53eeb4b38
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2226
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
coderhyme [Wed, 19 Aug 2015 15:34:59 +0000 (00:34 +0900)]
Refine codes using an enum with std atomic in DevicePresence
DevicePresence::state, a variable to keep the state of the class, is an enum type. It needs to be declared as an atomic to make it thread-safe.
std::atomic with user-defined type is not available on GCC 4.6.3, therefore std::atomic_int is used instead. The enum is scoped enum, which means it is enum class. It means it is not interchangeable with int implictly.
That's why a separate method is declared to set the value from int value. Plus, the values is controlled in the class, so it is safe to cast to int and vice versa.
Change-Id: I2689c550af293c41a9757646924f210e7fccab74
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2244
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sakari Poussa [Tue, 18 Aug 2015 10:46:37 +0000 (13:46 +0300)]
Enable resource/connnectivity logging for osx/ios
Change-Id: I31d065cf3d35fe5b94fbdd9a6d10b65c07a1fc2d
Signed-off-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
koushik.girijala [Wed, 5 Aug 2015 06:58:29 +0000 (12:28 +0530)]
[CA] Fix Get Network Information for Tizen
Added network monitor for CAIpnwmonitor
Had Fix for tizen RI sample build error
Change-Id: If049ccde21a3233ed4d4bebe7c81e32cd8f94d7c
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Tue, 11 Aug 2015 10:44:53 +0000 (16:14 +0530)]
Updated doxygen comments for OCPlatform.h and OCPlatform_impl.h files
Updated and fixed some issues w.r.t doxygen comments in both
OCPlatform.h and OCPlatform_impl.h files
Change-Id: I0b3e72c60c1b99aa6147823854757dce8148488a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Tue, 18 Aug 2015 04:13:08 +0000 (13:13 +0900)]
removed unnecessary codes in CA
- removed unnecessary method
- to check Null parameter
Change-Id: I31133e5f50b488830c4e39026862cd451bd98dd9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Mon, 17 Aug 2015 23:15:04 +0000 (16:15 -0700)]
Fix size error, lack of safety check, and type warning.
- Fixed a problem where the length of a different string was being
used after concatenating a different one.
- Added in missing size checks to avoid buffer overruns.
- Corrected to size_t for proper tracking.
- Changed assumed remaining size to instead be compile-time safe.
Change-Id: I314effbdc14d725e5b16a5e655552c6a817cb3b2
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jon A. Cruz [Mon, 17 Aug 2015 23:11:48 +0000 (16:11 -0700)]
Correct the warning from ingoring write()'s error.
Change-Id: Iff2bf6ded384237bd63427f4602f0f31dac2d9d5
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2220
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jay Sharma [Wed, 19 Aug 2015 12:48:57 +0000 (18:18 +0530)]
[Resource-Encapsulation] Fixed multiple builds
Change-Id: Id4c4c3b179f7f5eb1505ab7abf700772b2ea42d8
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2243
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: Jon A. Cruz <jonc@osg.samsung.com>
Jon A. Cruz [Tue, 18 Aug 2015 23:14:29 +0000 (16:14 -0700)]
Partially revert "Enabled x86_64 build for Android."
This reverts commit
806b994263369d28941aa1495a0a3b54d5249cd5.
Leaves in place the 64-bit code changes, but removes the 64-bit
target from builds for now due to a significant increase in
verification times.
Change-Id: Ib86c35c2a80b9d11621b05fcf16e050f3d6d48b6
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Hauke Mehrtens [Thu, 13 Aug 2015 13:03:11 +0000 (15:03 +0200)]
resource-encapsulation: fix build without curl
The hue plugin needs curl and it should only be build when libcurl is available.
Without this patch, the build fails without curl installed, this patch fixes the problem and makes the build worm without curl and without the hue stuff.
Without this patch I am getting this error message:
scons: ***
File "/service/third_party_libs.scons", line 50, in ?
Change-Id: I5b4da555ff84b9b605cc6c119990d60ff670bd0d
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Rami Jung [Wed, 12 Aug 2015 08:38:36 +0000 (17:38 +0900)]
[Resource Encapsulation] removing "boost/atomic.hpp" from DevicePressence.h
That was removed because Tizen 2.3 uses boost 1.51 which doesn't have "boost/atomic.hpp"
Instead of boost::atomic, std::atomic has been applied and related modules have been changed
- DevicePresence::getDeviceState() from DevicePresence.cpp
- Definition of DEVICE_STATE from BrokerTypes.h
- the way to print log from DevicePresence::subscribeCB()
boost::memory_order_consume vanished
Change-Id: I9403a19c9f52d0059cb60d6bff113f5608464753
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2180
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
hyuna0213.jo [Mon, 17 Aug 2015 11:53:43 +0000 (20:53 +0900)]
Changed the return type of functions in uarraylist
uarraylist.h includes the common functions for array list.
but now it depend on cacommon.h file.
so I modified the return value to reduce the dependence
on the other files.
Change-Id: Ia8584f000f78fec80b21006594af6574dbb6840b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2218
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jay Sharma [Mon, 17 Aug 2015 06:42:27 +0000 (12:12 +0530)]
[Resource Encapsulation] Enabled RE layer build for Android platform
Change-Id: Ia5091fb9e728e46e37a4f5ee8dc69e4b066db8d1
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
coderhyme [Fri, 14 Aug 2015 08:06:32 +0000 (17:06 +0900)]
Remove boost atomic dependency from ResourceObject
It uses one of std and boost if possible.
When they are not fittable which means the boost version is lower than 1.53.0 and the template parameter is not an integral type,
then it selects handmade atomic class.
Change-Id: I556a936f933d524bb4c78224202da4d742c6e9d5
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Fri, 14 Aug 2015 09:11:04 +0000 (18:11 +0900)]
Add noexcept specifier to methods of ResourceAttributes
It is related with efficiency for the compilers to create better optimized codes.
Change-Id: I92fc4ab7caecc874e3590516b1e46f22845ead32
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2210
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tim Kourt [Thu, 13 Aug 2015 19:35:30 +0000 (12:35 -0700)]
Enabled x86_64 build for Android.
Change-Id: Iaf4384cc4a1c3ec35ec00b3b0b88b19f5c73609c
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2201
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Hauke Mehrtens [Mon, 17 Aug 2015 16:05:54 +0000 (18:05 +0200)]
android: show stack trace if gradle fails
When gradle fails for whatever reason it does not show so many
information in most situations. This patch makes it show a complete
stack trace which makes identifying the issue much easier.
Change-Id: I943d8fbbb9b8c1e4a068330e6d1cd6edc4954d6c
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2219
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Erich Keane [Thu, 13 Aug 2015 20:56:24 +0000 (13:56 -0700)]
fix regression in Android interface handling introduced by IPv6 patch.
Added CAInitializeNetworkMonitor and CATerminateNetworkMonitor
Change-Id: Ic0aa1384d13a3ab4f090fe1fc40b6d2e2ceb0bd9
Signed-off-by: John Light <john.j.light@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1822
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Jaehong Jo [Mon, 17 Aug 2015 09:50:53 +0000 (18:50 +0900)]
Removed unnecessary EDR code related to u_arraylist_t
It is about the code after Change 2205 merged.
https://gerrit.iotivity.org/gerrit/#/c/2205/
Change-Id: I65920d410f209998a1525bc5a2434ee09e789791
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2217
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Mon, 17 Aug 2015 05:06:53 +0000 (14:06 +0900)]
removed unnecessary BLE code related to u_arraylist_t
it is about the code after Change 2205 merged.
https://gerrit.iotivity.org/gerrit/#/c/2205/
Change-Id: I3183883efa7914a065dbf56fd122b52e1e720a03
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2216
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Thu, 13 Aug 2015 12:33:11 +0000 (21:33 +0900)]
modified cainterface comment for doxygen.
Change-Id: I9022d3dd31e1f0e92d10964017abc1060f7d19c1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2198
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Fri, 14 Aug 2015 05:36:58 +0000 (14:36 +0900)]
to add check CoAP version
there was no check CoAP version.
it has to check by spec
Change-Id: I485779a0aef88cb18369f5b1842f06d19eadddcd
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2206
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Omkar Hegde [Fri, 14 Aug 2015 21:15:34 +0000 (14:15 -0700)]
Remove unnecessary log in occlient
The presence nonce number is already being printed by
OC_LOG_PAYLOAD. This resolves IOT-649
Change-Id: Ifb989c54ebac797c23a0b9f271a24e5d452b589d
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2213
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jnashok [Fri, 7 Aug 2015 06:16:42 +0000 (15:16 +0900)]
removing redundant code
Removing the redundant code in remote handler
Change-Id: I23d624eec6cf4b215f78fc74ab046a6eaa5468ae
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2133
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
leechul [Mon, 10 Aug 2015 02:21:34 +0000 (11:21 +0900)]
Add PIN based OxM for security provisioning
1. Implement PIN based OxM according to OTM(Ownership Transfer Manager) callbacks.
2. Add pbkdf2 implementation
3. Modify doxmresource.c and credresource.c to support PIN based OxM.
NOTE1:This patch will include several compile warning and work around codes.
It can be removed after the refactored PM and ECDHE_PSK cipher suite of tinydtls is merged
into security-basecamp branch.
NOTE2:This patch will not working. Please code review only.
[Patch #1] Initial upload.
[Patch #2] Update codes according to comments.
[Patch #3] Update codes according to Mr.Shim's comments.
[Patch #4] Update codes according to Sakthivel's comment.
[Patch #5] Updated to remove arduino build failure
[Patch #6~8] Update code and scons script according to review comments.
[Patch #9] Delete unnecessary codes.
[Patch #10] Rebase
[Patch #11] Rebase
[Patch #12] Merge with refactored PM.
[Patch #13] Remove build error.
[Patch #14] Delete unnecessary files.
[Patch #15] Update according to comments.
Remove the removable warnings.
[Patch #16] Update according to Shilpa's comments.
[Patch #18] Update according to Shilpa's comments.
[Patch #19] Refresh for rebuild.
[Patch #20] Refresh for rebuild since Jenkins Server issue is Fixed.
Change-Id: I1328db852a4a7e8225737719061b6c61c37a2f9c
Signed-off-by: leechul <chuls.lee@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1989
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jay Sharma [Sun, 16 Aug 2015 13:52:51 +0000 (19:22 +0530)]
[Resource Encapsulation] Updated DiscoverResource APIs
- Updated RCSDiscoveryManager class
- Updated Linux Sample App
- Updated UnitTestCase
Change-Id: Iaaf72b85335df2507543ccc16de6c094d4c1fe1f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2158
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Rami Jung [Fri, 14 Aug 2015 11:53:04 +0000 (20:53 +0900)]
[Resource Encapsulation] changing names of internal variable
improving readability
it-> attrKeyValPair
keyAttribute -> key AttrListener
Change-Id: Ie950a4ea68f6f1bd5133f1d4220673e7f5d62d31
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Hauke Mehrtens [Wed, 12 Aug 2015 13:36:35 +0000 (15:36 +0200)]
android: fix WELL_KNOWN_QUERY
The multicast IP address schould not be added to the WELL_KNOWN_QUERY constant.
Without this patch the IP address is added as part of the URI path.
Change-Id: I01589dff9239bd21b796b7bd925830799c6b5e52
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2184
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Fri, 14 Aug 2015 20:07:00 +0000 (13:07 -0700)]
Fixed ConditionalAddTextStringToMap
Refactoring changes the function to return an error in the 'null'
condition rather than remain a valid value. This patch returns it to
its previous behavior by having it return 0
Change-Id: I7a3b42399dec2df3955f2b4ef513fa0ca7433bb8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2212
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jnashok [Wed, 12 Aug 2015 23:30:30 +0000 (08:30 +0900)]
Removing unused elments from the structure
CADATA_t is having unused elements
As seen in changes, they are used nowhere but just cloning
Change-Id: If5cb34c085702c1f2bd0a5240bc5c2160277187e
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2193
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Erich Keane [Fri, 7 Aug 2015 17:18:51 +0000 (10:18 -0700)]
Enable arbitrary package sizes for OCPayloadConvert
Previously OCPayloadConvert would only allocate sizes up to 1024
due to how it was designed. This patch will enable unlimited size,
since it will now recover from a CborErrorOutOfMemory and resize the
buffer, then try again.
This requires tinycbor commit
47a78569c0 (currently HEAD of master in
the github tinycbor library), so you'll likely need to do a git-pull in
the extlibs/tinycbor/tinycbor directory. This commit also adds a
static_assert like functionality for C, and tests for the condition
where tinycbor needs updating.
Change-Id: I6f81d374ca2b68ebaf2f6a8239be58898b247309
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jon A. Cruz [Fri, 14 Aug 2015 04:00:04 +0000 (21:00 -0700)]
Corrected direct use of u_arraylist_t internals.
Places in the code were using u_arraylist_t internals, including
sections that were copies of the standard functions. These were
corrected to avoid further divergence and allow for corrections.
Change-Id: I52d251e19d8f80945d71e9d57b5c8107aaa3a4ca
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Thu, 13 Aug 2015 11:50:30 +0000 (20:50 +0900)]
updated interface file in android_api.
as java interface for BLE was changed(change-2100),
I have updated java files android_api.
Change-Id: I7519f007619eb5c4ac8b25abb8f9fbf5f3a5d3c0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2197
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Sakthivel Samidurai [Thu, 13 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Move security identity out of CAEndpoint_t and OCDevAddr.
Move security identity to CAInfo_t.
Propagate security to OCClientResponse for application.
Change-Id: I535577bedf0ed4f46a97249add56aec6928d2d84
Signed-off-by: John Light <john.j.light@intel.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2144
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Erich Keane [Thu, 13 Aug 2015 18:26:18 +0000 (11:26 -0700)]
Fixed collections double-sending children IOT-652
The children in a collection were being added both during
resource-conversion and during collection conversion. This fixes this
by making sure that resources don't add their children in cases where
they are not collections.
Change-Id: I1da7f98ddcc2c0a66a30165785e46cee83b77b5d
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2200
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Erich Keane [Thu, 13 Aug 2015 22:47:50 +0000 (15:47 -0700)]
Fix Rebase issue with RA_ADAPTER check
RA_ADAPTER check was merged improperly, this removes the second
instance.
Change-Id: Id2d02251d55f6917804eb943ab6cbe7ed27bbf83
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2202
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Erich Keane [Thu, 13 Aug 2015 20:18:12 +0000 (13:18 -0700)]
More robust IP Dual-Mode filtering
Update filtering in camessagehandler.c
Filter duplicates based on last 4 messages.
Filter both requests and responses, separately.
Change-Id: I191436f91c733893bcbf12c9ffdb05bc841bfa2f
Signed-off-by: John Light <john.j.light@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1994
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
John Light [Tue, 28 Jul 2015 04:53:11 +0000 (21:53 -0700)]
Upgrade all samples (C SDK tests) to work with IPv6
Some testing
Change-Id: I77b152b1e0c088b61b8f217313d70d62eb9f7383
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1963
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Geoffroy Van Cutsem [Tue, 4 Aug 2015 18:56:08 +0000 (11:56 -0700)]
Remove a couple of unneeded (legacy) files.
Change-Id: I1945d7b4e7d48f87f69f4d59df44fbd22ededc41
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2106
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Omkar Hegde [Wed, 12 Aug 2015 16:51:31 +0000 (09:51 -0700)]
Fixed IOT-679
Sometimes the server sends a observe notification before observe
cancel is processed by the client causing a segmentation fault.
Changing client to call cancel observe when count is equal to 11.
Change-Id: I2373a5bbadf0d3046e0f83af961528c19ab495d8
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2191
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Thu, 13 Aug 2015 00:50:34 +0000 (17:50 -0700)]
Fixed crash in bool arrays not being added properly on parse
The parser had a mistaken condition, so that a boolean array will never
be added as a type to a rep payload. This corrects the && to || in
order to ensure that it actually executes!
Change-Id: I215e5477596f7c5ad49e2a79a3af619343ef74d8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2194
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Rami Jung [Wed, 12 Aug 2015 09:55:56 +0000 (18:55 +0900)]
[Resource Encapsulation] removing "boost/atomic.hpp" from ResourcePressence.h
That was removed because Tizen 2.3 uses boost 1.51 which doesn't have "boost/atomic.hpp"
Instead of boost::atomic_long, std::atomic_long has been applied and related module has been changed
- (receivedTime.load(boost::memory_order_consume) is changed to "receivedTime"
at ResourcePresence::timeOutCB from ResourcePressence.cpp
Change-Id: I45758e639c0991e7b4f9b9a20816d9e970b2c984
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2182
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Shilpa Sodani [Mon, 10 Aug 2015 21:17:35 +0000 (14:17 -0700)]
Fixed compiler warnings
Fixed compiler warnings in security layer due to recently enable compiler flags.
Change-Id: Id88c7385bb493074fab40513745702f6b452590d
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2164
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
sandipan.p [Tue, 11 Aug 2015 12:20:56 +0000 (17:50 +0530)]
Setting adapter value in RI to enable BT(EDR) transport support
Change-Id: I93d2c10760d60f614588703dc52496943f446d56
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2168
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Tue, 11 Aug 2015 09:11:16 +0000 (18:11 +0900)]
fixed parsing error in android sample app in CA
Change-Id: I5ebb10c5361eea1fc88975a75e10c06f2df40f02
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2166
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
hyuna0213.jo [Wed, 12 Aug 2015 02:21:26 +0000 (11:21 +0900)]
modified if condition for log in messagehandler.c
null pointer leads to undefined behavior.
so if condition has to be modified.
Change-Id: Idf906ec940a80547543dfe01ccc9cbcda0f1d9b8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2178
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
leechul [Wed, 12 Aug 2015 05:56:29 +0000 (14:56 +0900)]
[Patch #1] Refactored provisioning manager
1. Change PM is to be used OC API instead of the CA API.
2. Generalization of each OxM(ownership transfer method) via callback mechanism.
3. Implement just works OxM according to callback mechanism(#2).
4. Add pmutility.c/pmutility.h for PM's utility functions.
5. Add public OC API that is exposed to PM API.
[Patch #2] Change the return value of request callback to OC_STACK_DELETE_TRANSACTION.
[Patch #4] Update commit message
[Patch #5] Add context in OC APIs PM(SRP, OTM)
[Patch #6] Update commit message
[Patch #7] Update commit message
[Patch #8] Remove the unused code in secureresourceprovider.c
[Patch #9] Integrate Patch #7 and Patch #8
[Patch #10] Modifiy codes according to review comments.
[Patch #11] Updated according to review comments.
[Patch #12] Rebase with security-basecamp
[Patch #13] Change the return type in discovery handler.(To ensure the operation of the PM)
[Patch #14] Updated according to review comments
[Patch #15] Removed tabs from pmutility.c
[Patch #16-17] Rebased with security-basecamp
[Patch #18] Update according to Mr.Shim's comments.
All oxm header files was moved into security/provisioning/include/oxm/
Change the PM's sample server based on ocserverbasicops.cpp
[Patch #19] Modify wrong module name of PM's SConscript.
[Patch #20] Modify the payload type in OTM and SRP.
[Patch #21] Upload README file.
[Patch #22] Revert to patch set 20 and upload README file again.
[Patch #24] Change the file extension of provisioning sample server according to Sakthivel's comments.
[Patch #25] Upload file missing.
[Patch #26] Rebase
[Patch #27] Remove build error
Change-Id: Ibda88c0b19282af5a2e0893dbf975f0cda34730b
Signed-off-by: leechul <chuls.lee@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1988
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ossama Othman [Mon, 10 Aug 2015 17:59:38 +0000 (10:59 -0700)]
Enable automated builds for most transports.
Currently only the Linux builds enables all IoTivity transports. That
allows platform-specific implementations, e.g. BLE on non-Linux
platforms, that are not enabled in the automated builds to potentially
stagnate.
This patch adds Bluetooth related builds for Android and Arduino.
Several builds issues were addressed as a result of doing so.
Tizen BLE compile-time issues were also addressed. However, a
separate patch will be submitted to enable ALL transports for Tizen
since unresolved symbol errors related to use of functions in the
Tizen Bluetooth currently exist in the master branch.
Change-Id: I4f4971e5a6cd8089b5c4cd16926331e24fec3181
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2163
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>
Ossama Othman [Tue, 11 Aug 2015 21:45:45 +0000 (14:45 -0700)]
[android] Addressed some minor SonarQube issues.
SonarQube flagged overly long lines, tabs in source code and lack of
braces in if-conditional blocks. Fix some of those issues.
Change-Id: I7ac79dda519cbec220118d4a9e283d7ba64d626c
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2177
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Erich Keane [Tue, 11 Aug 2015 18:40:19 +0000 (11:40 -0700)]
Worked Around GCC 4.6.3's Bool issue
GCC 4.6.3 converted bools improperly, I believe this to be a bug in the
compiler, however this work around forces the conversion to happen correctly.
Signed-off-by: Erich Keane <erich.keane@intel.com>
Change-Id: I30bbe9807593075a2518018f268d6e14a8dfa47a
Reviewed-on: https://gerrit.iotivity.org/gerrit/2170
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jihwan.seo [Tue, 11 Aug 2015 02:29:14 +0000 (11:29 +0900)]
replaced char* with uint8_t in EDR
i have updated EDR code
since EDR is not built after Change 2034.
Change-Id: I8e23fdf88b6da6055127488b33a52c1206ee770d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ravi Nanjundappa [Tue, 11 Aug 2015 05:59:01 +0000 (11:29 +0530)]
Add unittests for ConstructResourceTest for invalid uri value
Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with uri having just "/" as its value.
Change-Id: Ifdc128fc505a862ff4dedcbeff60896c25e1d029
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2157
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ravi Nanjundappa [Mon, 10 Aug 2015 09:12:18 +0000 (14:42 +0530)]
csdk : Refactoring ocpayload.c file
Introduced a static function OCRepPayloadSetProp() and pushed the generic code
for all datatypes.
Change-Id: I787274c91e80c52d61563944d1284aa7c24e10a8
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2152
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ravi Nanjundappa [Mon, 3 Aug 2015 11:42:50 +0000 (17:12 +0530)]
soft-sensor-manager: Fix cppcheck errors
This patch fixes the errors reported by cppcheck tool for
'(error) Mismatching allocation and deallocation: avg'.
Replaced delete with delete[] wherever the memory is allocated
using new [].
Change-Id: Ic32755347ad24aeb2a1c57341249038fd511073a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2067
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>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Ossama Othman [Wed, 29 Jul 2015 23:03:14 +0000 (16:03 -0700)]
Clean up some SonarQube warnings in `service' directory.
Clean up trailing whitespace from most text files to address SonarQube
warnings. As a side effect of this clean-up, several files that
should not have been executable had their executable permission bit
removed.
Change-Id: Ib3c56cd426bf868a8aed47d7d68038106e13c5c0
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1981
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Ossama Othman [Fri, 31 Jul 2015 23:12:40 +0000 (16:12 -0700)]
Corrected pointer arithmetic on void* variables.
Octet arrays were represented by void* and char* typed variables in
several areas of the CA layer. Use uint8_t* where appropriate to
address undefined pointer arithemetic on pointers to void. Code that
treated the octet arrays as strings (e.g. performed strcpy() on them)
was corrected as well. This addresses several major issues flagged by
SonarQube.
Change-Id: I8d5c57eafa0b0e394e0ee202df1bb7b67c7a59b1
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2034
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
John Light [Wed, 29 Jul 2015 22:33:15 +0000 (15:33 -0700)]
Fix parsing error in IP addresses in resourceURIs
Change-Id: Ia08ce526ffa759a5749a90d0d31ff5dbca60b072
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2120
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
John Light [Thu, 30 Jul 2015 22:14:07 +0000 (15:14 -0700)]
Avoid Segv by testing address field before using it.
sIssue reported off dev list by Gabriel Schulhof.
Change-Id: Ifa529da59fb784fd5cdef6ca333635cf99ed1f59
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2160
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Sakari Poussa [Mon, 10 Aug 2015 09:48:19 +0000 (12:48 +0300)]
Set socklen explicitly to make OSX happy when sending data
Change-Id: I57e6360bcd2fe26ff2b0cc6cce82011519e84485
Signed-off-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ravi Nanjundappa [Mon, 10 Aug 2015 10:10:24 +0000 (15:40 +0530)]
Add unittests for ConstructResourceTest for invalid host values
Added a test case for ConstructResourceTest to simulate the scenario of
Resource creation with host
* not having the ip or device address and
* not having the "coap://" protocol prefix.
Change-Id: Ic3f1b250950ad2c3a251a56a85e7356c06ac34fb
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2154
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Wed, 5 Aug 2015 06:49:47 +0000 (15:49 +0900)]
Removing build warnings
Aimed to remove build warnings in android sample and ipadapter
Also did minor fixes in other places
Change-Id: I7aa4bf46c1d494d42da89f9264f4e66dc622b815
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2112
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>
jihwan.seo [Fri, 7 Aug 2015 02:26:29 +0000 (11:26 +0900)]
fixed the crash for payload, when empty string is used.
Change-Id: Ide824e447dec95cd56a32a21d290044a1571b7f7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2131
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Sachin Agrawal [Sun, 9 Aug 2015 19:00:18 +0000 (12:00 -0700)]
Merge branch 'master' into 'security-basecamp'
Conflicts:
resource/csdk/security/src/aclresource.c
resource/csdk/security/unittest/doxmresource.cpp
Change-Id: Ic7ed242e7c394f40cfa13f5f353893aff66cb771
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Sat, 8 Aug 2015 00:23:56 +0000 (17:23 -0700)]
Fixed a bug by correctly invoking CAConvertAddrToName API
Recently, DTLS code in CA layer was updated to use
CAConvertAddrtoName() API instead of inet_ntoa. The API was
wrongly invoked by passing invalid arguments. This caused
failure in security samples.
Change-Id: I33a3981ca1c2ed0635b8def5106282349df611ee
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2149
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Shilpa Sodani [Fri, 31 Jul 2015 23:14:32 +0000 (16:14 -0700)]
Updated ACL and Cred EntityHandler to process Delete Request
Added HandleACLDeleteRequest function to ACL resource to process
delete request.
Added HandelDeleteRequest function to Cred resource to process
delete request.
Changed Rest query separator to ";" from "&"
Change-Id: I5f7a0e446051f63e6aad9e49e4cbce1e34dc5f57
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2035
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ossama Othman [Fri, 7 Aug 2015 19:05:14 +0000 (12:05 -0700)]
Fixed Linux BLE peripheral content type mismatch.
A pointer to an incorrect context object was passed to the GATT
service registration function. Pass a pointer to the correct one
(CAPeripheralContext*) instead. Addresses an "incompatible pointer
type warning".
Change-Id: I3a256ac278a28659bcc2352955a0172eebdc1c90
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ossama Othman [Fri, 7 Aug 2015 18:49:47 +0000 (11:49 -0700)]
Fixed seg fault when filtering Linux BLE devices.
The loop used to filter Linux BLE devices by UUID iterated through a
zero-terminated array, and used the zero terminator as the stopping
condition. However, it neglected to dereference the iterator to check
for the zero terminator, and incorrectly checked the iterator itself.
That resulted in the loop body dereferencing and using the last
element, the zero terminator, in a strcasecmp() call, and ultimately
seg faulting.
Rather than depend on the zero-terminator, obtain the length of the
array and use it to determine the end iterator beforehand.
Change-Id: Idecee74d19ebe01a812ecf17365f39be9ae1f7fe
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2142
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Caiwen Zhang [Thu, 6 Aug 2015 06:46:03 +0000 (14:46 +0800)]
Make sure the object files are put in default output directory
Currently the object files may be not in the default output directory,
if Arduino SDK is installed in the subdirctory of IoTivity project.
Change-Id: I3fb2f6af46e041418fdaedf5ebf93a3d13e21578
Signed-off-by: Caiwen Zhang<caiwen.zhang@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2125
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Minji Park [Fri, 7 Aug 2015 02:25:49 +0000 (11:25 +0900)]
resource-manipulation: modify container tests to get config path information
add logic to get app execution path to container-test
to set config file path when initializing container.
Change-Id: I4edc64caccfd6ce4c7c614673be53c139bbd2516
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2132
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Shilpa Sodani [Tue, 14 Jul 2015 22:53:52 +0000 (15:53 -0700)]
Enabled Period & Recurrence in ACL resource.
Andded marshalling and unmarshalling code for Period and Recurrence
properties of ACL.
Updated Policy engine to consider period and recurrence while allowing
access to resource.
Updated server json database.
Change-Id: I31181e6972f0bbf440c17521d20d5058a2621afa
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Thu, 6 Aug 2015 22:15:08 +0000 (15:15 -0700)]
Add TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256 cipher suite in tinydtls
[Patch #1] Initial upload
[Patch #2] Add function to calculate the pre-master key of ECDHE_PSK cipher suite.
[Patch #3] Update codes according to review comments
[Patch #4] Modify code alignment.
Change-Id: I70be3a8e9469cc1913373d820b4a3d4f4a6d6d0d
Signed-off-by: leechul <chuls.lee@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2103
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Gabriel Schulhof [Thu, 6 Aug 2015 15:42:56 +0000 (18:42 +0300)]
ocpayload.h: Factor out logging
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Change-Id: I35b7dac9a7877723da5ba3478193a3e8c78a78ed
Reviewed-on: https://gerrit.iotivity.org/gerrit/2128
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Ravi Nanjundappa [Thu, 6 Aug 2015 13:28:58 +0000 (18:58 +0530)]
Doxygen comments correction in OCPlatform.h
Correcting the proper argument names in doxygen comments of OCPlatform.h file
Change-Id: I36b528405a131a6971ce01d9b18d7ffc5f6fff2a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2126
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Wed, 5 Aug 2015 09:42:17 +0000 (15:12 +0530)]
Add Doxygen comments for OCApi
Add relevant doxygen comments for OCApi.h file.
Change-Id: Ic58af7eb33eed0253b96fcc9e1203f6b8b9d3c57
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2116
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Wed, 5 Aug 2015 02:16:14 +0000 (11:16 +0900)]
removed warning for Android EDR
- there was a few warning message in EDR
- also removed unused method in BLE
Change-Id: Ie9f181f8771d01696d47f9e876baac4a3a538773
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2111
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
John Light [Thu, 30 Jul 2015 05:10:51 +0000 (22:10 -0700)]
Set socklen explicitly to make IOS happy
Change-Id: I61a30d0c81c0607d127277b53fa0bef7240e0551
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Sakthivel Samidurai [Wed, 5 Aug 2015 16:36:21 +0000 (09:36 -0700)]
Use CAConvertAddrToName helper method instead of inet_ntoa
Use CAConvertAddrToName to provide protocol-independent translation
for DTLS.
Change-Id: If9e80aba1151ecbdb9af4cfa204ec88dc6f94001
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
sonu1.yadav [Wed, 5 Aug 2015 10:47:33 +0000 (16:17 +0530)]
Added significance of sequenceNumber in observe callback
Change-Id: I40a9266d0cffcb09925b9dba06c60c39437e7482
Signed-off-by: sonu1.yadav <sonu1.yadav@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2117
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
hyuna0213.jo [Wed, 5 Aug 2015 08:44:43 +0000 (17:44 +0900)]
fixed build warnings in CA common logic
modified build warnings in CA common files
Change-Id: If7ba87b32a971d6e8e921f92081051d7959d8380
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2114
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Jon A. Cruz [Tue, 4 Aug 2015 18:50:07 +0000 (11:50 -0700)]
Cleaning up more warnings.
These fixes clear a bit over 200 more of the basic warnings
seen. A few signed/unsigned issues that might require thought
were left for later.
Change-Id: Ie04411927cef8a73f17f16e329f6546229c2c3d1
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Mon, 3 Aug 2015 18:40:57 +0000 (11:40 -0700)]
Fixed the checked_guard/nil_guard to pass by reference
This fix should allow checked_guard to properly pass by
reference rather than pulling everything out to a copy. This
should ensure that out parameters are possible in the C++ stack,
though still extremely discouraged.
Change-Id: Ide35e9eb7adbdd532f375f341286387a641e8436
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2087
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
John Light [Wed, 29 Jul 2015 19:55:38 +0000 (12:55 -0700)]
Eliminate warnings from caadapternetdtls.c
Change-Id: I1ec6bda440ecb435586c872f4c63791c1b80d22a
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2108
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Yu-Hsin Hung [Tue, 4 Aug 2015 02:50:59 +0000 (02:50 +0000)]
Fix Android EDR memory leak
Android applications with EDR adpater always get crashed after
running for few minutes. The exception says that the JNI local reference
table is overflow, due to some memory not released by GC.
Change-Id: Ie274d7b28ab9f187728f04aa0dceaa4ebcb61240
Signed-off-by: Yu-Hsin Hung <hungys@hotmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2099
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ravi Nanjundappa [Wed, 5 Aug 2015 10:26:02 +0000 (15:56 +0530)]
Add unittest for ConstructResourceTest
Added a test case for ConstructResourceTest to simulate the
scenario of Resource creation with host not having port number.
Change-Id: Ia9ffa317956b8c73dca16a0701c9fd28c8cbaed1
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2115
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Fri, 31 Jul 2015 02:30:06 +0000 (11:30 +0900)]
modified some flag to set Blockwise tranfer
- unnecessary parameter was removed (payload, payloadSize)
- to add some flag related to enable BWT as per platform
Change-Id: I1606732073ba519a7655c430e0ef8bdc31a004d0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2014
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Sachin Agrawal [Wed, 5 Aug 2015 07:14:02 +0000 (00:14 -0700)]
Merge branch 'master' into 'security-basecamp'
Conflicts:
auto_build.sh
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/unittest/pstatresource.cpp
resource/csdk/stack/src/ocstack.c
Change-Id: I16af21ba19da38a5d0ec6d6ba0c236308f394676
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
jihwanseo [Tue, 4 Aug 2015 05:41:32 +0000 (14:41 +0900)]
modified CA comment for doxygen.
Fixed All files with out of date or
incorrect doxygen comments in CA
Change-Id: I99345cb693bb292e787e717f49cf4cc914caf534
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Tue, 4 Aug 2015 11:46:23 +0000 (20:46 +0900)]
removed warning from scons build for Android EDR
Change-Id: Ic54b6cbdd7582c6c2ff7ef0074cf56e58d5e400e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2105
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
hyuna0213.jo [Tue, 4 Aug 2015 10:22:04 +0000 (19:22 +0900)]
fixed build warnings in CA linux sample application
fixed build warnings raised by the -Wextra flag.
Change-Id: Id12844fa8fb28a60df58036c5ad1ffc91a3b28c8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2104
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
jihwan.seo [Tue, 4 Aug 2015 05:39:16 +0000 (14:39 +0900)]
removed warning in Android BLE
- to add NULL checker for parameter.
- to remove unnecessary code.
Change-Id: I197e8339d2757bfa750d171ad74e6064bff2d5e5
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2100
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
John Light [Tue, 28 Jul 2015 19:47:05 +0000 (12:47 -0700)]
Allow endpoint adapter type to filter discovery adapters
Change-Id: I1424b906ac4084180d6982623911accdf993237f
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2009
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
hyuna0213.jo [Mon, 3 Aug 2015 04:12:10 +0000 (13:12 +0900)]
[JIRA IOT-659] fix the bug related to CACreateEndpoint
CACreateEndpoint is returning CA_STATUS_OK without CAInitialize.
so I add the CA status check logic before calling CACreateEndpoint().
Change-Id: Icd0177efbf60dee2930fce1fddbcb401d4e4a549
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2047
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Jay Sharma [Tue, 4 Aug 2015 07:00:25 +0000 (12:30 +0530)]
[Resource Encapsulation] Fixed Sample APP issue
Change-Id: I1a90ec626f29b195ae1f4dde2d46b72fbc991133
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2101
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
projects / platform / upstream / iotivity.git / log