Synchronize PKIX with provisioning API

Certificate based provisioning does not use sql database now

Change-Id: I5dbceea998f24bfd449efbf108640fc80dd02be7
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 5e45de70ec8d17402c4d3327e5a5c18d3c74f7cd)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3423

Add archive libs into RPM package in Tizen build

-Issue : libocpmapi.a is not included in RPM package,
     after Tizen build with "secure_mode=1". So, we can't use that lib on tizen.
-Solution : Add libocpmapi.a into RPM package when Tizen build with "secure_mode=1"

Change-Id: I568407c16e27abc09843a785a457738527ff3057
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 9c30781c011a8a5de3caff97722663247759fc00)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3421

Added JUnit test case

-added test case for easysetupstatus
-changed signature of easysetupstatus api
-Updated comments
-Added new states and changed some states

Change-Id: I4afd9318f9f8c8ddf9189f856dbab8307946e8e5
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 25fc0875be77e18e8d4c8d221325d631cd1737ca)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3395

change location of resource container directory

- relocate the directory of resource container out of resource-encapsulation directory
- change sconscript for changed directory location

Change-Id: I912149cb7f3fe6b640b07108570c2fe9dd78fd1d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3313
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Disable checking parameters for non symmetric key

Disables the second device and key length checking,
in the case of credential provisioning based on the types
that are different from SYMMETRIC_PAIR_WISE_KEY.

Change-Id: I8dc8581e7af7ef104e7e2dd473c53d60acc1c9d9
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 84a8188c7d02881a46dc1f682e046463fed74c14)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3379
Reviewed-by: dongik Lee <dongik.lee@samsung.com>

Android: Added/Updated JavaDocs

In addition it adds a couple of missing ENUM
values that have been introduced recently

Change-Id: Iddd1eefec7b59f041036093e51ae336d28778487
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Merge "Merge Resource Directory into the master" into 1.0.0-dev

Merge Resource Directory into the master

Resource Directory Server:
• Hosting of RD (Server side)
• Respond to discovery request with the bias factor.
• Response after receiving publish resource and payload handling (Server side)
• Storage of resources at RD (Server side)
• /oic/res querying support with  a response in collection format.
Resource Directory Clients:
• API to initiate discovery of RD
• Publish resources to RD using the collection format.
• Stop Multicast API suport
Sample Applications:
• Server side application to start resource directory
• Thin-client side application to discover and publish resources to resource directory.
• Client to query resource published at the resource directory.

Change-Id: Iecd03cb26b231dc58ae1f5c30353c5a2514260bf
Signed-off-by: Habib Virji <habib.virji@samsung.com>

Refine comments for android apis of resource-encapsulation.

Incorrect tags are fixed.
Links for types and methods in comments are added for convenience.

Change-Id: I8f4bbc31dfb4ead6b4b5fd0f80046002f8e80589
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3337
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Android: fixing scons build for the examples

The issue in scons script introduced in
https://gerrit.iotivity.org/gerrit/#/c/3135/ and consequently
in https://gerrit.iotivity.org/gerrit/#/c/3287/ has caused
the long build times for the Android examples by rebuilding
it multiple times.

Change-Id: I978ac3459dbd0e42e231f8d70a0374558e85f9e8
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3329
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix duplicate observer registrations due to slow server or network.

This fixes IOT-720 and IOT-612.

The client retransmits a confirmable request before the 1st timeout for
un-acknowledged confirmable request. The server is occasionally too slow
to respond or the network is slow sometimes.
In case of OBSERVE registrations, a retransmit means two or more  observers will
be added for one observe request the client sent.
This leads to lot's of extra notifications being sent out and only one
of observers from the multiple clones are deleted if the client
de-registers.

Fix is to check with the token if observer was already added and ignore
the request if it was as the client was likely already ACKED for the
first request the server fully processed.

This should be cherrypicked to 1.0.0-dev.

Change-Id: I7ecfe1a6e8009606a9430515cbcedef2516507d7
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 758e307a204b5b66dbf81ab6ed73463d7024f44d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3325

[TIZEN] RE NestedAttributes Sample Application discovery fix.

Change-Id: I4f184d42f60ba3baacfde3aea4feec890e17b260
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit bee72560c33c5bb0148e06789b673aabcc91439c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3317
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fixed wrong return type in PDM

PDMIsDuplicateDevice API declaration returns null but function defination
have conditions which returns other values.

Change-Id: I3bab66243fb03908072d16dbc64cc4e8823755ad
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit e54f027eef9acbd018925b6b30325dfe13b27b44)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3321

Correcting the INPUT in Doxygen file.

Changed to include the relevant header files as per the updated
source code structure.

Change-Id: I2ceb54f2f7d7614008a4d0073b7964a8a44c27a5
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 65552dc7ccb251e6ea69f9dedf6c8706c50b4683)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3309

Extend the coverage of building Tizen

Given that the former area of Tizen  cannot cover up all the Tizen build,
sometimes it missed the compile errors in Tizen.
Therefore it allows Iotivity to run the whole Tizen build
to avoid the mistakes

Change-Id: I026746f0850fe96186f044ac375176276d80a53e
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 50df871e5c1815394031cb9c1864c6671b1159ab)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3303

[TIZEN] RESampleApplication bug fixes taken from master branch.

Change-Id: Ia25f7b2c53187f33e14cbc7804f026c318767e3e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Fix out-of-bounds access to the array

The array has TIMEOUTS elements, so timeout_list[TIMEOUTS] is one
element past the end.

Change-Id: I42e7ef1a481840699a8dffff1406c4b42d42fde1
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Change file permission of RCSResourceObject.h file

Removed the execute permission for the RCSResourceObject.h file
in resource-encapsulation dir.

Change-Id: Ic4a3e1f3ab2766e461c7308ee1d0bf16a4eedbf2
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit cae7b2a72ac6b7fd7de2707d7d609535a31f1be4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3279

modify timing issue and add test case for DiscoveryManagerUnitTest

- default waiting time is 3sec as each test.
- change discovery checking way from using sleep method to condition_variable.
: just unlock waiting mutex when is called callback function.
- request multiple discovery that have equal contents, and just one canceled.
  other request will be received callback function.

modify createId's logic for RCSDiscoveryManagerImpl.

modify Sconscript
- directory location for DiscoveryMaanger' unittest code is changed.

Change-Id: I3dfd5b1440959eac200746eba098ebd1ff93b69b
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 244d7b436e11f8705c79165ba67d26d6db3b6d0a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3275

Add check for expired symmetric keys

Iotivity should refuse DTLS session formation with devices whose
credentials have been expired.

Change-Id: Ic4708fbdd50ebc59e57f09c37211e7f36dbcf931
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 7fc33d509a8de4dd328386a7f155a52d4c347833)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3291

Added APK generation to build scripts

Updated android_api SConscript and Gradle files to generate
the APK of android examples with the existing scons command.
If trying to build examples from android studio, the user might
need to update the default TARGET_ARCH, RELEASE and SECURED flags
in <iotivity>/android/examples/gradle.properties

Updated the gradle versions to 1.3.0 in all gradle files.

Change-Id: Id9da3594ac83a4d27b3b1272a5aef6d893b305f9
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3135
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 6551c29a57983bc797f44da5a560778336480554)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3287

OCMulticast start and stop APIs

APIs to start and stop multicast traffic. For stopping and staring multicast traffic
it manipulates multicast fd and IP_DROP_MEMBERSHIP.

OCStopMulticastTraffic interface is called from rd_client. It stops the multicast traffic.

OCStartMulticastTraffic is implemented but it is not called as this functionality is
not yet implemented.

Change-Id: If56c7af074cbba097b7b23d1abd787093872418a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2387
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Refactor PSK Credential retrieval interface

When CA requests PSK credentials during DTLS handshake, SRM retrieves
credential for all devices and provides it to CA. This is un-necessary
and is in-efficient approach. Updated code to only provide credential
which has been requested by tinydtls.

Change-Id: Ie9bdc0ff1236b9f1f198215d211a682df416e731
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3009
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 134d702757cb17c888a6700ebd93bfc00a92f02e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3281

Updated Tizen GBS  build script to fix tinycbor clone error

During Jenkins build, tinycbor library is copied as a soft link in extlibs folder.
For Tizen build, we copy from this location to tmp folder, which in turn
is copied to GBS-ROOT during build. While copying from extlibs/tinycbor
which is present as a soft link, error appear during jenkins build.

Fixed the error by giving -L option during in copy command.
Also, added error return clause in gbs build script to enable
jenkins catch the error in case of build break.

Change-Id: I24c149dabd3ac3c382adf8aa11a60b0adae38a68
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 8004fc298636d66b236dd527c981b7f34845b0e7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3269

[Easysetup]Fixed an issue found in internal testing

Change-Id: I5a0bf9e5782765e72c2cc7528a66d241728db07e
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 6a363a38519075f2158965e98cab7db57705ccd8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3267

Android: Removed a null entity handler initializer from OcPlatform

This should have been removed as a part of the
https://gerrit.iotivity.org/gerrit/#/c/2346/

Change-Id: I3fd6de963b21174a41627ffdfe6b4e822bf313ee
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 3c369f1215c428337da5568fa14d0efaeb62fba7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3143
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Tizen build fix. Resource Hosting library name changed.

Change-Id: I7bdc05b230ecf807a36823ed6a9a7ca3f0d0040e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3245
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 27c83cb8975399c1e173f9fec3453fb713b1ef22)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3253

rename to resource-hosting from notification-manager.

notification manager is only provide resource hosting feature.
and resource hosting feature break off notifcation manager.

resource type name is modified to follow naming convention.

Change-Id: I96a0a60df60e60c44ecb9935cb73250949993fb6
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3205
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3243

/oic/res response based on the collection response structure

This is based on the new strucutre of the /oic/res as currently being defined
by Ravi. This is useful for the resource directory as it needs to include
multiple links maps inside links array.

It differs with the current /oic/res response as it includes links array with
multiple links map object.

The strucutre of the payload appears in this format:
Array
  TagsObject
    di
    baseURI
    bitmap
    ins
  LinksArray
    LinkMapObject
      href
      rt
      itf
      ins

Change-Id: Ifc61a70ede1fc44e9b2321604907d99961eea13b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Added Multi PHY EasySetup Service

Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Updated SConscript to build EasySetup

Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 95818b037e2b8e3c2a738f47a107fe4088ba40b1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3237

Fix for Jira issues IOT-733,739 and 727

Fixed double free corruptions and errors in freeing static memory

If accepted, this changeset should be cherrypicked to 1.0.0-dev.

Change-Id: I5b37f5090b68b45156b5965f715b68daebfe9e37
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3191
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 6c022b836ecb8331f719700ac405d57751f19db4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3227

Merge branch 'security-CKM' into 'master'

* security-CKM:
  Removed automatic switching to X.509 in CA
  implement unit tests for CK manager
  Add sample of PKIX provisioning

Conflicts:
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c

Change-Id: If1e8367e3729b152602d1585bc433f083354c5e1
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

Fix issue w.r.t URI comparison when querystring is used

If a query string is attached to URI, URI comparison fails
and packets are dropped. Updated the code to only compare the
URI part excluding querystring.

Change-Id: Iee81e6fb7851d3a3ce5b8410fecd14645e134713
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3081
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
(cherry picked from commit c5b381b150e93da6c906fc4c655c6bdb94beaf59)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3221

Added function to config terminal for read/write.

Change-Id: I816c23cfd68bd85ff32bf4dbc5cadba5a4c708c8
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3065
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
(cherry picked from commit 42bbf60e6bdbaec05a2d26cbc1571885ccfa093b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3213
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Fix segfault when calling OCCancel ()

This fixes the client side crash in IOT-733.
OCCancel () allocates a pointer that is free'd in routingutility.c.
Although the pointer was passed in as reference into routingutility and
is re-assigned with a new malloc'ed pointer, OCCancel() free's the old
pointer.
This is because there two structs that are being passed around. The
pointer that is double free'd is free'd twice as part of two DIFFERENT
structs. Got rid of the extra struct to keep things consistent and
resolve the crash.

If accepted, this changeset should be cherrypicked to 1.0.0-dev.

Change-Id: I8c961776406c02dbe7706a787bb19db53ba83853
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 96d4834e2dc6cf926cad639bb232b8b787cb8d3e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3141

fixed the jira IOT-712 issue in blockwise-transfer

if request data is bulk data with block option1 and
response data is not bulk data, response data will
be sent with only block option1. this case we have to
add the received data to receive queue.
This patch addresses the first part of IOT-712.

Change-Id: I62645ae9592f59ed16758e4ff4a2b635cb834e04
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
(cherry picked from commit b56fb32a396a0553a3334b54eebbcaf505207483)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3133
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Android: fix for IOT-755

1. Moved a number of function implementations from OCResource.h into OCResource.cpp to make Android happy
2. Updated android smoke tests

Change-Id: I0bf0edfae7490204d2f4ca44052066fc2dd9af12
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nagabharan Nagendran <nagabharan.nagendran@intel.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 24cda274e3050433677518b94dfb15d0bae59db5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3131

[JIRA IOT-737] fixed to prevent send coap pdu for no uri

if some case is need it to check. the case have to check it.
pdu have to be passed even though there is no uri.

Change-Id: I95ba9b2bb64f7733fcfb3d06b896032c0e3feeef
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3041
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit a993c18612ba08e00df46926a177f23017d5c614)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3129

Fix crash when discovering devices & platforms.

This fixes IOT-714

Iotivity does not currently enforce the mandatory fields of device and
platform be set by applications.
As a result, servers that do NOT set device and platform info segfault
when encoding device and platform info into CBOR as CBOR expects the
fields to be present.

Modified cbor payload to work with NULL fields in device and platform
payloads.

This changed also needs to go into 1.0.0-dev.

Change-Id: Ia626422bd441069febd47a5f44dd12aa42b1d46e
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit bf098fcea98bcc7a8ccd490a512f8aee320bcce7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3127

things-manager: change file permission of .h files

Removed the execute permission for the .h files from things-manager.

Change-Id: I4ebedbcc84114edcacc67dcaf373d6563f465bc1
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3209
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b725411d17dd973e8d0e91c2ac8a35b03b217535)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3215

Added support for proactive link checking

In current implementation whenever user tries to add link between two devices
which already exists apis logs error and doesn't return callback.
In this change, link api first checks that link between two intended devices
exists or not, if it exists then api return error and doesn't move ahead.

Change-Id: Iac02a44542235b962de2fe965f45548d96f9c625
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2899
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 6aa9d7eb1a93cdac934be8a4ff834de5f27ede3d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3181

[Things-Manager]Fixed junit testcases issues and jira IOT-745

- Updated Java SDK
- Updated sample Application

Change-Id: Ife6e1d3a00ff76d4c68f96949787fab1724092dc
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3115
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit e896af014916446b5098094af994885a76526337)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3211

Align resource container Java bundle APIs with new naming scheme

Updating Java bundle resource to follow the new naming scheme (handleSetAttributeRequest,
handleGetAttributeRequest). Latest changes in the resource container APIs
are now also updated in the Java related code.

Change-Id: I7b28c830c2dc6f2dd1c7ad31405851b6d94def54
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3031
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>
(cherry picked from commit ba2c9a84f7700c4778645bfd07e59d9bd8f40395)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3201

Modify directory location and code refactoring "RCSDiscoveryManager"

- change directory location for "RCSDiscoveryManager.h" into resource-encapsulation/src/resourceClient
- code refactoring about RCSDiscoveryManager and RCSDiscoveryManagerImpl

Change-Id: I6790e5aec8cb80a1b62c8767e71256fb582c58bf
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit db190254d8421cdbcea1c5c9292bb07d7fe29800)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3199

Fix a possible segmentation fault of ExpiryTimer.

The thread for ExpiryTimer might be started before members are initialized.

Change-Id: I2d83a60bb84422e033f6165aef3cb0136edbeae7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 735bf9c001146666d86f5e744e3a0cce6a5aa860)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3197

Remove delete request of notification sampleconsumer.

notification manager(resource hosting) is not service for delete request.

notification manager use to resource-encapsulation APIs.
but resource encapsulation APIs is not service for delete request to remote resource.
so, unsupported function about delete request is removed in sample application.

Change-Id: I1280b1fa647b57eadc80ff064d121593fdc88526
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3079
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>
(cherry picked from commit af23adaed8225157cac63389e81dbe4a2885f837)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3183

Fix the size calculation bugs while calling memset in secureresourceprovider.c

 1. Fix the 'sizeof(sizeof(...))' whiling calling memset().
 2. Change the 'OICMalloc + memset' to 'OICCalloc'.

Change-Id: Idbb14de5a3d4517bc55324f7a8a58d2079bf12e8
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit b4a723f299b3ccf44f7bc047eff06bb29abbed93)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3179

Add CRL resource URI to SRM checking

Enables CRL resource URI to be secure while SRM checking

Change-Id: Ie0e5bfc0a08e16730ff9a1f9ff1b52525545ca86
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit fcd6ddcf05f9a77c2b364afe1b13a9d22a6cb0a0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3177

In resource-encapsulation android api, ResourceContainer related files are removed.

It is not part of service api any more.
And manifest is modified to eliminate lint issues.

Change-Id: I80adb6784bd3a1667aa1b71f6f6b978c1148988c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 2d396d6ea3aa15c0a98cbded7c11d5eee7776346)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3111

Code formatting for unit tests for resource-encapsulation android api.

It is to conform with java code style for iotivity.

Change-Id: I70c824606b76025d2b7ddb517c426ebef2faf740
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b5215661fe93472908ee8b7b55378bcee75e055c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3109

Remove a wrong memory free in oicgroup

Schedule information for scheduled group action should be not freed until
it is canceled.

Change-Id: I9c92908b4425795603a98d649f6be2d48d96645e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3035
Reviewed-by: Jay Sharma <jay.sharma@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 9144f5288fe01dd82dd09df22b8dc5769d2e257a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3099

Convert android examples of resource-encapsulation into android-studio project.

Additionally source is modified to align with new version of apis.
Project names are changed as well to align with tizen samples.

ResourceContainer examples are removed because it will be excluded from service api.

JIRA issue : https://jira.iotivity.org/i#browse/IOT-744

Change-Id: Ie26dcef2ba373cde796099c4f6e5c32fbcf8aa03
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1697ec12d449b7e583ade370ff05d3d6adb5b564)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3095

Modify discoveryMap's cancel logic in order to keep data intergrity.

- lock guard mutex before erasing data in discoveryMap.

Change-Id: I71f2a63797e417148a670a1d9e880d0c2a6515d4
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 404a997993bfba1289279683f7b6c6534f3a651d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3093

modify BundleResource template api for handling attributes update

- remove set,get request handle apis for handling single attribute in bundle resource template to make template simple
- reorder the apis
- modify samples due to the change of resource template apis
- modify bundle resource to make container and bundle use shared pointer

Change-Id: I7b87ffc2e405aedd290a13b3b392063d785f8814
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3027
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 1d699397819badb51dfa4ca3adac1fae58be0af4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3089

Add API explained comments for RCSDiscoveryManager and RCSDiscoveryManagerImpl

- Modify return type (void -> unique_ptr<DiscoveryTask>) in RCSDiscoveryManager
- Add new API in RCSDiscoveryManagerImpl

Need to be cherry picked master branch into 1.0.0-dev branch

Change-Id: I69c90a7448efa325941c2aef53ea4a252e2ab6c8
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit 40309df462cfde1717a467bbda6cb77fa6de6adb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3087
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

resource: check for valid pointers

This is patch is in continuation of the patchset
As mentioned by Madhan, this patch checks for the validity of
the pointers before their dereferences.

Change-Id: I9c1cd15bbcbd0a77bb34898ce3bc55c7d87b05f4
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2971
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c9f56d7146b8c9e9fb69b9b0e4fa59cd3fbbb85d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3085

Update comments for documents of resource-encapsulation

Add missing file descriptions.
Update comments that were incorrect or unclear.

Change-Id: If2b2ff50d35e52a07e2ff66055801fd0658865b7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3025
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 61274389a127dd467b0ee5c70c7b2115e70c52f4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3083

Add class description of container bundle API

- add class and file description of container bundle API
- remove '-' for parameter description in comments for APIs

Change-Id: Iaca3db8d948657381fdf80350e45b7d783a5672a
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2983
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit d5cea0ae54fbf0980b59bbc60e15392773f39466)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2991
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Fixed Tizen build error with SECURED=1

[Patch-1] Initial
[Patch-2,3] Fixed build error in case of CA partially.
Note : The purpose of this patch is to fix build error
when building full tizen with security.
The change required in jenkins configuration is out of this patch.

Change-Id: I2ec95c13d6c7d7978662e7ef69f7a02cd8188df0
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2997
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 8a42b6a387e634c1138a82ada0df1fc43d93ad36)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3171

Add validation of parameters at JNI level.
Updated client json db file for 'sct'.
Few fixes in provisioning client sample.

Patch #1 Fix Review comments and device status enum fix.

Change-Id: Ib4d63619d730d2d350214d8fed6d3817b14eaa2c
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit f2be22f641e435b228af5916de901e90cfc09156)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3169

Fix for bug IOT-759

Fixed the seg fault when no recurrence rule corresponding to period
rule was present.

Change-Id: I69989819d17ef7edf644a0efa512b051b18b7307
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit 3382a044ea795e2335b96fb36139c6f217616c27)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3167

Removed the filter to add 'identity' info on selective connections

Ir-respective of the end-point being a SERVER or CLIENT, it may be
useful for RI and upper layers to know the true identity of the sender
of the message. Therefore, removed the filter which was checking for
'SERVER' only mode.

Change-Id: I21cda0a645d79df6df3a3a4113cccbac4a7ae8d6
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2949
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit e3cb235a806f9da339f4bb9ae07f5ac5cd8b25f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3145

Updated log level of log messages in SRM module

Many of the log messages had in-correct level of INFO, whereas they
were actually DEBUG messages.

Change-Id: I0e47e1b19b20a15f7d4b539e55995137270c75fa
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 2a98b1703dd7e3f558a5ecab7063047eb674931b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3139

Destroy Secure resources during system shut-down

Secure resources which were recently added were not being
destroyed during system shutdown. Added API calls to enable
proper de-allocation.

Change-Id: I1fcaf2218d8957138a87e1ffab14d07c78bebe5c
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
(cherry picked from commit 8f1b886445997c34a68851d280d2b7ef319312fc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3137

Android: Refactored SimpleClient

The app was refactored with the emphasis to readability
and cleanness. The theme has been modified to include IoTivity
logo and small android icons.
It also exercises the newly created features form the stack
such as OcResourceIdentifier.
Implemented hashCode() in OcResourceIdentifier to allow it to be
used as a key in the dictionary objects

PS 2: Removed unnecessary module reference

Change-Id: Ib1c9a56d97fa52ffe7d17c156ed228cf6e8946ef
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2719
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 7abfb5c94a9a18fbad632972f99ae4a8fb60c334)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3125

Android: Refactored SimpleServer

The app was refactored with the emphasis to readability
and cleanness. The theme has been modified to include IoTivity
logo and small android icons.

Change-Id: Ife421a83b5f23a8b903a76b4a89edcb0c558f8ef
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit 9e26620ba9d3a8bba6f7c1b353d6f9db1f55e2f6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3123

[JIRA IOT-738] fixed to calculate message length for option

message length in Header is wrong
for long option number and value for CoAP over TCP

Change-Id: I72452c07e2b5ffe43749cae5c3a4bae6d7c2f3f2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c77eae61f8232159e9d1e0e23b46f6cfb2ea4b5e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3049

fixed the jira IOT-742 Temperature Resource Creation Fail

- modify temperature resourceType
 (core.TemperatrueSensor -> oic.r.temperaturesensor)

Change-Id: Icbb9402055ae09e2e732a85a31ef1e1a81c46b44
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 06d09a4f3980c7131eb25bf7e52278875710df43)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3097
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Android: Adding GroupServer/Client examples

Change-Id: I2604a8dfccf6f55b37949e8ff0eda6b1b49d7713
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit e685fddfe38624da5495400df2a1b76f95db6886)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3121

android: add misssing error codes to stackResultToStr()

The OC_STACK_UNAUTHORIZED_REQ error code and some others were missing in
the method for translating them into strings.
Without this patch it resulted in this exception:
org.iotivity.base.OcException: stack error in onObserveCallback JNI_INVALID_VALUE

Change-Id: I739dfecafff55c035702a27a9b5d8dcb925993f4
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2643
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit c8487deda0f5ee888267c53322c6197a463c1b88)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2989
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

ca: fix android KitKat 4.4 support

pthread_condattr_setclock() was added in Android 5.0 and IoTivity used
it unconditionally which cause linkage errors on older android versions.
With this patch pthread_condattr_setclock() is only accessed when it is
available with a weak reference. In addition android < 5.0 provides a
private function __pthread_cond_timedwait_relative() which is similar
to pthread_cond_timedwait() use that when available instead.

This should make IoTivity compatible with KitKat devices.

This was tested backported to IoTivity 0.9.2 on an Intel based Android
4.4 Phone and an Arm based Android 5.0 Phone.

Change-Id: Ibae6613a4ae52e230b7850ef1a2bad0b5fd530df
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2565
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
(cherry picked from commit a3a8bfd5a5cb887f10a2a2b55a8bf86b7fa0edad)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3007

Move OCGetServerInstanceId in OCStack

Server instance id is needed by Resource Directory as it is a required field.

Currently getting Device Id is present in ocstackinternal.h but is needed to be accessible across.

This does not change any code but just moves API from ocstackinternal to ocstack.

Change-Id: I4f424a0fa498f3793933cd94294d9d8f991d4258
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2635
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Renaming of BundleResource APIs

Renamed the BundleResource APIs from simple setAttribute and getAttribute to
handleSetAttributeRequest and handleGetAttributeRequest. The maintainer
of the primitive services prefers these names in order to avoid
confusion with other resource encapsulation APIs.
The plain setters and getters are just for basic data structure manipulation and
do not handle any bundle resource specific logic any more.

Change-Id: Ie8f486269694ca7ee2a44f2e2390cdb2b27ba45b
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 956102b147d12016537dce17ea4500715fc41564)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2979

Add brief descriptions to several classes in things manager feature

GroupManager, ThingsConfiguration, and ThingsMaintenance has been added with
brief descriptions.

Change-Id: Ic2f884affa1754ff2b897eda171715624641b58b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 82a52fd3586e09fd5828c23b54a2e0bfdbe77a61)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2977

resource: Fix cppcheck issues in resource/csdk/security/ dir

This patch fixes the "(error) Possible null pointer dereference:" issues
reported by cppcheck tool in resource/csdk/security/ directory.

Change-Id: I36c41312fe3d78edd43c6c505b875ecbb6ba0dfa
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2905
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit d9121babfc07a9ecc54dd46ef02d6f6b0e8775a3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2967

Fix invoking attribute updated listener of RCSResourceObject.

There was a possible deadlock issue when the callback is invoked.
The mutex should be unlocked when the control is passed by invoking a callback to the users so that an object of the class can be used for the users without any concern regarding deadlock.

Change-Id: Iea35ab16858c7a8be67b87726b0e25ea6e94d73c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2959
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 2e89bcf2c559ff013cbc6c9d9c0f414371ef0b16)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2963

Updated java doc comments for services : TM and RE layer

- updated comments for bundle-java-api of Resurce Container module
- updated comments of Things Manager.

Change-Id: I39970e0cce8920488ac034d3b110421dce2fc0de
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2923
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ee0ccf1a7f9210b40030bb6a5ed26d73dbe8d8d3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2937

Fix a build failure issue of resource-encapsulation for android-debug mode.

Change-Id: I8bc556913b9582814144ef05fd5a9484b857a241
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2917
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 5fb1533ea069446cf65ef45c6e729da25f086dc1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2927

Update unittest of notification-manager.

Adding unittest for HostingObject Class,
and fixing release of smart pointer.

Change-Id: Ia27070b5908c5b42348a430dc602e136b70a9217
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2911
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>
(cherry picked from commit fb5bd9d3850692564af58daa92721c93720528e6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2919

Fix broken tests of resource-encapsulation.

DiscoveryManagerTest is moved.
ResourceClientTest is modified to conform to the modified discovery manager.

Change-Id: I55b1fcfa00e4a606796f44ee4c84351dfaebc4c7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ebea15b1767e1d545a2e7ac7745216b1f0fba666)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2913

correct the comment about mis-definition of class "RCSResourceContainer" for doxygen

The mismatch between the real name of a class RCSResourceContainer and it's comment resulted in the wrong doxygen description .
It means that Doxygen had two seperate definitions like RCSResourceContainer and ResourceContainer.

Change-Id: I3a3647ace72b641862cd05b7d4ee2c8d98aeaf75
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2885
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 5f06380535700dc28cf33690e0e9209363dcc3d1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2901

Update SConscript in service

Cleans SConscript in service folder by removing soft-sensor and
protocol plugin SConscript

Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Change-Id: Iccc880151f6b77a43f6f956eb6a7a40da25547ee
Reviewed-on: https://gerrit.iotivity.org/gerrit/2869
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit b940439ce35a3f3a8cbf2ef2d86cfe5b056b509a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2893

change resource type names of resource container samples

- modify container sample bundles, unittest and bundle configfiles
- change resource types of sample input sensors

Change-Id: I2738a8c2ad1f5e28ea5a3dd2d6c48739b7be9a5b
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2857
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit ba685fbcac922991fef921bcd8ba06cd8a247fb3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2891

Fixed bug in SRMIsSecurityResourceURI()

SRMIsSecurityResourceURI() API was returning "TRUE" for all resources with
URI starting with "/oic".  sizeof() char * is always 4.  Changed to strlen().

Change-Id: I2287ee29c677bf7229a80779fa150c73abb7db19
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2863
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 99cddf54412d34f7bb683041d7ef7a319011436f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2889

Rename resource-encapsulation exception classes.

It is to make class names consistent.
All exposed classes in resource-encapsultion layer as the API must start with RCS.

Change-Id: I64280bc959a60d368cfabab731196e35a7383a94
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2817
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>
(cherry picked from commit 9378122394680009804a5181275b16a6b71819dc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2879

Update Sconscript of notification-manager.

Samples exclude from the install target,
and library header include to the install target.

Change-Id: I06c7a2b8302c8d43d00cf2884098af97eb75bddf
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit d06d8bfc5bbb9ce319de7cb98a2478f6cf831187)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2875

Add missing copyright

Patch #2 : Trigger builds on 1.0.0-dev branch.

Change-Id: Ib376f468e060920ce0315ab36d582c365f7aea1e
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2845
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 7f3327fbdcddc691cd9b7921233d25f2af97446a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2861

Fix bugs in things manager reported as defects

CIDs: 65815, 65820, 65838, 65877, 77411, 77412, 81301, 81305, 81306, 81584

Additionally, modify resource type to be compatible to RFC 6690 guideline
for factory set resource.

Change-Id: Ia598cc00f8b3810a14a6341e941f20b11e3c4bfd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2843
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 962a14806e62788d08eea26cd0797f3bafe16f16)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2859

Remove wrapping '(' and ')' in OC_LOG arguments to resolve Tizen Build error.

Change-Id: I5ca0849bcde655c6eb8962c28bc5c4320f4bf925
Signed-off-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2827
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 5a4eb3109ea6aa759c17a59214552681c41879ad)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2849

Modify NotificationManager code to change resource type

- change the capital of resource type into the small letter

Change-Id: I85d34e25c903a826f2b4a16781991ee61b75b16b
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 279fd705afde671ba1cff6d414a18124fbc7e2f3)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2839

Making simulator build optional through scons command line argument "SIMULATOR".

simulator module will be built only if scons command passed with SIMULATOR
argument having one of the case insensitive value from "True", "Yes", "Y" and "1".

Example: scons SIMULATOR=1

Change-Id: Ie5dcd839d8770d219de1d623d60c23be0133bb1c
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2823
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 42471c31531a3dc46d3bbf861b767f11b48ac580)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2837

Fix the build failures on Ubuntu 12.04 32-bit machine.

Changes incorporate inclusion of "condition_variable" header file
in notification-manager dir.

Change-Id: I8dcf2a54579d8c5a1ce9f60a6498007eb7fe2c37
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit dad04311238a4c221a9cec662d9fe79fcd5e287a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2833

[Resource-Encapsulation] Tizen build fixes. Removal of SSM and PPM library references.

Change-Id: I038be50d750333696fcc1ee111fb7fc53bf7729e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2819
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>
(cherry picked from commit 8bdfa8e04052840296d79c98e8f49554ab12d054)
Reviewed-on: https://gerrit.iotivity.org/gerrit/2831

RD Query Response

RD Query response correction.

Also includes small minor clean up.

Change-Id: I279f91942d2806f20e0b17dab7f32477bba30849
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2386
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

RD Server Response for RD Client Publish

RD server response for the RD Client Publish.

Include change to adapt recent changes in cbor payloadType handling.

Change-Id: I55e9cacaa1a81c87c8bcc0e80c3b57f6fd98f8fc
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2385
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

Merge branch 'plugin-interface' into master

Change-Id: Idb58ff366694797d8bc433e974faf2c6124091aa
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>

Added Telegesis & Zigbee Wrappers, mapping logic, and plugin interface.

These additions encompass the first pre-release of the plugin
interface.

A unit test, server, client application are also included.

Change-Id: Ia61a01223f611ffc1e38e79b8e3a8317fb3f34cd
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Update RD with latest master

Change-Id: Ifaa16985f8bbc59bcf8d81aa03696ee3f6d784ae
Signed-off-by: Habib Virji <habib.virji@samsung.com>

Changed zigbee sample to use signal-atomic

The signal atomic type is more reliable than bool, since it is
guaranteed to enforce thread safety. Also fixed the logic in the 'while'
loop so that this will function properly when the calls work.

Change-Id: I1ef4713f9e894592b1b25c874327bce810c83352
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2769
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

Adding an IoTivity/Zigbee sample server

Added functionality for the IoTivity/Zigbee server.  Added file
for addition of the client.  Changed the PluginStart to have the correct
parameters.  Corrected SConscript to properly include the IoTivity
logger and CSDK.

Change-Id: I20aca3403c6a0a1e198fdb337a6affe13c389417
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2122
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>