platform/upstream/iotivity.git
9 years agoRemoved IoTivity v0.9.0 Primitive Service documents
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>
9 years agoAdded IoTivity Primitive Services Programmers guide
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>
9 years agoFix a race problem in con-server application, Things Manager
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>
9 years agoFix for the prevent issues for Notification Manager.
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>
9 years agoFix for the prevent issues for Things Manager.
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>
9 years agoFix to use OC_IPV4 instead of OC_ALL in Things Manager
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>
9 years agoAndroid Protocol Plugin Manager API merge from android-api branch to master
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>
9 years agoprevent defects resolved (removed not useful code)
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>
9 years agoEnable compiler coloring in build terminal
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>
9 years agoFix for the prevent issues for notification manager.
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>
9 years agoRemoved executable bit from non-executable files.
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>
9 years agoRemoved duplicate switch case in OCDoResource.
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>
9 years agoUpdate sample apps to include platform discovery at oic/p
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>
9 years agoAdded unit test for OCResourceResponse.cpp
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>
9 years agoFixed CAGetNetworkInformation() aggregation problem.
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>
9 years agoSupport BLE transport in casample program.
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>
9 years agoMerging primitive services(TM, SSM and NM) from android-api branch.
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>
9 years agoUpdate Unicast Discovery URI for Notification Manager
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>
9 years agoCorrect a predefined query string for multicast discovery in Things Manager
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>
9 years agoSpec Compliance Interface name change.
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>
9 years agoFix memory leaks in handling server requests.
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>
9 years agoAdded unit tests for OCSetPlatformInfo()
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>
9 years agoFixing Prevent reported issues in Android Sample
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>
9 years agoRemove unused OC_INIT_FLAG.
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>
9 years agoremove unnecessary code in protocolmessage
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>
9 years agoResolved merging issues in tizen connectivity build.
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>
9 years agoremove unused OCResponseHandle
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>
9 years agoSpec compliance change to move oc/core/d to oic/p.
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>
9 years agoSet the language to C++ when checking for Boost libraries.
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>
9 years agoProject files for importing the Tizen sample applications
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>
9 years agoFix Android build failures, enable random unit tests
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>
9 years agoChanged ServerInstanceID to UUID
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>
9 years agoRemove WiFi and Ethernet connectivity type options in RI.
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>
9 years agoFixed following Tizen BLE issues
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>
9 years agoRemoving Single/Double underscores at beginning of the preprocessor directives
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>
9 years agoAndroid Base API merge to master
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>
9 years agoProperly defined URI & Resource Type values for Presence Advertisement.
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>
9 years agoForce linking of liboctbstack to require all symbols resolved
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>
9 years agoFixing CA android sample application and ndk build
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>
9 years agoAndroid EDR replace keyword
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>
9 years agoFix segfault due to calling strlen on null payload.
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>
9 years agoChange in stacktest.cpp
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>
9 years agoResolved connectivity folder build issues.
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>
9 years agoSimplify copying of CAInfo_t
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>
9 years agoSpec Compliance change in interface names
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>
9 years agoFixes a large number of Klocwork identified issues.
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>
9 years agoFixed repeated network select/unselect causing no messages
jw1103.kim [Tue, 12 May 2015 08:28:18 +0000 (17:28 +0900)]
Fixed repeated network select/unselect causing no messages

This patch fixes Jira issue IOT-453.  Previously, selecting
and unselecting the network repeatedly would put the ipserver
into a state where it would no longer propogate messages.

Change-Id: I6698e72782682b3523404137a2cef5ee410586bb
Signed-off-by: jw1103.kim <jw1103.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/964
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFixed C and C++ sample apps.
Mandeep Shetty [Fri, 8 May 2015 19:17:16 +0000 (12:17 -0700)]
Fixed C and C++ sample apps.

Fixed the GET fail on C++ samples.
Added logging that informs users that query processing is not
implemented and is the responsibility if the entity handler.

Change-Id: If73ee023aa739584c34d1a4ffe4656a4902f6cf3
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/943
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoAdded check to make sure default interface is always first in list.
Mandeep Shetty [Mon, 11 May 2015 18:17:08 +0000 (11:17 -0700)]
Added check to make sure default interface is always first in list.

This changeset ensures the default interface, if present, is always
first in the interface list. This addresses spec compliance for section
7.1.4.2.3.
Also added unit tests to test changes made in this changeset and to test
for duplicate interfaces.

Change-Id: Iccfbb297c1745a86ce2cb0010f5b24519d567658
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/954
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoAddressed build warnings in OICMiddle example.
Ossama Othman [Mon, 11 May 2015 20:06:39 +0000 (13:06 -0700)]
Addressed build warnings in OICMiddle example.

Fixed OICMiddle compile-time warnings regarding potential use of an
uninitialized variable, as well as an ignored getline() result.

Change-Id: I6ce5a7212ea87cfc506cc97ca97a873c308bf17c
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/955
Reviewed-by: John Light <john.j.light@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoModify CAGeneratePDUImpl to take the payload size as a parameter
Thiago Macieira [Tue, 12 May 2015 07:23:14 +0000 (16:23 +0900)]
Modify CAGeneratePDUImpl to take the payload size as a parameter

This is required to send binary payloads, like CBOR is. It's also a good
idea so we don't have to do strlen all the time.

Change-Id: I66a35ce5f88941f29aa6ffff13dd68b7b06f7fe2
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/966
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFixed thread safety procedure by adding SOCK_CLOEXEC flag
Ashok Channa [Mon, 20 Apr 2015 21:56:55 +0000 (14:56 -0700)]
Fixed thread safety procedure by adding SOCK_CLOEXEC flag

JIRA ticket IOT-440 suggested to use SOCK_CLOEXEC flag for
socket file descriptor for thread safety.
This fix will ensure SOCK_CLOEXEC flag is checked
if kernal has supports  for it.

Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Change-Id: I84efdcd721c1f34f8d0931e08acbdcb147b9a5db
Reviewed-on: https://gerrit.iotivity.org/gerrit/774
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFix for DTLS message failure when previous not closed properly
jnashok [Mon, 4 May 2015 07:17:14 +0000 (16:17 +0900)]
Fix for DTLS message failure when previous not closed properly

This fixes JIRA issue IOT-417.  When a previous DTLS session was not
properly closed, DTLS messaging would fail.  This patch ensures that
DTLS sessions are properly closed.

Change-Id: I0483253cad313c7596ae30d9624db57c072417d8
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoCA Android Sample application Changes
jnashok [Thu, 7 May 2015 04:50:29 +0000 (13:50 +0900)]
CA Android Sample application Changes

This has the latest CA Android Sample application changes
Currently only WiFi is suppported
Signed-off-by: jnashok <jn.ashok@samsung.com>
Change-Id: I14872da31e501de310721bfdcdd315f681e1ff88
Reviewed-on: https://gerrit.iotivity.org/gerrit/755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoAdded Android EDR code
jaehong.jo [Wed, 6 May 2015 13:18:36 +0000 (22:18 +0900)]
Added Android EDR code

Android EDR functionality has been implemented.

Signed-off-by: jaehong.jo <jaehong.jo@samsung.com>
Change-Id: I036bde692098ea40e28df2b07b40e478a4eb021b
Reviewed-on: https://gerrit.iotivity.org/gerrit/757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoResolved compilation issues related to pthread changes
k.karthick [Wed, 6 May 2015 11:19:03 +0000 (16:49 +0530)]
Resolved compilation issues related to pthread changes

Change-Id: I60d25d5f9b1e6f525db28f509681e53ab8ffad19
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoIoTivity scons build update for Yocto
Kishen Maloor [Wed, 6 May 2015 22:26:38 +0000 (15:26 -0700)]
IoTivity scons build update for Yocto

* Added meta data for other architectures supported
by the Yocto toolchain. (For eg. we can now
build IoTivity for ARM/RaspberryPi)
* Added additional required compiler flags to be
used while building IoTivity for Yocto.
* Added new CROSS_COMPILE key to the construction
environment which can be used to build IoTivity's
external dependencies for Yocto. (For eg. gtest
uses autoconf, so CROSS_COMPILE gets passed in with
the --host switch)

Change-Id: Iad52c4fbc597abde32baf53205ddbd46e22f122b
Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/919
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFix linking of liboctbstack: conectivity_abstraction requires coap
Thiago Macieira [Wed, 6 May 2015 23:25:55 +0000 (16:25 -0700)]
Fix linking of liboctbstack: conectivity_abstraction requires coap

The order in which static libraries are listed matters, so
connectivity_abstraction needs to appear before coap.

This also solves the problem on iOS that caused libcoap to be moved to
later.

Change-Id: I0d4913955e3745b69672ffff13dbc5d38a438ef6
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/920
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFix latent error for OCCreateResourceWithHost.
HyunJun Kim [Thu, 7 May 2015 07:26:12 +0000 (16:26 +0900)]
Fix latent error for OCCreateResourceWithHost.

It was crashed when OCCreateResource calls using invalid uri or
already used uri.
OCCreateResource can return OC_STACK_OK, OC_STACK_INVALID_PARAM,
OC_STACK_INVALID_URI and so on.

Currently, it checks only if the result is OC_STACK_ERROR.
But, there can be a case where the result is not OC_STACK_ERROR
but 'handle' is NULL. In this case with this conditional statement,
some exceptional errors could happen.

Therefore, it should be changed for the conditional statement to check
if the resource creation is successful as intended.

Change-Id: I9921b3bb7874b1dbf8b0fda5483471506da93882
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/923
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoTemp fix for broken multicast presence after WiFi/Ethernet merge.
Mandeep Shetty [Thu, 7 May 2015 00:04:56 +0000 (17:04 -0700)]
Temp fix for broken multicast presence after WiFi/Ethernet merge.

This is a temporary fix.
The multicast notifications from server side need remote endpoint to be
null in caipadapter.c::CAIPSendDataThread().
But the function signature called from the RI layer into the CA layer
to send responses takes a CARemoteEndpoint struct which cannot be null.

The temp fix is to make caipclient.c think that a response is multicast if
the remoteAddress is the fixed multicast ip 224.0.1.187.

Change-Id: I6720ceb123d044b9c2aa510d41488b5003324e4e
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/922
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix [IoT-265] issue for Group.
HyunJun Kim [Thu, 7 May 2015 00:11:21 +0000 (09:11 +0900)]
Fix [IoT-265] issue for Group.

FindGroup can not support callback correctly.
It was check the duplication of resource as wrong method. so if resource was duplicated It did ignore the response.

So we change the checking logic for duplication.
Fix [IoT-265].

Change-Id: I27a58a9be688da172043439f62d1694aaaf10c96
Signed-off-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/872
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoHandled tizen CA sample properly in case of SendNotification.
k.karthick [Wed, 6 May 2015 12:02:17 +0000 (17:32 +0530)]
Handled tizen CA sample properly in case of SendNotification.

This is fix for Jira Issue "IOT-450".
SendNotification functionality has been modified
to allow either CONFIRM or NONCONFIRM in CA Sample.

Change-Id: I67baad2313b85850f879bf45afeb790d76e56522
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/776
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoRemoval of unnecessary files in CA as IP changes are merged
vimala.v [Wed, 6 May 2015 10:43:12 +0000 (16:13 +0530)]
Removal of unnecessary files in CA as IP changes are merged

Change-Id: Ie2d4a55267bdbe4a263d55bf65162f2084c1fa39
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/912
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoCompilation fix for protocol plugin app on Ubuntu14.10
Habib Virji [Fri, 1 May 2015 12:28:54 +0000 (13:28 +0100)]
Compilation fix for protocol plugin app on Ubuntu14.10

Compilation of mqtt sample app was failing as pthread was included in
LIBS but should be appended after connectivity_abstraction as it depends on the pthread library.

Change-Id: Ie1019c5ba4b31a06f7e25a3e2ce338ea21c91b52
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/881
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix Jira Difect IOT-505
YounghyunJoo [Tue, 28 Apr 2015 02:34:29 +0000 (11:34 +0900)]
Fix Jira Difect IOT-505

MQTT-Fan plugin can't recognize mqtt broker server status.
so linux sample application cannot print connection error message
and try to turn on/off the fan
I modify plugin codes to check the connection status.

Change-Id: Id1eff1b4439bf1d473dd8a0873a187b721a4d93e
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/850
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdded new function in EntityHandler to parse and validate query string.
Moumita Ray [Tue, 28 Apr 2015 21:14:54 +0000 (14:14 -0700)]
Added new function in EntityHandler to parse and validate query string.

IOT-491: When client creates a resource and calls GET  with different
resource type name and interface,GET should fail but it is successful.
Analysis: Since APP creates resource, it should know the
resource/interface types and it should check for resourceTypeName
and ResourceInterface to identify a known resource prior to handle
entity Request.

Change-Id: I9159b465bf708a4cb5835f4b3adf0aea3a2c87bb
Signed-off-by: Moumita Ray <moumita.ray@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/860
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoUpdate C++ samples to work after WiFi/Ethernet adapter merge.
Mandeep Shetty [Mon, 4 May 2015 23:07:46 +0000 (16:07 -0700)]
Update C++ samples to work after WiFi/Ethernet adapter merge.

The merge of ethernet and wifi includes a check in the adapter for whether
a request is going out to a multicast or unicast endpoint.
The decision for whether it is a multicast or unicast request is made on
the basis of whether the group endpoint is set or the remote endpoint.

The C stack creates a group endpoint if the connectivity type is
OC_ALL or a remote endpoint otherwise. But all connectivity types are mapped
to CA_IPV4. To ensure that a group endpoint is created for multicastm the C++
samples should make the findResource() call with OC_ALL.
The new constant is the multicast resource discovery uri

Change-Id: I8933a92a18ec920cf9b4b7dd994a6cbd82cb1c44
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/898
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoIntegrated WIFI/ETHERNET adapters to single IPAdapter.
Erich Keane [Mon, 4 May 2015 23:09:37 +0000 (16:09 -0700)]
Integrated WIFI/ETHERNET adapters to single IPAdapter.

Removed all eth,wifi adapter files and created ipadater files for easy access.
Sconscripts,Resource Layer modified to adapt IPV4 instead of ethernet and wifi.
Added network monitoring code for ipadapter.
As its interface change and on 4 platforms, many changes are inevitable.

Change-Id: Ib4db996e8a29ffc7f8955e9d0d7280c023d3d64d
Signed-off-by: jw1103.kim <jw1103.kim@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/752
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoBLE implemention for Android Platform
Erich Keane [Mon, 4 May 2015 22:12:31 +0000 (15:12 -0700)]
BLE implemention for Android Platform

it had been modified by fragmentation logic applied.

Change-Id: Ic3687fc016f2e28671a1d3962992d66481244288
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/753
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoAdded configuration parameters to the C++ SDK's generated documentation.
Joseph Morrow [Mon, 4 May 2015 21:15:14 +0000 (17:15 -0400)]
Added configuration parameters to the C++ SDK's generated documentation.

As pointed out by Bill Dieter in changeset 878, these defines are
inherently included by the the octypes.h file. To give end users the
definition of these defines, we must also include the configuration
parameters in the C++ SDK's documentation.

Change-Id: Iac98843920afae295dd86ac11236332c605b184e
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/895
Reviewed-by: William Dieter <william.r.dieter@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFixed regression in CARetransmission from the deadlock fix
Erich Keane [Fri, 1 May 2015 20:20:13 +0000 (13:20 -0700)]
Fixed regression in CARetransmission from the deadlock fix

The fix for the deadlocks resulted in hitting an 'else' case
inadvertantly.  This ensures that no additional waiting happens
on stop.

Change-Id: Ia10a5477e4502b4dff669cdc58d7d7e978e5dc51
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/883
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoBLE implementation for Tizen Platform.
k.karthick [Tue, 28 Apr 2015 07:26:51 +0000 (12:56 +0530)]
BLE implementation for Tizen Platform.

Typo errors, naming changes and fragmentation logic fixes merged.

Change-Id: I94a508f8367228fd5ecc261307a6ed7cf73be136
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/738
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoBLE Adapter implementation for Arduino
vimala.v [Mon, 4 May 2015 03:49:33 +0000 (09:19 +0530)]
BLE Adapter implementation for Arduino

Change-Id: I99c3dc7074f255e6b5549977844a477d4b331a7d
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/734
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>
9 years agofix build errors
Caiwen Zhang [Thu, 30 Apr 2015 06:24:16 +0000 (14:24 +0800)]
fix build errors

The value of jboolean should be 'JNI_TRUE' or 'JNI_FALSE'
The value of bool should be 'true' or 'false'

Signed-off-by: Caiwen Zhang <caiwen.zhang@intel.com>
Change-Id: I6ad62b25abe32c67dc3d8335c1836d3338631b12
Reviewed-on: https://gerrit.iotivity.org/gerrit/871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoAdded simple query example for non virtual resource in C samples.
Mandeep Shetty [Fri, 1 May 2015 20:45:49 +0000 (13:45 -0700)]
Added simple query example for non virtual resource in C samples.

Added test case in C client to send GET request for the light
resource with query 'power<30'. Added simple query parsing example in
C server.

Change-Id: I3fea41e2e2094797d76d9c2f7574cf1d43dd66e9
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/884
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoUpdate camsgparser.h to fix CA_SUPPORTED_EDR_MTU_SIZE definition
Erich Keane [Fri, 1 May 2015 22:07:06 +0000 (15:07 -0700)]
Update camsgparser.h to fix CA_SUPPORTED_EDR_MTU_SIZE definition

A patch was cherry picked adn the dependency on a previous commit
was not properly noticed.  This patch brings in the correct value
from review 738, so that the server's build will compile and be
correct.

Change-Id: I9b0a032677d1edb443ce3d86075b59d3ac7f87b8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/885
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
9 years agoImplementation for Tizen EDR transport.
k.karthick [Tue, 28 Apr 2015 09:49:05 +0000 (15:19 +0530)]
Implementation for Tizen EDR transport.

Typo errors, logging issues and some refactoring

Change-Id: I4103abf950c67cb6181a7137a72fa8fd78f18b3e
Signed-off-by: k.karthick <k.karthick@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/756
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoAdded an IoTivity 'octypes' header file.
Joseph Morrow [Thu, 30 Apr 2015 22:09:53 +0000 (18:09 -0400)]
Added an IoTivity 'octypes' header file.

This removes the C++ SDK's documentation dependency on the full C SDK's
API. Now, Doxygen generated documentation will not include the full C
SDK's API in its documentation.

Change-Id: Iaedf8ff1ef832b6f32466f9d978fda703d1f3f53
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/878
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFixed a build issue noticed on the mailing list with lib CA
Sachin Agrawal [Fri, 1 May 2015 16:31:09 +0000 (09:31 -0700)]
Fixed a build issue noticed on the mailing list with lib CA

As reported by Gabriel Schulhof on the mailing list, he had
an issue compiling liboctbstack directly.  This patch was
submitted by him via the mailing list.

Change-Id: I2083a8875baddabfa6df6287074639f437cfda60
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/875
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
9 years agoFixed a pair of deadlocks on shutdown
Erich Keane [Thu, 30 Apr 2015 16:32:12 +0000 (09:32 -0700)]
Fixed a pair of deadlocks on shutdown

In the event where a condition variable was signaled before it
was waited on, the thread would fail to exit properly and be
deadlocked.

This fix correctly checks the stop value before locking, and ensures
that signalling is done in a locked context as well.

Change-Id: Iab19adcee854a1ca1531deea29fa3bb6c82d042f
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/874
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoRemoved all makefiles and associated documentation from the repo.
Joseph Morrow [Fri, 1 May 2015 15:57:54 +0000 (11:57 -0400)]
Removed all makefiles and associated documentation from the repo.

These makefiles and documents were removed to remove all reference to our
old build system in our repo. Please refer to "Readme.scons.txt" at the
root of the repo for all builds from now on.

Change-Id: I93ae3a4c8d2a075ee24278da469d66ff49f4997b
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoModified query parsing to handle all filters.
Mandeep Shetty [Wed, 29 Apr 2015 18:58:03 +0000 (11:58 -0700)]
Modified query parsing to handle all filters.

Earlier the parsing only passed if "rt" and "if" were in the query
which did not work for other filters for non virtual resources.
Function now simply splits the uri on the delimiter '?'.

Change-Id: Iaafd2c5c55140f7c0b9207cf069f1a8e11979b25
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoRemoved duplicate code in ocresource.c::HandleVirtualResource.
Mandeep Shetty [Thu, 30 Apr 2015 21:45:12 +0000 (14:45 -0700)]
Removed duplicate code in ocresource.c::HandleVirtualResource.

An else-if block was duplicated.

Change-Id: Ib902da2e9d12871dded674e0b0532b7eaf728a09
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoImplementation of threadpool with very simple join-at-end
Erich Keane [Fri, 24 Apr 2015 18:23:21 +0000 (11:23 -0700)]
Implementation of threadpool with very simple join-at-end

Feedback was received that the 'dumb' threadpool implementation
was not sufficient.  This fix ensures that all threadpool items are
stored and joined at the end.

Change-Id: I47d6af18723c994efd072c08ed6766b07a212db9
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/832
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
9 years agoreplaced 'com' keyword with 'org' keyword
jihwan.seo [Fri, 17 Apr 2015 06:31:42 +0000 (15:31 +0900)]
replaced 'com' keyword with 'org' keyword

'com' keyword has been changed in Android Sample App

Change-Id: I9c9e424cf767d8b01462c647345cadfb053840a0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/763
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>
9 years agoAdded a description for the OCQualityOfService enum
William R. Dieter [Wed, 29 Apr 2015 03:19:49 +0000 (23:19 -0400)]
Added a description for the OCQualityOfService enum

Previously, there was no description of the meaning of the fields.  The
description added in this commit is based on dev mailing list discussion
of the field.

Change-Id: Iba183aeab69905c226c54935c15da7aeb5d522d5
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Vijay Kesavan <vijay.s.kesavan@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
9 years agoFix all braces on own line violations in C stack source files.
Mandeep Shetty [Wed, 29 Apr 2015 00:15:29 +0000 (17:15 -0700)]
Fix all braces on own line violations in C stack source files.

This commit only has braces on own line and style changes.

Change-Id: I6e3cb9be2d91088a42f69debe8e0889aae9417bc
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/862
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoModified sample apps for easier and automated testing.
Mandeep Shetty [Wed, 29 Apr 2015 00:01:51 +0000 (17:01 -0700)]
Modified sample apps for easier and automated testing.

This addresses IOT-506.
Presence sample app required keyboard input which was inconvenient for
automated testing. Modified some sleep times and counts to make sample
apps more responsive or run quicker.

Change-Id: I3ea1ae3be8e06986a78d904619c9f8860216848b
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/861
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoUpdated formatting of comments for better Doxygen output
William R. Dieter [Thu, 23 Apr 2015 20:41:26 +0000 (16:41 -0400)]
Updated formatting of comments for better Doxygen output

Converted some end of line comments on enums and structs in the public API
from "//" to "///<" so that the comments will show up in Doxygen API docs.
Added a few comments where I figured out what the elements were.

Change-Id: I8cad63757b0a8a1f0c0f98dbee5f8e5febf5e3a4
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/866
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
9 years agoFixed "[IOT-471] CATerminate can not clear out the previously registered handlers...
vimala.v [Fri, 17 Apr 2015 12:00:01 +0000 (17:30 +0530)]
Fixed "[IOT-471] CATerminate can not clear out the previously registered handlers" issue.

Change-Id: Iffd86c2f3c24e210af4b9c33da48032cb421b4bc
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/768
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
9 years agoFix the issue of NM tizen sample not working with WiFi connectivity.
Harish Kumara Marappa [Wed, 29 Apr 2015 07:21:09 +0000 (12:51 +0530)]
Fix the issue of NM tizen sample not working with WiFi connectivity.

Modified hosting.c file for using OC_WIFI connectivity type for Tizen,
Android platform and OC_ETHERNET for other platforms.

Change-Id: Ia89423c0d27c375f319aa1b1b4e8274d9c9642e7
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/828
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix IOT-504 issue of soft sensor manager
jk13 [Wed, 29 Apr 2015 05:06:59 +0000 (14:06 +0900)]
Fix IOT-504 issue of soft sensor manager

1. Fix IOT-504 issue which related to negative TC.
   - re-init failed after init using invalid configuration.

Change-Id: I5a3acbbed2f02a35dd055a5c823cb9dde8cc31fe
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/868
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix exception handling in Notification Manager Sample.
jyong2.kim [Tue, 28 Apr 2015 08:12:19 +0000 (17:12 +0900)]
Fix exception handling in Notification Manager Sample.

1. handle exception for resource bind.
2. update multicast-request address.
3. clean up code.

Change-Id: I9cf87319cf360aaa8b483b45be34b2d520597abf
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/852
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix for API return type of Notification Manager issues about return value of APIs.
jyong2.kim [Tue, 28 Apr 2015 11:41:47 +0000 (20:41 +0900)]
Fix for API return type of Notification Manager issues about return value of APIs.

1. fix return value of APIs.
2. handle exception about memory.
[IOT-501]
[IOT-502]

Change-Id: I77e54efe9e44572a8f7bd83849dc6215ff6daa79
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/854
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix for following issue about Notification Manager SampleProvider.
jyong2.kim [Tue, 28 Apr 2015 12:19:44 +0000 (21:19 +0900)]
Fix for following issue about Notification Manager SampleProvider.

[IOT-459] Notification Manager Sample consumer and provider app doesnot handle invalid menu option properly

Change-Id: Ibabe15fe2c6192817b4216a0050cb8711767700e
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/855
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix SSM JNI wrapper and android app
jk13 [Fri, 24 Apr 2015 04:42:13 +0000 (13:42 +0900)]
Fix SSM JNI wrapper and android app

This commit is for master branch
1. Fix JNI wrapper which includes invalid signature and load seqeuence
2. Fix android app ui

Change-Id: I75e0ebe98000340f75987fc9e707f542ef8ea18c
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/824
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoNotification manager Tizen sample application
Harish Kumara Marappa [Fri, 24 Apr 2015 15:54:43 +0000 (21:24 +0530)]
Notification manager Tizen sample application

Change-Id: I5bee6c4f7ecc64e6c6085e37451ab3bedde0030f
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdded timeouts and cleanup for zombie callbacks in NON cases.
Mandeep Shetty [Mon, 27 Apr 2015 23:26:52 +0000 (16:26 -0700)]
Added timeouts and cleanup for zombie callbacks in NON cases.

The client maintains a callback list to pass results upto the app.
If a request, specially a NON request is lost in the network, the
callback will sit in memory forever with no one left to use it.

Added a timeout field for the callback and a default timeout value of 2
hours in ocstackconfig.h. Stack will simultaneously purge timed out callbacks
when going through the callback linked list.

Change-Id: Idbaa7c5c85a40267f101f7bba53c3f98ed29d467
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFix bug about size of string.
jyong2.kim [Tue, 28 Apr 2015 05:30:53 +0000 (14:30 +0900)]
Fix bug about size of string.

1. fix size of string on strncpy

Change-Id: Ia314be019be586cb56fabcf2ffebac48c367f426
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
9 years agoFix for the issue of factory reset feature of things-manager not working.
Harish Kumara Marappa [Mon, 27 Apr 2015 14:45:31 +0000 (20:15 +0530)]
Fix for the issue of factory reset feature of things-manager not working.

Things-manager service sends factory reset request to collection using
ActionSet structure. When user calls factory reset second time it was not
working as the ActionSet executed for first request had not been deleted.
Modified the thingsDiagnostic class for deleting the factoryReset
actionset everytime after its execution.

Change-Id: I312a0126a48ebd6dda6e5e887daed6f2a797de67
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>