Fixed bug in u_arraylist_contains caused by poor member naming.

Corrected a bug in u_arraylist_contains caused by the member names
'size' and 'length' being too similar and hiding a logic problem.
Fixed by changing 'size' to the more common 'capacity'.

The base fix (without any of the name change) was pulled from
Vimala's revision 10 submission of change 2301.
https://gerrit.iotivity.org/gerrit/#/c/2301/10/

Change-Id: I22ac6fc159669ad58212b145f70cb559187fa999
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Vimala Vishwanathan <vimala.v@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>

Resolved doxm issue

SVR db is not not getting updated with owned as true and owner
information, in case of JUST_WORKS case.

Change-Id: Icbbd19171d0177c5fadae429dc54b8626af57a75
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2336
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

[Resource-Encapsulation] Java SDK for resource-encapsulation layer

- SDK for client side [updated as per review comments]
- SDK for server side [updated as per review comments]

Change-Id: Ie13656f263d39377269dd2479c43ef2a3efaeac0
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2266
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add sequence types to ResourceAttributes

There are sequence types supported by OCRepresentation, for ResourceAttributes to support perfect compatibility with OCRepresentation these types are added.

Change-Id: I260f4363e07e72220a2424c700d12dbef1d10e54
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2314
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Updated provisioning API to cater different connectivity type.

 - PMGenerateQuery() will make a proper query
   based on connectivity type of endpoint.

[Patch #1] Intial upload
[Patch #2] Update according to comments.
[Patch #3] Modify the buffer size which is request query is stored.
[Patch #4] Update according to comments.
[Patch #5] Update according to Jon's comment.

Fixed a buffer size for writing queries.

Change-Id: I996888faec20614736907dc7c17300eb8d1550cf
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2300
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>

Android: Mimics stack behavior and allows "null" entityHandler to be passed into the registerResource API

Change-Id: Ic7d11043e2b5a18e832e06ef1c71865d6a912530
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Android: Allows to destroy OcResource java object before all of the C++ callbacks have been received.

Change-Id: Idc77b12f7ad6aa3dd8d4cea6e4555eac3f776ab7
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2306
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fixed android build to work multithreaded.

Previously the android build was missing proper dependencies
so could only be built if multithreading was disabled. This change
adds minimal dependencies to get gradle to be executed after the
native parts are built, and re-enables threaded builds.

This could reduce build times by roughly 75% on average systems.

Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Change-Id: Iccecd7cc976855592d3375027a4de1f9fd2dbe98
Reviewed-on: https://gerrit.iotivity.org/gerrit/2310
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>

Fixed IOT-674 bug

Updated doxm resource to set it's oxmSel field to selected ownership
transfer method during onboarding process.

Change-Id: I518e69e9f92b5dbbb8bb7fb83c2489a272c950b8
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Updated doxygen comments for OCResource.h

Updated and fixed some issues w.r.t doxygen comments in OCResource.h file

Change-Id: Ia89553197b32aad5ae1c8fa6482c03783e70baed
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fixed the IsRequestWithinValidTimeTest unit tests.

Fixed  IsRequestWithinValidTimeTest unit tests so that they don't failing on boundary
conditions.

Change-Id: Ie52e3e75d8fc2ee052f43a532681cb2091545fbb
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[Resource-Encapsulation] Android Sample Application for client side APIs.

Change-Id: I1605fe00027c8bd6d2182a70e3dbb35f2d6c2b2d
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2267
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

update comments of RCSResourceObject.h for doxygen
-straighten up lines
-typedef AttributeUpdatedListener
-class LockGuard

Change-Id: Idfbad3ade7fcedc6870835bff32b966d574bc8b5
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2302
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Generate device ID from Secure Virtual Resource

SRM should generate the device ID for the resource server

Change-Id: Ic4f83f63a59827bf5cfb412afc34e1d955ee69e2
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2162
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: Sachin Agrawal <sachin.agrawal@intel.com>

Fix Android EDR Client memory leak

Delete JNI local reference

Change-Id: Iee79cdf5adac2a8d2f1bac67fd1ac34757d974d8
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

OCRepresentation: fix segmentation fault by initializing memory

dimensions was not fully initialized, but used by the code, so it could
contain arbitrary memory. If this memory was a big number this code
could allocate very much memory as this was used to create a 2 or 3
dimensional arrays.

This fixes a Segmentation fault seen in normal operation of the
garageserver and a invalid memory read and a following segmentation
fault seen with valgrind in the garageserver

Change-Id: Ifbab3d48b00bd2e3559ca3a8d79336ecf5feef6e
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Variable declaration incorporated in for() loop itself.

https://gerrit.iotivity.org/gerrit/#/c/2277/

Change-Id: I83c03bdba83109b9a313dee977efd13b6e65aa55
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2303
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Change build option about provisioning

Now, provision manager is working on linux only.
So, build condition is changed to SECURED=1 and linux.

Change-Id: I310ccffcd911ec925b9c9725909d22d24062603d
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2280
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Modify a group management implementation with CBOR conversion in c stack

Previously, oicgroup.c file dealt with processing group action requests and
constructing the corresponding responses and it was strongly related with
json encoding/decoding. With this commit, all json-based codes in the file
have been updated to use CBOR instead of json.

Change-Id: I2f0953fab9c77024435d389538a4f43b600d7864
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

add a gtest case into serverBuilder unittest of resource-encapsulation for testing nested attributes

new case of  unittest : SettingNestedAttributesIsSameToGettingNestedAttributes

A RCSResourceAttributes, itself could be value of a key-value pair like int, double, string and so on.
That means developers are able to nested structure when they make key-value pairs and it is possible to set up the following hierachy in attributes.

{
 "type": "Living Colors",
 "name": "LC 1",
 "modelid": "LC0015",
 "swversion": "1.0.3",

 "state": {
    "hue": 50000,
    "on": true,
    "effect": "none",
    "alert": "none",
    "bri": 200,
    "sat": 200,
    "ct": 500,
    "reachable": true,
    "colormode": "hs"
  }
}

Change-Id: Ifdf2fb41860ad7227753677741bf79c6709fbaa6
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2284
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Fix resource sample and unit test warnings

Change-Id: Ieced950f54f7ce9997852a455fd5f9b5e89afbc1
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Re-enabled some of the Android smoke tests

Change-Id: If90118088be6f4663196bd1dd05cdd5c7d1ec161
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2294
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fixed u_arraylist to correct performance and missing calls.

Corrected poor memory management to not realloc() on each remove
call, use a normal approach to growth of the backing store, and
some general cleanup. Added calls for reserving space and for
requesting reduction of the backing store.

These were all issues called out in the intial code review.

Simple cleanup improved performance of the contains function
reducing its time by 40%-50% (~ 36ms down to 21ms-19ms).

With the backing store corrections, repeted add/remove testing was
improved with its time being cut by 75% (36.8ms down to 9.4ms).

(Times should be taking as very rough, since runs were done using
valgrind to slow things enough to actually measure.)

Change-Id: I81e42f2fdbec8fb7fb18f16f09cfa5008640a2d4
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2293
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

[TIZEN] Enabled Resource Encapsulation build for Tizen platform with sample applications.

Change-Id: I1cdd77f53c959ac4825bafe1d31cfcb39aff4975
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rami Jung <rami.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Fix for the incorrect payload size conversion in the stack

Change-Id: I928170769799b4c9ca5c466680e9103956a35a53
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2290
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Add unit tests for u_arraylist_t in preparation for subsequent changes.

Change-Id: I489398da1bb5455977b8bbb0d302a889f130b04f
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2214
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

things-manager: Updated doxygen comments for ThingsManager.h

Updated and fixed some issues w.r.t doxygen comments in ThingsManager.h file

Change-Id: Icafdaa0bd00b275b1e7423ea25d22601bcab9323
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2276
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

android: fix location of sdk

The file android-sdk_r24.2-linux.tgz contains a directory named android-
sdk-linux and the macos and windows version use similar directory names.

This fixes the following error message:
/iotivity/extlibs/android/gradle/gradle-2.2.1/bin/gradle build -b/iotivity/android/android_api/build.gradle -PTARGET_ARCH=armeabi -PRELEASE=release

FAILURE: Build failed with an exception.

* What went wrong:
A problem occurred configuring project ':base'.
> The SDK directory '/iotivity/extlibs/android/sdk/android-sdk_r24.2' does not exist.

This was only tested under Linux and not tested under windows or macos.

Change-Id: Ia316ed65dc22f653a297b6423d4e1b47a24c8dbe
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1222
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Remove sleep in Android EDR.

It is no longer necessary.

Change-Id: I8d2e0f741830f659edee7b977f24d32f8e93b8c1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix Secure sample build warnings

Change-Id: I0993913a67fdebf7717d513e9760b048f44ee59d
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2271
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix C sample build warnings

Change-Id: Icbe7e6f5a2ef136628ccad3986641d2bb492188e
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2272
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix C++ unit test build warnings

Change-Id: Ic018b9d6fda988031761ba23b43d8a93231e00f4
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix C++ sample build warnings

Change-Id: Ib79a9ba3f251169a17bbe809a00ccca05a206a92
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2274
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix C++ stack build warnings

Change-Id: Ib653a245e4b4301dd68970c613bcd1252fbae5ec
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2270
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Enables SimpleClient/SimpleServer to communicate over the BLE on Android.

The wait/re-try logic was introduced into CALEClientSendMulticastMessageImpl
to make sure that there is at least one connections established before
the send call is made.

Change-Id: I5ad52321fc316005dbc48e4e323205a661293f3e
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2248
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

support blockwise-transfer on RI layer

Change-Id: I5bb08b94bf3cf4cab3ff5878260c845bee5592a5
Signed-off-by: Myungchul Kwak <minus2k@hotmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2256
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Resolved bug IOT-685

Resolved bug IOT-685. Due to unintialized value of field "interface" of
struct CAEndpoint_t and changed return value type of method  u_arraylist_add()
broke the security apps.

The unintailzed value of interface gave it random value
which inturn set the wrong value for ipv6 sockaddr_in6 struct field
"sin6_scope_id" causing "Network unreachable" error.

The return value of methode "u_arraylist_add()" was recently changed
from CAResult_t to bool. This caused seg fault.

Change-Id: I23fea80a0d6e12dd4122f2e032497a72496a4745
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

replaced LOG type with other thing.

when this logic is worked,
the log is giving some confusion now.

Change-Id: I7ca43eb16d211b75975a27d07aaf841f0ecb91cf
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Split up Android builds by architecture

With the additional option of building Android for the x86_64
architecture builds can reach upwards of 3 hours. This change sets the
groundwork for adding the x86_64 arch as a build target by splitting up
the android build by architecture.

Change-Id: I8d6837c3187e871543c0841638d1cc50600f75a9
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Merge "Merge branch 'security-basecamp' into master"

Fix presence with ipv6 changes

Previously, the CA layer code was assuming that
all responses are always sent as unicast messages. But, in
the case of presence, it is always multicast. As a result,
the server sent presence notifications only to the ipv4
address and the clients subscribed to server's ipv6 address ignored
the notification. Adding isMulticast flag to the CAResponseInfo_t
structure and changing camessagehandler to handle multicast responses.

Change-Id: I4a0991aca6cf60b4b1ad3f0dfcda683284680adc
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2252
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix Android EDR crash issues.

CAEDRServerStop is called twice.
So occure reference to invalid global.

Change-Id: I5652b53cf78257a8c59a9ffcf67cfe58879855a1
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Merge branch 'security-basecamp' into master

Conflicts:
resource/csdk/connectivity/api/cainterface.h
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp

Change-Id: I3f49aaa0a1e23f1e361f9f2aa3ceaa5a2acd6aef
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>

to check max token length by coap spec

token lengths 9~15 are reserved.
it must be preocessed as a message format error.

Change-Id: I84b2e51b7364fef4e4dae0d60b1b5010fd059ad2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2235
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Removed some warnings from security code.

Removed warnings related to missing-field-initializers.

Change-Id: If4af332ba8f7995c5657dc052763e1bd4089682c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Removed warnings from provisioning module

Removed all unused variable warnings coming from provisioning module

Change-Id: I6183c9413ea495d2969d0e94aa6152a53eeb4b38
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2226
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Refine codes using an enum with std atomic in DevicePresence

DevicePresence::state, a variable to keep the state of the class, is an enum type. It needs to be declared as an atomic to make it thread-safe.
std::atomic with user-defined type is not available on GCC 4.6.3, therefore std::atomic_int is used instead. The enum is scoped enum, which means it is enum class. It means it is not interchangeable with int implictly.
That's why a separate method is declared to set the value from int value. Plus, the values is controlled in the class, so it is safe to cast to int and vice versa.

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

Enable resource/connnectivity logging for osx/ios

Change-Id: I31d065cf3d35fe5b94fbdd9a6d10b65c07a1fc2d
Signed-off-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[CA] Fix Get Network Information for Tizen

Added network monitor for CAIpnwmonitor
Had Fix for tizen RI sample build error

Change-Id: If049ccde21a3233ed4d4bebe7c81e32cd8f94d7c
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Updated doxygen comments for OCPlatform.h and OCPlatform_impl.h files

Updated and fixed some issues w.r.t doxygen comments in both
OCPlatform.h and OCPlatform_impl.h files

Change-Id: I0b3e72c60c1b99aa6147823854757dce8148488a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

removed unnecessary codes in CA

- removed unnecessary method
- to check Null parameter

Change-Id: I31133e5f50b488830c4e39026862cd451bd98dd9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fix size error, lack of safety check, and type warning.

- Fixed a problem where the length of a different string was being
   used after concatenating a different one.
- Added in missing size checks to avoid buffer overruns.
- Corrected to size_t for proper tracking.
- Changed assumed remaining size to instead be compile-time safe.

Change-Id: I314effbdc14d725e5b16a5e655552c6a817cb3b2
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Correct the warning from ingoring write()'s error.

Change-Id: Iff2bf6ded384237bd63427f4602f0f31dac2d9d5
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2220
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

[Resource-Encapsulation] Fixed multiple builds

Change-Id: Id4c4c3b179f7f5eb1505ab7abf700772b2ea42d8
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2243
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: Jon A. Cruz <jonc@osg.samsung.com>

Partially revert "Enabled x86_64 build for Android."

This reverts commit 806b994263369d28941aa1495a0a3b54d5249cd5.

Leaves in place the 64-bit code changes, but removes the 64-bit
target from builds for now due to a significant increase in
verification times.

Change-Id: Ib86c35c2a80b9d11621b05fcf16e050f3d6d48b6
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

resource-encapsulation: fix build without curl

The hue plugin needs curl and it should only be build when libcurl is available.
Without this patch, the build fails without curl installed, this patch fixes the problem and makes the build worm without curl and without the hue stuff.

Without this patch I am getting this error message:
scons: ***
File "/service/third_party_libs.scons", line 50, in ?

Change-Id: I5b4da555ff84b9b605cc6c119990d60ff670bd0d
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[Resource Encapsulation] removing "boost/atomic.hpp" from DevicePressence.h

That was removed because Tizen 2.3 uses boost 1.51 which doesn't have "boost/atomic.hpp"
Instead of boost::atomic,  std::atomic has been applied and related modules have been changed
 - DevicePresence::getDeviceState() from DevicePresence.cpp
 - Definition of DEVICE_STATE from BrokerTypes.h
 - the way to print log from  DevicePresence::subscribeCB()
    boost::memory_order_consume vanished
Change-Id: I9403a19c9f52d0059cb60d6bff113f5608464753
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2180
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Changed the return type of functions in uarraylist

uarraylist.h includes the common functions for array list.
but now it depend on cacommon.h file.
so I modified the return value to reduce the dependence
on the other files.

Change-Id: Ia8584f000f78fec80b21006594af6574dbb6840b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2218
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[Resource Encapsulation] Enabled RE layer build for Android platform

Change-Id: Ia5091fb9e728e46e37a4f5ee8dc69e4b066db8d1
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Remove boost atomic dependency from ResourceObject

It uses one of std and boost if possible.
When they are not fittable which means the boost version is lower than 1.53.0 and the template parameter is not an integral type,
then it selects handmade atomic class.

Change-Id: I556a936f933d524bb4c78224202da4d742c6e9d5
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Add noexcept specifier to methods of ResourceAttributes

It is related with efficiency for the compilers to create better optimized codes.

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

Enabled x86_64 build for Android.

Change-Id: Iaf4384cc4a1c3ec35ec00b3b0b88b19f5c73609c
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2201
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

android: show stack trace if gradle fails

When gradle fails for whatever reason it does not show so many
information in most situations. This patch makes it show a complete
stack trace which makes identifying the issue much easier.

Change-Id: I943d8fbbb9b8c1e4a068330e6d1cd6edc4954d6c
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2219
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

fix regression in Android interface handling introduced by IPv6 patch.

Added CAInitializeNetworkMonitor and CATerminateNetworkMonitor

Change-Id: Ic0aa1384d13a3ab4f090fe1fc40b6d2e2ceb0bd9
Signed-off-by: John Light <john.j.light@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1822
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Removed unnecessary EDR code related to u_arraylist_t

It is about the code after Change 2205 merged.
https://gerrit.iotivity.org/gerrit/#/c/2205/

Change-Id: I65920d410f209998a1525bc5a2434ee09e789791
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2217
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

removed unnecessary BLE code related to u_arraylist_t

it is about the code after Change 2205 merged.
https://gerrit.iotivity.org/gerrit/#/c/2205/

Change-Id: I3183883efa7914a065dbf56fd122b52e1e720a03
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2216
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

modified cainterface comment for doxygen.

Change-Id: I9022d3dd31e1f0e92d10964017abc1060f7d19c1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2198
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

to add check CoAP version

there was no check CoAP version.
it has to check by spec

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

Remove unnecessary log in occlient

The presence nonce number is already being printed by
OC_LOG_PAYLOAD. This resolves IOT-649

Change-Id: Ifb989c54ebac797c23a0b9f271a24e5d452b589d
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2213
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Mark Tung <mark.y.tung@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

removing redundant code

Removing the redundant code in remote handler

Change-Id: I23d624eec6cf4b215f78fc74ab046a6eaa5468ae
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2133
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Add PIN based OxM for security provisioning

  1. Implement PIN based OxM according to OTM(Ownership Transfer Manager) callbacks.
  2. Add pbkdf2 implementation
  3. Modify doxmresource.c and credresource.c to support PIN based OxM.

NOTE1:This patch will include several compile warning and work around codes.
        It can be removed after the refactored PM and ECDHE_PSK cipher suite of tinydtls is merged
        into security-basecamp branch.
NOTE2:This patch will not working. Please code review only.

[Patch #1] Initial upload.
[Patch #2] Update codes according to comments.
[Patch #3] Update codes according to Mr.Shim's comments.
[Patch #4] Update codes according to Sakthivel's comment.
[Patch #5] Updated to remove arduino build failure
[Patch #6~8] Update code and scons script according to review comments.
[Patch #9] Delete unnecessary codes.
[Patch #10] Rebase
[Patch #11] Rebase
[Patch #12] Merge with refactored PM.
[Patch #13] Remove build error.
[Patch #14] Delete unnecessary files.
[Patch #15] Update according to comments.
            Remove the removable warnings.
[Patch #16] Update according to Shilpa's comments.
[Patch #18] Update according to Shilpa's comments.
[Patch #19] Refresh for rebuild.
[Patch #20] Refresh for rebuild since Jenkins Server issue is Fixed.

Change-Id: I1328db852a4a7e8225737719061b6c61c37a2f9c
Signed-off-by: leechul <chuls.lee@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1989
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

[Resource Encapsulation] Updated DiscoverResource APIs

- Updated RCSDiscoveryManager class
- Updated Linux Sample App
- Updated UnitTestCase

Change-Id: Iaaf72b85335df2507543ccc16de6c094d4c1fe1f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2158
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

[Resource Encapsulation] changing names of internal variable
improving readability

it-> attrKeyValPair
keyAttribute -> key AttrListener

Change-Id: Ie950a4ea68f6f1bd5133f1d4220673e7f5d62d31
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

android: fix WELL_KNOWN_QUERY

The multicast IP address schould not be added to the WELL_KNOWN_QUERY constant.
Without this patch the IP address is added as part of the URI path.

Change-Id: I01589dff9239bd21b796b7bd925830799c6b5e52
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2184
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

Fixed ConditionalAddTextStringToMap

Refactoring changes the function to return an error in the 'null'
condition rather than remain a valid value.  This patch returns it to
its previous behavior by having it return 0

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

Removing unused elments from the structure

CADATA_t is having unused elements
As seen in changes, they are used nowhere but just cloning

Change-Id: If5cb34c085702c1f2bd0a5240bc5c2160277187e
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2193
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Enable arbitrary package sizes for OCPayloadConvert

Previously OCPayloadConvert would only allocate sizes up to 1024
due to how it was designed.  This patch will enable unlimited size,
since it will now recover from a CborErrorOutOfMemory and resize the
buffer, then try again.

This requires tinycbor commit 47a78569c0 (currently HEAD of master in
the github tinycbor library), so you'll likely need to do a git-pull in
the extlibs/tinycbor/tinycbor directory.  This commit also adds a
static_assert like functionality for C, and tests for the condition
where tinycbor needs updating.

Change-Id: I6f81d374ca2b68ebaf2f6a8239be58898b247309
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Corrected direct use of u_arraylist_t internals.

Places in the code were using u_arraylist_t internals, including
sections that were copies of the standard functions. These were
corrected to avoid further divergence and allow for corrections.

Change-Id: I52d251e19d8f80945d71e9d57b5c8107aaa3a4ca
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

updated interface file in android_api.

as java interface for BLE was changed(change-2100),
I have updated java files android_api.

Change-Id: I7519f007619eb5c4ac8b25abb8f9fbf5f3a5d3c0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2197
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

Move security identity out of CAEndpoint_t and OCDevAddr.

Move security identity to CAInfo_t.
Propagate security to OCClientResponse for application.

Change-Id: I535577bedf0ed4f46a97249add56aec6928d2d84
Signed-off-by: John Light <john.j.light@intel.com>
Signed-off-by: Sakthivel Samidurai <sakthivel.samidurai@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2144
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Fixed collections double-sending children IOT-652

The children in a collection were being added both during
resource-conversion and during collection conversion.  This fixes this
by making sure that resources don't add their children in cases where
they are not collections.

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

Fix Rebase issue with RA_ADAPTER check

RA_ADAPTER check was merged improperly, this removes the second
instance.

Change-Id: Id2d02251d55f6917804eb943ab6cbe7ed27bbf83
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2202
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

More robust IP Dual-Mode filtering

Update filtering in camessagehandler.c
Filter duplicates based on last 4 messages.
Filter both requests and responses, separately.

Change-Id: I191436f91c733893bcbf12c9ffdb05bc841bfa2f
Signed-off-by: John Light <john.j.light@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1994
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

Upgrade all samples (C SDK tests) to work with IPv6

Some testing

Change-Id: I77b152b1e0c088b61b8f217313d70d62eb9f7383
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1963
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

Remove a couple of unneeded (legacy) files.

Change-Id: I1945d7b4e7d48f87f69f4d59df44fbd22ededc41
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2106
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

Fixed IOT-679

Sometimes the server sends a observe notification before observe
cancel is processed by the client causing a segmentation fault.
Changing client to call cancel observe when count is equal to 11.

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

Fixed crash in bool arrays not being added properly on parse

The parser had a mistaken condition, so that a boolean array will never
be added as a type to a rep payload.  This corrects the && to || in
order to ensure that it actually executes!

Change-Id: I215e5477596f7c5ad49e2a79a3af619343ef74d8
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2194
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

[Resource Encapsulation] removing "boost/atomic.hpp" from ResourcePressence.h

That was removed because Tizen 2.3 uses boost 1.51 which doesn't have "boost/atomic.hpp"
Instead of boost::atomic_long,  std::atomic_long has been applied and related module has been changed
 -  (receivedTime.load(boost::memory_order_consume) is changed to "receivedTime"
    at ResourcePresence::timeOutCB  from ResourcePressence.cpp

Change-Id: I45758e639c0991e7b4f9b9a20816d9e970b2c984
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2182
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fixed compiler warnings

Fixed compiler warnings in security layer due to recently enable compiler flags.

Change-Id: Id88c7385bb493074fab40513745702f6b452590d
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2164
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Setting adapter value in RI to enable BT(EDR) transport support

Change-Id: I93d2c10760d60f614588703dc52496943f446d56
Signed-off-by: sandipan.p <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2168
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

fixed parsing error in android sample app in CA

Change-Id: I5ebb10c5361eea1fc88975a75e10c06f2df40f02
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: jnashok <jn.ashok@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2166
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

modified if condition for log in messagehandler.c

null pointer leads to undefined behavior.
so if condition has to be modified.

Change-Id: Idf906ec940a80547543dfe01ccc9cbcda0f1d9b8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2178
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>

[Patch #1] Refactored provisioning manager

   1. Change PM is to be used OC API instead of the CA API.
   2. Generalization of each OxM(ownership transfer method) via callback mechanism.
   3. Implement just works OxM according to callback mechanism(#2).
   4. Add pmutility.c/pmutility.h for PM's utility functions.
   5. Add public OC API that is exposed to PM API.

[Patch #2] Change the return value of request callback to OC_STACK_DELETE_TRANSACTION.
[Patch #4] Update commit message
[Patch #5] Add context in OC APIs PM(SRP, OTM)
[Patch #6] Update commit message
[Patch #7] Update commit message
[Patch #8] Remove the unused code in secureresourceprovider.c
[Patch #9] Integrate Patch #7 and Patch #8
[Patch #10] Modifiy codes according to review comments.
[Patch #11] Updated according to review comments.
[Patch #12] Rebase with security-basecamp
[Patch #13] Change the return type in discovery handler.(To ensure the operation of the PM)
[Patch #14] Updated according to review comments
[Patch #15] Removed tabs from pmutility.c
[Patch #16-17] Rebased with security-basecamp
[Patch #18] Update according to Mr.Shim's comments.
            All oxm header files was moved into security/provisioning/include/oxm/
            Change the PM's sample server based on ocserverbasicops.cpp
[Patch #19] Modify wrong module name of PM's SConscript.
[Patch #20] Modify the payload type in OTM and SRP.
[Patch #21] Upload README file.
[Patch #22] Revert to patch set 20 and upload README file again.
[Patch #24] Change the file extension of provisioning sample server according to Sakthivel's comments.
[Patch #25] Upload file missing.
[Patch #26] Rebase
[Patch #27] Remove build error

Change-Id: Ibda88c0b19282af5a2e0893dbf975f0cda34730b
Signed-off-by: leechul <chuls.lee@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1988
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>

Enable automated builds for most transports.

Currently only the Linux builds enables all IoTivity transports.  That
allows platform-specific implementations, e.g. BLE on non-Linux
platforms, that are not enabled in the automated builds to potentially
stagnate.

This patch adds Bluetooth related builds for Android and Arduino.
Several builds issues were addressed as a result of doing so.

Tizen BLE compile-time issues were also addressed.  However, a
separate patch will be submitted to enable ALL transports for Tizen
since unresolved symbol errors related to use of functions in the
Tizen Bluetooth currently exist in the master branch.

Change-Id: I4f4971e5a6cd8089b5c4cd16926331e24fec3181
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

[android] Addressed some minor SonarQube issues.

SonarQube flagged overly long lines, tabs in source code and lack of
braces in if-conditional blocks.  Fix some of those issues.

Change-Id: I7ac79dda519cbec220118d4a9e283d7ba64d626c
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2177
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Worked Around GCC 4.6.3's Bool issue

GCC 4.6.3 converted bools improperly, I believe this to be a bug in the
compiler, however this work around forces the conversion to happen correctly.

Signed-off-by: Erich Keane <erich.keane@intel.com>
Change-Id: I30bbe9807593075a2518018f268d6e14a8dfa47a
Reviewed-on: https://gerrit.iotivity.org/gerrit/2170
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

replaced char* with uint8_t in EDR

i have updated EDR code
since EDR is not built after Change 2034.

Change-Id: I8e23fdf88b6da6055127488b33a52c1206ee770d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

Add unittests for ConstructResourceTest for invalid uri value

Added a test case for ConstructResourceTest to simulate the scenario
of Resource creation with uri having just "/" as its value.

Change-Id: Ifdc128fc505a862ff4dedcbeff60896c25e1d029
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2157
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

csdk : Refactoring ocpayload.c file

Introduced a static function OCRepPayloadSetProp() and pushed the generic code
for all datatypes.

Change-Id: I787274c91e80c52d61563944d1284aa7c24e10a8
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2152
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Naga Ashok Jampani <jn.ashok@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

soft-sensor-manager: Fix cppcheck errors

This patch fixes the errors reported by cppcheck tool for
'(error) Mismatching allocation and deallocation: avg'.
Replaced delete with delete[] wherever the memory is allocated
using new [].

Change-Id: Ic32755347ad24aeb2a1c57341249038fd511073a
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>