Merge branch 'master' into windows-port

Change-Id: Ideba675f1379a9044e9a7668ad72a34953d26767
Signed-off-by: David Antler <david.a.antler@intel.com>

VS 2013 changes for csdk

Change-Id: Ib4c437c96c80327eb80e259d4f937696afbe1002
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8361
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

VS2013/15 aggregate changes of Intel and Microsoft

Status: Compiles in VS2015 and runs tests

List of TODOs:

  TODO: Fix tinydtls tick and locking issues.
  TODO: Fix disabled tests (PersistentStorageHandlerTest, usleep)
  TODO: Enable ocpmapi.dll shared lib (currently it's static)
  TODO: Remove hacks to solve error C2059: syntax error: 'constant'
          see: resource\include\StringConstants.h
  TODO: Address inconsistent style! Perhaps file a JIRA issue; CI
        should reject such issues before they enter the code base.
  TODO: Understand priority around enabling services.

Merger changelog:

* Adopted libtimer\timer.c changes from Microsoft
* Adopted Boost SCons installation changes from Intel
* Combined build_common\windows\SConscript from both Intel and
  Microsoft
* Adopted tinydtls code changes from Microsoft (INLINE_API macro,
  features wrapped in #ifdefs, etc)
* Adopted tinydtls SCons changes from Intel, tinydtls random seed
  generation from Intel
* Adopted ocrandom.c "QueryPerformanceCounter" from Microsoft.
* Adopted resource\examples from Intel
* Adopted liboc_logger and liboc from Intel
* Adopted resource/src from Intel
* Adopted boostification from Microsoft (BOOST_NOEXCEPT, etc.)
* Adopted "getopt" from Microsoft (multiple locations)
  - resource\csdk\stack\samples\linux\secure\occlientbasicops.cpp
  - resource\csdk\stack\samples\linux\SimpleClientServer\common.cpp
* Adopted SimpleClientServer changes from Microsoft
  - resource\csdk\stack\samples\linux\SimpleClientServer\
* Adopted oicgroup.c from Intel
* Adopted OC_EXPORT changes (and OC_EXPORT_DLL define macro)
  from Microsoft

Change-Id: Ib4298cd63731b39e1bcfa6a790fd18298c73720a
Signed-off-by: Henry Beberman <henry.beberman@intel.com>
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7627
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

[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>

[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>

Fix retransmission according to RFC

tinyDTLS does not satisfy RFC (https://tools.ietf.org/html/rfc6347):
1. "Partial reads (whether partial messages or only some of the messages
   in the flight) do not cause state transitions or timer resets.
2. "In addition, for at least twice the default MSL defined for [TCP],
   when in the FINISHED state, the node that transmits the last flight
   (the server in an ordinary handshake or the client in a resumed
   handshake) MUST respond to a retransmit of the peer's last flight"

List of changes:
1. Changed 'dtls_stop_retransmission' function. It clears timer only.
   Needed to save server's last flight in retransmission buffer.
2. Added 'dtls_start_retransmission' function. It can resume the
   retransmission after 'dtls_stop_retransmission'.
   Needed for responding to the client's last flight in FINISHED state.
3. New function 'dtls_clear_retransmission' clears retransmission buffer
   instead of 'dtls_stop_retransmission'.
4. Disabled clearing retransmission buffer in case of partial flight
   in 'handle_handshake_msg' function.
5. Added answering HELLO_VERIFY_REQUEST if client retransmit CLIENT_HELLO
   in 'handle_handshake_msg' function.

Change-Id: Ief775733e52a0e5f2e663b0317ed3f922bd92629
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8371
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Change QOS to HIGH for security module

Issue: If packet loss happend during OTM, OTM is failed due to Non-Confirmable msg.
Solution: In order to retransmission, change msg type to  confirmable.

Patch 1,2: Init patch

Change-Id: I5222d19661a6eb01a2cc0033857e96ad63a8f175
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Updated and typo-fixed |SHA| API names on tinydtls module

this change is for updating the fixed |tinydtls-sha| API names
and correcting the missed typo on its API names. this change
was reviewed finally by Mr. Olaf Bergmann and Mr. Craig Pratt,
who maintain |eclipse-tinydtls|.

Change-Id: I9d4eb21ab5d507726b2dda0b3f27bfa0264b0565
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Add API support to get and set device spec version and data model version.

JIRA: https://jira.iotivity.org/browse/IOT-1100

Change-Id: I0afb56cd1f1f104113e58371b6e6b00c20c1ad7b
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8325
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Build: updated hippomocks to support arm64

Without it, I will fail to build and complain about missing method.

This is latest release with this patch :
  https://github.com/dascandy/hippomocks/pull/49

It was tested on Ubuntu wily arm64, more details to be shared at :
  https://wiki.iotivity.org/community

Change-Id: Ie641ad10af4b22d191f041ad2d27ac3b998a891a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

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>

[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>

Update secure sample and SVRs for testing NonDevOwner client.

- Requests from DevOwner are allowed without checking ACL.
- Requests from NonDevOwner are checked against ACL against
  subjectuuid, permission and period-recurrence.

Change-Id: Icbf9b19f3fc6f2676b970c39dd0b74cea5d862bd
Signed-off-by: Shujuan Chen <shujuan.chen@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8365
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Fixed build with SECURED=1 DTLS_WITH_X509=1 flags.

Change-Id: I67945146ac572d7b13e9dd4070e4d78de722c521
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8323
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-1097] Fixed bug related to dpc property in doxm

Issue : There is bug when handling dpc property

Solution : If PUT/POST payload do not has dpc in doxm,
           iotivity server keep own dpc value.

Related jira : https://jira.iotivity.org/browse/IOT-1097

Change-Id: I6a1d5874240d81b2ef590831d1db4a3b69c89fa4
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[Tizen]Fix for LE Server termination issue

On terminating, LE server doesn't call Disconnect to all the clients
connected.  This patch resolves the issue by maintaining client list
at the server and on terminating, the server disconnects with all
the clients it is connected with.

Change-Id: I0e177dbb3a2803e1d21ccc5a9d0298faa77f5740
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8105
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

added error callback for findResource() in stack

There is no way to pass the error of findResource().
so I added error callback for findResource() in stack.

Change-Id: Iec2b1427d0b6473e032aa4e5c959c141526c9764
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

[IOT-1096] Relax rt and if value validation for unregistered values.

Change-Id: I6da985d36b7d1e449320a4181cd5c39c31507706
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8251
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

added direct gatt connect in Android

it can prevent to connect duplicatly while CASendRequest is working.

Change-Id: Ib8690c8e3ce7da43cab958473da33fa748e9ec56
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8217
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

[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>

[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>

[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>

[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>

[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>

[TIZEN]Moved GMainloop to CSDK sample from network monitor[LE/EDR].

Change-Id: I6b4f19ba07142e8f6e8aa4ca015ae6cc9384a42a
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Fix debug output

Change-Id: I740808bb198809b5103e69d540ce1ae1b0dc5f15
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Fix a wrong conditional statement in GetClientCB()

if the first byte of the token is 00, GetClientCB() fails
to get client callback.

Change-Id: Ia25362c2231e35af43519602809f2483481b6967
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

modified android settings.gradle to build simplebase app

Fix merge issues, simplebase build was omitted when 1.1 branch
codes were merged.

Change-Id: I920031b960448cbc82b41866b61158c04ce9a7cd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Implement Binary String transit type in C++ stack

The C stack got a Binary String component here:
https://gerrit.iotivity.org/gerrit/#/c/2337/

This patch implements it in the C++ stack, and validates it in the unit
test.

Note that this patch does NOT do binary-string-array, but this patch
should be able to demonstrate the effort involved.

Change-Id: I2fd6341f3d84539c3ad5450279f1d755ba211fd6
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7937
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Readme File changed

Change-Id: I55ab169e855b8c3ba7acd88bb2a8c33558f90678
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

[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>

Merge branch 'master' into windows-port

Change-Id: Iea39b951591a8f6a72285cf457b83f9c96e2e772
Signed-off-by: David Antler <david.a.antler@intel.com>

[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>

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>

[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>

[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>

Merge "Merge branch '1.1-rel'"

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>

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>

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>

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>

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>

Merge branch 'master' into windows-port

Change-Id: I980ead11aa2b07bc3cf2d21a7baa5e207da4398c
Signed-off-by: David Antler <david.a.antler@intel.com>

[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>

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

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

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>

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>

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>

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>

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>

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>

Merge branch 'master' into windows-port

Change-Id: Iefbd0b074e8e654ee143617137c165d05ab56aed
Signed-off-by: David Antler <david.a.antler@intel.com>

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>

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>

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>

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>

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>

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>

[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>

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

[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>

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

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

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

[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

Merge branch 'master' into windows-port

Change-Id: Ia553668db05e19ade5afa2b42b7e42632cae4cba
Signed-off-by: David Antler <david.a.antler@intel.com>

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>

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>

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>

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>

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>

[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>

[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>

[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>

Merge branch 'master' into windows-port

Change-Id: I65de4e8c13f736abe49948a042448d8261f47753
Signed-off-by: David Antler <david.a.antler@intel.com>

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>

Merge branch 'master' into windows-port

Change-Id: I7ad9210417b7cfa0eb99de1d8ce9a8c20fd459cd
Signed-off-by: David Antler <david.a.antler@intel.com>

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

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

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>

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

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>

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>

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>

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>

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>

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>

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>

[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

[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>

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>

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

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

[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>

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

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

[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

[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

[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