platform/upstream/iotivity.git
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 years agoFix build error for broker and cache.
jyong2.kim [Thu, 16 Jul 2015 08:29:41 +0000 (17:29 +0900)]
Fix build error for broker and cache.

Change-Id: I29c19515a5b175153d69c95c7e52b2656b7cfd99
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1689
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoMerge branch 'master' into resource-manipulation
hunje.yeon [Thu, 16 Jul 2015 08:29:20 +0000 (17:29 +0900)]
Merge branch 'master' into resource-manipulation

Apply recent changes of 'master' branch into 'resource-manipulation' branch

Change-Id: I201c7759d7ddbf2fd12440315968e270c360e265
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
9 years agoUpdate soft-sensor-manager to use updated OIC Virtual Resource definitions
Minji Park [Thu, 16 Jul 2015 05:32:46 +0000 (14:32 +0900)]
Update soft-sensor-manager to use updated OIC Virtual Resource definitions

modify ssm resource finder to use changed OIC Virtual Resource
and to get connectivity type of found resources

Change-Id: Ia91fa7e1aed17f614c1dbc5bae9cc37668091174
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1686
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix primitiveResource and serverBuilder to remove incompatibles for GCC4.6
coderhyme [Thu, 16 Jul 2015 06:25:41 +0000 (15:25 +0900)]
Fix primitiveResource and serverBuilder to remove incompatibles for GCC4.6

Change some codes using C++11 features which is not supported on GCC4.6.

Change-Id: I864321abdfaee960277ebfcab5fa09c33757453e
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1688
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoChanged TAGs in CA source files to be more specific.
Mandeep Shetty [Wed, 15 Jul 2015 23:08:50 +0000 (16:08 -0700)]
Changed TAGs in CA source files to be more specific.

TAGs in almost all source files were just "CA".
Changed them to be more specific to help when looking at the logs.

Change-Id: I895e9c29c66fc8b61dde43177954affd1534c708
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1679
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFix memory leak in CA android sample
hyuna0213.jo [Mon, 13 Jul 2015 11:56:43 +0000 (20:56 +0900)]
Fix memory leak in CA android sample

Endpoint allocated memory in CA sample is not freed.

Change-Id: I3a8b2716a469b808a788952866709bf188ad0e56
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1635
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 agoRemoving unnecessary code for ca samples
jnashok [Mon, 13 Jul 2015 06:55:10 +0000 (15:55 +0900)]
Removing unnecessary code for ca samples

after recent ipv6 plumbing changes, this code is not used
hence removing the unused code

Change-Id: I0e3b0cd1aee394fcba2a35f0021ed3a2f7068352
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1630
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoAdd missing public headers of the resource container API
Markus Jung [Thu, 16 Jul 2015 00:20:08 +0000 (09:20 +0900)]
Add missing public headers of the resource container API

Change-Id: I54bf4c3dc228ebb1cf9c5c811bb8e1369cc90549
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1685
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
9 years agoUpdate ResourceObject Unit test.
Heewon Park [Wed, 15 Jul 2015 08:28:41 +0000 (17:28 +0900)]
Update ResourceObject Unit test.

 - Old AutoNotify Unit Test Removed.
 - Added New Unit Test about SetRequestHandlerPolicy.
 - Changed one of SetRequestHandlerPolcy from DEFAULT to NEVER.

Change-Id: Id0af15bd7b455efc4715d1cfd4280766e171ba2a
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1665
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
9 years agothings-manager: change file permission of cpp files
Ravi Nanjundappa [Wed, 15 Jul 2015 12:12:27 +0000 (17:42 +0530)]
things-manager: change file permission of cpp files

Removed the execute permission for the source (.cpp) files from things-manager.

Change-Id: Id5290623f6fc68fe5cc6d623b93eae0e72a2998a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1670
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdd check for dos2unix package in build process.
Joseph Morrow [Tue, 14 Jul 2015 21:51:31 +0000 (14:51 -0700)]
Add check for dos2unix package in build process.

This check will prompt the enduser to retrieve the package themselves.

Change-Id: Ic58302f1491ac787822f70ed43939eca81c746f7
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1652
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 agoput NULL check and corrected the debug log in CASendThreadProcess
sonu1.yadav [Tue, 14 Jul 2015 05:16:22 +0000 (10:46 +0530)]
put NULL check and corrected the debug log in CASendThreadProcess

Change-Id: I49d3dd4afb71724e6a17cbfb43e777a1efae20e9
Signed-off-by: sonu1.yadav <sonu1.yadav@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1643
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 agoFixed broken platform and device discovery
Omkar Hegde [Wed, 15 Jul 2015 23:54:56 +0000 (16:54 -0700)]
Fixed broken platform and device discovery

The stack result was not being set on forming
the payload. Also, the device payload was being set
into the incorrect variable.

Change-Id: I18875b9ba0bd9776f0914317617c3c5d66ed64f8
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1681
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoMerge branch 'master' into resource-manipulation
hunje.yeon [Thu, 16 Jul 2015 00:11:31 +0000 (09:11 +0900)]
Merge branch 'master' into resource-manipulation

Apply latest updates from 'master' branch into 'resource-manipulation' branch

Change-Id: I2a3cce2070bf9193ca8d87261e4422f5ec8649f8
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
9 years agoImprove logging in the stack.
Mandeep Shetty [Mon, 13 Jul 2015 22:11:49 +0000 (15:11 -0700)]
Improve logging in the stack.

Log messages in the stack mostly hinted at WHERE the call flow was
going.
Added logging to say WHAT the execution is doing. Helps tremendously
with debugging the logs if we can see what important params are passed
into functions.

Change-Id: I50a2ebf4be2d4eea527015cad01d27e5d03e6004
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1640
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoUpdated android examples to use OcConnectivityType.CT_DEFAULT since
Rahul Rahul [Wed, 15 Jul 2015 18:53:37 +0000 (11:53 -0700)]
Updated android examples to use OcConnectivityType.CT_DEFAULT since
IPV4 is no longer supported

Change-Id: Ie158c53924d934cd83450297e125c61d71b6bc79
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1677
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoFixed Double-passing in the cbor parser
Erich Keane [Wed, 15 Jul 2015 18:17:18 +0000 (11:17 -0700)]
Fixed Double-passing in the cbor parser

The Cbor Parser incorrectly missed a break in the parsing
after a double.  This patch repairs that, plus fixes some of
the spacing issues that seem to have come in due to a find/replace

Change-Id: Ife48886bc8d1391cd7e7361ea49eb3aff318431d
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1676
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoRemoved Dead Code from CBOR merge
Erich Keane [Wed, 15 Jul 2015 16:48:16 +0000 (09:48 -0700)]
Removed Dead Code from CBOR merge

Somehow a bit of code from the OCSerialization.h got left
over from the development process.  This commit removes it,
since it is dead code.

Change-Id: I9b692086f3a00b5ff0f4e1b38c25239fe9d40b96
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1675
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoFixing collection samples
Omkar Hegde [Wed, 15 Jul 2015 16:25:49 +0000 (09:25 -0700)]
Fixing collection samples

Wrong property name was being used for resource and
values being added incorrectly to the payload after
CBOR changes.

Change-Id: Id3e4c8c20bae0feee33efb1f5c1479da76f680c9
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1673
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoRemoving unnecessary use of IPV6 flags.
Omkar Hegde [Tue, 14 Jul 2015 21:59:41 +0000 (14:59 -0700)]
Removing unnecessary use of IPV6 flags.

Previously, default flags were interpreted as both
IPv4 and IPv6 and "[ ]" was added around the IP address
in presence uri. This was wrong for IPv4. Changing the
addition of brackets exclusive to IPv6 and removing IPv6
flag from caipserver since it is not supported yet.

Change-Id: Ic103f9f0f10dcda3252e95404bc6f1a19d56597b
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1653
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoMerge "Merge 'security-basecamp' branch into master with CBOR"
Sachin Agrawal [Wed, 15 Jul 2015 18:14:27 +0000 (18:14 +0000)]
Merge "Merge 'security-basecamp' branch into master with CBOR"

9 years agoMerge 'security-basecamp' branch into master with CBOR
Sachin Agrawal [Wed, 15 Jul 2015 16:40:26 +0000 (09:40 -0700)]
Merge 'security-basecamp' branch into master with CBOR

security-basecamp for 0.9.2 is merged in master brach.

Change-Id: Ia5cd2710a688d3e631009ed03f7e5eb97aba5d24
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agofixed linux, android sample app in CA
hyuna0213.jo [Wed, 15 Jul 2015 05:25:21 +0000 (14:25 +0900)]
fixed linux, android sample app in CA

- add the payload length
- resolve the compile warning

Change-Id: I2766090765790283afecc05f052ec77b85252334
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1658
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 agoadd descriptor in andorid BLE server
jihwan.seo [Tue, 14 Jul 2015 23:46:35 +0000 (08:46 +0900)]
add descriptor in andorid BLE server

actually, it had removed previously for Tizen 2.4
but as not only Tizen 2.4 delay to release but also
OIC spec/linux BLE is supporting descriptor.
we decided that it should add.

Change-Id: I07e8b42e566d56d71bd65f5b590f40484c4a8492
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1656
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoUpdated Resource Client and Sample Applications
Jay Sharma [Wed, 15 Jul 2015 07:48:05 +0000 (13:18 +0530)]
Updated Resource Client and Sample Applications

- Added exception for the missed api.
- Updated exception handling in Resource Client
- Added more logs in the Sample Applications

Change-Id: I7a212e05856f37628f2e744d83d4f1619f6a1e06
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix bug for ResourceCacheManager.
jyong2.kim [Wed, 15 Jul 2015 05:48:52 +0000 (14:48 +0900)]
Fix bug for ResourceCacheManager.

change definition value to milliseconds for time.
add prefix and suffix for definition value.

Change-Id: I7f8496f3ac0d95e206a46b1d90ff896fe019bdb5
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoUnitTest cases for Resource Client with resource manipulation API
Jay Sharma [Wed, 15 Jul 2015 09:32:31 +0000 (15:02 +0530)]
UnitTest cases for Resource Client with resource manipulation API

Change-Id: I224d370e1a3be92d93b6806ed44d8863a99029cb
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1666
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoMoved resource container API header files to new include folder
Markus Jung [Wed, 15 Jul 2015 07:24:54 +0000 (16:24 +0900)]
Moved resource container API header files to new include folder

Change-Id: I2a22f3efb5f6e0e010b2543697192efeff1a2e1f
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1662
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdd logic about device presence timeout handle.
jyong2.kim [Wed, 15 Jul 2015 10:32:58 +0000 (19:32 +0900)]
Add logic about device presence timeout handle.

add device presence timeout.
add changing presence mode.
change to definition value for time.
add definition value for timer.

Change-Id: Ia631d18774d1684207b6bc87cbd8010af8a1a3bd
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1668
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix broken unit-test for the Resource Builder
coderhyme [Tue, 14 Jul 2015 15:02:45 +0000 (00:02 +0900)]
Fix broken unit-test for the Resource Builder

It is caused by AutoNotify which is new feature of ResourceObject.

Change-Id: I20b423d9c155d9f410d809be6b91c4c945d480c7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Change-Id: I20b423d9c155d9f410d809be6b91c4c945d480c7
Reviewed-on: https://gerrit.iotivity.org/gerrit/1648
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdd missing method for ResourceAttributes in Resource Manipulation Module
coderhyme [Tue, 14 Jul 2015 15:04:01 +0000 (00:04 +0900)]
Add missing method for ResourceAttributes in Resource Manipulation Module

clear is a mandatory method for this class.

Change-Id: I5a4a571b9f8c85e06ca98214c42ac610a3cde9ba
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Change-Id: I5a4a571b9f8c85e06ca98214c42ac610a3cde9ba
Reviewed-on: https://gerrit.iotivity.org/gerrit/1649
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoRemove DeadLockException from ResourceObject
coderhyme [Tue, 14 Jul 2015 15:01:46 +0000 (00:01 +0900)]
Remove DeadLockException from ResourceObject

It allows recursive lock from now, instead.

Change-Id: I349c9dd9f2916d73587f814ac98d088790b4e09e
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoFix Discovery Payload parsing for Secure Port
Sachin Agrawal [Tue, 14 Jul 2015 21:39:03 +0000 (14:39 -0700)]
Fix Discovery Payload parsing for Secure Port

Discovery response with CBOR was not parsing Secure Port info
in Policy Node.

Change-Id: I8db9e38dc08c3153ab62d58c8ac6fe6872eede7c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1650
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoImproved OIC Virtual Resource definitions (IOT-603)
Sachin Agrawal [Fri, 10 Jul 2015 16:17:30 +0000 (09:17 -0700)]
Improved OIC Virtual Resource definitions (IOT-603)

There were multiple instances of same virtual resource strings
within C stack. This was a cause of 'many' recent un-intended bugs
in the Ioptivity stack. Updated octypes public interface to publish
'reserved' virtual resources and those can be used by applications.
Also updated associated sample applications.

Change-Id: I587727a63dace0086cc27b994bdf238ad203daa4
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1620
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoFix Discovery Payload
Omkar Hegde [Tue, 14 Jul 2015 21:02:07 +0000 (14:02 -0700)]
Fix Discovery Payload

We were accidentally accessing the resource types
instead of interface name when doing discovery response.
The issue could be seen on running collection samples.

Change-Id: Iabd132e1a8b85b1c8f9890ae2db1a35983bee938
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1651
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoCBOR rebase onto master for merge/review
Omkar Hegde [Fri, 10 Jul 2015 21:41:46 +0000 (14:41 -0700)]
CBOR rebase onto master for merge/review

The CA layer has been converted to use binary data, rather
than string data to support CBOR as a transport.  The CSDK has
been changed to use the OCPlatform object model instead of json
strings.  Underneath this, the JSON encoding has been replaced
with CBOR.

Also, some of the previous blockwise transfer functionality has
been removed, since the blockwise-transfer functionality has been
pushed ot the CA stack.

Change-Id: I6423a5180643cea3d311ec7497b246117f7c02b0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoFix for the Jira issue IOT-524
Ravi Nanjundappa [Wed, 24 Jun 2015 10:26:02 +0000 (15:56 +0530)]
Fix for the Jira issue IOT-524

This patch addresses the first part of IOT-524.
Added the --prefix option to install all the build output files
in the user preferred location, if opted for.
All exe files will go into PREFIX/bin and all library files will
go into PREFIX/lib
For ex: /home/XYZ/bin and /home/XYZ/lib

Change-Id: Id1ab0fe0ca0ed0b3b86095df87f172448c366daf
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1439
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoremove unnecessary codes in android BLE
jihwan.seo [Fri, 10 Jul 2015 05:25:03 +0000 (14:25 +0900)]
remove unnecessary codes in android BLE

there are many unnecessary wait/mutex/flag.
it will bring slow performance.

Change-Id: I8cb9c4c93d522c5c32669aab569da1a6ff22511a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1617
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFix IOT-605: fridgeclient executable's abnormal termination
sonu1.yadav [Tue, 14 Jul 2015 09:09:57 +0000 (14:39 +0530)]
Fix IOT-605: fridgeclient executable's abnormal termination

Change-Id: Idcfcd4296d76742859e10b44f36f3ca56ce76ca0
Signed-off-by: sonu1.yadav <sonu1.yadav@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1644
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoChange 'resource-manipulation' folder structure
hunje.yeon [Tue, 14 Jul 2015 12:31:46 +0000 (21:31 +0900)]
Change 'resource-manipulation' folder structure

Move sub-folders of 'modules' to 'src'.
Remove 'modules' folder
Update SConscript according to the folder changes
Disable SConscript of 'resource-manipulation' due to gcc version (jenkins is not gcc4.7)

Change-Id: I90a6f6e0afd3a72a569d70d8c16fd69cad897c8d
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1646
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdd AutoNotify & SetRequestPolicy Feature
Heewon Park [Tue, 14 Jul 2015 07:24:08 +0000 (16:24 +0900)]
Add AutoNotify & SetRequestPolicy Feature

 - AutoNotify Feature Implement
 - SetRequestPolicy Feature Implement
 - AutoNotify Unit Test Implement

Change-Id: Idcb346d6bb38637a231d69b91ba5ee3418a5a444
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1606
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoChanged api's name 'requestTimer' to 'postTimer'
doil.kwon [Mon, 13 Jul 2015 13:28:17 +0000 (22:28 +0900)]
Changed api's name 'requestTimer' to 'postTimer'

Changed api's value's unit 'second' to 'millisecond'

Defined about api's value for using 'expiryTimer'

- MILLISECOND
- SECOND

Change-Id: I92fb805a9cd7351d6971132fb47f83f5f2390ad2
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1636
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoAdd destroyTimer function to ExpiryTimer
ChaJiwon [Fri, 10 Jul 2015 05:22:37 +0000 (14:22 +0900)]
Add destroyTimer function to ExpiryTimer

User call destroyTimer function, ExpiryTimer is destroyed.

Change-Id: I7cf625adbb51c3ec2ade4f6b223c8a3876ce842f
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1603
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: kwon doil <doil.kwon@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoModify resourceCache/DataCache file
YounghyunJoo [Mon, 13 Jul 2015 11:28:42 +0000 (20:28 +0900)]
Modify resourceCache/DataCache file

correct building errors
modify the function name from requestTimer to postTimer

Change-Id: I7ed1fb6656291ea1b3d863b27fae53b4a7ebf83d
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1632
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
9 years agoImplemented C++/Android API for OCRegisterPersistentStorageHandler()
Sachin Agrawal [Mon, 13 Jul 2015 18:17:45 +0000 (11:17 -0700)]
Implemented C++/Android API for OCRegisterPersistentStorageHandler()

Add C++ secure sample client and server test app using c++ persistent
storage handler.
Add Android secure sample client app with persistent storage API.

[Patch set 2]: 1. Enhanced Android secure_simpleclient app to choose SVR DB file.
       2. Fixed setting.gradle for android sample.
               3. Add UTC for Persistent Storage in Plaform Config.
[Patch 3]: 1. Fix Sconscript to install SVR DB file for unit test.
[Patch 4]: 1. Fixed jenkins build break.

[Patch 7]: Fixed build issue due linux provisioning client during andriod build.
[Patch 8]: removed secure_simpleclient/server and modified simpleclient/server
[patch 10]: Removed Dialog box for db file selection.
            Modify simpleserver for PS changes.
[Patch 11]: Addressed Review Comments.
[Patch 13]: Rebased to security-basecamp branch
[Patch 14]: Updated Android Server sample to publish non-secure resource
    (otherwise it will break Android client-server non-secure
     test case)

Change-Id: Ica2fc26e65b228a02bc400f87e9780798c19c700
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoFixed broken observation cancellation.
Mandeep Shetty [Mon, 13 Jul 2015 02:15:37 +0000 (19:15 -0700)]
Fixed broken observation cancellation.

Observe Cancel was broken because the uri from the client callback was
not copied into the request object. This caused connectivity to eat the
request witout sending it out.

Change-Id: Ib0ab815647897f2815fdffc3011e9977a003ac5f
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1637
Reviewed-by: Omkar Hegde <omkar.m.hegde@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoFixed Fridge sample with constructResourceObject
Erich Keane [Fri, 10 Jul 2015 23:34:32 +0000 (16:34 -0700)]
Fixed Fridge sample with constructResourceObject

The constructResourceObject takes a host string, which isn't compatible
with the current OCDevAddr address.  This patch parses said string, and
converts it properly to an OCDevAddr.

Change-Id: Id86f3832e596aa8869794a1d33915e158fe85008
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1624
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoFixed CA request/response handler over write issue
Randeep Singh [Wed, 8 Jul 2015 07:13:15 +0000 (16:13 +0900)]
Fixed CA request/response handler over write issue

ocstack register HandleCARequest and handleCAResponse using CARegisterHandler
and save values in global variables to handle request and response.
Provisioning API is also using CARegisterHandler and over writing those handlers.
This change resolves this issue.

Change-Id: Id8d86edb487e58ad1c6a5ed5b0211c4b8b28cd6e
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1577
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoIn case of Just works provisioning,
leechul [Mon, 13 Jul 2015 00:25:59 +0000 (09:25 +0900)]
In case of Just works provisioning,
Close the temporary dtls session after the ownership transfer.
Now, PT will use the PSK based session for ACL provisioning.

patch#6 : rebase with master
patch#8 : Fix the ownership transfer. But ACL provisioning will still fail.
patch#10 : Change to the copy CAEndPoint_t of addDevice() using memcpy
patch#12 : Resolve provisioning credential issuses.
          (missing the provisioning status intialization to the provision of
           two or more times.)
patch#14 : Resolved mem leak in sendCARequest(). Updated doOwnershipTransfer()
   to disable anon ECDH before leaving the method.
patch#15 : Remove .gitignore which was added accidently in previous patch.
patch$16 : Remove the code that invokes the CASelectCipherSuite().

Change-Id: I5e5ef061c46c4a81615cd923dc915fc028699d74
Signed-off-by: leechul <chuls.lee@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1628
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
9 years agoBugfix for unregister of bundles and renamed Java Bundle API getters
Markus Jung [Thu, 9 Jul 2015 10:55:22 +0000 (19:55 +0900)]
Bugfix for unregister of bundles and renamed Java Bundle API getters

Added java bundle test. Allowing container test sample app and unit tests to be build in parallel.
Configureable library path for Java bundles. Set bundle-api version number to 0.1

Change-Id: I8660787613b38d7acc4296c9c6c701397e18dee2
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
9 years agoFixed Secure Resource Mgr Policy Engine to allow for wildcard resource URIs.
Nathan Heldt-Sheller [Sat, 11 Jul 2015 05:12:47 +0000 (22:12 -0700)]
Fixed Secure Resource Mgr Policy Engine to allow for wildcard resource URIs.

The Policy Engine was not checking for wilcard resource URIs in Access Control List entry (URI = "*"); this has been added per Security Spec A v0.96r3.

Change-Id: Iff6d8618cee2d177aa1b03dc3c58a78cd1fd6061
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1626
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
9 years agoMerge branch 'master' into resource-manipulation
hunje.yeon [Sun, 12 Jul 2015 03:35:30 +0000 (12:35 +0900)]
Merge branch 'master' into resource-manipulation

Apply the resece updates from 'master' branch into 'resource-manipulation' branch
This update includes the fix of current 'presence' issues.

Change-Id: I4417164bd31285e80d9dd4b655e6f828ee1b6fe0
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
9 years agoFixed broken presence after IPv6 plumbing merge to master.
Erich Keane [Sat, 11 Jul 2015 05:37:41 +0000 (22:37 -0700)]
Fixed broken presence after IPv6 plumbing merge to 

Presence wasn't working for multiple reasons. oc/presence was not moved
to oic/ad, probably lost in the merge to master.
resourceUri in CA data structures was moved form the endpoint to the
CAInfo struct. But wasn't included in a clone operation which resulted
in a race condition when the memory was free'd in the main thread before
being accessed by the thread in CA.
Other adapter/flag issues.
Unicast presence failed to work because host() from OCResource only
returned the IP without the port.

Change-Id: If2e46f4677ebe369cbaee9609de38c369bf4c524
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Erich Keane <erich.keane@verizon.net>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1424
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
9 years agoChanged C Samples to use correct adapter type
Omkar Hegde [Fri, 10 Jul 2015 23:21:17 +0000 (16:21 -0700)]
Changed C Samples to use correct adapter type

The  C Samples were broken as a result of changing
the samples for IPv6. Also, removed port 6298 from
unicast discovery query and replaced some printf()
with OC_LOG(). Removed Differentiation between
IPv4 and IPv6 in the samples.

Change-Id: I83859aaf468c991ca5406014359476d0f43d5745
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>