Sachin Agrawal [Thu, 4 Jun 2015 16:51:01 +0000 (09:51 -0700)]
Merging security-M3 to master
Added support for resource access control, anonymous ECDH,
and Just Works Provisioning.
Patch 1 : Squashed all security-M3 patches and rebased to
common ancestor of security-M3 and master.
Patch 2 : Rebased to master. (Arduino build fails).
Patch 3-4 : Fix the unit test failures.
Patch 5 : Fix the previsioning server send request issue
by adding token length.
Patch 6 : Fixed Arduino compilation.
Patch 7 : Fixed DTLS handshake issue.
Patch 8 : Fix the build issue.
Patch 9 : Replaced strncmp with memcmp, As token handling is
from null terminated string to byte buffer.
Patch 10: Rebased with master.
Patch 11-12: OSX Build Failure Fixes.
Patch 13: Updated README related to secure-Iotivity stack.
Patch 14: Fixed issues identified in Patch 5.
Patch 15: Rebased with master to avoid merge conflicts.
Patch 16: Updated commit message
Change-Id: Icae698c3bf377862b561d6ebba1d784058d28adb
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1071
jnashok [Wed, 3 Jun 2015 01:54:36 +0000 (10:54 +0900)]
NDK build Fix to support DTLS in Android sample
As the DTLS flag was not defined for in sample application
Android.mk, secure message sending fails, as credentials
cannot be set.This patch fixes the issue
Change-Id: I3f44cb1b299c967855112f9f1c3981b8499815e2
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1177
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Charlie Lenahan [Thu, 4 Jun 2015 00:14:17 +0000 (20:14 -0400)]
Add script license headers.
Change-Id: I94b31f4e7971d9840d760e8a5deb5478e17f7b7f
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1186
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
hyuna0213.jo [Thu, 4 Jun 2015 05:37:29 +0000 (14:37 +0900)]
remove the unnecessary file.
proguard-project.txt is the unnecessary file.
so this file should be removed for open source.
Change-Id: Ib6c78cf7c1e104bc19ace44e1a965a0c6d368e6f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1190
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Tue, 2 Jun 2015 00:15:24 +0000 (17:15 -0700)]
Moved oic_string and combined mallocs to central place
Created the c_common directory to contain all stuff common
to the C stack. Currently, oic_string has been added. Additionally,
ocmalloc and oic_malloc have been combined and moved to this directory.
Future targets will be the ocrandom and oc/oic_logger libraries.
Change-Id: Ic4858881565367b3e69b47d6b0e0145a42d4ace0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Ravi Nanjundappa [Wed, 3 Jun 2015 10:29:52 +0000 (15:59 +0530)]
Addressed build warnings in resource folder.
Fixed compile-time warnings regarding
* not handling a enumeration value in switch case of OCException
* unused exit label and
* comparison between signed and unsigned integer expressions
in resource/csdk/ and resource/src folders.
Change-Id: Ia2d00ec335db56a5070cbe222093d392dd3a531c
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1182
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
nravi [Tue, 2 Jun 2015 06:05:20 +0000 (11:35 +0530)]
Added unit tests for OCCreateResource()
Unit tests exercise code paths to check for invalid URI field.
Change-Id: Id4f1f759c5d554e808af7da77194b688d2283d7b
Signed-off-by: nravi <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1166
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Wed, 20 May 2015 07:48:12 +0000 (16:48 +0900)]
Adding Error handling from CA to RI
This is the first step to add the error handling
Error handling in adapters will be added incrementally
Change-Id: I6d27133cab49d5945e9eb42ea734d7ad881e89b8
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1046
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jaehong.jo [Wed, 3 Jun 2015 04:43:54 +0000 (13:43 +0900)]
Fix to android EDR multicast
When send data fail, do not return.
Try to send data to next bonded list.
Change-Id: I7d3d16b768c72ca4f81c8cf7a2e8be400502986f
Signed-off-by: jaehong.jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1178
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Tue, 2 Jun 2015 15:37:32 +0000 (11:37 -0400)]
Refactored android default ArchType check in SConscript.
According to SCons' wiki, checking strings should be done with "==" and
not "is". "is" is to be used for checking against the ID value for a
value and not the value, while "==" checks against the value.
Change-Id: I28710e324d998098cd22bb615a03c388f6903f18
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1170
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Fri, 29 May 2015 07:33:51 +0000 (16:33 +0900)]
Fixed [IOT-539] issue for CAInitialize
CA APIs is returning CA_STATUS_OK without CAInitialize.
so we have fixed it through some flag is used.
Change-Id: I1adfee5a0e9dfbd3b91acc851fea52b2f7740619
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1138
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Fri, 29 May 2015 20:39:40 +0000 (13:39 -0700)]
Fixes for strcat/strcpy implementation
Jon Cruz suggested a number of ways of simplifying the Strcpy/StrCat
implementation, sot his contains them. Additionally, the error
conditions are now run-time so as to be entirely run-time safe, rather
than asserts, which resulted in some nasty undefined behavio.
Change-Id: I175b0df37d822d2c95b22b6521dbfbedbe15797b
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Charlie Lenahan [Fri, 29 May 2015 19:28:16 +0000 (15:28 -0400)]
Remove CreateResourceWithHost calls.
"host" member is never referenced anywhere or returned in
any callbacks,so it is just a blackhole.
Change-Id: I957e44361851191c2a834528e60a3007e58db026
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Fri, 29 May 2015 22:21:27 +0000 (15:21 -0700)]
Fixed trailing-comma in too-long JSON discovery packet
The logic for removing the trailing comma in the event that a resource
was improperly added was reversed. This removes the "NOT" to correct
this so that the comma is only removed in the event that it was actually
added.
Change-Id: I4f6037198ef7a67cd3d83d77f5e27aebb7cc0b28
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jnashok [Fri, 29 May 2015 05:12:49 +0000 (14:12 +0900)]
Fix to avoid android log messages in release mode
Problem occured due to android logs defined when TB_LOG is not enabled
Removed the code to fix the issue
Change-Id: I247df1ece564b0996fcbd6929360bf0367a84107
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1135
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
G S Senthil Kumar [Wed, 27 May 2015 10:05:33 +0000 (15:35 +0530)]
Constructing the libraries path in PPM at runtime loading using tizen
app framework package.
Removing libcoap.so and loading libuuid.so in tizen applications and
removed unwanted files to be packaged into rpm.
Change-Id: Ic207a0609044b39a6a3809745dea62b964bf89e1
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1096
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Joseph Morrow [Fri, 29 May 2015 22:30:57 +0000 (18:30 -0400)]
Fixed issue where stack logging is incorrectly enabled in release mode.
This will ensure that release mode applications & tests will not
log out extranneous messages that should only be printed in debug
mode.
Change-Id: Id66c2f511e8b31ea58cfb1e41a26c6b83daac3a1
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1156
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Fri, 29 May 2015 21:28:05 +0000 (17:28 -0400)]
Fixed template issue on Android for arch types armeabi or x86.
The issue arises because Jave templates expect the Object
type to be used and not the primitive type.Other compilers
other than armeabi and x86 (at least reproducible for
armeabi-v7a) properly convert the primitive types to their
object form.
Change-Id: I6f4916b2e6d6699c58018baf25269c369eee01a5
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1153
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Fri, 29 May 2015 22:07:14 +0000 (18:07 -0400)]
Specify proper default SCons parameter build values for Android.
This will allow an end user to simply issue "scons TARGET_OS=android" and
expect the build to work. Before this, end users had to specify
the TARGET_TRANSPORT & TARGET_ARCH parameters every time.
Change-Id: I48cea638a441fa55b1a82d320cd2a65b6cc39c01
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1154
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Fri, 29 May 2015 21:25:13 +0000 (17:25 -0400)]
Refactoring the TB_LOG flag for Android builds.
The TB_LOG flag on Android should not be defined with '-D'.
When using compilers for an arch type other than armeabi
or x86 (reproducable for sure on armeabi-v7a), the definition
for TB_LOG ended up being "-D-DTB_LOG".
This issue & solution was raised by an outside contributor
Anton Spaans <flyingdutchie@gmail.com>.
Change-Id: I9f8caeec37e241fb62772bc8d9f9628f87ff0eb0
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1152
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Fri, 29 May 2015 20:08:57 +0000 (13:08 -0700)]
Revert "Adding error handling in IP Adapter"
This reverts commit
c6f597bdc2eaf385c50be824cfb8845d7ca72e46.
Change-Id: Ia0d8b3a9b604206bb9027e170ba3fda6613aa0b3
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1146
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jw1103.kim [Wed, 20 May 2015 08:44:14 +0000 (17:44 +0900)]
Adding error handling in IP Adapter
Change-Id: I8e59cc7d876207cdf8b29af760ff602aada35b5e
Signed-off-by: jw1103.kim <jw1103.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1048
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>
hyuna0213.jo [Fri, 29 May 2015 01:06:13 +0000 (10:06 +0900)]
Fix for issue of CA don't check the invalid CAResponseInfo_t.result.
currently, CA don't check the value of CAResponseInfo_t.result.
so I add the logic which CA check whether CAResponseInfo_t.result
is valid value.
This issue is related to IOT-385, IOT-386.
Change-Id: I8fdb7bc021c2b294b068d202a5bd6d5131d1904d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1133
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>
Erich Keane [Thu, 21 May 2015 22:47:24 +0000 (15:47 -0700)]
Implementation of OICStrcat/OICStrcpy
Repeated mistakes based on copy and cat operations in the C
code shows that we need a unified implementation that is as safe as
possible. These implementations closely emulate the Microsoft _S
versions of these functions, which seem to be safest feature wise.
Replacing copy and cat operations is reserved for a different
commit.
Change-Id: Id1f6f4515a00679661cc722419fa0bab84a624c2
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1115
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Abhishek Sharma [Thu, 28 May 2015 07:39:29 +0000 (13:09 +0530)]
[TIZEN][DTLS] Fix broken DTLS build for Tizen
Fixed Tizen DTLS related scripts.
Change-Id: I0ace0f5e44d8b6808f7a71d994464f5202d1aa89
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1126
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Joseph Morrow [Thu, 28 May 2015 21:23:03 +0000 (17:23 -0400)]
Fixed a bug introduced in Spec Compliance change for Android
A change of the interface names in C++ was not propogated into Android API
https://gerrit.iotivity.org/gerrit/#/c/956/
Change-Id: Ida9540ea6ea45575d8c0191164b8e80a6981f393
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1103
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Thu, 28 May 2015 16:10:28 +0000 (12:10 -0400)]
Converting OTA payload for advertisements to JSON packaging.
This commit ensures that presence advertisments comply with section
11.3.4, wrt. Table 21 of the OIC Core Specification 0.9. This further
ensures that any OIC Core Spec Compliant project will be able to
send/receive advertisements with IoTivity.
Change-Id: I4df50b5a7e322c6e1c2f422de4de1b5b38fa0af9
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Joseph Morrow [Thu, 28 May 2015 19:57:09 +0000 (15:57 -0400)]
Fixed issue where Scons param 'LOGGING' is assigned wrong default value.
This will fix issue reported on the IoTivity dev list where the flag
for Stack Logging (ie. TB_LOG) was not being enabled in any Debug build
that wasn't invoked by using exactly "false" for the Scons param
'RELEASE'.
Change-Id: I19677113d3d195059cf15c7073adc6418a152a1f
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1130
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Thu, 28 May 2015 17:26:07 +0000 (13:26 -0400)]
Fix issue where Boost is downloaded everytime for Android builds.
Change-Id: I6c5244ef63c360993ecf569d35f95b5eac6ed42c
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1124
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Charlie Lenahan [Wed, 27 May 2015 00:21:42 +0000 (20:21 -0400)]
Auto-detect OS X/iOS SDK versions.
Detects the latest SDK installed and uses that if no SYS_VERSION
param is passed to scons.
Change-Id: I5387c704df5d7649485c9c90a55f98f652da50fc
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1117
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Moumita Ray [Fri, 15 May 2015 20:28:02 +0000 (13:28 -0700)]
Changed ampersand '&' to semicolon ';' to concatenate multiple query string
This change set is based on OIC core framework standard specification draft A.
Modified '&' to ';' to separate multiple filters in a query params.
Added necessary changes in the parser to validate and parse the query
including core framework, unit tests and sample.
Change-Id: I5dd3cb130bdf1bcce5785fec5517bd8d80f5e433
Signed-off-by: Moumita Ray <moumita.ray@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1014
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Fri, 22 May 2015 21:04:14 +0000 (14:04 -0700)]
Added constructors to trivial struct types used in C++
The C++ stack uses a OCHeaderOption and OCCallbackData
directly and in situations where construction is necessary.
This patch adds a constructor to both (a trival ctor, permitted
by C++11) POD types. This cleans up the code and prevents
avoidable errors with either.
Change-Id: I744daf3bb091b646e06d23a069bbe7ee048a8e51
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1100
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Doug Hudson [Wed, 27 May 2015 15:25:08 +0000 (11:25 -0400)]
Fix broken build for Arduino when UPLOAD=yes.
Bug documented in JIRA IOT-521.
Change-Id: I613b0abdd8a1aab75abfe5d27fbeb0ef5f86ec1b
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1120
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Harish Kumara Marappa [Fri, 22 May 2015 09:58:14 +0000 (15:28 +0530)]
Fix for issue of NM ResourceHosting android sample not working.
Error code type changed from OCStackResult to int in
ISubscribePresenceListener::onPresenceCallback.
Change-Id: If0cc7684ca8cd1932a721bf56ca23c13fa98421f
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1092
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: kwon doil <doil.kwon@samsung.com>
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Harish Kumara Marappa [Tue, 26 May 2015 14:55:41 +0000 (20:25 +0530)]
Cleaning things-manager service build scripts.
Removed all unnecessary header file inclusion and libraries linking in
things-manager service build scripts. Changed Android.mk file to copy all the required libraries to "libs/armeabi" folder for building TM java layer.
Specified the connectivity_abstraction library instead of coap in SSM's
Android.mk file
Change-Id: Ie31387f77f3452b7d8420489a569a315be7301a2
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1108
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Harish Kumara Marappa [Fri, 22 May 2015 10:06:06 +0000 (15:36 +0530)]
Removed libcoap.so and added libconnectivity_abstraction.so dependency
in ResourceHostingSample and SampleProvierApp Android.mk files
Change-Id: I3a13319aa1629b7874646f1626cf173ebbe2a09c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: kwon doil <doil.kwon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Charlie Lenahan [Tue, 19 May 2015 22:15:37 +0000 (18:15 -0400)]
Adjust compile messages to handle "Shared" targets .
Scons has compile messages for Static targets and Shared targets.
Adds shared targets for non-verbose builds, to allow warning messages
to be more visible(standout).
Change-Id: I7f4a5e7dd53c70003c963a486dcb0dfd99bb0ff7
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1043
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Wed, 20 May 2015 22:33:17 +0000 (15:33 -0700)]
Added support for device discovery at oic/d.
Spec compliance task for adding support for device discovery.
Using a struct for Device info with the device name field that is
expected from the application. Generate device id of type UUID and
insert string representation of uuid in discovery responses.
Updated sample apps and unit tests to support changes.
Also updated android jni, OCDeviceInfo.java class and a test in
SmokeTest.java.
Change-Id: Ib2d676d2a504fb9ff177487899f74bd121dc1d59
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Kishen Maloor [Mon, 25 May 2015 10:37:39 +0000 (03:37 -0700)]
Updates for the Yocto build
* Added libuuid to LIBS in the Yocto build configuration.
* Updated OICSensorBoard client for API change.
* Replaced scons script with Makefile for OICSensorBoard.
* Updated OICSensorBoardREADME to reflect the above change.
Change-Id: I8764616476b7d62d06510999535cef10c132e23d
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1106
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Bernie Keany <bernie.keany@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Thu, 14 May 2015 10:17:59 +0000 (19:17 +0900)]
replace 'org_iotivity' with 'org_iotivity_ca' and change java file name
- replace 'org_iotivity' with 'org_iotivity_ca'
- change java file name for android callback interface
- android EDR interface code is added
- android BLE code had been separated
since Gatt Server can be only supported after Android v5.0
and interface of LE client can only be supported until v4.4
- COPY: <iotivity>resource/csdk/connectivity/samples/android
/sample_service/src/org/iotivity/ca/< CaEdrInterface.java
& CaIpInterface.java & CaLeClientInterface.java &
CaLeServerInterface.java>
PASTE to: <iotivity>/android/android_api/base/src/main/java
/org/iotivity/ca/
Change-Id: I77b605313f73f3b2677d05e99a047f541cfcda14
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/990
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Moumita Ray [Mon, 11 May 2015 17:39:12 +0000 (10:39 -0700)]
Renamed all references to ‘/oc/core’ to ‘/oic/res’ and '/oc to /oic'
This change set is based on OIC core framework standard specification draft A.
Modified reserved namespace to ‘/oc/core’ to ‘/oic/res’ and '/oc to /oic' for
discovery, including core framework, unit tests and samples.
Change-Id: I9721a2a70fd1e3245088b8a2f6366853db849b21
Signed-off-by: Moumita Ray <moumita.ray@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Tue, 26 May 2015 07:32:51 +0000 (16:32 +0900)]
[Jira] IOT-529, Fix to support multiple IP networks in Android
currently only one IP network is enabled due to the bug
Change-Id: I878dec13ec7e4da6a5b2867d8b3c28fb99d85530
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Thiago Macieira [Tue, 7 Apr 2015 18:25:02 +0000 (11:25 -0700)]
Update .gitignore to ignore *.orig files too
Change-Id: I9a75ad8521ae4e5cbbe5ffff13d2ce8696e14c83
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1101
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Tim Kourt [Sat, 23 May 2015 01:36:22 +0000 (18:36 -0700)]
Changed behavior of the Android tests
Change-Id: I47df4d62e5b41c1b84de1f5d6fa71adacc94d295
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1104
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ossama Othman [Fri, 22 May 2015 16:12:15 +0000 (09:12 -0700)]
Corrected spelling. s/Unitcast/Unicast/g
Change-Id: I19639f550d7d8dc70700c9b5e2fdb54ed0a769e5
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1097
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>
k.karthick [Fri, 22 May 2015 11:07:57 +0000 (16:37 +0530)]
Fixed linking issue when LOGGING=true is enabled
When we are enabling LOGGING=true, there is linking error
related to OIC_LOG_BUFFER in case of tizen platform.
Change-Id: I34cd4b77636804210e1d8023345517e7adbdcaac
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1094
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tim Kourt [Thu, 21 May 2015 23:49:11 +0000 (16:49 -0700)]
Changed the connectivity type in Android examples from WIFI to IPV4
Change-Id: I7c99aa674183d4ae80c39e1422223a004274f504
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1083
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>
YounghyunJoo [Fri, 22 May 2015 07:37:18 +0000 (16:37 +0900)]
Modify <iotivity>/service/SConscript file to build PPM for Android platform
Modify PPM Android Sampleapplication jni Android.mk file for latest code
Change-Id: Ibadff3f2589cad9c7e33167f5beffac295db9941
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1086
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jay Sharma [Fri, 22 May 2015 05:30:15 +0000 (11:00 +0530)]
Added required files for importing Notifcation Manager Android Sample App
Change-Id: I4037fab6e7a4dca694e0cbfff46a1f53e94f12dd
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1084
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: kwon doil <doil.kwon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Charlie Lenahan [Wed, 6 May 2015 18:49:57 +0000 (14:49 -0400)]
Fix darwin/ios build issues
With these changes enables the LF osx build machine
to build and verify
Change-Id: I3b93558b94bd1a9c5e5daaa62de3953ce51bed97
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/915
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Harish Kumara Marappa [Thu, 21 May 2015 13:49:43 +0000 (19:19 +0530)]
Fix for tizen build failure issue.
Removed glib package dependency and added uuid package dependency.
Change-Id: I31ab7b2946dea000a499248276160fb20cd2214d
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1066
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Harish Kumara Marappa [Thu, 21 May 2015 13:27:26 +0000 (18:57 +0530)]
Prevent fix in notification manager
Change-Id: I3bed42533b88f2c9f266e77e3a9fb5f3ed84fbca
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1070
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Thu, 21 May 2015 11:19:38 +0000 (20:19 +0900)]
Update Doxyfile for generating Primitive Service C/C++ API
Change-Id: I89752fff9b87755e1aa44514fe17b3f92d465c9d
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1067
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Thu, 21 May 2015 10:33:22 +0000 (19:33 +0900)]
Fix for the prevent issue with CID 65911 for Things manager
Change-Id: I3f85d6b0267190ab56d4c0d6ebf91e2456f5d9d6
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1065
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Thu, 21 May 2015 10:12:43 +0000 (19:12 +0900)]
Removed IoTivity v0.9.0 Primitive Service documents
All IoTivity v0.9.0 Primitive Service documents are removed
Change-Id: I4a065220988664d12477a89a94d11b8618b67418
Signed-off-by: Jihun ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1064
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Thu, 21 May 2015 09:44:53 +0000 (18:44 +0900)]
Added IoTivity Primitive Services Programmers guide
Programmers guide added for IoTivity Primitive Services for Android, Linux and Tizen platform
Change-Id: Ia0242c65c8a785372c8f539aaa03f8a4dc6281b5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1063
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Thu, 21 May 2015 07:48:58 +0000 (16:48 +0900)]
Fix a race problem in con-server application, Things Manager
Using mutex, the race problem has been resolved.
Change-Id: I7d36b740f46b4dc7ca221efafea5385f36f67cf5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Heewon Park [Thu, 21 May 2015 07:25:22 +0000 (16:25 +0900)]
Fix for the prevent issues for Notification Manager.
Referenece CID: 65774, 65791, 65825, 65829, 65830, 65831, 65833
65840, 65841, 65844, 65846, 65852, 65854, 65866
Change-Id: I85cc23d58317fced911314ba8684dec7bacf42e5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1060
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Thu, 21 May 2015 03:39:57 +0000 (12:39 +0900)]
Fix for the prevent issues for Things Manager.
Referenece CID: 65800, 65809, 65815, 65819, 65884
Change-Id: Ibed280c25363c033f4303305cadb1dd33ac9fcd1
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1058
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Thu, 21 May 2015 04:06:03 +0000 (13:06 +0900)]
Fix to use OC_IPV4 instead of OC_ALL in Things Manager
When constructResourceObject function is used, OC_ALL parameter is not
working well. Instead of this, OC_IPv4 parameter can be used.
Change-Id: I5652551b844dd3d4a15af0392c170535db68dd8b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Thu, 21 May 2015 01:52:54 +0000 (10:52 +0900)]
Android Protocol Plugin Manager API merge from android-api branch to master
Merge anroid-api branch ppm codes to master branch
Change-Id: I41f35246bcb9d2728d112a719fb19f482c157df7
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1049
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jw1103.kim [Tue, 19 May 2015 13:52:06 +0000 (22:52 +0900)]
prevent defects resolved (removed not useful code)
dereferencing freed pointer, comparing an array to null
Change-Id: I9b9e49d39df8d4220c183bec0f8617b198a484a7
Signed-off-by: jw1103.kim <jw1103.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1038
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Wed, 20 May 2015 17:27:32 +0000 (10:27 -0700)]
Enable compiler coloring in build terminal
This patch forces Scons to inherit all environment terminal
settings, including the support for color. This allows
warnings/errors to show up in color during the build.
Change-Id: Ibd27cdecef71205d03b0a04043aac0e9763a14d0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jay Sharma [Wed, 20 May 2015 15:25:42 +0000 (20:55 +0530)]
Fix for the prevent issues for notification manager.
Change-Id: Iab02bb30bb8a4fde666974f98ff78741aa7d9720
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Signed-off-by: Arya Kumar <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1052
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Ossama Othman [Wed, 20 May 2015 20:22:52 +0000 (13:22 -0700)]
Removed executable bit from non-executable files.
Change-Id: Ib8128921810103629c67c28d4abd9a3c56421ab3
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1055
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Mandeep Shetty [Wed, 20 May 2015 00:08:42 +0000 (17:08 -0700)]
Removed duplicate switch case in OCDoResource.
There were two separate switch statements for validation and converting
to CA method. Moved it to one.
Also improved logging, variable names and vertical spacing in some
sections.
Change-Id: Ic68253dd23e5da15d469951293fc4173a13f7afd
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1045
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Fri, 15 May 2015 00:45:14 +0000 (17:45 -0700)]
Update sample apps to include platform discovery at oic/p
Added platform discovery to go woth changeset moving oc/d to oic/p.
Updated ocserver/client and devicediscoveryserver/client to make
platform discovery requests.
Change-Id: I972fa8585c966a7d047f82d0cc0f18c01dcd6508
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1008
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Shilpa Sodani [Sun, 12 Apr 2015 12:36:15 +0000 (05:36 -0700)]
Added unit test for OCResourceResponse.cpp
Added unit test for public APIs in OCResourceResponse.cpp
Change-Id: Ie33a95d4a34459577cc6cb92eb049c609ccad3d2
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/739
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ossama Othman [Tue, 19 May 2015 00:00:55 +0000 (17:00 -0700)]
Fixed CAGetNetworkInformation() aggregation problem.
CAGetNetworkInformation() was not displaying information of adapters
for all transports. Fixed CALocalConnectivity_t* array aggregation in
underlying CAGetNetworkInfo() function so that interface information
from all transports is correctly combined into the array passed back
to the caller.
Change-Id: I699ceeb3e8652acc495037085f88c359e206fa7d
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1028
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Ossama Othman [Tue, 19 May 2015 17:07:00 +0000 (10:07 -0700)]
Support BLE transport in casample program.
Change-Id: I5a78b5944b9a46a538969265fe9b2edc0e7ac6e1
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Jay Sharma [Wed, 20 May 2015 14:42:15 +0000 (20:12 +0530)]
Merging primitive services(TM, SSM and NM) from android-api branch.
Change-Id: Ic94647509c50a44265dca63509f0883e99173f59
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1036
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jyong2.kim [Wed, 20 May 2015 13:00:46 +0000 (22:00 +0900)]
Update Unicast Discovery URI for Notification Manager
Change-Id: I46fa1f06e4e5f20567b8308c14a4a2b60d776024
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1050
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Wed, 20 May 2015 08:09:21 +0000 (17:09 +0900)]
Correct a predefined query string for multicast discovery in Things Manager
Instead of OC_WELL_KNOWN_QUERY, OC_MULTICAST_DISCOVERY_URI should be used
for multicast discovery.
Change-Id: Ia38c578a461b67e4298c3aa0ae978c4bdda245cf
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1047
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
sanjaysh [Fri, 15 May 2015 18:54:03 +0000 (11:54 -0700)]
Spec Compliance Interface name change.
Additional files modified service folder,
for the default interface names
Change-Id: Id21b7868f4eef3250274cd837a6ea35d95cd792f
Signed-off-by: sanjaysh <sanjay1.sharma@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1013
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Mandeep Shetty [Tue, 19 May 2015 17:35:46 +0000 (10:35 -0700)]
Fix memory leaks in handling server requests.
Two memory leaks fixed. One after a response is sent and one when a
server request is deleted. malloc'ed tokens were not free'd in both
instances.
Change-Id: I125bab278dd8542ff5970e6655b24a5cbacfe7e9
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1040
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Mon, 18 May 2015 18:37:04 +0000 (11:37 -0700)]
Added unit tests for OCSetPlatformInfo()
Unit tests exercise code paths to check for mandatory fields and
length constraints on some fields.
Change-Id: Ic15e1717b8743a4168b7c3d9cd67edbc5621dc3a
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1032
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Tue, 19 May 2015 10:26:38 +0000 (19:26 +0900)]
Fixing Prevent reported issues in Android Sample
Change-Id: Ifb07d72a790e8000cb5166cb0a00de03bf9b72c1
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1037
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>
Charlie Lenahan [Fri, 15 May 2015 23:46:00 +0000 (19:46 -0400)]
Remove unused OC_INIT_FLAG.
The stack/samples doesn't send it or rely on it.
Change-Id: I2809ab9fc48b2f8cf45f4ba4bc88d68f3c66b988
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1016
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jihwan.seo [Tue, 19 May 2015 06:42:08 +0000 (15:42 +0900)]
remove unnecessary code in protocolmessage
pdu already is checked previously.
it means pdu is not null
so execution cannot reach removed code.
Change-Id: I2cf8a862937f197fb639f41fbf9e355841bad2e3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1034
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>
k.karthick [Mon, 18 May 2015 14:24:00 +0000 (19:54 +0530)]
Resolved merging issues in tizen connectivity build.
Fixed merging issues in tizen platform connectivity folder build.
Updated readme file for connectivity module building.
Change-Id: Ia0ea1b046b5e848f999046861dd05991219a6d73
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1018
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Charlie Lenahan [Fri, 15 May 2015 23:30:15 +0000 (19:30 -0400)]
remove unused OCResponseHandle
a different approach to handle slow-responses was implemented
and this wan't removed
Change-Id: Id2f0c2dcd730041b0aacca689c358789ef28e79c
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Thu, 14 May 2015 00:09:17 +0000 (17:09 -0700)]
Spec compliance change to move oc/core/d to oic/p.
Moved /oc/core/d to /oic/p.
-Created a new struct for platform information.
-Added code paths so devices can respond to platform discovery query.
-Added public APIs to registerPlatform used by server devices and
getPlatformInfo used by client devices. getPlatformInfo is just to make
the intent of the request clear. Internally, it uses all of the plumbing
that is already in place for what was previously "device".
-Changed stack to hold smaller OCPlatfromInfo object compared to a
cJson object. Construct cjson only when discovery request received and
delete immediately.
Change-Id: Ie5cca447e8fac67171be5a5ec7c5ece563fbb7ca
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Erich Keane [Tue, 19 May 2015 00:32:47 +0000 (17:32 -0700)]
Set the language to C++ when checking for Boost libraries.
The Boost libraries are written in C++ so it is best to set the
language as C++ when running the SCons Configure.CheckLib(boost_...)
tests.
Change-Id: I64f4d9cd1baebed8080fa7cfde375bafe7de19f8
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1022
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Harish Kumara Marappa [Tue, 19 May 2015 05:38:46 +0000 (11:08 +0530)]
Project files for importing the Tizen sample applications
Developers can not import the tizen sample applications without .cproject
and .project files which includes all the configuration and settings of
applications. Modified the related gitignore files accordingly.
Change-Id: I3f1fb9520d86c24aecac81731221463abe89b821
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/951
Reviewed-by: RadhaBhavani <radha.p@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Erich Keane [Mon, 18 May 2015 17:51:06 +0000 (10:51 -0700)]
Fix Android build failures, enable random unit tests
It was discovered that the ocrandom uuid changes broke the android
build. This is because Android, despite being an incomplete linux
implementation, defines __linux__. This patch fixes that, and properly
enables the ocrandom unit tests.
Additionally, the OC_WIFI/OC_ETHERNET removals weren't propogated
properly to the android build, this patch does that in order to fix the
build.
Change-Id: Iabfeb704d046fbadf1fd368259d0e96ca1e74d90
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1020
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
Erich Keane [Wed, 13 May 2015 21:20:23 +0000 (14:20 -0700)]
Changed ServerInstanceID to UUID
The specification and design document both specify that server instance
ID should be a UUID, yet this was initially implemented as a Uint32.
This patch implements UUID generation, UUID-as-string generation,
and UUID-to-string conversion in the ocrandom module. Additionally,
the server instance ID calls now correctly work with UUID rather than
the int32. OCResourceIdentifer also now work directly with strings
rather than converting the value to an int32.
Change-Id: Ic37559973f82515f795d75f798dab6b6ff99d31f
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/983
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Doug Hudson [Thu, 14 May 2015 17:44:55 +0000 (13:44 -0400)]
Remove WiFi and Ethernet connectivity type options in RI.
- Replace with IPv4 and IPv6 options.
- Note that IPv6 is not currently supported
- Update C/C++ sample apps
- Update C/C++ unit tests
- Update several services files to support mod.
Change-Id: I086580d76665355d14cfa240347252cef969fa64
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
vimala.v [Wed, 13 May 2015 10:01:33 +0000 (15:31 +0530)]
Fixed following Tizen BLE issues
1) Fixed JIRA-472 Issue.
2) Fixed issues related to Tizen BLE interoperability with Arduino BLE.
Change-Id: Id29bb04f5ba241daa084f9ecaac8cd30d888068d
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/970
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>
jnashok [Thu, 14 May 2015 15:00:41 +0000 (00:00 +0900)]
Removing Single/Double underscores at beginning of the preprocessor directives
Change-Id: I7fcb060f9a2db955032768d4c8417c920a90299f
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/994
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>
Tim Kourt [Fri, 15 May 2015 20:16:29 +0000 (13:16 -0700)]
Android Base API merge to master
Introduced support for automated Jenkins build for android
Change-Id: Ide54185a0e75ee8c75b3616beb5f935810220203
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/894
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Joseph Morrow [Wed, 13 May 2015 19:46:27 +0000 (15:46 -0400)]
Properly defined URI & Resource Type values for Presence Advertisement.
This changeset ensures that presence advertisments comply with section
11.3.2.4 of OIC Core Specification 0.9. This will ensure that any
implementation of the OIC Core Spec Compliant Project A will be able to
send/receive advertisements with IoTivity.
Change-Id: Ie00347099cab67c03af6557157e64290c625d828
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/981
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Thiago Macieira [Wed, 6 May 2015 23:28:48 +0000 (16:28 -0700)]
Force linking of liboctbstack to require all symbols resolved
The --no-undefined option (same as -z defs) causes the linker to refuse
to create its output if there are any symbols still unresolved after
searching all the dependent shared libraries. The default on ELF systems
is to allow shared libraries to link even if there are symbols
undefined, which has caused many a developer a lot of headache.
Unfortunately, changing ELF design flaws is not within our grasp.
Change-Id: I0d4913955e3745b69672ffff13dbc5f36ac07b3d
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jnashok [Tue, 12 May 2015 07:05:51 +0000 (16:05 +0900)]
Fixing CA android sample application and ndk build
While resolving merge conflicts, header file is missed.
This is necessary to build the sample application.
Added necessary changes to build androd ndk as well
Change-Id: I0e2185abb5c82042bf7273ef61022e448b32468d
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/962
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
jaehong.jo [Thu, 14 May 2015 06:58:57 +0000 (15:58 +0900)]
Android EDR replace keyword
Replace 'com' keyword with 'org'
Change-Id: I3ef2399154bc0395377e7d0c21ee5cc41085cf60
Signed-off-by: jaehong.jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/989
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Mandeep Shetty [Wed, 13 May 2015 18:14:16 +0000 (11:14 -0700)]
Fix segfault due to calling strlen on null payload.
Some messages like ACKs, RESETs and others have null payload.
strlen was called in the function args which caused a seg fault.
Added check for null before calling strlen and moved call outside of
args list.
Change-Id: Ia97d48e662c220f73eec56bd260ed1f6c94dab90
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/979
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
sanjaysh [Wed, 13 May 2015 16:29:12 +0000 (09:29 -0700)]
Change in stacktest.cpp
conflict of variable OC_RSVD_INTERFACE_DEFAULT from two files.
Removed explicit declaration from two test casses in this file.
Change-Id: I146a144861dcff07513a20af0b5bb81ed8aa14f4
Signed-off-by: sanjaysh <sanjay1.sharma@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/978
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
k.karthick [Tue, 12 May 2015 13:18:28 +0000 (18:48 +0530)]
Resolved connectivity folder build issues.
Fixed the connectivity folder build issues.
Fixed build issues for Linux, Tizen, Arduino Platforms.
Connectivity build is enabled from iotivity root folder.
For building tizen, connectivity/build/gbsbuild.sh will be used.
Change-Id: Id8be5f19c6e64f441b0333aa536ad644e9fe6f0b
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/893
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Thiago Macieira [Tue, 12 May 2015 07:19:17 +0000 (16:19 +0900)]
Simplify copying of CAInfo_t
This copies all members, which means it will copy new members
when they exist.
Change-Id: I66a35ce5f88941f29aa6ffff13dd68807fe1e2f2
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
sanjaysh [Mon, 11 May 2015 23:48:07 +0000 (16:48 -0700)]
Spec Compliance change in interface names
Changes:oc.mi.def->oic.if.baseline, oc.mi.ll->oic.if.ll,
oc.mi.b->oic.mi.b
Change-Id: Ibf26901777628c2735d742b03878f368847597ed
Signed-off-by: sanjaysh <sanjay1.sharma@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/956
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Erich Keane [Wed, 6 May 2015 21:43:45 +0000 (14:43 -0700)]
Fixes a large number of Klocwork identified issues.
A large number of memory/strcpy related issues were fixed, as
well as some situations where the code was cleaned up to be
a bit easier to read.
Change-Id: Ieca48d0bbae02604c2e6e904432178e3ea80a417
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/942
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
projects / platform / upstream / iotivity.git / log