[IOT-1089] Changed BUILD_JAVA from Enum value to Boolean

Change-Id: Ic8cd4d16127d67e014e0d9ec2a2bd87c251f282b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15079
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Iff187c8462c8b4fa52a96a6bd020997b6c19439c
Signed-off-by: George Nash <george.nash@intel.com>

[IOT-1547] add stop BLE scan API

scanning should be stopped for saving battery when BLE is not using.

Change-Id: I0e12afb4f0961bd1fa4ec579b3e0412796cacf23
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Fixed Brace location

The matched '{' and '}' symbols in compound statements(except do-while) shall have the same indentation,
and these symbols in a line shall be used alone (except comment)

Change-Id: I3f760f430120a2bea371376eb0a589189613e64e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14681
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Don't display third party library warning on x86_64 build

Change-Id: I7cef30cfc4c8199d45cdb7e9824f56d2995ba3d5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14487
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

build: only add dependency for valgrind supported hosts

Windows is confused with implicit .exe suffix ie:

  scons: *** [out\windows\...\utresource\csdk\connectivity\test\catests] \
  Explicit dependency ...\utresource\csdk\connectivity\test\catests' \
  not found, needed by target \
  ...

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

build: Valgrind script now depends on unit test executable

This prevents Sporadic Valgrind Failures, caused by race conditions
Common error message is like:
  out/linux/x86_64/debug/resource/unittests/unittests: Permission denied

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I49bfb21ee7cd934b965e132cb150d59c047ef383
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14705
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

sqlite: Use in needed cases (RD and Secured) only

Today, only a few modules are using it:
* resource-directory (in Server mode)
* provisioning

Bug: https://jira.iotivity.org/browse/IOT-1296
Change-Id: I918c17820f78fe222d2410cdf7a820ef8f0b579d
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

[IOT-1601]Adding logic to validate oxmsel updating

Oxms should be considered at updating oxmsel.
Oxm should be read-only.

Patch 1: Init patch
Patch 2: Rebase
Patch 3: If owned=Ture, validate oxmsel is omitted for CTT testing
Patch 4: Revert file permission to 644

Don't merge this patch because need to confirm an operation in case of owned=True

Change-Id: I57fbd6a65db9a8d4400934e11ec40cc4c8e96051
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d53432d2d090a3ea28611454650c9cc285dd1ba6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14833

[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP

Fixed sending/receiving for large size of data which is bigger than 16kbytes on TLS.

https://jira.iotivity.org/browse/IOT-1548

*Notice : This patchset necessarily requires https://gerrit.iotivity.org/gerrit/#/c/14325/.

Change-Id: I1921d1d2d9d18acb921f093136457120ac862a2c
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14351
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14827

CloudProvisioningClient Signout bug fixed. updated to call new api

Change-Id: I26f60b5ec04583907170ea7c49796b58003e5120
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit eb98d88a7485ab43639a9fa3789b15e1a836266f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14793

fix: messageID for coap over TCP always is null

Change-Id: Iaf883a1a63a3b221bbcfe9f13bb4856d676de9fe
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e62ef1079225787d3c757325409c8142a93bdf22)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14789

Remove shared resource directory library usage from other modules

All the added code for the resource directory shared library dependency on library oc.

https://jira.iotivity.org/browse/IOT-1510

Change-Id: Ic8710588bf0a044e8b29283dc36a411c1928b6ae
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Add secure and port in policy

In the collection response, add secure and port information.

Change-Id: Iaec8788bba04fa0a404dfb16ddf54a704493e65b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14751
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Fix query handling for /oic/res

There was a mix up when query was supplied, it was only working if the interfaceQuery passed too. With just rt supplied,
it was returning all the resource. This patch fixes up the issue.

Change-Id: I980f0dd73fafdadd3d1dabae5edf024ac256f95c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14757
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Add param check code in PrepareMCertificateCallback.

Change-Id: I1bd917024ab1ac20c000dccf9da5e31ba865a2a0
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 83a63409ebe7e320e835c62aaeb87359bdc29b47)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14749

Add cipher suites

TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 and TLS_ECDHE_ECDSA_WITH_AES_128_CCM
cipher suites were added in order to support manufacturer certificate based OxM.

Change-Id: I3ec5ddce982e5bfd5f7591b493448eec5468653f
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14619
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e2a98487b8fffab23e11e93e8cd0fd21b5df0340)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14745

[IOT-1569] Use OICMalloc/OICFree consistently

Lingering and mixed uses of malloc/free exist throughout
IoTivity. Some buffers allocated with malloc are later freed
with OICFree; this is dangerous in case the implementation of
OICMalloc/OICFree ever changes.

This change harmonizes the code to use the OIC versions to
ensure code is always using the same heap allocation and free
functions with two exceptions:

* Sample code continues to use malloc/free; samples should not
refer to internal functions.
* The oc_logger module also still uses malloc/free; oic_malloc
calls oc_logger when operating in ENABLE_MALLOC_DEBUG mode, and
could result in a circular dependency if changed over.

Change-Id: Icd47243eec33500fe7fcd7d5d79ddf2128a9e717
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 8141de8815b7c7a39b8b7d8ce9acb91608cf9e17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14697
Reviewed-by: Omar Maabreh <omarm@microsoft.com>

Add p in response of oic.if.ll

In collection response add p parameter.
This is the response in case of default entity handler.
Application has to handle on its own adding policy parameter.

Change-Id: Ie2195eb07575fbcc34413fca729a1a7db0805314
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit b19d08056e4efe08d3ae3e3a53c01d7c61347e4b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14699
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Add generic API for setting and getting defined tag values

- Uses the resource attribute of OCResource for storing and retrieving device and platform values.
- Removed global savedDeviceInfo and savedPlatformInfo. The information passed via
OCSetDeviceInfo and OCSetPlatformInfo is stored in rsrcAttributes.
- OCAttribute type change from char * to void * to store generic value, this was part of OCResource but was not used.
- Payload type PAYLOAD_TYPE_DEVICE and PAYLOAD_TYPE_PLATFORM is removed from PAYLOAD_TYPE as this was used only internally.
- Payload convert and parse for payload type device and platform is removed, as device and payload uri uses
OCRepresentation payload type.
- Delete function to delete resource attributes.
- OCDevicePayloadCreate and OCPlatformCreate is removed as this was only used internally, all values are now stored in
resource attributes.
- Moves OCSetDeviceInfo and OCSetPlatformInfo from ocstack to ocresource to avoid duplicate checking.
- Add set and get API to set parameter for /oic/d and /oic/p.
- OCGetResourceHandleAtUri accesible without ifdef RD_CLIENT.
- Updated Unit test to test the functionality.
- Add the OCSSetParam and OCGetParam in C++ and Java

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

Add OCConvertStringToUuid on C_common

Patch 1,2: Expose ConvertStrToUUID on OC stack to use common
Ptach 3: Add OCConvertStringToUuid on C_common

Change-Id: Icf9b0ee1bda6fa4d914c696fbbdc27e0998a7262
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d026fc6e98db05280cb7e94aacffd1d7d09838d7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14723

[IOT-1582] Change "PUT" to count as "Create" and never as "Update"

Per Core Spec conventions, even though PUT is technically legal
for Create or Update, PUT is only ever used for Create.  Therefore
we need to change the CRUDN permission bit check in security layer.

Updated Readme.scons.txt and README-building-and-running-secure-IoTivity-
stack.txt to clarify build and use of secure IoTivity stack.

Change-Id: Id362c9c0225e53240b2d1f844c5f05d55cfa2938
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit da4ccd548c926669896e844a672edb32f8de6d70)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14719
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-1595] Change Policy Engine to us ACE Union behavior.

The current Policy Engine logic is to assess the permissions on the first matching ACE for a
request (matched via Subject and Resource), and respond to the request (Grant or Deny) based on
that ACE.

The new OCF 1.0 behavior specifies that if any ACE allows a request, it should be Granted (so-called "Union" behavior).

To allow consistency we must fix this in 1.2.1.

This patch changes the Policy Engine to keep searching for an ACE that Grants the request,
until either the request is granted, or the end of the ACL is reached.

Change-Id: Idd4e90c37c7e0fcf963105b34b3e82dfde2ccfd2
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14701
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
(cherry picked from commit 9524976da93a87f1b74e550a672a431e63e858f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14717
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-1592] Fix rd publish fail

1. RD publish fail due to lack of shared point lock logic.

https://jira.iotivity.org/browse/IOT-1592

Change-Id: I278b67ac050fb5bcb0cb5ee6920c27e446f0f01a
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit d1abd0caaa69ba0f4346ecd8958e4fb4363ae239)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14711

Fix bugs for no catch std::out_of_range exceptions.

Samples of serveral services, no catch exception about out_of_range.
With this patch, all of exception was caught.

Change-Id: I18b9cf7633ac6c6ad3d5a8b9e37a5110ffd9d68f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13859
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 8b776fc5549f97cee12aefd41a085f4e678129ea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13865

Remove x.org.iotivity from secure resources

Remove x.org.iotivity from IoTivity secure resources

Patch #1: Initial upload

Change-Id: Icb067cc8a44d365665ef26e3955f6f79fa12415c
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7704a4d2318cf63bccb3fc09c9e8ca9cb8eaf0c7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14663

Fixed bug for device status management in OTM.

[Bug]
  1. Perform the OTM.
  2. Remove the device using OCRemoveDevice or OCRemoveDeviceWithUuid
  3. Initialize the server to unowned status.
  3. Perform the OTM again w/ same server.
     [Actual Result] Device UUID removed from PDM DB.
     [Expected result] Device UUID should be set to initial status.

Change-Id: Ie662ca6eeedfb5a98db4d97e020b61fbf331cb0e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14643
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 531eb849bb6cd36510ecd83194268a1f304e85a9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14665

Update Easysetup mediator android sample app

 - Add validation check logic when received response of findResource.

Change-Id: Ib2e9f6bf3534f77e7d6260fca803ccf629df5b2d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14617
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add raxmpp and yaml extlibs to .gitignore

If these dependencies are cloned into the repo, git will think
they're untracked subtrees of the iotivity repo. This change
adds them to .gitignore like the rest of the dependencies in
extlibs.

Change-Id: I65074d5df9accef813d8f1ffc3be2a0e887ced91
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 7a89bb933037540bf5e32647260b9a43d2054842)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14519
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

[IOT-1561] Improve vs12_snprintf

Improve the snprintf surrogate used to build for Windows using Visual
Studio 2013 or older.

Also remove the dependency on cmake for building gtest for Windows, to
fix a build break for the new snprintf_test.cpp.

This is a cherry-pick of commit b2a398e from the 1.2-rel branch.

Change-Id: I70c9d0766a9a316a19cbd283671137e61ab88dbf
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14387
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14627

Add gitreview File

This is used by the 'git-review' to specify the upstream gerrit server.

Change-Id: I5823a86f1eb0d0a8b6d2ed39fc0927347ea2ca94
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9655
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

[connectivity] Fix parameter type mismatches.

To match the corresponding callback function prototype
(e.g. CANetworkPacketReceivedCallback and CAErrorHandleCallback), the
data length parameter for a few callback function implementations
should have been of type size_t instead uint32_t.  This addresses
several parameter type mismatch warnings on 64 bit platforms.

Change-Id: Iaa5740a9fdb9d59fa13832eb3b87335d3355bd37
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>

tizen: Declare used licenses using SPDX convention

Change-Id: I6f016165739f57e33fd950f07f1d379b6fa3da69
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13523
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
(cherry picked from commit 9f9489062b780aa77f44c0b2d8fd4e4bb4d59d02)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13561
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

D2D Get request error fix

Removed payload type check in Get request

Change-Id: I405a7a6bba7255d8c05cc8a34342217c6e04e819
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 0528ed289e063f7ea5ec139f579032acbfc31a61)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14601

[IOT-1361]Fix android X86_64 runtime issues

Add missing .h files on ifaddrs.h
and android caipnwmonitor.c for fix runtime issue.

Change-Id: Iec71fa0929b8682fda05a4d0d7cb89351be01d2d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14537
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Return correct entity handler result for Get and Publish requests to
RD server.

Prior to this fix, rdEntityHandler would always return OC_EH_ERROR.

Change-Id: I1099ffe19e200982562cd9de4f7c97e173a71431
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Add Idea to gitignore

Ignore extra IDE files for IDEA

Change-Id: I06656bc9fb15fee68559902e6b620bfb6e9ea62c
Signed-off-by: Jeff Beck <beckje01@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

[IOT-1529] Sync TinyCBOR to release tag before using

Current build will sync to the head of TinyCBOR's master branch.
To remove this unpredictability from the build, always sync to
a particular release tag.

Change-Id: I471ac19aedc787bca64ee01c4733ab319d6f32d3
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 6b368cb9e7f45efccad93455aff98ad5b4e0ccb0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14425

[IOT-1528]update file path and remove static analysis warring

update file path(ifaddrs.x -> caifaddrs.x)
and fix netlink usage for remove static analysis warring

Change-Id: I672d9ba1250710cc10c66cbbde56b6b12afc15e8
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-1207] Data structure for OCF Endpoint Impl

provide basic data structure, function, types for OCF Endpoint
See detail in Jira IOT-1207

Change-Id: I4bdcca71ffdab101c729406a6509b6f1103b9ca8
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

fix C++11 error with constexpr

error: constexpr function's return type 'std::vector<TypeInfo>' is not a literal type

Change-Id: I3f0e2ac5ba0330698052db962a3ca4b81b3edb39
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Fixed Typos: DEFALUT -> DEFAULT

Change-Id: If23217339d99ba5ad9e38133607de813ba27fd75
Signed-off-by: Robert Spielmann <spielmann@kellendonk.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Modify a typing error of help message.

A name of this file is OICMiddle, but there is a typing error
in help message. So modify from IOCMiddle to OICMiddle.

Change-Id: I29be198ca313022753531088e53d5d47c61fef36
Signed-off-by: Jake Kim <copy_x@naver.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1405
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

Manufacturer certificate based ownership transfer support.

1. Add manufacturer certificate OxM callbacks
   : resource/csdk/security/provisioning/src/oxmmanufacturercert.c
   : resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h

2. Apply the manufacturer cert based OxM on the client & server.
   : resource/csdk/security/provisioning/src/ownershiptransfermanager.c
   : resource/csdk/security/src/doxmresource.c

3. Add manufacturer certificate supported sample server
   : resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp

4. Add API to set the allowed/not-allowed OxM which is OCSetOxmAllowStatus()
   : resource/csdk/security/provisioning/src/ocprovisioningmanager.c
   : resource/csdk/security/provisioning/include/ocprovisioningmanager.h

5. Add OCStackResult code to handle not allowed OxM exception.
   : resource/csdk/stack/include/octypes.h
   : resource/src/OCException.cpp
   : resource/include/StringConstants.h
   : resource/unittests/OCExceptionTest.cpp

6. Update the SConscript according to above modifications.
   : resource/csdk/security/provisioning/SConscript
   : resource/csdk/security/provisioning/sample/SConscript

Change-Id: Ibb4b4eec33a1e39234f808e32cc3b96aff4879ad
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7b7e5a97b1acdf4a265915bd4eaf745dd8262b03)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14503

Fix windows build failed about incompatible types in jenkins

- resolve incompatible types error to build windows

Change-Id: I5095bb7de066eb966316812d57728361c685a811
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: I7b374f04928cd05762d39459f18016bb94b8172c
Signed-off-by: George Nash <george.nash@intel.com>

Import SCons.Errors to fix error at line 35

Change-Id: I683b6602afcc26984be146d800559532df729675
Signed-off-by: Benjamin Cabé <kartben@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1158
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

[IOT-1513] Incorrect URI construction

The % character is not legal to be placed literally in a URI, it must be
escaped (as "%25") before being enclosed in a URI.  Other places were
changed in July in change 9419, and some more in change 14009, but these
code paths were not changed at that time.

This also fixes a bug in setHost which did not mark an IPv6 address as
IPv6, and adds a test case that covers this.

Change-Id: I1331ecb9c5482a2d43dd675978a1f34c6d37cb4c
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14263
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

Fix Device and Payload response

Bug fix due to change introduced in  https://gerrit.iotivity.org/gerrit/#/c/12283/

Change-Id: Ib6b03f4296c8ef0fb1ac7ac79ff1023856a070bc
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14419
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Treat Visual Studio C4133 warning as error

Change-Id: I9cc9019fb90d38913151b9d6678f359ca35c06a4
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Added CAcloseSslConnectionAll() in ssl adapter

added api to close all of ssl connections

Change-Id: I2bcd1890a70ba64fd7f4cc33e6a1dfcbf6590050
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14357

Build json2cbor on OSX

Change-Id: I5858833c85a76bc4acaab1b6393f0feda28284b7
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-1519] Don't clear ownerPSK secret too early

Owner PSK secret was cleared too early; only clear after
all uses are finished.

Change-Id: Ie39990a5aabfcd71b8370103b7182cb76cb09f40
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d07d715c49707a0940cc27f57b128e44954829e8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14497

Fix bug for can not callback on consumer cpp layer.

When starting consumer service, getTopic callback fisrt
and then discover callback due to can not call both changed callback and discover callback.
because when callback getTopic, NSProvider instance does not set the listener,
and when callback discover after, NSProvider instance already create, so can not callback discover.
This point is invalid logic on CPP layer.

With this patch, altough call getTopic first, can callback discover callback.

Change-Id: Ib7a3c8cf3e78edf24d0251227c5d3c225c3ba3a4
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13855
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 6124156346ad25e57fb1489ccd7febf532c58fa6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

[IOT-1519] Securely zero buffers containing secret data

Add an OICClearMemory helper function, and use it to securely
clear buffers that contain keys and other secret data that
shouldn't be left in the stack or on the heap.

Rename privateKey to g_privateKey in csr.c.

Fix a couple of leaked payloads on error return paths in
secureresourceprovider.c (which will also now zero their
contents).

Change-Id: If79c840ad758be2a7ca1bf7e6ccccb6dbdc39cf2
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 916ced6413b93c3c4448fb4124be429c0f13bb82)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14443

[IOT-1550] Resolved reset issue on rowner of cred

https://jira.iotivity.org/browse/IOT-1550

issue : Rowner of cred is reset, when saving Cert. chain
        using SRPSaveTrustCertChain and SRPSaveOwnCertChain.

Patch 1: upload patch
Patch 2: rebase
Patch 3: Apply review comment

Change-Id: I59cdbfb30253c61e1c27dcf640958899af976a96
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14327
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 39f4a884082aa687f86fc24296b37401780dc9cb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14441

fix Sample App related getPlatformInfo/getDeviceInfo

Change-Id: I07e2e0e24241f0c5dd53259f8333eccc722d4e39
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14405
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Enable mbedTLS's log with LOGGING=1 option

Change-Id: I51b285aac780d17d5ff45a6e5be200bef4359602
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit a682f6f440066ab1656b7704dca486684d64eaa4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14437

added log messages on ip adapter to improve debugging

Because there was no log for the netlink event, it was hard to see the triggering
point for multicast group join.

And modified some codes for optimization.

Change-Id: I06c8ca4e7ec5e87db6f9fe3cb0b03ae22fb6b42e
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[IOT-1570] fixed a crash issue related to block-wise transfer

When a resource server receives 4.08 error response from a resource
client, the server will try to send the response from the first
block again.
But now, the server assumes the message type that has to be sent
for receiving 4.08 error is only request message.
So I modified to handle it up to the message type.

Change-Id: I555b5dd5c44b73647c2543de551aba6f5113f909
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Addressed "missing braces around initializer" warning.

Gcc exhibited a "missing braces around initializer" warning when zero
initializing the ipv6mr_multiaddr field in the ipv6_mreq structure.
This appears to be a known issue with gcc.  Avoid the warning by
removing the explicit zero initialization, and rely on the implicit
initialization behavior of designated initializers instead.

Change-Id: I5658fb620433bc7f47a31d94bab2e9f07ce66f40
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

fixed bug for ESEnrolleeState validation check logic

Change-Id: I51225c3f814ed6a651a06082a2504fb65289c58a
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[IOT-1511] Update mbedTLS to use 2.4.0 release tagged version

Reviewed-on: https://gerrit.iotivity.org/gerrit/13973
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
This change also includes the fix:

Fix mbedtls-2.4.0 build error

.git/refs/tags directory is empty

Reviewed-on: https://gerrit.iotivity.org/gerrit/14223
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Change-Id: I259709cd2024eb9eca83aa19c90783bc2a9f8c72
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

[IOT-1544]: Fixing ParseRecur memory corruption.

 Removing possible memory corruption from ParseRecur
 by adding buffer size checks.

Change-Id: Ib4a6e943057d1ce7ba6dadca1b20090f3e4c456c
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14315
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Junit files for acl id and acl verify methods

Change-Id: Ib2b138631a63a1eba9a15608d04605f726fc5ba6
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 1cd48fe9add7032fdf0e3afbd06fe190142b01ef)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14399

fix findresource failure issue.

this fix is from https://gerrit.iotivity.org/gerrit/#/c/12283/

Change-Id: I70314bdc6506101b551c9389bb694cad3bf222f5
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14397
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

[IOT-1549] Add DTLS retransmission

Create thread for checking peer timer

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

Change pstat.deviceuuid from R-only to RW

As SWG decided that pstat.deviceuuid is RW,
pstat handler has been fixed accordingly.

Patch #1: Initial upload

Change-Id: Ibc0b1d86ddfb06306268dddaf07f38152d8800f2
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 4f64da7a5e385b66948daee3d61b9b2bf6a408e8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14347

Change doxm.deviceuuid from R-only to RW in doxm entity handler.

CTT testing revealed a bug in 1.2 (and a matching bug in the 1.1
schema) that had marked deviceuuid as R-only.  However this is
not correct: deviceuuid must be Writeable to allow the OBT
to update with a new UUID during onboarding.  This has been
verified by SecWG and needs to be fixed in 1.2.

Patch #2: added a line to also copy deviceuuid in updateWriteableProperty() function

Change-Id: Icff6d978f5a12af021d557a5c71f25a4e9957ba2
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14345
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Modify NotificationService Script to support Tizen OS

- Modify Script files to build on Tizen Platform
- Modify Logic for logging to print log through dlog api

Change-Id: I0a624400187d37817627875f983104cb14b7946b
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

fix crash issue related set interfaceQuery.

Change-Id: I7c40c0930879a0ad860e935325adc44b860d9ee8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Add RD_MODE build option on Tizen Platform

- in case of building using gbsscript, can get RD_MODE option

Change-Id: I88a027e2ba050ce9eb622eabf3d988eba8db9c64
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Fix Discovery issue with OCResource

Fix memory allocation and handling response as introduced in the change for issue 1134.

Change-Id: Ieebd1dde50d87e05f9e7ea0cec04af398cabe3ef
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>

[IOT-1537] Fixed twice response on both svc and amacl

Issue: In CTT test (version 1.3.15), CT1.1.1 was failed.
https://jira.iotivity.org/browse/IOT-1537
Cause: the server is responding with both 4.00(ACK) & 5.00(CON)
       error message for not supported SVR(amacl, svc).

Patch 1: Resolved this issue.

Change-Id: I552781a242a0932fbe89823d17a5403b419116b0
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 198848194084af8981c4690f6d2182ef3850fb6d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14331

[IOT-1524] Added check to reject unsecure request for selected SVR resources

ALL SVR resources other than DOXM & PSTAT resource should reject request over coap.

Change-Id: Idcf0ff22d7c676bef2480fe9b32a9e7b22c2317a
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
(cherry picked from commit c9e82ceebe5ac962ec5ef0a42b1d6e62d9476f5d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14323

[IOT-1514] Always log sensitive data at DEBUG level

Some sensitive data is logged at levels other than DEBUG. Having
all of these at DEBUG can help ensure in release builds secret
data isn't inadvertently leaked through logging.

Change-Id: I58aa4ebc8e8dcdbc9d267d7eef3135a21e6daa0b
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14085
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7257937531b5a9165f58e377eafffae175259665)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14321

Removed SECURED define dependency from JNI.

Change-Id: I7fd578d3d18a220e86794ce558e3cc704784b605
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit dc5ce01c137d023418d31d9cfa1de2c34051b53d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14319

[IOT-1540] replace the path for BLE connection manager

Change-Id: Id6e2adf906bcd86586ebe7743b626fdd6a00944f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14271
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

build: Use project path for libcoap headers path

Without this change, build is failing,
because compiler looks for non existing libcoap in service/...

This was observed on Tizen Yocto

Change-Id: Ib1e3a4dd7aae929213165576840157fdb6286941
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14083
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

tizen: Add resource_directory lib to main package

Change-Id: I168fe5915466abdd82049bb43744f7b425fedbe2
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14283
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

[IOT-1543] modified some log message more clearly.

since some log message is printing with ERROR level even not issue,
replace it with normal message.

Change-Id: I6de18b072c4dd5b9011094368a77cec1fa4043b8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Added error callback when adapter is terminated

If application try to send data when adapter is terminated,
Error message should be delivered to application layer.

Change-Id: Iec02116e864fb8667570c67982f44838d74f84a9
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14181
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Remove resource directory dependency in lib OC

- Android code related to the resource directory is removed from OCPlatform and is in standalone file.
- In android resource-directory is linked as a shared file.
- Resource directory code in the InProcServerWrapper was creating a circular dependency and unwanted requirement
for the unit test and sample code.
- This patch fixes this dependency and moves C++ code to the resource directory.

https://jira.iotivity.org/browse/IOT-1510

Change-Id: I23423929b3000471d7fb91cb7c7bac89c3d1879b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>

Fix crash issue while stopCaching.

Change-Id: I7319690301e32cb41e224528e8e032e57d58fc77
Signed-off-by: Harry <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14213
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add manufacturer certificate

1. Added ability to switch TLS
between different credential usage types
2. Manufacturer credentials injected to
oic_svr_db_client.dat and oic_svr_db_server_mfg.dat

Change-Id: Ide5ec7f849a03a787e45bb77e31076e94e1eb1b3
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14049
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 1d7f903fabdb827ea27ca19874c4d93c5f6da465)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14265

[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: I6627b56dbe51592159eefebde3f63480eb61f8ee
Signed-off-by: George Nash <george.nash@intel.com>

Fix static analysis issues in CA, rd_client and ocstack

- variable initialization and null checking added

Change-Id: Ibb47193ccb480941abfa71b0d32020891d2025f6
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14157
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Added C and C++ callback API for TrustCertChain Change Notification.

patch #2,3,4 : Fix callback context at RI layer
patch #5: Address review comments

Change-Id: I1d776a01cfb41074ce518ee20ddda1ce7ccde40f
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13627
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[CONPRO-296] Check Null parameter in GetACLResourceData()

Check Null parameter in GetACLResourceData()

Change-Id: Ifac67589b6d3fd949122d94584574635c38f8ab0
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14159
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 2653631403ed52cc49f16c7eeac2307f038804ee)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14205

Return correct error code when send fails in catcpserver

Modified ssl adapter along with  modified return type.

Change-Id: I68d0d1ab73f1a858c42b3340947f01ca61974987
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

[CONPRO-311] Fix due to TinyCBOR v0.4 Release

The anonymous union member of struct CborEncoder is no longer anonymous.
References to the union member are replaced by API added for them

Patch #1: Initial upload

Change-Id: Ie47779bee68cfae4fa578ae39ae087ea23b905df
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 9a31ef80095f6382985404ba0a6c71437c9d8c43)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14203

[IOT-1530]Fix resource interface checking logic

Fix resource interface checking logic
when server receive discovery request
for find matched interface type.

Change-Id: I439017180a367d0b3b20c0637d826c2a3bea1c3c
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14169
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

yocto: Add aarch64 for DragonBoard-410c

Change-Id: I0ebf93ca17a9a6624da3caaaf7487529b2c556d6
Credit-to: Kotaro HASHIMOTO <Hashimoto.Kotaro@ds.MitsubishiElectric.co.jp>
Origin: https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-November/002805.html
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14183
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

tizen: cbor headers are no more needed

Change-Id: I1c9df13d1b05a9b0aa0f8d60de8519c0c44b2486
Bug: https://jira.iotivity.org/browse/IOT-1460
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13775
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit e8426c062339308674329ca75d2da227c7f58d69)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14081

[JIRA-1134] Fix mem leak in HandleVirtualResource

- VERIFY_NON_NULL to exit by cleaning the mem already allocated.
- InterfaceQuery which wa being assigned is not done, and instead if no interfaceQuery it is considered as oic.if.ll.
- Moved out rd resource search out of function,
- Baseline information handling has been updated to be handled separately.

https://jira.iotivity.org/browse/IOT-1134

Change-Id: Ie894284e4c67a7bbd4bbaa52801416a0c8dab778
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>

Add OIC_ prefix for security module's log.

Change-Id: I6802265094222c0d01acc000a14b9b5afdacf6ee
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit af2c4591eca2a68cc797f0ec41a53926cdfc23d4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14149

Update the OTMContext management mechanism to improve the reliability of the OTM process.

  1. Apply the list mechanism to manage the OTMContext.
    -> It replaces the global variables of OTMContext.

  2. Add the OCDoHandle member into OTMContext.
    -> In case of OTM process stopped before OTM process complete,
       unnecessary retransmission can be occur
       due to request is performed just before the OTM process stops.
       So we need to cancel this request to prevent retransmission.
       OCDoHandle will be used at this time.

  3. Add the device status of PDM to prevent duplicate OTM.
    -> Added PDM_DEVICE_INIT to prevent deplicate OTM.
       If device status is PDM_DEVICE_INIT, PT will skip OTM process of this device.

Change-Id: I74e200aa88a0c5016c065a518b75614bf4a3a7a8
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Ib37bdbb2955bdb0edc136786f1abf5a11c1489d6
Signed-off-by: George Nash <george.nash@intel.com>

[IOT-1472] Separated BLE receive queue.

Change-Id: I64d63ed15070d851b4c02cc4c355266d972ebc46
Signed-off-by: junghun kim <jhun1105.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

OCRepPayload NULL array handling

OCRepPayload was not handling empty array. This patch handles both conversion and parsing. Also added new tests.

Change-Id: If06e1f47ecaaa926e0ee720ab890ca67076bad03
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14095
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: byonggon chun <bg.chun@samsung.com>