platform/upstream/iotivity.git
8 years agoUpdated discovery response when filter query does not match.
Sachin Agrawal [Wed, 22 Jul 2015 21:20:30 +0000 (14:20 -0700)]
Updated discovery response when filter query does not match.

Iotivity should respond to discovery requests in below manner:
If query filter matching fails (or if Server does not have
any DISCOVERABLE resources) and discovery request is multicast,
it should NOT send any response.
But, if the discovery request is unicast in above scenario,
it should send an error(RESOURCE_NOT_FOUND - 404) response with
empty payload.

Currently, Iotivity stack sends a response in all error scenarios
with return code as OC_EH_OK (along with some payload) which has
various drawbacks, such as, causes un-necessary traffic in the network
and also wastes power on constrained devices.

Change-Id: Ibb3bedc7b8ae67b708b89e9ad747c031ab552cae
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1766
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>
8 years agoChanging resource "URL" to "URI"
Omkar Hegde [Thu, 23 Jul 2015 21:35:40 +0000 (14:35 -0700)]
Changing resource "URL" to "URI"

We were logging the resource URI as URL which
was ambiguous for the test team.

Change-Id: I90e862cc35f3c1fd3ec2f3a95950668fb45d0134
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1861
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
8 years agoFinalizing CI build script changes.
Joseph Morrow [Thu, 23 Jul 2015 20:17:34 +0000 (13:17 -0700)]
Finalizing CI build script changes.

This commit effectively only affects the Integration/Validation build.
This had to be done in steps to not break any of the ongoing pre-[build
script overhaul] work that were already in their merge-into-master
validation stages.

Change-Id: I3c32df57d526f7a34847a96f48814fd31f79e4fc
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoliboc: add missing depending library
Hauke Mehrtens [Tue, 21 Jul 2015 18:50:39 +0000 (20:50 +0200)]
liboc: add missing depending library

liboc.so depends on liboctbstack.so, liboc_logger.so and pthread, this
patch adds these dependencies to the build.

Without this the dynamic loader will not automatically load these
libraries and it could result in unresolved dependencies at runtime.

Change-Id: I971b45669adef31dc9cca719884ebeb74aaf735e
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1794
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoEliminate warning about const mismatch in caipadapter (IOT-632)
John Light [Fri, 17 Jul 2015 14:39:15 +0000 (07:39 -0700)]
Eliminate warning about const mismatch in caipadapter (IOT-632)

Change-Id: I9c5afff53ded18b01467c0426c24876b219d7a34
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1858
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agocsdk: remove dependency to liboc_logger.so in c code
Hauke Mehrtens [Tue, 21 Jul 2015 20:45:40 +0000 (22:45 +0200)]
csdk: remove dependency to liboc_logger.so in c code

The liboc_logger.so is only used by the c++ part and not by the c part,
remove it from the c only part.

Change-Id: Ib0894974de8ef7150401f02fbd0ea864d1d6f2cd
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1801
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoRemoving unnecessary logs in message handler.
Omkar Hegde [Thu, 23 Jul 2015 18:11:50 +0000 (11:11 -0700)]
Removing unnecessary logs in message handler.

The "IN" and "OUT" tags give no useful information
and completely floods the debug mode. All the useful
information is already being logged within the function.

Change-Id: Ieac528913b659fbaccedcb465000f11f370b678a
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1816
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoFix memory leak on OCDoResource
Erich Keane [Wed, 22 Jul 2015 18:31:42 +0000 (11:31 -0700)]
Fix memory leak on OCDoResource

OCDoResource was leaking the generated payload each time, so
this fixes the issue by ensuring it is free'd at the end.

Change-Id: I693318bdcb6d7baa37a5397fab33b0fe4c784960
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoClean up CBOR payload in Arduino sample app.
Joseph Morrow [Wed, 22 Jul 2015 21:36:30 +0000 (14:36 -0700)]
Clean up CBOR payload in Arduino sample app.

This effectively keeps Arduino server from crashing when it receives
+24 requests. Services bug IOT-484
(https://jira.iotivity.org/browse/IOT-484).

Change-Id: I1b651e560d935bc71c1b8a3aa5062c2162e313f7
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1824
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoFix Tizen Build
Erich Keane [Thu, 23 Jul 2015 15:55:31 +0000 (08:55 -0700)]
Fix Tizen Build

Hopefully fixes the Tizen build

Change-Id: Ic202729f4d6a571cfad18724da27e5295258a1e2
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1854
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoModify resourceCache Unittest code for gcc 4.6 version
YounghyunJoo [Thu, 23 Jul 2015 02:22:14 +0000 (11:22 +0900)]
Modify resourceCache Unittest code for gcc 4.6 version

remove override tag on the each test code.

Change-Id: I8a22c442c65a3f9099cbb9adcf6e40a518c4fd56
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1837
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoresource-manipulation: add unittest for container
Minji Park [Thu, 23 Jul 2015 03:40:27 +0000 (12:40 +0900)]
resource-manipulation: add unittest for container

- add unittest for dynamic bundle loading and resource registration
- update sample bundle used for unittest

Change-Id: I9a59ecd5cbd49a8adbff703d58c0cb72ff58687a
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1839
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoresource-manipulation: Fix some typo errors
Ravi Nanjundappa [Tue, 21 Jul 2015 04:50:09 +0000 (10:20 +0530)]
resource-manipulation: Fix some typo errors

Fixed some typo in resource-manipulation scons script.

Change-Id: I64099f8b7d1ec18954e13d177b47d5c5cd73bfc8
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate PPM Android Sample Application for Updated CA API
YounghyunJoo [Wed, 22 Jul 2015 12:08:40 +0000 (21:08 +0900)]
Update PPM Android Sample Application for Updated CA API

OcConnectivityType Option on FindResource API(ALL to CT_ADAPTER_IP)

Change-Id: Ide07e1049ce505e03ceeb8ea934378935057d913
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1812
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRemove boost library dependency on PPM module.
YounghyunJoo [Wed, 22 Jul 2015 12:34:04 +0000 (21:34 +0900)]
Remove boost library dependency on PPM module.

Change-Id: Ic8710ec19e0417d912869a0a24c7e476a932acf0
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1810
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoInitialize response payload in entity handler
Omkar Hegde [Wed, 22 Jul 2015 22:38:12 +0000 (15:38 -0700)]
Initialize response payload in entity handler

As no payload is set for observe deregister and the response
payload was uninitialized, the payload destroy method caused a
segfault. This fixes IOT-611.

Change-Id: I050587c18fee922bfe61522f3ba7af6a2b207b09
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1828
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoFixed memory leak while sending the response in SRM
Sachin Agrawal [Wed, 22 Jul 2015 16:20:11 +0000 (09:20 -0700)]
Fixed memory leak while sending the response in SRM

Dynamic memory was being allocated while forming the OCSecurityPayload
and was not freed. Also, updated code in ocserverrequest.c to replace
dynamic memory allocation with local variable on the function stack for
CAToken variable.

Change-Id: I4372fe46001c10cb68d069cae5916c8798913121
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years ago[ARDUINO][BLE] Changed UUID's as per OIC Spec
Abhishek Sharma [Tue, 21 Jul 2015 10:55:36 +0000 (16:25 +0530)]
[ARDUINO][BLE] Changed UUID's as per OIC Spec

Updated RBL library patch to advertise new UUID's as per OIC spec

Change-Id: I50c50d59779922b2c16e86156fe43ec0a62cde52
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoUpdated auto_build.sh for continuous integration improvements.
Joseph Morrow [Wed, 22 Jul 2015 18:10:39 +0000 (11:10 -0700)]
Updated auto_build.sh for continuous integration improvements.

This commit effectively adds a new mode of building in the build
script. This new mode can be referenced as "parallel". Before all
builds occurred in sequence and could take a long time. Now an
individual contributor may build just a shim of the entire build
list. This will allow the Jenkins CI system to build each of the
shims in parallel to better utilize the several executors found
across the many build servers we have available for CI.

Change-Id: I945bc45201d8c3d4a5c754de02eaa623f59c8449
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1818
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoFixed invalid write in doxmresource
Erich Keane [Wed, 22 Jul 2015 17:25:48 +0000 (10:25 -0700)]
Fixed invalid write in doxmresource

The doxmresource was allocating based on the size of a short,
but the type was an enum.  This adjusts the size to be correct.

Change-Id: Id0dcc26b346b2ef096992bd84173319ddce2c7e6
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1819
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agomodified linux CA sample to handling blockwise-transfer
hyuna0213.jo [Tue, 21 Jul 2015 11:19:47 +0000 (20:19 +0900)]
modified linux CA sample to handling blockwise-transfer

currently, CA sample send the fixed payload data.
so I modified the CA sample to send bulk data request and response

Change-Id: Icd94f5f0c56defe80890cf020f4413cbc4153f83
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1782
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoblockwise-transfer rebase into master for merge/review
hyuna0213.jo [Wed, 22 Jul 2015 02:49:01 +0000 (11:49 +0900)]
blockwise-transfer rebase into master for merge/review

- block option1, option2 can be supported
- size option can be supported
- late negotiation is supported
- IP tansport can be supported
- not supported in single threaded devices such as the Arduino Mega
- design document can be found on the link below
  https://wiki.iotivity.org/proposal_for_block-wise_transfer

Change-Id: Iebaa23ff8a6c1e23ee9fa6e10c09d76385affb66
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoadding UnitTest functions in Server Builder
Rami Jung [Wed, 22 Jul 2015 11:00:53 +0000 (20:00 +0900)]
adding UnitTest functions in Server Builder

-addAttributeUpdatedListener()
-removeAttributeUpdatedListener()

Change-Id: I3bc137c02d4b6d386b406ee0879242ea961ff085
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1811
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix compiler warnings.
Ravi Nanjundappa [Tue, 21 Jul 2015 08:09:39 +0000 (13:39 +0530)]
Fix compiler warnings.

This fixes compiler warnings related to in csdk and services dirs.
- unused but set variables
- control reaching end of non-void functions

Change-Id: I98b83091dc97e059e2755b98e33aef209dbb5adb
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1778
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[Resource Manipulation] Integrated Resource Manipulation libraries into 4 categories
Jay Sharma [Wed, 22 Jul 2015 15:28:54 +0000 (20:58 +0530)]
[Resource Manipulation] Integrated Resource Manipulation libraries into 4 categories

- rcs_server
- rcs_client
- rcs_common
- rcs_container

Change-Id: I262b7e9c57c48530e2128d14545c335c6a098223
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1814
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed build warnings due to assert, unused function, time
Erich Keane [Tue, 21 Jul 2015 23:05:54 +0000 (16:05 -0700)]
Fixed build warnings due to assert, unused function, time

This fixes a handful of the warnings present on master.

Change-Id: Idc39f9c8f8c73e0107831bc340738028a1294604
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1804
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoDefault entity handler for collections
Omkar Hegde [Tue, 21 Jul 2015 22:17:05 +0000 (15:17 -0700)]
Default entity handler for collections

Adding default entity handler for collection C samples
in the case when the resource does not exist. This change
fixes IOT-628.

Change-Id: I4f060a856fd9bb712fc145a5c98081ecbe1fec7e
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1803
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>
8 years agoprotocol-plugin: libfanserver_mqtt_plugin.so and liblightserver_mqtt_plugin.so add...
Hauke Mehrtens [Tue, 21 Jul 2015 20:41:09 +0000 (22:41 +0200)]
protocol-plugin: libfanserver_mqtt_plugin.so and liblightserver_mqtt_plugin.so add missing depending library

libfanserver_mqtt_plugin.so and liblightserver_mqtt_plugin.so are also
depending on liboc.so and libcrypto.so, this patch adds these
dependencies to the build. In addition it puts the dependency to
mosquitto to the beginning of the list. This is needed because
mosquitto is a statically linked lib and it also has unresolved
symbols, but gcc only searches the dynamic libs defined after the
static for unresolved symbols in the static lib.

mosquitto was only build as a static linked library so we can use the
normal LIBS mechanism and it will be statically linked.

Without this the dynamic loader will not automatically load these
libraries and it could result in unresolved dependencies at runtime.

Change-Id: Ia130827d04bd3bb1a8863fc64d0097a076edc751
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1798
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agomqtt-fan: libmosquittopp.so: add missing depending library
Hauke Mehrtens [Tue, 21 Jul 2015 20:38:02 +0000 (22:38 +0200)]
mqtt-fan: libmosquittopp.so: add missing depending library

libmosquittopp.so also depends on libpthread.so, this patch adds these
dependencies to the build. In addition it puts the dependency to
mosquitto to the beginning of the list. This is needed because
mosquitto is a statically linked lib and it also has unresolved
symbols, but gcc only searches the dynamic libs defined after the
static for unresolved symbols in the static lib.

Without this the dynamic loader will not automatically load these
libraries and it could result in unresolved dependencies at runtime.

Change-Id: I866a46305c31d37cf706b9f2b965e843c35c5667
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify UnitTest Code for 'ResourceBroker'
doil.kwon [Wed, 22 Jul 2015 07:00:05 +0000 (16:00 +0900)]
Modify UnitTest Code for 'ResourceBroker'

- Bug fix : Segmentation Fault Issue
- Support 4.6 gcc compiler and 4.7 gcc compiler

Modify WhiteSpace Error

Change-Id: I9fa65b24b7133f08fcd5ecb03fd163fa6de106b7
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1808
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[resource-manipulation] Add RCSAddress class
coderhyme [Wed, 22 Jul 2015 06:31:59 +0000 (15:31 +0900)]
[resource-manipulation] Add RCSAddress class

This is a helper class to provide distinguishable api for the address of discoverResource.

Change-Id: I3108f852b504d7b900e06435b7033d6d93f35e9d
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoResourcePresenceUnitTest: Fix when the requesterList is not initialized
Ravi Nanjundappa [Tue, 21 Jul 2015 09:00:33 +0000 (14:30 +0530)]
ResourcePresenceUnitTest: Fix when the requesterList is not initialized

This issue fixes the segmentation fault issue during the execution of broker_test.
The fix returns true when the requesterList itself is not initialized, otherwise
returns the value of requesterList->empty().

Change-Id: I3e57264497fd283e15824b088c6dcad925e0c2f4
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1780
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[resource-manipulation] Add Test Helper class
coderhyme [Tue, 21 Jul 2015 08:06:10 +0000 (17:06 +0900)]
[resource-manipulation] Add Test Helper class

The class is to avoid aborting test execution, when expectation is not fulfilled on GCC 4.8.
The issue is caused by a difference of destructor's noexcept specifier between MockRepository of HippoMock and Test of gtest.
This class allows test fixtures have same usage regardless of GCC version.

Change-Id: I247a63009ca2625b27a29eb5320a1a6e3ebbd71b
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1779
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoresource-manipulation: Update container bundle-api doxygen comments
Minji Park [Wed, 22 Jul 2015 02:44:44 +0000 (11:44 +0900)]
resource-manipulation: Update container bundle-api doxygen comments

- add bundle-api doxygen comments for updates regarding bundle resource attributes and dynamic configuration
- update bundles and bundle resources for applying resource attribute

Change-Id: Ic1389eb0c643ded2df313e1b1bfa2968743af525
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1806
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix of header file for compability with gcc 4.6
Markus Jung [Tue, 21 Jul 2015 07:49:34 +0000 (16:49 +0900)]
Fix of header file for compability with gcc 4.6

Change-Id: I31f018da290c98fdfe6042327c3eefbbc41e9c52
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agofixed linux, android ca sample application
hyuna0213.jo [Tue, 21 Jul 2015 06:39:03 +0000 (15:39 +0900)]
fixed linux, android ca sample application

after 'New IP Adapter supports IPv6' changes,
ca sample is not working. so I fixed the issue.

Change-Id: Idadf0e5ecfdd3433d8e598c9d3af392e2ffb6a0b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1752
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoRe-enable Tizen build
Erich Keane [Mon, 20 Jul 2015 17:35:07 +0000 (10:35 -0700)]
Re-enable Tizen build

Tizen build was disabled for the 0.9.2 release since it was incomplete
and interfered with features.  This commit puts them back into the
auto_build.sh so that it'll be building on master.

Change-Id: I4ecf2cd7a9df06a3d2ca987fffc7130fabba0ca1
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1764
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFixed Presence
Omkar Hegde [Mon, 20 Jul 2015 23:32:37 +0000 (16:32 -0700)]
Fixed Presence

Wrong presence URI was being formed as a part of
IPV6 changes. Also, the presence resource URI was not
updated in the IPv6 changes.

Change-Id: I66dcbcd729e4c91cec57f551bf9b1be36a559442
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1770
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFixed payload length in Android Sample App
jihwan.seo [Mon, 20 Jul 2015 08:15:15 +0000 (17:15 +0900)]
Fixed payload length in Android Sample App

the code related to length of payload in Android Sample App
is changed.

Change-Id: I8c62a4065e46609149fa69f2d42772b56e22dd38
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1754
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoImplement VERIFY_NON_NULL() in terms VERIFY_NON_NULL_RET().
Ossama Othman [Tue, 21 Jul 2015 04:03:11 +0000 (21:03 -0700)]
Implement VERIFY_NON_NULL() in terms VERIFY_NON_NULL_RET().

Minimize code duplication in the VERIFY_NON_NULL() macro by
implementing it terms of the VERIFY_NON_NULL_RET() macro.

Removed duplicate definitions of these macros as well.

Change-Id: I692b68744a0a1606ca64c7a676d910d32ffbbaf5
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1772
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoMerge Single/Multi thread for camessagehandler
jnashok [Mon, 4 May 2015 09:33:04 +0000 (18:33 +0900)]
Merge Single/Multi thread for camessagehandler

Common code in Single thread and multithread merged into single file
Specific code is seperated with SINGLETHREAD flag

Change-Id: I6e9f3486c28fc188635fd86be1f01036636dedb3
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/892
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years ago[CA] Fix for tizen build error and CA sample for Tizen
koushik.girijala [Mon, 20 Jul 2015 09:07:56 +0000 (14:37 +0530)]
[CA] Fix for tizen build error and CA sample for Tizen

Fix for tizen build error and fixed CA sample for Tizen for IPv6 changes

Change-Id: Idb551359c3223c0c1d26a08a8443ac6874f3ff87
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1755
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix redefinition types in octype
Sakthivel Samidurai [Tue, 21 Jul 2015 16:02:06 +0000 (09:02 -0700)]
Fix redefinition types in octype

Remove duplicate definition in octype header.

Change-Id: If99021458bc16ae6aa645f7946bd047baa565b67
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1786
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agocsdk: Fix build issues related to OCResource conversions on Linux
Ravi Nanjundappa [Tue, 21 Jul 2015 13:33:07 +0000 (19:03 +0530)]
csdk: Fix build issues related to OCResource conversions on Linux

This fixes OCResource conversion issues to/from rsrc_t

Change-Id: I04c197446df9311c2617f0035e469058ff81e81e
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoprefer the other version
Erich Keane [Tue, 21 Jul 2015 16:06:28 +0000 (09:06 -0700)]
prefer the other version
Revert "csdk: Fix build issues related to conversions on Linux"

This reverts commit 9604ac4ece381c26b7478e97f1ee8a604bc50d6c.

Change-Id: I4704d20a0a091920842dc33056eb238a0a3789d8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1791

8 years agocsdk: Fix build issues related to conversions on Linux
Ravi Nanjundappa [Tue, 21 Jul 2015 05:21:41 +0000 (10:51 +0530)]
csdk: Fix build issues related to conversions on Linux

This fixes OCResource conversion issues to/from rsrc_t

Change-Id: I09c03eebba9226afad1a9278733d436f9927361e
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoC++ samples select Correct Adapter Type
Omkar Hegde [Tue, 21 Jul 2015 00:00:18 +0000 (17:00 -0700)]
C++ samples select Correct Adapter Type

Previously we were allowing the user to select between
IPv4 and IPv6 which is wrong since the stack is supposed
to make this decision by itself. This fixes IOT-621

Change-Id: If8f1c125f739696d33d6fef211a9a9033ec63f45
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoDisabled boost download when boost is already downloaded.
Joseph Morrow [Mon, 20 Jul 2015 20:11:02 +0000 (13:11 -0700)]
Disabled boost download when boost is already downloaded.

This effectively disables the build server from downloading boost
when it already has it. (Before it was making its decision on
whether or not to download it based solely on whether or not the
*.zip file already existed.)

Change-Id: I155fec0428b7caa0b517bbbe6458ee85e692ec8b
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1768
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoUpdated C stack external API comments for doxygen documentation.
Moumita Ray [Fri, 26 Jun 2015 17:24:29 +0000 (10:24 -0700)]
Updated C stack external API comments for doxygen documentation.

C stack external header files were missing support for doxygen documentation.
Modified comments, spelling, definitions, alignment and terminology.

Change-Id: Ic777555324c45fe5e9fcd421eac20fc418fe10cc
Signed-off-by: Moumita Ray <moumita.ray@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1431
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoAdded instruction to install dos2unix before Arduino build in readme doc.
Joseph Morrow [Mon, 20 Jul 2015 18:27:29 +0000 (11:27 -0700)]
Added instruction to install dos2unix before Arduino build in readme doc.

This commit also includes explanation of the newer "SHIELD" option
for Arduino builds (ie. the current Arduino Shield on your Arduino
device).

Change-Id: I4b86fef5af77e567b19fcbab19cf87b23b5d576a
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1765
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoRemoving CA sample with NDK build
jnashok [Mon, 20 Jul 2015 05:23:52 +0000 (14:23 +0900)]
Removing CA sample with NDK build

CA sample that will build from gradle is submitted
This will build the APK directly using SCons and gradle
Hence removing earlier sample with NDK build

Change-Id: Icde256f08e7886ecfe1edcb434e7153aa69e0247
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1750
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agocomplete android ca sample build with scons
jnashok [Thu, 25 Jun 2015 05:47:10 +0000 (14:47 +0900)]
complete android ca sample build with scons

ca sample now has gradle support
gradle build is intiated from scons
this also takes care of building ca using ndk

Change-Id: Id681c508a8a4ef4e3fcca9e67dcf1a88a1cca989
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years ago[ARDUINO] Fixed heap corruption and build issues
Abhishek Sharma [Mon, 20 Jul 2015 14:57:56 +0000 (20:27 +0530)]
[ARDUINO] Fixed heap corruption and build issues

1) Fixed heap corruption in le adapter
2) Fixed build issues on enabling OIC_LOG_V
3) Deleting unnecessary files added by IPV6 merge

Change-Id: Ia7cc7782771f2e76c1a7927a376f866ade0f927d
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1760
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>
8 years agoremove unnecessary codes in callback for android
jihwan.seo [Mon, 20 Jul 2015 03:59:44 +0000 (12:59 +0900)]
remove unnecessary codes in callback for android

I have updated callback codes into the code of android_api.

Change-Id: Idcf5015d24aa9e263b16dfe42d4f596efd7e7b2e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1746
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoMemory Leak when UUID is not valid.
Amit Kumar Verma [Fri, 17 Jul 2015 08:27:04 +0000 (13:57 +0530)]
Memory Leak when UUID is not valid.

When UUID is not valid then in case free the temp UUID memory.

Change-Id: I1abe5f13feaf2c1edc97f4fc2e1ac585c9aa3297
Signed-off-by: Amit Kumar Verma <ak.verma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1713
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoMerge branch 'resource-manipulation' into 'master'
hunje.yeon [Mon, 20 Jul 2015 09:54:27 +0000 (18:54 +0900)]
Merge branch 'resource-manipulation' into 'master'

Add resource manipulation features such as resource container, broker, cache and server builder.
It also includes API references at /resource/docs/Doxyfile.

Change-Id: Id72cf1d99fe6d19a62f3b8f8e57c96ca91120c6b
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
8 years agofixed build script for android.
jihwan.seo [Mon, 20 Jul 2015 05:34:00 +0000 (14:34 +0900)]
fixed build script for android.

Change-Id: Ia960079085652be7e9ff052d632d670d4a052f1f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1751
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoReplaced Watching word to Monitoring in ResourceClient
Jay Sharma [Mon, 20 Jul 2015 04:57:05 +0000 (10:27 +0530)]
Replaced Watching word to Monitoring in ResourceClient

- updated ResourceClient and Sample
- updated Notification manager (HostingObject.cpp)

Change-Id: Iee01cbfabf175d731265bb161cfb3a1aa921302a
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded libcurl copyright and permission notice to example bundle
Markus Jung [Mon, 20 Jul 2015 05:14:37 +0000 (14:14 +0900)]
Added libcurl copyright and permission notice to example bundle

Change-Id: I5b039a06ef6bda5be737dd7691b376b4df969a4a
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1749
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd UnitTest for "Resource Broker"
doil.kwon [Mon, 20 Jul 2015 01:48:48 +0000 (10:48 +0900)]
Add UnitTest for "Resource Broker"

- Modify Sconscript to build UnitTest

- Add UnitTest Code After Generating "UnitTest" Folder

Add API for "DeviceAssociation" and "ResourcePresence"

- for checking empty list

- for checking list size

Modify Code to support 4.6 compiler

Modify White Space

Change-Id: I70c56d77da3540b95048fd13baa18b6044321115
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1742
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate ResourceCache codes for expiry Timer
YounghyunJoo [Mon, 20 Jul 2015 01:20:59 +0000 (10:20 +0900)]
Update ResourceCache codes for expiry Timer
- change timerCB return type to void
Add resourceCache unittest code files

Change-Id: I7ebaf1d7d08febba999687258b021a97ddae6469
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1740
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoResource container can be built without Java support.
Markus Jung [Mon, 20 Jul 2015 00:48:58 +0000 (09:48 +0900)]
Resource container can be built without Java support.

SConscript checks for the presence of a Java build environment and configures a CPP Macro variable that includes/excludes Java related code
in the resource container.

Change-Id: I33cc32e45eb28b554512841ff92a0a078966598a
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoArrange Code for Resource Hosting.
jyong2.kim [Sun, 19 Jul 2015 10:54:16 +0000 (19:54 +0900)]
Arrange Code for Resource Hosting.

fix doxygen description
add initialization for member variable.
handle exception.
update sample consumer app.

Change-Id: If1b40b7359cf09d7322fc265e1eadb1e2ce70f76
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1738
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoArrange code of Resource Broker.
jyong2.kim [Sun, 19 Jul 2015 10:19:01 +0000 (19:19 +0900)]
Arrange code of Resource Broker.

fix typing error.
update from list::erase to list::remove.

Change-Id: If8d28d6ca391246611254a02efeb73a283ec97d4
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate and resolve conflict of service SConscript
hunje.yeon [Sun, 19 Jul 2015 09:23:37 +0000 (18:23 +0900)]
Update and resolve conflict of service SConscript

Change-Id: Iade5cafaf1c20dfc2c204fc53c80cb13a4241e27
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
8 years agoUpdate Doxyfile for resource-manipulation
hunje.yeon [Sun, 19 Jul 2015 06:27:52 +0000 (15:27 +0900)]
Update Doxyfile for resource-manipulation

Add resource-manipulation API path into Doxyfile.

Change-Id: Icf538956a34882d89831d38a35280cf1422b100b
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1735
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUsing ResourceAttributes class for BundleResource and added a container sample client.
Markus Jung [Sun, 19 Jul 2015 04:57:28 +0000 (13:57 +0900)]
Using ResourceAttributes class for BundleResource and added a container sample client.

Change-Id: Id759249d912e1c5ab275e2c0cd608bf4cf1ada18
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1734
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate ResourceBroker for updated expiryTimer.
jyong2.kim [Sun, 19 Jul 2015 04:50:12 +0000 (13:50 +0900)]
Update ResourceBroker for updated expiryTimer.

update expiryTimer return type to void.

Change-Id: I7fc13857a09db2c567f7aaeeac46b092d6b8241a
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1733
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate SConscript for resource-manipulation
hunje.yeon [Sun, 19 Jul 2015 02:32:09 +0000 (11:32 +0900)]
Update SConscript for resource-manipulation

Change-Id: I9fa0c530eb0b78d70bd9713be8c6b3060f79aa39
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1732
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded Doxygen comments for all public APIs of RM layer
Jay Sharma [Sat, 18 Jul 2015 13:26:33 +0000 (18:56 +0530)]
Added Doxygen comments for all public APIs of RM layer

Change-Id: I2af3444a6fa20bac14c75c616ccc2aa38a2a1a57
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1731
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoRenamed startWaching, stopWatching apis to startMonitoring, stopMonitoring
Jay Sharma [Sat, 18 Jul 2015 11:10:44 +0000 (16:40 +0530)]
Renamed startWaching, stopWatching apis to startMonitoring, stopMonitoring

- updated ResourceClient
- updated SampleResourceClient linux application.
- updated unittestcases of ResourceClient

Change-Id: I9f64e6218d7ff46b511f82401c65a0eee7bfff0b
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1730
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixing collections
Omkar Hegde [Fri, 17 Jul 2015 00:59:49 +0000 (17:59 -0700)]
Fixing collections

The result status was set incorrectly. Also, wrong type
of payload was being created in HandleBatchInterface()
and HandleLinkedListInterface(). Added a function to
create representation payload from resource pointer.
Also, changing HandleAggregateResponse() to handle
collections correctly. Some bug fixes for CBOR parsing
which affected collections.

Change-Id: Ia3c1fb4d144ead24e7efad0d915a01dad16d15e5
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1700
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoChange Android sample app light resource URIs to match linux sample apps.
Joseph Morrow [Fri, 17 Jul 2015 23:37:37 +0000 (16:37 -0700)]
Change Android sample app light resource URIs to match linux sample apps.

This will fix an issue between Linux SimpleClient app and Android
SimpleServer app where the server application was not responding
to client application.

Change-Id: I8a34539415df3adfd5a1d3c7912dedd2be2afce2
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1726
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoset correct default value to sequenceNumber for response(IOT-615)
sonu1.yadav [Fri, 17 Jul 2015 10:09:38 +0000 (15:39 +0530)]
set correct default value to sequenceNumber for response(IOT-615)

Change-Id: Iaf4027cb4f379d3e5dff04d06cbd5d4fb38d23e0
Signed-off-by: sonu1.yadav <sonu1.yadav@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1717
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoRebase remote-access over master
Sakthivel Samidurai [Fri, 17 Jul 2015 16:34:36 +0000 (09:34 -0700)]
Rebase remote-access over master

Added the remote adapter code in connectivity/src/ra_adapter folder.
Adding plumbing throughout the stack for applications to do requests
over remote access.
Added a C sample app ocremoteaccessclient that makes all it's requests
ONLY through the RA adapter.

Change-Id: Ie1b250a0fad584e85631f66e3d2ec4f44607320d
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoNew IP Adapter supports IPv6
John Light [Sat, 20 Jun 2015 23:48:52 +0000 (16:48 -0700)]
New IP Adapter supports IPv6

builds on Linux
tested on Linux
IPv6 is now experimental
missing: testing on Android, build and test on Tizen

Change-Id: I4912317111dcc26712aec036715925905bd35eb9
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1724
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoremove broken build of android.
jyong2.kim [Fri, 17 Jul 2015 15:55:07 +0000 (00:55 +0900)]
remove broken build of android.

remove broken build of unittests.

Change-Id: Ia139029b7430dedf01ad4059009eb54ad629c00e
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1723
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix for IOT-613 issue.
sonu1.yadav [Thu, 16 Jul 2015 07:09:44 +0000 (12:39 +0530)]
Fix for IOT-613 issue.
Problem: When SIGINT signal is raised, occlient called OCStop(). OCStop() function called deleteResource() to delete the resources. deleteResource() takes OCResource* as first argument and dont check the NULL value.

Fix: Null check for argument in deleteResource().

Change-Id: I1f71bc5f90ef7199bf33da7157c8e52d2ffe94dd
Signed-off-by: sonu1.yadav <sonu1.yadav@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoEnabled Jenkins build check for Tizen CA
Abhishek Pandey [Thu, 16 Jul 2015 14:51:05 +0000 (20:21 +0530)]
Enabled Jenkins build check for Tizen CA

- Added Tizen scons for CA libs and sample for IP transport
  in auto build.
- Both secured and non secured build is added.
- Updated  Tizen build script to return error on failure.
- Updated auto_build help menu as well.

Change-Id: I5766b37cd2263068eff050127178d80eb2340308
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1697
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoUpdated Resource Client and sample apps as per new Header structure.
Jay Sharma [Fri, 17 Jul 2015 13:51:03 +0000 (19:21 +0530)]
Updated Resource Client and sample apps  as per new Header structure.

Change-Id: I74bbee499c4c829bd49a27d8514c73e12308a044
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1722
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix structure in ExpiryTimer
ChaJiwon [Fri, 17 Jul 2015 13:27:39 +0000 (22:27 +0900)]
Fix structure in ExpiryTimer

Add cancelAll function and remove destroy function.
Change function name in postTimer and cancelTimer.
ExpiryTimer_Impl class change name to ExpiryTimerImpl.

Change-Id: I546e75ff52962cba248d9f9689f39f526646e57b
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1718
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd README for Provisioning Tool
Sachin Agrawal [Fri, 17 Jul 2015 00:05:13 +0000 (17:05 -0700)]
Add README for Provisioning Tool

Using Provisioning tool sample in Security module is not
straight-forward and it may be tricky for a new user to
get familiar with it. This README details all the steps
and files needed for a successful Just Works Provisioning.

Change-Id: I4afbcbbb5ad6310df42810bc6d3ada663b2ce243
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1699
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agomaking Resource-manipulation mouldes been built by default
Rami Jung [Fri, 17 Jul 2015 09:51:10 +0000 (18:51 +0900)]
making Resource-manipulation  mouldes been built by default
( clientwrapper, clientwrapper'unitest, examples will be commented out later by SRI)

Change-Id: I72c3bb28cd1feb7f5659ace0e4f320e79ec9ec84
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1716
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify the DataCache.cpp file for initialization issue
YounghyunJoo [Fri, 17 Jul 2015 08:56:19 +0000 (17:56 +0900)]
Modify the DataCache.cpp file for initialization issue

initialize networkTimeOutHandle, pollingHandle value

Change-Id: I773552b8e15a59c6209c6be047476b72b61db19e
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1714
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoupdate container and sample bundles for so bundle dynamic configuraion
Minji Park [Fri, 17 Jul 2015 09:00:59 +0000 (18:00 +0900)]
update container and sample bundles for so bundle dynamic configuraion

- implement features for dynamic configurataion
- update so sample bundles

Change-Id: I3ff054affee1796e89c4d295ecd82b518c753d6f
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1715
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoupdate ResourceCache Module files for the reorganisation of directory path
YounghyunJoo [Fri, 17 Jul 2015 07:47:34 +0000 (16:47 +0900)]
update ResourceCache Module files for the reorganisation of directory path

Change-Id: Id57afa8ba10fad15a198a16886a731d418f231d0
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1709
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoChanging api's name from 'setAttributeUpdatedHandler' , 'removeAddAttributeUpdatedHan...
Rami Jung [Fri, 17 Jul 2015 07:20:06 +0000 (16:20 +0900)]
Changing api's name from 'setAttributeUpdatedHandler' , 'removeAddAttributeUpdatedHandler ' to 'addAttributeUpdatedListener' and  'removeAttributeUpdatedListener'
these chagnes came from discussion in HQ

Change-Id: Ib5f331103b7d752d703999433f3284510cdd1cb4
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1708
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoArrange build script for notification manager.
jyong2.kim [Fri, 17 Jul 2015 08:04:03 +0000 (17:04 +0900)]
Arrange build script for notification manager.

Fix build error on gcc-4.6.

Change-Id: Ibbe48e519f1e4537133ce8775e16be1bc88ff0a3
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1711
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix Broker build error on gcc-4.6.
jyong2.kim [Fri, 17 Jul 2015 07:49:54 +0000 (16:49 +0900)]
Fix Broker build error on gcc-4.6.

arrange build script.
modify from std::atomic to boost::atomic.
resolve prevent.

Change-Id: I225a58721fe2de9926d226f9e46baff03b04cb52
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1710
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix memory leak in caqueueingthread
Chetan Toshniwal [Wed, 15 Jul 2015 13:24:37 +0000 (18:54 +0530)]
Fix memory leak in caqueueingthread

free preallocated memory on failure and return CA_MEMORY_ALLOC_FAILED.

Change-Id: I9f5b9591b96d9dd0bf96bbaf7e9c5a6407ad831e
Signed-off-by: Chetan Toshniwal <c.toshniwal@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1671
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoModify service/SConscript file for boost download issue
YounghyunJoo [Fri, 17 Jul 2015 04:27:43 +0000 (13:27 +0900)]
Modify service/SConscript file for boost download issue

change the building sequence of notification and protocol-plugin

Change-Id: I5a8697fc70fe29034c7dddc6614e31c9c6430318
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1704
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix build error of notification manager.
jyong2.kim [Thu, 16 Jul 2015 11:12:39 +0000 (20:12 +0900)]
Fix build error of notification manager.

update sconscript of notification manager and sample.

Change-Id: I07bf40097361dfb4eae960bc04d3ba551626a39c
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1694
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate container and build script for rearrangement of headers
Minji Park [Fri, 17 Jul 2015 05:13:11 +0000 (14:13 +0900)]
Update container and build script for rearrangement of headers

modify container and SConscript regarding changes of serverbuilder

Change-Id: I779e2690968d07825bfba91992d96fd646eca4e5
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1706
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoRearrange the headers
coderhyme [Fri, 17 Jul 2015 01:53:29 +0000 (10:53 +0900)]
Rearrange the headers

The headers to be exposed as a part of API are moved to include folder of root of resource-manipulation

Change-Id: I40ee68e9aefcacdaef2272338674b66d5dbbf47c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1703
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoRefactor duplicated SCons/Python test run code.
Ossama Othman [Wed, 15 Jul 2015 21:23:41 +0000 (14:23 -0700)]
Refactor duplicated SCons/Python test run code.

Moved duplicated code test run code to a Python module under
tools/scons.  Support for Valgrind suppressions was also added.

Change-Id: I31d0bf7879116a358439e387dcd5fd87bbbecc9d
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1678
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoChanging occlient get request query
Omkar Hegde [Thu, 16 Jul 2015 18:38:29 +0000 (11:38 -0700)]
Changing occlient get request query

Since the server starts on any random port, the test
engineers have to do a multicast discovery before sending
a unciast request. Increasing the request query "power" value
to account for this delay. This is related to IOT 610.

Change-Id: Ibc5805cc2dc4a7236800230ab380aa7a1481edd0
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1698
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoAdded new OCStack Error Code for Unauthorized Req (IOT-609)
Sachin Agrawal [Thu, 16 Jul 2015 05:28:30 +0000 (22:28 -0700)]
Added new OCStack Error Code for Unauthorized Req (IOT-609)

A Server can deny a REST request from a Client if
'Access Control List' does not authorize the request.
Server returns CoAP 401 error code to Client originating the
request. RI layer at client incorrectly translates it to
OC_STACK_ERROR which does not provide specific failure reason
to Client Application.

Change-Id: I127060d186a021c676c36bc6148e264bdcb60fde
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1684
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoMemory Leak recources not released in case of failure.
Vikas Gupta [Wed, 15 Jul 2015 08:10:08 +0000 (13:40 +0530)]
Memory Leak recources not released in case of failure.

Multiple Mutex are initialized in this function, if one of them fails
previous allocated resources should be released.

Change-Id: I869cfce4dce6c3858443833df523b6234eae3761
Signed-off-by: Vikas Gupta <vs.gupta@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1664
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoEnabled EDR and BLE adapter in RI
vimala.v [Mon, 13 Jul 2015 11:17:43 +0000 (16:47 +0530)]
Enabled EDR and BLE adapter in RI

- Added EDR and BLE connectivity types for sending Response.
- Parsing of EDR and BLE adapter address in Request URI.

Verification of IP and EDR adapter was done in Tizen with the above changes.

Change-Id: I70ebc099497ab744c4d822e65c94e0610d338e13
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1634
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
8 years agoRefactoring Notification Manager using Resource-manipulation API.
jyong2.kim [Thu, 16 Jul 2015 08:43:06 +0000 (17:43 +0900)]
Refactoring Notification Manager using Resource-manipulation API.

This commit is draft of Resource Hosting.
ignore to build manager in service/SConscript.

Change-Id: Iee707c5432da8c05246551328f131b575d6f206a
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1691
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>