contrib/iotivity.git
8 years ago[Win32] Modify SConscripts to prepare for VS
David Antler [Wed, 11 May 2016 20:34:09 +0000 (13:34 -0700)]
[Win32] Modify SConscripts to prepare for VS

Change-Id: Ieebc9ab44f597a9cd47e28591e6edb8be30399c4
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8107
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[Win32] Add media client, server, GUI examples
David Antler [Wed, 24 Feb 2016 00:49:46 +0000 (16:49 -0800)]
[Win32] Add media client, server, GUI examples

Change-Id: Ia4c4861ba932692a4ea40c5a2bff46f8791935fa
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5693
Reviewed-by: Daniel Jay Ferguson <daniel.j.ferguson@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoIOT-1073 Enable AutoConf header file CPPDEFINES
David Antler [Wed, 20 Apr 2016 19:18:34 +0000 (12:18 -0700)]
IOT-1073 Enable AutoConf header file CPPDEFINES

This change enables inclusion of header files based on the presence of
the headers themselves.

Change-Id: I742a02911b20f77fb6f05c75611784f01ad86b3b
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7861
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[Win32] Implement events shutdown in lieu of pipes
David Antler [Tue, 2 Feb 2016 00:50:39 +0000 (16:50 -0800)]
[Win32] Implement events shutdown in lieu of pipes

Windows is not able to select() for read on unnamed pipes.  Move to an
event-based scheme where signaling can come from a shutdownEvent or
readable data on a socket.

Included some clean-up of preprocessor macros.

Change-Id: I7db3235a6c870c97c9c317f833f2d8682fd9ce70
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5521
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[Win32] Add secure provisioning and stack samples
Daniel Ferguson [Thu, 5 May 2016 21:27:43 +0000 (14:27 -0700)]
[Win32] Add secure provisioning and stack samples

* Modified Linux secure stack samples to support an msys_nt target
* Configured SCons scripts to build provisioning code in security

Change-Id: I59442e937bf0df9b37894466b2c017f31f13dd9e
Signed-off-by: Henry Beberman <henry.beberman@intel.com>
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5519
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[Win32] Add win32 threading & synchronization.
Daniel Ferguson [Fri, 5 Feb 2016 21:40:04 +0000 (13:40 -0800)]
[Win32] Add win32 threading & synchronization.

* Modified camutex_pthreads
* Modified cathreadpool_pthreads
* Modified camutex_t; use win32 GetSystemTime() in getAbsTime()

Change-Id: I9793a784398c29dab4ed838ff43b041c62120cc3
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5517
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
8 years ago[Win32] Add SECURED build option support for msys_nt
Daniel Ferguson [Sat, 30 Jan 2016 00:42:05 +0000 (16:42 -0800)]
[Win32] Add SECURED build option support for msys_nt

Change-Id: Ie443ec1b69f2fbae8076db1882ad4e0eca4bb0a2
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5515
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
8 years ago[Win32] Add msys_nt flags to enable gtest unit tests
Daniel Ferguson [Thu, 5 May 2016 21:25:42 +0000 (14:25 -0700)]
[Win32] Add msys_nt flags to enable gtest unit tests

* New MSYS2 dependencies on cmake, make, tar, and unzip
* Stack and connectivity tests enabled in unit_tests.scons
* To compile gtest unit tests add flag TEST=1 and build in resource
* Changed security scons to enable TB_LOG only if env has LOGGING

Change-Id: Id80ca1e97bf9dadae83c6bd99ddc69e0d551ea4f
Signed-off-by: Henry Beberman <henry.beberman@intel.com>
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
8 years ago[Win32] Add win32-specific networking APIs
Daniel Ferguson [Thu, 14 Jan 2016 08:31:49 +0000 (00:31 -0800)]
[Win32] Add win32-specific networking APIs

* Network Interface Monitor using GetAdaptersAddresses()
* WSARecvMsg() instead of recvmsg()
* WSARecvMsg() requires the use of WSAIoctl()
* Added function pointer to caglobals
* CAIPServer.c:sendData() supports partial sends

Change-Id: Icc0c38fa34fa8d50f8b4253990d83be5ae3cdd5c
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5509
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
8 years ago[Win32] Add conditional compilation directives.
Daniel Ferguson [Tue, 12 Jan 2016 00:30:11 +0000 (16:30 -0800)]
[Win32] Add conditional compilation directives.

Several places, mostly related to networking and examples, needed
conditional compilation directives inserted.

Change-Id: Iad8f39c8ac28e760f5e3ded39d9c79b089aae6d7
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5507
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoMerge branch 'master' into windows-port
David Antler [Fri, 20 May 2016 21:31:54 +0000 (14:31 -0700)]
Merge branch 'master' into windows-port

Change-Id: Iea39b951591a8f6a72285cf457b83f9c96e2e772
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years ago[Win32] Add SCons support for building /resource
Daniel Ferguson [Mon, 11 Jan 2016 18:51:04 +0000 (10:51 -0800)]
[Win32] Add SCons support for building /resource

* Enable use of MSYS2 as the build host and build target.
* Add MSYS2 specific SCons files.
* Modify existing SCons files to support building /resource
  directory from within MSYS2.

Change-Id: I95f4d205f106782c0dc487209fbb5c137aa3d7ac
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5505
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agomodified tag name for BLE Callback Interface class
jihwan.seo [Wed, 18 May 2016 11:00:21 +0000 (20:00 +0900)]
modified tag name for BLE Callback Interface class

Change-Id: I69f361c91f3e9fca3b166fc3ec8895eec7e8b296
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[IOT-1095] Add request parameters to attribute handlers
Inga Stotland [Thu, 12 May 2016 20:34:37 +0000 (13:34 -0700)]
[IOT-1095] Add request parameters to attribute handlers

API change: allow passing query parameters to attribute GET/SET handlers.

Change-Id: Ib3d294a4901f066409a837f03db16a94791fd8f8
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
8 years ago[Win32] Rename 'interface' to satisfy Windows.h
Daniel Ferguson [Fri, 1 Apr 2016 19:57:29 +0000 (12:57 -0700)]
[Win32] Rename 'interface' to satisfy Windows.h

Definitions including the name 'interface' were conflicting
with Windows.h. Some were changed to ifindex, and others
were changed to iface, depending on the context.

Change-Id: I7e7ded6587736c09307fa41bc6d90202d6ab0554
Signed-off-by: Henry Beberman <henry.beberman@intel.com>
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5561
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
8 years agoMerge "Merge branch '1.1-rel'"
Ashok Babu Channa [Thu, 19 May 2016 12:05:16 +0000 (12:05 +0000)]
Merge "Merge branch '1.1-rel'"

8 years agoFix in LE adapter to return CA_STATUS_OK when BT is not enabled
vimala.v [Thu, 12 May 2016 11:48:01 +0000 (17:18 +0530)]
Fix in LE adapter to return CA_STATUS_OK when BT is not enabled

LE Adapter returns error when BT is not enabled.  This patch returns
CA_STATUS_OK and when BT is enabled, with the notification of device state
change callback, LE server/client is started.

Change-Id: Ic6c717535547f76d37b55f49e23b0efe25f77dff
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoclean up the socket close logic in caipserver
hyuna0213.jo [Thu, 12 May 2016 10:33:48 +0000 (19:33 +0900)]
clean up the socket close logic in caipserver

clean up the socket close logic in caipserver

Change-Id: I8db6137b582dc7656b3180276e3d65d7d405e480
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8117
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoFixed crash issue related to send in Android BLE
jihwan.seo [Thu, 12 May 2016 04:53:31 +0000 (13:53 +0900)]
Fixed crash issue related to send in Android BLE

when there are a lot of BLE devices nearby.
local reference overflow can be occured.

Change-Id: Ib0a962eeaef4cecb49026d30eb4a81ce1a9bfcf4
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8111
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoreplace response code in keepalive of TCP
jihwan.seo [Wed, 27 Apr 2016 23:06:28 +0000 (08:06 +0900)]
replace response code in keepalive of TCP

since Valid response code only used to indicate that
response identified by the entity-tag(ETag option)
to use Changed code is more suitable.

Change-Id: I8ee3ea6e06ae49c4b005a024352cf5ff36d00588
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoMerge branch '1.1-rel'
Thiago Macieira [Mon, 16 May 2016 20:09:22 +0000 (13:09 -0700)]
Merge branch '1.1-rel'

Conflicts:
android/examples/settings.gradle
android/examples/simplebase/simplebase.iml
android/examples/simplebase/src/main/AndroidManifest.xml
android/examples/simplebase/src/main/res/values-w820dp/dimens.xml
android/examples/simplebase/src/main/res/values/dimens.xml
plugins/samples/linux/IotivityandZigbeeClient.c
resource/csdk/connectivity/inc/cablockwisetransfer.h
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
resource/csdk/connectivity/src/cablockwisetransfer.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
resource/csdk/connectivity/util/src/camanager/tizen/caleconnectionmanager.c
resource/csdk/security/SConscript
resource/csdk/security/include/internal/aclresource.h
resource/csdk/security/include/internal/dpairingresource.h
resource/csdk/security/include/internal/pconfresource.h
resource/csdk/security/include/internal/pstatresource.h
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/provisioning/ck_manager/sample/provisioningclient.c
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
resource/csdk/security/provisioning/src/credentialgenerator.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/base64.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/directpairing.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/dpairingresource.c
resource/csdk/security/src/pconfresource.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/src/svcresource.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/doxmresource.cpp
resource/csdk/stack/include/octypes.h
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocpayloadparse.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/docs/cpp-doc/Doxyfile
resource/docs/cpp-doc/devdox/mainpage.dox
resource/provisioning/examples/SConscript
resource/provisioning/examples/provisioningclient.cpp
resource/unittests/OCPlatformTest.cpp
service/easy-setup/enrollee/arduino/onboarding.cpp
service/easy-setup/enrollee/inc/onboarding.h
service/easy-setup/enrollee/src/easysetup.c
service/easy-setup/enrollee/src/easysetupcallbacks.h
service/easy-setup/enrollee/src/onboarding.h
service/easy-setup/enrollee/src/resourcehandler.c
service/easy-setup/enrollee/src/resourcehandler.h
service/easy-setup/enrollee/src/softap.c
service/easy-setup/enrollee/src/softap.h
service/easy-setup/mediator/csdk/unittests/MediatorCSDKTest.cpp
service/easy-setup/mediator/richsdk/unittests/MediatorRichTest.cpp
service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
service/resource-encapsulation/examples/tizen/RESampleClientApp/src/reclient.cpp
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java
tools/tizen/iotivity.spec
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java

Change-Id: I912131cd6905e5758a143fa71d0e32ef4201abab
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Markus Jung <jay.sharma@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: Saurabh Sharma <saurabh.s9@samsung.com>
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
8 years agoMerge branch 'master' into windows-port
David Antler [Mon, 16 May 2016 16:22:19 +0000 (09:22 -0700)]
Merge branch 'master' into windows-port

Change-Id: I980ead11aa2b07bc3cf2d21a7baa5e207da4398c
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years ago[Simulator] Minor UI changes fixing the IOT-1087.
G S Senthil Kumar [Thu, 12 May 2016 06:49:52 +0000 (12:19 +0530)]
[Simulator] Minor UI changes fixing the IOT-1087.

1. Added UI support to allow the resource type property to be editable
during resource creation from RAML.
2. Added a new dialog to edit the resource name and resource type during
the creation of multiple resource instances from RAML.
3. Removed the native code which forms rt when it is not specified
in RAML. For this case, plugin will pop-up the above mentioned dialog to
get the resource type from user.

Change-Id: I9a7c927fc63e3ff22db62ae07ce23e63ec8e05d8
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8115
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for jira issue IOT-1087.
Harish Kumara Marappa [Thu, 21 Apr 2016 16:46:39 +0000 (22:16 +0530)]
Fix for jira issue IOT-1087.

Resource was creating with oic.if.def which is not defined in OIC spec.
Modified the code such that all simulated resource will be having at least
oic.if.baseline interface at any point of time as per 1.0.0 core spec.

Change-Id: I07c6e4513546d1d4be9c0584408801552c5f4ce4
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7877
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>
(cherry picked from commit 3cd3700407657c96d02534f6e6be6c2398b97c68)
Reviewed-on: https://gerrit.iotivity.org/gerrit/8047

8 years agotizen: Fixed RHSampleApp project file to use SDK path separator
Philippe Coval [Thu, 3 Mar 2016 17:56:51 +0000 (18:56 +0100)]
tizen: Fixed RHSampleApp project file to use SDK path separator

This MSDOS '\' will break support on non Windows tizen-sdk

Change-Id: I83aaa2529d9d317a9f6406beba40ec6de8fddfcf
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5499

8 years agomodified the observe cancel logic for CoAP over TCP
hyuna0213.jo [Thu, 28 Apr 2016 06:45:45 +0000 (15:45 +0900)]
modified the observe cancel logic for CoAP over TCP

if qos is NON_CONFIRMABLE, When observe is unobserved, remove
the callback associated on client side. and when the next notification
comes in from server, reply with RESET message to server.
but in case of CoAP over TCP, RESET message is not supported.
so client have to send Observe request to server with
observe flag = OC_RESOURCE_OBSERVE_DEREGISTER.

Change-Id: I4169546308560caebabb35dbf1b27eb80516ae5b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agochange the condition for BLE connected callback
Jaewook Jung [Mon, 2 May 2016 07:43:06 +0000 (16:43 +0900)]
change the condition for BLE connected callback

As BLE connected callback means communication on BLE is available for user,
the callback should be called on DescriptorWrite success callback which is the last step
for BLE communication.
However, since there is a case that gatt descriptor can not be found,
the callback needs to be called on ServicesDiscovered callback in this case.

Change-Id: I9d0daa233a1b605e70857d9fcc584f9224f53e03
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoUpdated unit test case for CASetNetworkMonitorCallbacks
hyuna0213.jo [Sun, 8 May 2016 22:18:10 +0000 (07:18 +0900)]
Updated unit test case for CASetNetworkMonitorCallbacks

if LE_ADAPTER is not defined, this will fail.
so this test case needs to be updated.

Change-Id: I48896db9eb8dd70533578954f1f2fb951c08a027
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8073
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoUpdate a logic for POST request in Enrollee implementation
Jihun Ha [Fri, 6 May 2016 02:26:30 +0000 (11:26 +0900)]
Update a logic for POST request in Enrollee implementation

Updated logic/flow:
(1) Parsing the requested attribute like tnn, cd, and tr
(2) Check if the provisioning is completed
(3) Check if the trigger is requested
(4) If the trigger process fails due to some reason, revert an attribute tr
    to 0

Change-Id: I1db3bfcd3b0d5593516b7719d64ba23f831ba9bc
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoAdded COAP over TCP feature for Arduino for Transport TCP
Abhishek Sharma [Fri, 30 Oct 2015 09:09:24 +0000 (14:39 +0530)]
Added COAP over TCP feature for Arduino for Transport TCP

Made changes  for arduino to support COAP over TCP for Transport TCP

Change-Id: Ifb9c30b1b324cf28c14abb3ebbcb292de31b1fda
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoclean up FreeCARequestInfo of security
jihwan.seo [Mon, 2 May 2016 07:23:40 +0000 (16:23 +0900)]
clean up FreeCARequestInfo of security

- added null checker
- removed duplicated codes with line 133 of header file

Change-Id: I7a7454e29ef2a63cfa9cf3107922e90b56baa313
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8023
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoMerge branch 'master' into windows-port
David Antler [Wed, 4 May 2016 16:57:46 +0000 (09:57 -0700)]
Merge branch 'master' into windows-port

Change-Id: Iefbd0b074e8e654ee143617137c165d05ab56aed
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years agoadded filter related to CoAP option that is not supported.
jihwan.seo [Thu, 28 Apr 2016 02:34:37 +0000 (11:34 +0900)]
added filter related to CoAP option that is not supported.

so many CoAP option is missed in iotivity.
thur, i modified some filter code about it
except for some option assciated with transport layer.

- If-Match, If-None-Match is for PUT method
- Location-Path, Location-Query is for POST Methos.

Change-Id: I7e46932b086d1c4a87f337590415fe32525367c3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agocode clean up for android edr
Jaewook Jung [Thu, 28 Apr 2016 09:34:07 +0000 (18:34 +0900)]
code clean up for android edr

Change-Id: Ic901a29cecd1376f416b049c71c693b77be0b3a5
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7977
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoadded network monitoring logic in CAUtil
hyuna0213.jo [Fri, 15 Apr 2016 04:31:17 +0000 (13:31 +0900)]
added network monitoring logic in CAUtil

I added the function to monitoring the status of the transport adapter
and connection.

- added connection status monitoring callback.
- modified adapter status monitoring callback parameter.
- modified network interface monitoring logic in ipa adapter.

Change-Id: I1d04e018f7cd54ea069b6257a1c2188bbf266232
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7791
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agostdassert.h is not standard-compliant. Change this to assert.h
daeken.kwon [Fri, 29 Apr 2016 02:00:45 +0000 (11:00 +0900)]
stdassert.h is not standard-compliant. Change this to assert.h

Change-Id: I7034df1b22b2040815bdc06521921814e5a09998
Signed-off-by: daeken.kwon <daeken.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoandroid: update EDR socket info when re-connection
Jaewook Jung [Thu, 28 Apr 2016 07:53:22 +0000 (16:53 +0900)]
android: update EDR socket info when re-connection

If a EDR client requests connection to an Android EDR server which had been connected before,
the server has to update the socket info of the client on the list.
Otherwise the server tries to read data of a wrong socket object.

Change-Id: I4978455c26f0b6ade9fbf5cd5756a60d038c039e
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7959
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed build script to test ca api.
hyuna0213.jo [Thu, 21 Apr 2016 00:42:11 +0000 (09:42 +0900)]
fixed build script to test ca api.

currently, blockwise transfer can be supported for ip.
so blockwise transfer unit test has to be included only
in case target transport type is ip or all.

Change-Id: I7501847cbf7f1035d287ba6770838faea122eeca
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[Win32] Change libcoap bitfield structure to use ushort
Daniel Ferguson [Tue, 12 Apr 2016 20:10:08 +0000 (13:10 -0700)]
[Win32] Change libcoap bitfield structure to use ushort

* unsigned int bitfields compile differently between GCC 4.8.4 on Linux
  and GCC 5.2.0 in msys2. Visual Studio's C Compiler Version 19 builds
  the same way as the msys2 GCC.
* Specifiying unsigned short for all platforms does not change the
  structure on Linux, but it does fix the msys2 and VS structures.

Change-Id: I5ef10c0485413859a3f93c67ecb3c148a828b3de
Signed-off-by: Henry Beberman <henry.beberman@intel.com>
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
8 years agoFixed build issue by Installing missing header OCUtilities.h
Philippe Coval [Mon, 7 Mar 2016 14:48:13 +0000 (15:48 +0100)]
Fixed build issue by Installing missing header OCUtilities.h

Change-Id: Icc5313c48ef95b322526eea169c4b23eab3758a6
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5581
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit aa5f4de4c1f08f1ae20dce9c4bc22ff6ba409e6b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5563

8 years ago[IOT-1065][IOT-1069] RC - Tizen: sample application fix
Markus Jung [Tue, 5 Apr 2016 04:38:40 +0000 (13:38 +0900)]
[IOT-1065][IOT-1069] RC - Tizen: sample application fix

- Correct sample configuration
- Deactivate notification on bundle resource initialization
- Remove BMI related UI for Tizen. Soft-sensors cannot be configered at runtime.
  This will be a feature for the next release.
- Removed async bundle activation which is causing crashes in Tizen

Change-Id: Id87a36b1cb27d4267433823494415e35d2c6acee
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 08ee7c41e9b7bb64243fd1dc1f416e53aad6f1d1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7623
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFixed template syntax to prevent ambiguity with stream operators
Philippe Coval [Fri, 4 Mar 2016 16:06:32 +0000 (17:06 +0100)]
Fixed template syntax to prevent ambiguity with stream operators

This is a minor change but was noticed when trying to build with clang

This message appeared while building using tizen-sdk 2.4.0 Rev4
with imported libs (built with gbs from Tizen:2.4:Mobile repo)

Change-Id: Ib573d5ea9b23b29d6114d1f072210c370859fdec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6149
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit feee78125dc35f61f2f466096ebf41a764f5ee82)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5565

8 years agotizen: prevent building as seems unsuported on 32bit arch
Philippe Coval [Fri, 11 Mar 2016 12:15:40 +0000 (13:15 +0100)]
tizen: prevent building as seems unsuported on 32bit arch

Let's disable it for Tizen now, like for android or iOS.

Error was observed while building for Tizen:2.3.1:Wearable on i586 or armv7l :

  #error "Requires IEEE 754 floating point!"

Change-Id: Ibd7ccbc0e8405aa3cbace45a2a0ae65ce35c87f3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6139
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sanjeev BA <as2902.b@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 362732ef77005ec2b6a760b51ee7ec6865c94c29)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7905

8 years agotizen: Bump version to 1.1.0
Philippe Coval [Wed, 13 Apr 2016 18:52:08 +0000 (20:52 +0200)]
tizen: Bump version to 1.1.0

Change-Id: Ia2901ce4335e7a9a2998a098dbebf48668cf4f83
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 29106ba0518680f4bdfc56b2fec9f094ada05c51)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7907

8 years ago[Resource-container] Backported init fix to 1.1-rel
Philippe Coval [Tue, 26 Apr 2016 13:28:17 +0000 (15:28 +0200)]
[Resource-container] Backported init fix to 1.1-rel

[Resource-container] Fix member var initialization

Incorrect type was used causing build error.

Origin: 6a10062f1fe64ca75ac6d34541bbd295ef052dcb
Author: Inga Stotland <inga.stotland@intel.com>
Change-Id: I701096c3b6512546847cf4e120430f690e920453
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7929

8 years agoMerge branch 'master' into windows-port
David Antler [Wed, 27 Apr 2016 21:30:57 +0000 (14:30 -0700)]
Merge branch 'master' into windows-port

Change-Id: Ia553668db05e19ade5afa2b42b7e42632cae4cba
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years agochanged queue destroy logic to delete the remained data in CA
hyuna0213.jo [Tue, 26 Apr 2016 05:28:23 +0000 (14:28 +0900)]
changed queue destroy logic to delete the remained data in CA

In case of the receive queue in camessagehandler, we don't start
the queue thread because RI supports single thread. accordingly
we have to delete the remained data in CAQueueingThreadDestroy().

Change-Id: I18667b97d97ac83dabcb0affb13b4a593fc15a9f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoadded to checking connection state from CALEGetConstantsValue dynamic.
jihwan.seo [Mon, 18 Apr 2016 08:25:14 +0000 (17:25 +0900)]
added to checking connection state from CALEGetConstantsValue dynamic.

- it is about BLE server.
- added null checker for some global variable.

Change-Id: I04444e3dac5ab2fb374ee5fdaf0842d4d2034f6d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7803
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoAdd source files to tinydtls SConscript
David Antler [Tue, 26 Apr 2016 18:43:29 +0000 (11:43 -0700)]
Add source files to tinydtls SConscript

Debug options were being stored in an environment variable, which is the
old way of doing things.

Change-Id: Ia525707f6cba918b209b9f94323fa49082577592
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7933
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoThe TCP port number discovery based UDP multicast message
hyuna0213.jo [Thu, 31 Mar 2016 08:21:06 +0000 (17:21 +0900)]
The TCP port number discovery based UDP multicast message

The TCP port number will be part of the discovery payload.
so the response to the UDP multicast message, should be an UDP unicast
reply containing the TCP port number if TCP adapter is activated.
After receiving the discovery response, the client can use TCP port
number to communicate with the server via CoAP/TCP.

- added tcp port value in policy of discovery payload
- the dynamic use of tcp server port in TCP adapter
- TCP adapter changes to support IPv6

Change-Id: Ie93361abec0287f0f600a791a58e41cf5b381892
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agocode clean up in connection manager
Jaewook Jung [Mon, 11 Apr 2016 05:48:30 +0000 (14:48 +0900)]
code clean up in connection manager

code clean up in connection manager

Change-Id: I842c0f49d87525d28b916e90e54d9afa4dc5ad8e
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7731
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[Arduino] Changed write property to Write without response
vimala.v [Fri, 1 Apr 2016 11:46:35 +0000 (17:16 +0530)]
[Arduino] Changed write property to Write without response

Change-Id: I879cd15f9acb5cf71e594fbef6ff3e9989dac5fc
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 8152d3ea3f68fa5f676bc4d6c50ecda487a40150)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7603
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[Tizen]Gmainloop context is changed from default to custom context
vimala.v [Wed, 6 Apr 2016 10:26:25 +0000 (15:56 +0530)]
[Tizen]Gmainloop context is changed from default to custom context

Change-Id: I6a5813b69d94683ab88a6c21a2c3c882898e4e62
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years ago[JIRA-1086] fixed CoAP uri-Port option filtering issue.
jihwan.seo [Fri, 22 Apr 2016 09:12:49 +0000 (18:12 +0900)]
[JIRA-1086] fixed CoAP uri-Port option filtering issue.

Change-Id: I34921e1485117b189bf3c1dc6d5ca3908cca01a5
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7893
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoMerge branch 'master' into windows-port
David Antler [Tue, 26 Apr 2016 22:53:25 +0000 (15:53 -0700)]
Merge branch 'master' into windows-port

Change-Id: I65de4e8c13f736abe49948a042448d8261f47753
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years agoadd removing BWT data when retransmission fails
Jaewook Jung [Mon, 25 Apr 2016 07:37:02 +0000 (16:37 +0900)]
add removing BWT data when retransmission fails

When retransmission fails(time out), the data in BWT list has to be removed.

Change-Id: Ic94b5f2c8c25604b237383939f31bd30412bb1f9
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7901
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoMerge branch 'master' into windows-port
David Antler [Mon, 25 Apr 2016 16:15:27 +0000 (09:15 -0700)]
Merge branch 'master' into windows-port

Change-Id: I7ad9210417b7cfa0eb99de1d8ce9a8c20fd459cd
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years agoIOT-1080 Update rt and if to send array of string over the air
Habib Virji [Mon, 11 Apr 2016 22:30:09 +0000 (23:30 +0100)]
IOT-1080 Update rt and if to send array of string over the air

It was being return in form of "oic.if.ll oic.if.baseline". It is now changed to
["oic.if.ll", "oic.if.baseline"]

Change-Id: Ie32a0c2135a6f9994193d6be85fedb7041a68a70
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7839

8 years agoIOT-1018 RD payload handling of uint8_t and uint64_t value
Habib Virji [Thu, 31 Mar 2016 23:01:29 +0000 (00:01 +0100)]
IOT-1018 RD payload handling of uint8_t and uint64_t value

- Setting the value of uint64_t to avoid casting being set wrong.
- Update to helper function to set size of the string.
- ocresource correct payload destroy.
- Removes duplicate MAX_ADDR_STR_SIZE
- Update Publish resource type from oic.wk.rdPub to oic.wk.rdpub.

Change-Id: I3bd13eb0fe52accf1d86da4d8ba0ecebdda79885
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7503
Reviewed-by: Towhidul Islam <t.islam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7743

8 years agoResolved simulator crash issue.
G S Senthil Kumar [Fri, 22 Apr 2016 08:09:09 +0000 (13:39 +0530)]
Resolved simulator crash issue.

Simulator plug-in crashed due to recent changes in the OCDeviceInfo
structure in platform layer. Handled the changes required in simulater
module.

Change-Id: Ib277d0ed9ff6094f6f48c3c947144954d231bb9a
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7891
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoIOT-1079 /oic/d & /oic/p to include oic.if.baseline
Habib Virji [Fri, 8 Apr 2016 10:31:04 +0000 (11:31 +0100)]
IOT-1079 /oic/d & /oic/p to include oic.if.baseline

Added support for /oic/d to add interface information.
Added support in /oic/p to include oic.if.baseline.

Change-Id: I6985548cec4efee4f4ceedd11146e4e9a3ba672a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7727
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7841

8 years agoFix for jira issue IOT-1087.
Harish Kumara Marappa [Thu, 21 Apr 2016 16:46:39 +0000 (22:16 +0530)]
Fix for jira issue IOT-1087.

Resource was creating with oic.if.def which is not defined in OIC spec.
Modified the code such that all simulated resource will be having at least
oic.if.baseline interface at any point of time as per 1.0.0 core spec.

Change-Id: I07c6e4513546d1d4be9c0584408801552c5f4ce4
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7877
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 agoChange characteristic user desciption descriptor.
Jaehong Jo [Thu, 21 Apr 2016 05:36:10 +0000 (14:36 +0900)]
Change characteristic user desciption descriptor.

"OIC Node.." chaned to "OCF Node..".

Change-Id: Ifcf4355f58f90e53b06df3a93fb29be383e6c879
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoClean up warning
George Nash [Tue, 12 Apr 2016 17:47:08 +0000 (10:47 -0700)]
Clean up warning

This cleans up the warning capture of variable with non-automatic
storage duration

The warning is given when lambda functions are trying to capture
variables that are static or global. The easy fix is to not
capture the variables. They will still be avalible to the lamba
function without the variable capture.

Change-Id: I00890ddf5cf6932d1114ff4ca305905b4b877cc6
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7761
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoadded code to close the netlink socket.
hyuna0213.jo [Thu, 21 Apr 2016 02:53:11 +0000 (11:53 +0900)]
added code to close the netlink socket.

added code to close the netlink socket.

Change-Id: Ifbad9db35a9b38a6367f04586a665bc8208eecf4
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed build error issue related TCP Adapter.
jihwan.seo [Thu, 21 Apr 2016 03:18:28 +0000 (12:18 +0900)]
fixed build error issue related TCP Adapter.

some parameter of the callback realted to keepalive was not correct.

Change-Id: I21975c99221a506de722992280d929d446712a28
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoFixed odd comment block formatting that was breaking tools.
Jon A. Cruz [Wed, 20 Apr 2016 06:05:16 +0000 (23:05 -0700)]
Fixed odd comment block formatting that was breaking tools.

Corrected odd combination of comment delimiters that was confusing
tools such as Doxygen.

Change-Id: I692513c12c32801d4949cbc03ed2f9cc3ea86774
Signed-off-by: Jon A. Cruz <jon@joncruz.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years agoModify the potential errors
Jaehong Jo [Fri, 15 Apr 2016 01:55:05 +0000 (10:55 +0900)]
Modify the potential errors

Added null check

Change-Id: I007b131450e672091d5783c82b56d6a5151439ef
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7793
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[IOT-972] add type and interface to platform representation
hekra [Thu, 10 Mar 2016 01:58:19 +0000 (17:58 -0800)]
[IOT-972] add type and interface to platform representation

Change-Id: Ie02a201507ffcc0c6a640846dc57341832ea3158
Signed-off-by: Hugues Ekra <hekra@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 22932f7aefc633d90011f8fc474f416305976cfc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7857

8 years ago[IOT-963] Fix maximum URI length
Inga Stotland [Mon, 18 Apr 2016 22:41:52 +0000 (15:41 -0700)]
[IOT-963] Fix maximum URI length

According to core spec, maximum URI length could be up to 256

Change-Id: Ic9037fcca8a6ef49b0695ac5d3515f84aa11c773
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoReorder library link order for connectivity abstraction
hyuna0213.jo [Tue, 19 Apr 2016 07:28:47 +0000 (16:28 +0900)]
Reorder library link order for connectivity abstraction

An unresolved symbol error for connectivity abstraction occurred
during the Linux link phase. Generally, libraries that depend on
specific libraries should appear earlier in the linker command line.

Change-Id: Ic126e8e03266f4061328018c49037dc658652bfd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7789
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoIOT-970: Handle get requests on oic/p and oic/d resources
hekra [Tue, 8 Mar 2016 14:26:03 +0000 (06:26 -0800)]
IOT-970: Handle get requests on oic/p and oic/d resources

Change-Id: I6a96e188f7dcb839467c4285c3b4a57871669b78
Signed-off-by: Hugues Ekra <hekra@cisco.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5553
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit a51b71c150d30614439dbbe1c3ec0ae01bdefaeb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7843

8 years agoIOT-982 Query handling for /oic/res
Habib Virji [Sat, 26 Mar 2016 22:54:02 +0000 (22:54 +0000)]
IOT-982 Query handling for /oic/res

- By default oic.if.baseline is added for any resource created. All resource
  created in OIC should have oic.if.baseline.
- In case query is empty, oic.if.ll as interface query.
- oic.if.ll handler returns all resources which are DISCOVERABLE.
- Same handler handles when query includes oic.if.ll.
- Only oic.if.ll and oic.if.baseline are supported as query param for /oic/res.
- oic.if.baseline handler only responds to query that are baseline interface.
- In case query includes rt but no if param. response is based on matching of rt value.
- It also include rt, if and uri for /oic/res response if it is oic.if.baseline..

Change-Id: Icaeab9f5407e9a02623e31b2d3be4488643c1e7a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7365
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7837

8 years ago[IOT-994] Fixing crash for parsing arbitrary UTF-8 payload
Markus Jung [Mon, 11 Apr 2016 09:23:33 +0000 (18:23 +0900)]
[IOT-994] Fixing crash for parsing arbitrary UTF-8 payload

Avoid the crash by checking whether the cbortype is map.
Fundamentally, no-cbor type payload should be filtered in tinycbor library.
This change can be removed later.

Change-Id: Icde1422c61319d8c5e66675d9ef2b66f30dc4077
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
(cherry picked from commit d237eecb9b581157dee9c3314d5a07091b0078ed)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7835
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoIOT-921 OCSetDeviceInfo to update resource type information
Habib Virji [Tue, 5 Apr 2016 00:01:49 +0000 (01:01 +0100)]
IOT-921 OCSetDeviceInfo to update resource type information

OCSaveDeviceInfo to  update resource information. The code has been
updated to include this information.

Change-Id: Id30546d0e32f5347875a9346de9699a35d81734e
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 2ccfba677941ada7bc3730538132182ce9fb872d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7833

8 years agoIOT-1075 PUT/POST/DELETE for /oic/res, /oic/d, /oic/p returns error
Habib Virji [Tue, 5 Apr 2016 18:58:01 +0000 (19:58 +0100)]
IOT-1075 PUT/POST/DELETE for /oic/res, /oic/d, /oic/p returns error

/oic/res. /oic/d and /oic/p returns error when PUT/POST/DELETE is performed on the resource.

Change-Id: Ib40c4d2b5e9263bc4252e3553fa7e30ef21c2a51
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7625
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 10ac37501a95a2ebbeb4e16a873b45d2c8a9a3b4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7831

8 years ago[IOT-990] Support for URI comparisons to be case-insenstive
Habib Virji [Wed, 23 Mar 2016 21:31:47 +0000 (21:31 +0000)]
[IOT-990] Support for URI comparisons to be case-insenstive

Support for rt or if in the query to be case-insensitive.

JIRA ISSUE: IOT-990
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Change-Id: Ieff5256e25b2232f25dec52e86b356a0682e3241
Reviewed-on: https://gerrit.iotivity.org/gerrit/6237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 34df9a3c8865ea31c1bfc2dd18198733ec05f2aa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7829

8 years ago[IOT-914] Device ID to be based on DOXM GetDeviceID
Habib Virji [Thu, 24 Mar 2016 14:01:26 +0000 (14:01 +0000)]
[IOT-914] Device ID to be based on DOXM GetDeviceID

Instead of ocstack generating random device id. DOXM id is going to be used.

Change-Id: I1a780f07388ee1fe09e315c2d645f1c8ee5142de
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit eb927a675208f8c2d416f874ed02ed01b8007d2b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7827

8 years ago[IOT-921]Return correct resource type in /oic/d
Habib Virji [Fri, 11 Mar 2016 12:37:43 +0000 (12:37 +0000)]
[IOT-921]Return correct resource type in /oic/d

It adds support to add device resource type via API.

Jira Issue: IOT-921
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Change-Id: Ib47f637ff343b5bc8dbce5d5f0cc2b5f1eab46ab
Reviewed-on: https://gerrit.iotivity.org/gerrit/5747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7825

8 years ago[IOT-980] oic.if.ll support for /oic/res
Habib Virji [Thu, 17 Mar 2016 13:31:37 +0000 (13:31 +0000)]
[IOT-980] oic.if.ll support for /oic/res

/oic/res currently was supporting only oic.if.baseline.

Support for oic.if.ll has been added. It includes unit test as a callback.

Change-Id: I8b90c7c686b753c5d41191508866b0c23bcc6578
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 8b297671a821177b41e62d39aa4d2d1bb6114235)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7813

8 years ago[IOT-914] Change format of the device id as text string
Habib Virji [Thu, 10 Mar 2016 17:59:51 +0000 (17:59 +0000)]
[IOT-914] Change format of the device id as text string

DI field was being sent as a byte string over ther wire.

This patch update it to be sent as a string.

ocpayloadparse.c can handle both byte string and text string.
But ocpayloadconvert.c will be sending in text string.

Jira Issue: IOT-914
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Change-Id: I049bf4cff5f2b390e589eb5cf55966e8034838b1
Reviewed-on: https://gerrit.iotivity.org/gerrit/5691
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit d96fb8bee5a4895962f4b8fce8fee0f314bcce3b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7811

8 years ago[IOT-979] Correct /oic/d icv field
Habib Virji [Thu, 10 Mar 2016 12:03:42 +0000 (12:03 +0000)]
[IOT-979] Correct /oic/d icv field

Currently icv [Spec Version] field was being set as lcv instead of icv.

Change-Id: I3e4930cba42f5474f90f622b28c031a03331053e
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5685
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 7a893187456a05110f32f730695fa3cf3c58904e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7809

8 years agofixed EDR crash issue when g_context is deleted.
jihwan.seo [Mon, 18 Apr 2016 09:58:35 +0000 (18:58 +0900)]
fixed EDR crash issue when g_context is deleted.

Change-Id: I7876a3604272ee568b86041d0eeee02158234017
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed svace issue for CA
jihwan.seo [Mon, 18 Apr 2016 08:33:12 +0000 (17:33 +0900)]
fixed svace issue for CA

- buffer overflow issue in caprotocolmessage.c
- OICfree timing issue in tcp

Change-Id: Ifd1682e485cc415175023b05657e0cd1e33b3cbc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7805
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agomodified comment related parameter in BT JNI interface.
jihwan.seo [Fri, 15 Apr 2016 03:12:07 +0000 (12:12 +0900)]
modified comment related parameter in BT JNI interface.

Change-Id: I8958e7f1353a5b69787ec6973c706c1c0f5caace
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7795
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoAdded unit test cases for cablockwisetransfer.c api
hyuna0213.jo [Wed, 16 Mar 2016 07:15:12 +0000 (16:15 +0900)]
Added unit test cases for cablockwisetransfer.c api

Added unit test cases for cablockwisetransfer.c api.

Change-Id: Idf6570aebc4bd5f15202d6f0236b126199768851
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5947
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[Easy-Setup] Fixed Android-Arduino issue.
Jay Sharma [Thu, 7 Apr 2016 14:49:24 +0000 (20:19 +0530)]
[Easy-Setup] Fixed Android-Arduino issue.

Change-Id: I0b8d4b918047f0a95b1d1b45e79bf439d458700c
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 3cd1ecdf06dc7c0cb2c788103ca9dea5e9f7df9f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7717
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
8 years agoMerge branch 'master' into windows-port
David Antler [Mon, 18 Apr 2016 16:16:13 +0000 (09:16 -0700)]
Merge branch 'master' into windows-port

Change-Id: I6f4ecaa199b4ebe5dc3800e1df5d2d05ff21e970
Signed-off-by: David Antler <david.a.antler@intel.com>
8 years agoUpdate to server .json and .db files to allow /p and /d access,
Ashwini Kumar [Fri, 15 Apr 2016 09:16:07 +0000 (14:46 +0530)]
Update to server .json and .db files to allow /p and /d access,
to address JIRA issue 1077.

The default oic_svr_db_server_justworks.json and .dat files, along
with _randompin.json and .dat, do not contain ACL entries to allow
access to /p and /d.  This may confuse vendors who will most likely
wish to change this behavior.  IoTivity should (by default) allow
access, and allow vendors to change to not allow it if they wish.

Note that /oic/res is accessible in the current version prior to
this fix; it is just /oic/p and /oic/d which are not accessible
until new ACLs are provisioned.

Change-Id: I0ca424dc73db366a5c8ceca3236887d90543286e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoRemoved un-needed build script
George Nash [Thu, 14 Apr 2016 18:28:07 +0000 (11:28 -0700)]
Removed un-needed build script

In resource/csdk/connectivity/ the SConscript tries to
build sample code that does not exist. Since the samples
do not exist the build warns that the samples SConscript
can not be found.

Change-Id: I96cc0b2c8a53f9431a7188089075d8f85e75cbe5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed svace issue in ocstack
jihwan.seo [Thu, 14 Apr 2016 08:36:27 +0000 (17:36 +0900)]
fixed svace issue in ocstack

added null check.

Change-Id: I772835707ea7b8dfb32bb12bec90c965bc349928
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoChanged to be used only once to create input stream.
Jaehong Jo [Tue, 12 Apr 2016 07:50:03 +0000 (16:50 +0900)]
Changed to be used only once to create input stream.

Fixed a problem that generates whenever read data.

Change-Id: Ib07dac59dce69f8305926d3b7ad5597a582d0a4d
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[Resource-container] Fix member var initialization
Inga Stotland [Tue, 12 Apr 2016 18:22:06 +0000 (11:22 -0700)]
[Resource-container] Fix member var initialization

Incorrect type was used causing build error.

Change-Id: I701096c3b6512546847cf4e120430f690e920453
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7759
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agotizen: Bump version to 1.1.0
Philippe Coval [Wed, 13 Apr 2016 18:52:08 +0000 (20:52 +0200)]
tizen: Bump version to 1.1.0

Change-Id: Ia2901ce4335e7a9a2998a098dbebf48668cf4f83
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoCleaned up the unused-parameter warning
George Nash [Mon, 11 Apr 2016 17:09:37 +0000 (10:09 -0700)]
Cleaned up the unused-parameter warning

unused parameters are typically the result of 3 things
- they are from a call back and are not needed for that instance of
  the call back
- introduced to maintain backward compatability for older APIs
- variables only used in debug mode for debuging reasons

Many projects that try to build without warnings cast the unused
paramenter to a void type to prevent the warning.  The cast can
be added to the project using a #define.

The OC_UNUSED macro has been added to the octypes header file
to be used when in one of the three given scenarios.

In addition the macro has been used to prevent the unused-parameter
warning for several files.

Change-Id: Ib10967df4a135f0863aebbca41479d8e62d1a27b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoCompiler warning clean up
George Nash [Tue, 12 Apr 2016 20:19:02 +0000 (13:19 -0700)]
Compiler warning clean up

sign-compare warning:
IotivityandZigbeeClient.c compares as size_t and int
one value  comes from sizeof the other from snprinf
the larger size_t value is cast to int to remove the
warning

discarded-qualifiers warning:
in the cablockwisetransfer files the CAUpdateBlockOptionItems
function is passing one of its const input parameters to
the CANegotiateBlockSize function but the input parameter is
not const in CANegotiatedBlockSize.  Since CANegotiatedBlockSize
does not actually change the pdu input pointer so it is changed
to const.

type-limits warning:
The variable nextStartIndex is of type unsigned int. The value
is assigned from a call to find_first_of that returns a size_t
value. If the the value string::npos is returned (0xFFFFFFFFFFFFFFFF)
on a 64-bit system it would be cast to (0x00000000FFFFFFFF) so the
compairison (nextStartIndex == string::npos) will always be false
and the RCSInvalidParameterException will never be thrown even if
string::npos was returned from the find_first_of call.

Change-Id: I949ad7c9ab20f9b220fbe46235e27a5c87aa487f
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7763
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agocombined getting JNI methodID for several connectivity type.
jihwan.seo [Mon, 11 Apr 2016 05:50:41 +0000 (14:50 +0900)]
combined getting JNI methodID for several connectivity type.

- BLE : caedrserver.c / caedrutils.c
- EDR : caleserver.c / caleutils.h / caleutils.c,
- NFC : canfcserver.c

Change-Id: Ibe936afb320e5112bfc221d6b5a16f53b170210a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7733
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agofixed calling getService failure without SDP.
jihwan.seo [Thu, 7 Apr 2016 07:38:35 +0000 (16:38 +0900)]
fixed calling getService failure without SDP.

- modified setter/getter related to state in common.
- cleaned up state management for connection / send state.

Change-Id: I5d136ae502e506f62a3bea83a6b32023219ec2d3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7653
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years ago[IOT-1081] Fix for discoverying old resource servers
Markus Jung [Tue, 12 Apr 2016 05:57:15 +0000 (14:57 +0900)]
[IOT-1081] Fix for discoverying old resource servers

Catch ResourceInitException and ignoring old resource servers

Change-Id: Idd3dd3853cadc63aeb83a2ccaba54b1fd5de88a0
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7753
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[Resource-Encapsulation] [IOT-1026] Fixed Jira Issue
Jay Sharma [Mon, 28 Mar 2016 11:27:00 +0000 (16:57 +0530)]
[Resource-Encapsulation] [IOT-1026] Fixed Jira Issue

Change-Id: I216c46097a85590ba927fe74c56b74b848a5611f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6293
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit c055363558b594263a523f54d5016463d64eb872)
Reviewed-on: https://gerrit.iotivity.org/gerrit/7679