[Easy-setup] Commented check for Intended resource

- commented the condition for checking the intended resource in
  RemoteEnrolleeResource class.

Change-Id: I937c07d151eb503e238215ec60abe69ba83dde14
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit a0aa322df9df6e677cdbc8bc9afcc1bb09cb0862)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6121

[Tizen Secure mode] Copy json file in rpm package

Change-Id: Ia5b9e0f45017e4f1b25b0538e613509de58eeb2f
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 127be1815683c9d0afc8d64cc9055e2f5eb6d112)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6119

[Easy-Setup][IOT-1016] Fixed Jira issue.

Change-Id: I2690cd69ad35fd95759cdc66361e45c84b42a7f4
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 010f30dae73cbc522de79f6069571351de4391d0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6271

remove previous received data from ReceiveQueue for gatt server.

and modified to adjust destroy thread.

Change-Id: I39043ae19527160a4f76d808a4a8e8b70d055f8a
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 2a7b046b63032c419db682fa11ed2ad2bf84081e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6135
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

(IOT-997) modified checking scanned device for unicast

Change-Id: I48854d19c95f0af6fe3a0e0f28d35a4127262ab1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit 993cf22827e0d6ca6252ed93c48c164f46d0d54e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6191

[Easy-setup] Unit test case fixes for Mediator SDK

Change-Id: I3a6d37b7aafb29aecf197f05b6bd801e7378996a
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6125
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

[IOT-1208] fix for jira issue

It works as expected, server sample set sensor interface as its default interface. And the sensor interface does not support set request by the core spec.

I feel server and client sample should work as pair, which means sample server needs to support set request. So sample server is modified.

Change-Id: Ib2ff696c18ba5449300dff833d2dfdc7e2d7c8bb
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6209
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 45837c22238e8a2714a1db0cf19b6e202895011e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Fixed coding styles in TestBase.java of RE-android

Change-Id: I5cd88b6ee6c20312bc12d6c4082cbe046af5b13b
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

resolve jenkins build error in unit test case

Change-Id: I054b023d1d400f1baace456c929aa808dd41607f
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Corrected spelling mistake in Doxyfile

Change-Id: Ic86f860117f6e492cda831b4c832f834a38e8a75
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5765
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Fixed a bug in the cache module of RE

If observation for a resource from a client is started, it should be canceled.
But there was a logic error that it isn't.

Change-Id: I2440c20999b7076bea5987ccbad3f0710269b3d9
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>

Correcting error case return value

Change-Id: If1b1e8e0674ab37461f95a8fae0a22b026fe4ce6
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6011
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Modify Ciphersuite code number

Accoding to conclusion of OCF Securit TG,
the code number of TLS_ECDH_anon_WITH_AES_128_CBC_SHA256 is changed to
0xFF00 as OCF Vendor Specific Ciphersuite.

Change-Id: I24456049608a8559bd8082ab359e4a2b3c0a00b8
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6095
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit a44f827d62aa56d4220eec869cd63ec73a829bbd)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6097
Tested-by: Randeep Singh <randeep.s@samsung.com>

fix error for create a new block data

Change-Id: I1a90bc9959e2049dd04d12ef90e5476608357681
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit f8bf221edc2b29a6684afe8be0b8fd735537f746)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6003

Fix for Klockwork issues

Fixed issues reported in Klockwork run

Change-Id: I00e6a874ce53a0614ed20230d18f1470a2ec4904
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5909
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

fixed initialization issue for connection state.

Change-Id: I16b02d35ae36feacb6472a73796cb1b9e24636bb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5631
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 1b395d956b94afcc69a5a0c7d24a2f75042aa2a4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5895

Add timeout into checking invalid input condition

- Patch 1: If timeout is 0, return error.
- Patch 2: Add unittest
- Patch 3: Modify file mode

Change-Id: I571615ffe4d00dc1feff94d9b39525eabc75d215
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6061
Reviewed-by: Yonggoo Kang <ygace.kang@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 92a40d711d88dddba9476640e8b8204c2f60b0ba)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6069
Tested-by: Randeep Singh <randeep.s@samsung.com>

Modified README-building-and-running-secure-IoTivity-stack.txt

Change-Id: Ifd44d3b64b1e2643eda82146b6b1d4d9fb85d44e
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Static Analysis correction of testcases

Change-Id: Idb52664e0ecc31c7d6f04f2cd8f46367c8b1e7f8
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

MAC address parsing in constructResourceObject()

When call the function constructResourceObject(..), the first parameter
is a string for a host address of the server.
The string could be a IPv4 form or IPv6 or MAC.
But there is no parsing logic for MAC address form(xx:xx:xx:xx:xx:xx).
Without this, MAC is parsed as IPv4 which does not work properly.
(the first block as IP address, the second one is port number, and
lasts are ignored)
So I added the MAC parsing logic with checking a validity of address.

Change-Id: I2fc5a14b400605c9255173bbddc2ff7a4bae0551
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit 613c5281e662dd8f693477fa001f9f5500fa8f2f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/4521

Adding security json file to easysetup android assets folder

- This file is need for easysetup secured mediator for storing the creds and enrollee information

Change-Id: I3a11c332167dd3969f3fc9dee9b8455aebf8cc51
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6051
Reviewed-by: Sandipan Patra <sandipan.p@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Updated Tizen easysetup readme with proper rpms names

Change-Id: I0f457d03afebae55005924d035a0762dbd5d7b66
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit 3405b241ea43bfc6472e3f559033230e2dff812c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6043
Reviewed-by: Sandipan Patra <sandipan.p@samsung.com>

removed warning in CA layer

Change-Id: Id7b89929a8497a041590b60e91f2ad33d51ce0c1
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit e1dffdd55cd2a6f3e18c5bf5eb6a348e3bfef9fc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5403

[Tizen Secure Mode] Tizen enrollee build using security mode enabled

Change-Id: I5a4d91e5e56863a9a859f681202f52828207a00a
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5611
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit cacf88d328ec0a4efb2bc4024d3a102abf9e13d0)

Change-Id: I5a4d91e5e56863a9a859f681202f52828207a00a
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5803
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Corrected compile time warning of unused variables

Change-Id: Ic875af1273f0c6dc2907479e8ae5203e87435262
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Changes related to accept socket initialization

Changed tcp adapter start logic to create accept socket only when
host is server.

Change-Id: If0c20f20e8bacdcca63b20e0b204e87c7d1e78df
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5941
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 895ffc47e860f4ae78577853b1f8e39fa708c79f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/6001
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

fixed the bug related to coap over tcp pdu creation.

The first nibble of the frame is used to indecate the length of
the options/payload. and if a value is 13, an 8-bit unsigned integer
follows the initial byte and indicates the length of options/payload
minus 13. even in case the length of options/payload is 13, an 8-bit
unsigned interger has to be used to indicate 0.

Change-Id: I580e126755ae4b3018fe7eb11eae34035b0efa6c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5901
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 417ac656bad3f3c84f5cbbc8a4c88b5426a4fe1d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5999
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Adding unit test cases for direct pairing

Change-Id: I5f140fcf7895b2e6b517b4588655a3be483c6bb1
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5791
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit df3779aa30c5b105c7ab50799748b9770ea6cea7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5997
Tested-by: Randeep Singh <randeep.s@samsung.com>

Corrected warning of unused variable

Change-Id: I9708256a325978de5d55ef8b9b12edd44337fa5b
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Corrected empty body 'if' warning

Change-Id: I6a7a8f0f1374e84bede366d4cc6b2d87c71eec94
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Corrected spelling mistake in ReadMe

Change-Id: Ia4cde829f4596e13b1300d0b16b79bb7d5003cf3
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5761
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Remove unnecessary code

And changed Tizen API

Change-Id: Iecc07d760926b1ce42554bdf9cb9fcfda38833c3
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5615
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

[Easy-Setup] Updated Doxygen and javadoc

- Updated Doxygen and javadoc updates for easysetup service based
  on latest folder structure

Change-Id: I4a3d888fb30a6a334aba3d7cd5fe4ed019b2ed75
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5825
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 0c97f909f863c325b2e4de71f0486b173617cf3e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5943

Fix for klocwork issues.

This change includes fix for all klocwork reported issues
in native and java layer.

Change-Id: Ibba5d478e64251636c8ef514c52b9e9bd6f36442
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 975f03206382a5a92a1bb6b02797716361103989)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5945

IOT-945: Fixing segmentation fault issue

- Using smart pointers for managing bundles
- Changing APIs to use smart pointers

NOTE: this patch breaks backward compatibility with previous APIs

Change-Id: Ibeb833c3a0381856ca96747404302ae4bc308a39
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5661
Reviewed-by: Inga Stotland <inga.stotland@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
(cherry picked from commit 6db3155bd07c9394a1e8409077d95aac709180aa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5707

Added Unittests and Added LICENSE

Generate response test(Actuator Interface, Custom Interface)
InterfaceHandler.cpp file not contains LICENSE
Added LICENSE

Change-Id: I034f43f6524ed630ed806173ffa3db267308dec5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5657
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
(cherry picked from commit b683f1a68f66f9db2743fe20e8d9e3b92b6675c3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5809

Add required header file in sceneserver and sceneclient

I've added condition_variable header file because it is required
for some compilers.

Change-Id: I68655e613a10b3c8941fd743651d304999272160
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5715
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
(cherry picked from commit 07a6497a5b51e0dd7e03008d4ede68de64df8b08)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5813

Removed unnecessary/duplicated code in connectivity abstraction

remove unnecessary/duplicated code in connectivity abstraction
to increase unit tc coverage

Change-Id: Ifa589642b43f1590ed492a129a0af4a2cd954358
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5607
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5729
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>

Memory Leak of capi context resolved

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

Changed the /oic/ping resource registration condition.

In order to register /oic/ping resource in case host is not client,
I modified the keepalive init/terminate logic.

Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5571
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 47c277017baf1e4bed04f2b84132b2cc87bdfcfa)

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

fixed an issue there is no check null for connection manager.

Change-Id: I1a8d48f5a12489f6c5809cdcdcaa0b2ea1304892
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5881
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

clean up for android BLE client

- release variable related to JNI
- terminate Glabal variable
- add some comment

Change-Id: I342a7fd9a8550d0a3c2bf139254e5a147e2dd4dc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit df1c2dcd5815b6fc069d13552069365c297adc75)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5727

code clean up in caedrserver.c

In CAEDRNativeReadData(), getting a address string of the device is unnecessary
unless inputstream is available.

Change-Id: Ic1d363bc42eaeb948fe8f6ee5f4fddcec3d35086
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5721
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit 77f5a745361dfd79addd79899e0cb5863330e34b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5929

code clean up in cablockwisetransfer

code clean up and remove unnecessary code in cablockwisetransfer

Change-Id: I92836df67c3b5ec128915baad9936aedad176b53
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit a25cd01f67d1cb254f65605e53efaa06b467be23)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5927

To get device name from scanned device for Android BLE.

Device name has to be included in advertise packet
after Android API 23.

Change-Id: I0379e1fc1d7675088739f07a47b0d0171e9f57eb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit 27208a308eedba634cd9ed488aa9c6a0c79f906a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5925

fixed wrong waiting for scanned device.

when scanning is waiting for target device for unicast.
there is no delay time in previous logic.
so send was failed

Change-Id: I8b7d3b71e462434d1f31f273c5b2dcbb5e0e9f28
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5689
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit 9ac6be815366eb44653b514643b71df92cc5b919)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5741

clean global variables for connection manager

Change-Id: I595d2fc6c92939a4b4d048e0f0eb97db3d903db1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5669
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
(cherry picked from commit d251a8dac04c1fb97b5f7eb8c1956b09ce21c02f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5725

Corrected spelling mistake in README

Change-Id: I66be31a8aaffd997a59abd56427bf9d298cff809
Signed-off-by: Shashank Shekhar Shukla <shekhar1.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Remove ca_mutex_trylock and associated unit test

ca_mutex_trylock is not used anywhere. Implementation of this function
presents challenges for porting to additional platforms where an
easily-wrappable implementation might not be available, such as on
Windows.

Change-Id: I7727c5f9a6c97a53dda15007cdfd74043ab03a7b
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5645
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Memory Leak of urandom resolved

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

Wrong use of fflush() library function

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

Resolved Adruino build errors

Change-Id: I28b7e3a2844904a91b9abaacd1e634419a821069
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5875
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Add direct-pairing feature

 <contents of modification/addition>
 : Added direct-pairing resouces and related types
 : Added direct-pairing provisioning feature for provisioning tool
 : Added D2D pairing operation feature(discovery, pairing) for client
 : Added RI layer APIs and data types for direct-pairing client
 : Modified provisioning tool for direct-pairing feature and created new sample client

-Patch 1: Initial
-Patch 2: Fix OSX build error.
-Patch 3: Add DPC(Direct Pairing Capability) resource and processing logic
-Patch 4: Fix dpc parse error when loading svr db
-Patch 5: Fix unnormal processing when duplicated request on dpairing resource & Change DPC default value as true
-Patch 6: Fix SVACE warning & Divide pconf and dpairing resource into another ACL entry in svr db
-Patch 7: Fix SVACE warning's positive false
-Patch 8: Fix device list management

Change-Id: I461626fe041a5927c0e27e78e63e74e215d61cd5
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5673
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d2f4378179667e7b55b38af7af11e639bea10885)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5745

Remove the compile errors for arduino.

If we use 'goto' on arduino.
We should initialize variable before the 'goto'.

Change-Id: I06bc47dcfece26ad5d5bde7e71e0f57473310d5a
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5705
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit e432aeff0031f9852e2031e018957c350c938d54)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5743

Code cleanup of csdk/connectivy/util/SConscript

* Base directory paths are more clear than relative paths.
* Remove unnecessary reassignment of src_dir.

Apply change to extlibs/tinydtls/SConscript to reduce env pollution.
This includes a fix for a newly exposed issue wherein debug.h is being
included from an incorrect directory.

Change-Id: Icd6a8afe688768da8e491006f2479cbbe78ca02a
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Readme.txt of resource sample changes

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

Changed tcp adapter logic to process the received data directly

Currently If new connection is created with remote device, received
first data from remote device can be processed after select timeout.
because select() is blocking function. so I added connection file
descriptor to update read file descriptor list after receiving
connection event.

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

Modify to update default ACL of security resource
after ownership transfer is successfully completed.

Current default ACL of security resource can make a access permission issues.
If we do not update defualt ACL, anonymous user can access security resource.

For this reason, If ownership trnasfer is successfully completed,
the securiy resource ACL should be updated as follows:
{
  "sub":"Kg==",
  "rsrc":[
    "/oic/sec/doxm",
    "/oic/sec/pstat"
  ],
  "perms":2,
  "ownrs":[
    "cmFuZG9tUGluRGV2VVVJRA=="
  ]
},

In order to resolve this issues,
I've modified SRM to update security resource ACL
when 'owned' property of doxm is changed as 'true'.

[Patch #1] Intial upload
[Patch #2] Remove compile errors
[Patch #3] Update comments in source code.
[Patch #4] Update comment in source code.
[Patch #5] Retrigger
[Patch #6] Fix the bug which is occurred due to operator precedence.
[Patch #7] Remove default ACL provisioning step in ownership transfer.

Change-Id: Ia5eb62693168788cf1a607bb95ce97a44ce5b15d
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5625
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit c35094220f8fcfeaa40c4befc9e9c1883756fe3a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5703

Fixed defects reported by svace in SRM

- Patch #1 : Init patch
- Patch #2 : Modify file permission
- Patch #3 : Update doxmresource.c
- Patch #4 : fix defects
- Patch #5 : Apply the review comment of Mr. Cho
- Patch #6 : Apply the review comment of Mr. Chul Lee.

Change-Id: I7c1ffb65bed604adbee60ee55456f230b83a759c
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5653
Reviewed-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 61853f8bce9f038b91fd1aa1127c990469b58c24)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5687

Update a CBOR parser logic for well-known keywords to OIC

I've updated a CBOR parsing logic When CBOR parser encounters a well-known
keyword like "href" as an attribute.
If the attribute is *NOT* on the outermost representation bracket, it is
treated as a normal attribute.

Change-Id: I1f1c28dd59ae09e1f3f8ab0188c59a1b9fc3b950
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix defects reported by SVACE in ckm unittests

Change-Id: I68d86ed516dad5492d8b0028d28f460612b8775e
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5437
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

add doxygen comments for exceptions in Scene-manager remote apis

- add doxygen comments in scene-manager remote apis
- change to use const variable in scenecommons with get request in RemoteSceneList class

Change-Id: I3354b7c271962be8d22f226a663e5cc415c8f211
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5545
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

RE ServerBuilder always included "oic.if.baseline" interface.

If User don't setting "oic.if.baseline" interface.
but, RE ServerBuilder always support "oic.if.baseline" interface.

setDefaultInterface API(Modified comment of header) and Modified Initialize of Builder Constructor
If it is not called, the interface passed to the constructor is the default.

Added, Duplicate check the resource property of interface and resourcetype.

Change-Id: Ie25f1135cc7c99fbf5fe1b04f3121b9e2707be21
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fixed build issue by including condition_variable header

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):

    error: 'condition_variable' in namespace 'std' does not name a type
    std::condition_variable cond;

Change-Id: Ieaff9bb24e0dd44e6660c7e2ac2d5d718e4270e2
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5495
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

Fixed build issue by implicitly capture by reference (of Scene)

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):

    error: capture of non-variable 'OIC::Service::Scene::m_name'
    [&actions, &m_name](const SceneMemberResource::Ptr& member)

Futher explanation from Thiago Macieira <thiago.macieira@intel.com> :

  Looking up the C++ standard, it says that :
  "An entity that is designated by a simple-capture [...]
  shall be this or a variable with automatic storage duration".
  That means you cannot capture non-static members by name and you
  have to capture the whole object.
  Using [&] accomplishes capturing of "this".

Change-Id: Id9db9ca55b858b5c39cee48a5eb9b25ad9e59b41
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5497
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

OICSensorBoard: make configuration variables able be overriden from outside

This still can be forced as :

  make CLIENTARCH=x86_64 BUILDTYPE=debug

Or by exporting CLIENTARCH in parent Makefiles or env

Change-Id: Iccf271ce0a5108a4c4c2f8c2d2187b7c02e00d34
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4745
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

OICSensorBoard: update includepath to new location of platform_features.h

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

Fix issues reported by SVACE tool in CKM module 2

Change-Id: Ied98d297287e3e1dad6bc51b19889c6647e097b9
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5627
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>

Fixed bugs reported SVase checking on |provisioningclient|

Change-Id: I7f0c7fc2ecd6f1fa410f40fbe96dc3226531e92c
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5621
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>

Fix initialization in PKIX

Change-Id: I752659624cba73d138936d1038913dd7ba19825d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5633
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>

Modify OTM & SRM according to spec CR document.

NOTE : This patch is modified based on ownership transfer CR document.
Please refer to https://workspace.openinterconnect.org/apps/org/workgroup/security_tg/download.php/4703/STG008_OIC%20CR%20Ownership%20Transfer%20sequence%20diagram%20v2.docx
This CR document seems to be applied to next spec.
I'd like to apply CR to save time for prepare 1.1.0 release.

This patch includes the following modifications :
   1. Modify not to include private data when OBT sends owner credential.
        - Please see the step 19 of CR document.

   2. Modify to re-establish secure session using owner credential
      when owner credential was successfully exchanged.
        - We can verify owner credential through re-establish secure session.
        - Please see the step 38,39 of CR docuemnt.

   3. Add logic to handle errors that occurred during ownership transfer.

[Patch #1] Initial upload.
[Patch #2] Add logic to handle errors
[Patch #3] Remove the compile errors and warnings.
[Patch #4] Retrigger
[Patch #5] Retrigger
[Patch #6] Rebase
[Patch #7] Rebase
[Patch #8] Update based on self-review.
[Patch #9] Rebase
[Patch #10] Retrigger
[Patch #11] Modify according to Mr.JongSung Lee's comment.

Change-Id: If3d8f21ef686db86dbfcc1b15382eeebaa232a9d
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5341
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>

Fix issues reported by SVACE tool in CKM module.

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

Fix static analysis issues in PM

Change-Id: I1a079333d7636b52f8ae9d4ab0609656a5395278
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Updated Address max size

Max array of size 40 is not adequate for storing address ipv6 address.
Thus increased the value from 40 to 56.

Change-Id: Icd63c11365cefc2576043c87ef54802b5028c971
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5411
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Fix a problem in SceneCollectionResource.cpp file for 64bit environment

I found when a capture paramter in LAMDA operation is a reference type, an unexpected error happens.
So I've changed it to the parameter to be copied.

Change-Id: Id4b7ef68d85d0800df84331210c85fa035441229
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5483
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Modified const variable of baseline interface and excetion class.

When adding already has scene and scene member,
throw exception class is changed to RE layer exception class.
And const variable of baseline interface is changed at create RCSResourceObject.

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

Modified Exception and Doxygen in SceneManager Local-side Excepiton

- InvalidAddMemberRequestException -> RCSBadRequestException
- Adds API doxygen of excepiton

Change-Id: Ie520f84bc6895c57e0bef9ed0ee6adb97154681d
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

remove build warnings for resource container

Change-Id: Ic2216bb76bcd16ac410e78a321b1d92cb3241596
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5533
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>

removed unnecessary cafragmentation files

because fragmentation was not used, I deleted related code

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

Fix CKM build error

Fix build error with "scons SECURED=1 DTLS_WITH_X509=1"

Change-Id: I317427bd8818e6f7f28edcdf7ff7957a9b78022d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5501
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@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>

Fixed build issue by generating ~DiscoveryTask code

If declared as default (and not defined), this function will be inlined,
but in some cases (using shared libraries?) inlining is not appropriate,
so it's preferred to make a regular declaration and still use the default
capabilities for definition.

Problem was observed while building using tizen-sdk :

    libresource_hosting.so: undefined reference to \
    `OIC::Service::RCSDiscoveryManager::DiscoveryTask::~DiscoveryTask()'

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

Used toolchain for Tizen:2.4:Mobile is arm-linux-gnueabi-g++ (GCC) 4.9.2

Change-Id: I708812404b01c35f09e8aa68afad962c7d6e0df3
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5445
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

OCPayloadConvert cbor payload size

CBOR payload conversion by default is set to 255. When memory failure occurs it
uses encoder->ptr - encoder->end to increase the payload size.

The recent error checking resulted in returning immediately and that result in
encoder->end having a wrong value set. Close container results in setting end
encoder->value correctly.

Changes include to not exit immediately if it fails. It fails after close container
call.

It also introduces the max size of the payload. It is set of 1530, which is based on
6 times of default paylaod size.

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

[Mediator] Removed hard-coded Secure Flag from android application

Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5441
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 815da513484596845e08fb0ac80346930b662343)

Change-Id: Ifa96ff1d2a2a3e11a2916755495af2c32106d79e
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Merge "Merge branch 'simulator'."

Merge branch 'simulator'.

Change-Id: I7566052325446e1887fa531af4e6f47c4f4089db
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>

Merge "Merge branch 'cloud-interface'"

Additional unit tests for the resource container component

Change-Id: I90b7b8c6dcc2075bdf30aad2b7fd6395deb1c328
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5347
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>

Modified RCSResourceObject to eliminate its inheritance from enable_shared_from_this.

Change-Id: I7950249ad1ad132693ee93cb11794bf3b90c6e48
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5337
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Merge branch 'cloud-interface'

Change-Id: Icc8c35a45a75ab2e1703db95a9312fbdce746b44
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>

Resolved issues and concerns found during overall functionality testing.

1. Handled the array type value validation.
2. Handled the redundant resource discovery callbacks.
3. Added more information in UI to show the array properties
   when updating array type values.
4. Added more log messages.

Change-Id: I95bf65ad4bd7b9cfcfe02141832b281065bd0f99
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Added UI Support for updating model arrays.

Implemented changes in ServiceProvider and ClientController simulator
plug-ins for adding/removing items to/from array of complex attribute
value types.

Change-Id: I0f590fbbcf8dca7cbfaf9ca68eaecf55fd0a5626
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge "Merge branch 'master' into cloud-interface" into cloud-interface

Merge "Merge branch 'group-manager'"

Fixed build issue by implicitly capture by value (of RCSResourceObjectTest)

I assume this what the author meant, with the previous version it failed to build from source.

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):

    service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:\
    In member function 'virtual void ResourceObjectInterfaceHandlerTest_GetResponseForBaselineContainsAllPropertiesOfServer_Test::TestBody()':
    service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:613:18:\
    error: capture of non-variable 'ResourceObjectTest::server'
    [server](const shared_ptr<OCResourceResponse> response)

    service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:134:28:\
    note: 'OIC::Service::RCSResourceObject::Ptr ResourceObjectTest::server' declared here
    RCSResourceObject::Ptr server;

    (...)

Change-Id: I30f905bc983bbfad5e54ce60f5ccce4573cb2f78
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fixed unit tests for resource container

Change-Id: Ib8d25140d08b538cb9d376f3e76bb390c8d0758e
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>

Update ocstack.c cbData comments

C API cbData currently implies response is only when whole process is completed.

C++ API OCPlatform.h holds the details correctly for resourceHandler.

Jira Issue: IOT-678
Change-Id: I5ce19a03fe44189679ae05346fdfcb21f72d1b37
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Fix to notify connected state to Tizen LE client from network monitor

Change-Id: I6d0c0cbf1c6c48f07c39b1d01c48ac0f29396eaa
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

corrected spelling mistakes

Change-Id: Ia4e0f2fe476760f9050648726281ab8899509215
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5389
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

modified timing issue associated with data transmission.

when gatt is disconnected during data transmittion.
there is some crash since some global variable was available.

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

Merge branch 'master' into cloud-interface

Change-Id: I7c493903fabad7e9444c5d1d16bd0d5cfca0c3fb
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>