Merge "Merge branch 'master' into notification-service" into notification-service

Added API about create message and memory allocate, deallocate

1. Our service is support to createMessage interface,
This Function does initialize, set the providerid, generate messageid.
2. modifiy related struct(resource) memory allocation, deallocation.

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

Fixed bug for uri on subscription request.

when send subscription request,
device id on query parameter should be inserted request uri.

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

Modified consumer internal function call flow.

When receive provider discover and message and syncinfo,
callback is called by communication module until this patch.
but, a proper way is callback should be calling by internalTaskControl module.
so, execution of callback logic is moved to internalTaskControl module.

Public NSProvider structure is modified.
Query Paramater(Consumer Id) is inclued on the request for subscription to providers.

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

Merge branch 'master' into notification-service

update the master changes into notification-service.

Change-Id: Ic35a92a83450755f4b664ede111e51b9d2efabcc
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Fix typo "Model" is correct spelling not "Modle"

Maybe be squashed into :

5f505cf352f0f5fd675b3f97662b5f243dd2f89e
https://gerrit.iotivity.org/gerrit/#/c/8325/

Bug: https://jira.iotivity.org/browse/IOT-1100
Change-Id: If13b0155b1d94ce2bb362ed4cf580b2879e84090
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

[JIRA Issue - 1092] IoTivity Zigbee sample application wrongly freeing memory

OICFree was wrongly freeing memory in OCSetDeviceInfo for a sample application.

Change-Id: Idf621cce81da84e5ae6719f18a31a95b26ef7855
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Add GET request handler for CRED resource

GET request returns credential without private data
This patch is requried, because there is step for 'GET oic/sec/cred' in TEST SPEC.

Patch 1: Init patch.
Patch 2: Add OC/SRPGetCredResource API for debugging only.
Patch 3: Apply Randeep's comment

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

related sturct and queryparam

1. modify logic about related NSMessage, NSSynInfo of struct.
2. Added NSGeneratedUUIDStr function (providerid, consumer id)
3. Added NSGetValueFromQuery function (related using the queryparam)
and modified logic of 2,3

fifth patch included
apply to resource protocol about response.

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

WARNING: eliminate warnings: [-Wsometimes-uninitialized]

The warning is caused by decls "TWEntry* entry = NULL;" coming
after tests that call "goto exit;" where "entry" is used.
the decl in front of the conditionals removes the warning.

Also added NULL test on "entry" to avoid unecessary calls
to TWDeleteEntry.

Change-Id: I0d7069e2497563a2c5378789c26acfdd3c48d89d
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8599
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>

resource-container: Port to gcc6 using std namespaces

Bug: https://jira.iotivity.org/browse/IOT-1111
Change-Id: Ie64ae80bb5851a887dd6fd589f72c4e64198b227
Credit-to: Kevron Rees <tripzero.kev@gmail.com>
Signed-off-by: Phil Coval <philippe.coval@s-opensource.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8651
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

BUGFIX: variable has incomplete type 'OIC::Service::RCSResourceObject::WeakGuard'

Embedding the definition of WeakGuard syntactically eliminates
the error we get if its definition is a sibling.

Change-Id: Ia020ca5fda0f604d4c60ebfde895b3ecbd244a4c
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

Remove extra href property in /oic/res as
the href property should be within links only.

JIRA Issue: https://jira.iotivity.org/browse/IOT-1104

Change-Id: I2b7b6996feebe92902a23a275c5bfbd3ad7e47e9
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>

fixed bulid issue for tcp adapter in RI layer

Bulid error occurs by https://gerrit.iotivity.org/gerrit/#/c/8423/
patchset if WITH_TCP=true option is used to build IoTivity.
so I modified the code to resolve the build issue.

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

modified tcp connection callback parameter type

I modified the parameter of the tcp connection callback
to pass the connectivity and flag information

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

Merge branch 'master' into notification-service

update the recent changes of master into notification-service

Change-Id: I504c8c331fde11cc4c167b8d503131b3bdf066d9
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Implement missing unit tests for CKM.

Added CKM unit tests to common build.
Added result state to functions.
Change-Id: I11ef2d003f95d850ed395f5c2584bbb34ca154a4
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Build: Export pkg-config when cross compiling using yocto

Without this change, host's /usr/include may be used which is unwanted.
This was obsevered when building with Yocto jethro setup
with security checks (LfAgl).

While this change has been done for crosscompiling purpose,
it make sense to have this in all contexts.
(ie: those which don't set CROSS_COMPILE variable)

Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Origin: https://github.com/tizenteam/iotivity
Change-Id: I3027642c77cc27f2072cdc22886aa09e124cdf4c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8125
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

Update OTM's unit test to use the real resource servers during OTM test

[Patch #1] Initial upload
[Patch #2] Update to use the correct path for OTM unittest w/ sample server.
[Patch #3] Remove the warnings in OTM unittest.
[Patch #4] Update to use the default SVR DB.

Change-Id: I806b1bd0ec860a91f3e9d762dbed0dc35b133cd6
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

Add context param to DP

 Added user context to direct pairing API OCDoDirectPairing

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

Add C++ API for Direct pairing

 Added C++ API for direct pairing feature
 Updated unittests for C++
 Added direct pairing sample
 Fixed Construct resource to '|' Secure flag instead of '&'

 Note: this change needs https://gerrit.iotivity.org/gerrit/#/c/8273/

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

Changing DOXM resource to be normally discoverable

Issue: DOXM is not listed by default in /oic/res response.
Resolve : Changeg DOXM to be normally discoverable

PT should use secure port of DOXM for OTM and Provision,
even if Device has different COAPS ports per resource.

Patch 1: Init
Patch 2: According to review of Randeep, modified form strcmp to strncmp

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

Update .gitignore for notification service
add iotivity.pc, notification-service build object in .gitignore

Change-Id: Ic82ac71b40386142973ffa8bb11ffd01fb2df758
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Updated sturcture of consumer.

Task type about discover protocol is added.
NSMessage_consumer and messageId in NSMessage is updated.
messageId in NSMessage handling logic is modified to cause changed variable type.

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

added struct, enum and modified struct, enum

resource of noti. service support to mandatory field and optional field.
so, added optional field of struct and enum.
and then modified rename the field.

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

tizen: deploy gtest file to be included by unittests

Note, currently unit testing is not done on Tizen,
but only on GNU/Linux and Darwin (OSX).

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

Change the type of "rt" in /oic/p from string to array.

JIRA issue: https://jira.iotivity.org/browse/IOT-1102

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

[IOT-1113] MAX_ADDR_STR_SIZE_CA should match MAX_ADDR_STR_SIZE.

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

added Scan Interval API

3rd party can adjust scanning with interval time as user scenario.

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

Expose OcRepresentation values to the Java layer

Change-Id: Ia6ef76be68f686e9a461475b1cd6282b749a39fd
Signed-off-by: Salvatore Iovene <salvatore.iovene@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sakari Poussa <sakari.poussa@intel.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Change request method on OTM

Post is used for UPDATE.
Put is used for CREATE.

Patch 1: Change request method form PUT to POST on update case.
Patch 2: Change hadler on doxmresource.c

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

Cleanup compiler warnings

ocpayload:
The `tcpPort` was unused in the in the `OCCopyResource` function
The only place the `OCCopyResource` function was called from was
from the `OCDiscoveryPayloadAddNewResource`.
[-Wunused-parameter]

Change-Id: Icb17930e730c8154fbf10d54dd9b5e3857e3e1db
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

fix warning/bug: address of array 'info->addr' will always evaluate to 'true'

Change-Id: Ib4b65f43f35fc0547d50983334c2e6760d212340
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

[RI][Android]: Propagation of the mandatory device info types into Android

Follow up for the https://gerrit.iotivity.org/gerrit/#/c/5747/

Change-Id: Iedafa880cea0cf5ee25e30f29429889b3b5b8b50
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

[IOT-1106] Properly clone OCByteString values.

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

Modified Error handle of consumer.

error handling of consumer was modified to macro functions.
TASK_CONSUMER_RECV_NOTIFICATION is renamed to MESSAGE.

POST callback for sendSyncInfo request is added.
it is bug for fail of sending POST msg since listener module is removed.

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

Fix CA DTLS handshake retransmission timer

registerTimer allows only positive integers
which can not be less than RETRANSMISSION_TIME = 1 sec

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

Added source member variable in Android side & modified example in linux.

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

Modify the incorrect UUID parse in 'GetSubjectFromQueryString' API.

[NOTE]
GetSubjectFromQueryString API will be invoked when received REST requests to
retrieves the 'subject' field.
BTW, Since the subject of query is the string type,
The subject field should not be copied directly.
it should be converted as OicUuid_t.

[Patch #1] : Intial upload
[Patch #2] : Update unittest

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

add missing OCException case

Change-Id: Ia5d92080ab6adb31c4748366dd5392a70bf4cf0f
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

Clean up compiler warning/removed unused code

ocstack.c:
Removed the verifyUriQueryLength() function. This function
is not used anywhere in the code.  The code may be valid,
however, if it is not used its not being maintained.
[-Wunused-function]

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

Clean compiler warnings.

in caipserver.c:
the function static void CAHanderlNetLink() was not defined or used and could
be removed. [-Wunused-function]

the function CAIPInitializeNetworkMonitorList was not returning a status on
the succesful use case. [-Wreturn-type]

In the CARemovedNetworkMonitorList the ifindex value comes from a system
library and can not be changed so I cast the removedifitem->index to int
to prevent the warning [-Wsign-compare]

Change-Id: I5dd8c52c2e82d68df9a0baf4ad2aa6acb4facfc7
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

Fixed crash issue related to BT on/off in Tizen

Fixed crash issue related to BT on/off in Tizen

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

Added CA Util API to assign the port number of IP(UDP/TCP)

CA utility layer provides transport specific functions.
and the UDP/TCP port number related functions are added.
- get the port number currently openned.
- set the port number to use.

Change-Id: Ibb4ca1b1a08ee2d7e540f07c0b6267b05dd0bd6a
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: John Light <john.j.light@intel.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>

modified observe logic in ocstack

when register/deregister of observation is failed,
ocstack will send response directly.

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

fixed the bug to check the tcp header type from size

fixed the bug to check the tcp header type from size

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

removed retry code for uncommon case in android BLE

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

Renamed submodule of Consumer.

Listener, Notification, Subscription module is renamed.
(to NetworkEventListener, Communication, InternalTaskController)
wrapper of listening for response is removed.
some of variables, functions, structures is renamed.
fixed bug about mutex lock and unlock at creation of thread.
waitting time is added in the thread function at queue scheduler.

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

Fix retransmission according to RFC

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

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

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

Change QOS to HIGH for security module

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

Patch 1,2: Init patch

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

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

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

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

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

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

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

Rename Functions, variables, structs and bug fixed.

This patch included,
Rename the Interface API, structs.
Add setting OCPayload exception.

Second patch included,
modified sconscript and Removed NSCacheAdapter.h
--> changed NSStorageAdapter.

third patch included,
remove not required path.
remove empty space in sconscript.

fourth patch included,
NSCallbackSchedule change to NSInterfaceSchedule.

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

Build: updated hippomocks to support arm64

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

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

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

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

remove not required function and rename the function, const variable.

this patch included
remove not required initialize value and function.
const variables change to define.
all structs move to NSStructs.h file.

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

Renamed variables and functions of Notification consumer.

a couple of variables and function is renamed.
in particular, processing function of queue task in each submodules renamed
to TaskProcessing and thread structure is renamed to NSThread from NSThreadHandle.
and thread join function is added.

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

implementation NSStopProvider and bug fixed.

this patch included
first, memory copy and free of NSSync, NSConsumer and so on.
second, uregister resource and thread exit.
third, bug fixed about createpayload value is NULL.

Second patch included
first, resolve android build error in proivder jni code.
second, remove duplicated log.

Change-Id: I525efde2c81793a4947a75df1022337dd2766845
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8375
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Update secure sample and SVRs for testing NonDevOwner client.

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

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

Fixed build with SECURED=1 DTLS_WITH_X509=1 flags.

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

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

Issue : There is bug when handling dpc property

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

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

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

[Tizen]Fix for LE Server termination issue

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

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

added error callback for findResource() in stack

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

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

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

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

added direct gatt connect in Android

it can prevent to connect duplicatly while CASendRequest is working.

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

Update notificaion message synchronization.

A bug about message synchronization function is fixed.
This function provides for subscribers to receive sync data
which is sent by a subscriber.

Change-Id: Idfa0b242e1a17af7ec88eb43c7b5084d6ceae14d
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8351
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

NSDuplicateMessage copy logic not working(bug fixed).

previosuly patch added NSMessage copy logic.
but, that is wrong condition. so copy is not working.

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

Fixed bug about  Subscription logic on Consumer.

Now, consumer notify all messages of providers to user,
included subscription acceptance message.
but, subscription acceptance message no need for user.

and, in this patch, included deletion of unused comments.

Change-Id: I4e21bece1601492e55d0adb5d2f1bb49dac46277
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8349
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Add "Source" attribute in NSMessage Resource

- source attribute contains message generation information(where it comes)

Change-Id: Ibea94aed6044a18ba5d989cdc5aca7e109400ee9
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8339
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Issue fixed about OCEntityHandlerRequest same pointer address.

Modify duplicatation issue about
OCEntityHandlerRequest pointer address
when receiving entityhandler callback.
So, Added NSMessage, OCEntityHandlerRequest copy & free logic.

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

Add Memory Cache module for Consumer on Linux.

- by adapting cache adpater, add consumer cache module which uses memory list on linux

Change-Id: I6cc344f0be36aff7ec9045b4ae200b57c8def777
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8317
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

Modify listeners of android sample app to receive subscription and sync data.

The listeners work seperately when requested subscription and sync data
from consumer are delivered.

Change-Id: Ifa637b2e0e03878a4b1ca02b9860e445a4be8685
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8315
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

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

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

Fix debug output

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

Fix a wrong conditional statement in GetClientCB()

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

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

modified android settings.gradle to build simplebase app

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

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

Implement Binary String transit type in C++ stack

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

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

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

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

Readme File changed

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

Add callback interface and open source license term.

The files for JNI interface are modified to offer callback function
and add open source license term.

Change-Id: I3f9453b37f274b9098117550e530a388b318ac02
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8269
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

Create android sample app for provider service.

This is a sample application working on notification service.
The applicaion guides how to use APIs of notification service
on android platform.

Change-Id: Ia2fa461ad299a74507ee5898d7f4174f777611b5
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8283
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

changed log in provider side

this patch includes log change in notification provider
from printf to NS_LOG and NS_LOG_V.

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

Updated SConscript of Notification service.

gcc build option is changed to c type flag.
gcov build option is added to measure code coverage.
unused command line is deleted.
warning is resolved in NSUtil.c

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

modified tag name for BLE Callback Interface class

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

[IOT-1095] Add request parameters to attribute handlers

API change: allow passing query parameters to attribute GET/SET handlers.

Change-Id: Ib3d294a4901f066409a837f03db16a94791fd8f8
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Markus Jung <markus.jung85@gmail.com>

Added Unit Test of Notification service.

Unit test of Notification serivces is added for public APIs on positive case.

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

Merge "Merge branch '1.1-rel'"

Clean the warning message in notification service .

This patch is clean the warning code in provider side.

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

Notification Service - add Android JNI in provider.

This patch is Add Android JNI in Provider side.
Our Notification support to android platform.

Added 6 source files. other files are related build.
four files - java, two files - jni native interface.c, h.

IoTNotification.java - this is user interface object.
NSMessage.java - notification message object.
NSSync.java - related read operation object.
NSConsumer.java - related Accept operation object.

notificationProvider.c, h - java native interface.

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

added cacheadapter interface and memorycache of notification.

this patch included cacheadapter and using the memorycache.
previosuly, we used the only observeid(unique id).
currently, we use the ip in OCDevaddr Struct.

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

Fix in LE adapter to return CA_STATUS_OK when BT is not enabled

LE Adapter returns error when BT is not enabled.  This patch returns
CA_STATUS_OK and when BT is enabled, with the notification of device state
change callback, LE server/client is started.

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

clean up the socket close logic in caipserver

clean up the socket close logic in caipserver

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

Fixed crash issue related to send in Android BLE

when there are a lot of BLE devices nearby.
local reference overflow can be occured.

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

replace response code in keepalive of TCP

since Valid response code only used to indicate that
response identified by the entity-tag(ETag option)
to use Changed code is more suitable.

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

Merge branch 'master' into notification-service

update the lastest changes of master branch into notification-service branch

Change-Id: I87cbd690cc9e6b752a96edd1967c57c699988836
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Merge branch '1.1-rel'

Conflicts:
android/examples/settings.gradle
android/examples/simplebase/simplebase.iml
android/examples/simplebase/src/main/AndroidManifest.xml
android/examples/simplebase/src/main/res/values-w820dp/dimens.xml
android/examples/simplebase/src/main/res/values/dimens.xml
plugins/samples/linux/IotivityandZigbeeClient.c
resource/csdk/connectivity/inc/cablockwisetransfer.h
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
resource/csdk/connectivity/src/cablockwisetransfer.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
resource/csdk/connectivity/util/src/camanager/tizen/caleconnectionmanager.c
resource/csdk/security/SConscript
resource/csdk/security/include/internal/aclresource.h
resource/csdk/security/include/internal/dpairingresource.h
resource/csdk/security/include/internal/pconfresource.h
resource/csdk/security/include/internal/pstatresource.h
resource/csdk/security/include/internal/srmresourcestrings.h
resource/csdk/security/include/securevirtualresourcetypes.h
resource/csdk/security/provisioning/ck_manager/sample/provisioningclient.c
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json
resource/csdk/security/provisioning/src/credentialgenerator.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/base64.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/directpairing.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/dpairingresource.c
resource/csdk/security/src/pconfresource.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmresourcestrings.c
resource/csdk/security/src/svcresource.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/doxmresource.cpp
resource/csdk/stack/include/octypes.h
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocpayloadparse.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocstack.c
resource/docs/cpp-doc/Doxyfile
resource/docs/cpp-doc/devdox/mainpage.dox
resource/provisioning/examples/SConscript
resource/provisioning/examples/provisioningclient.cpp
resource/unittests/OCPlatformTest.cpp
service/easy-setup/enrollee/arduino/onboarding.cpp
service/easy-setup/enrollee/inc/onboarding.h
service/easy-setup/enrollee/src/easysetup.c
service/easy-setup/enrollee/src/easysetupcallbacks.h
service/easy-setup/enrollee/src/onboarding.h
service/easy-setup/enrollee/src/resourcehandler.c
service/easy-setup/enrollee/src/resourcehandler.h
service/easy-setup/enrollee/src/softap.c
service/easy-setup/enrollee/src/softap.h
service/easy-setup/mediator/csdk/unittests/MediatorCSDKTest.cpp
service/easy-setup/mediator/richsdk/unittests/MediatorRichTest.cpp
service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
service/resource-encapsulation/examples/tizen/RESampleClientApp/src/reclient.cpp
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java
tools/tizen/iotivity.spec
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java

Change-Id: I912131cd6905e5758a143fa71d0e32ef4201abab
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Markus Jung <jay.sharma@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: Saurabh Sharma <saurabh.s9@samsung.com>
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Added Initial version of notification.

This patch is initial version of notification service in IoTivity.
in this patch, included functionality of notification resource creation,
discover, send notification, read and dismiss messages.

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

[Simulator] Minor UI changes fixing the IOT-1087.

1. Added UI support to allow the resource type property to be editable
during resource creation from RAML.
2. Added a new dialog to edit the resource name and resource type during
the creation of multiple resource instances from RAML.
3. Removed the native code which forms rt when it is not specified
in RAML. For this case, plugin will pop-up the above mentioned dialog to
get the resource type from user.

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

Fix for jira issue IOT-1087.

Resource was creating with oic.if.def which is not defined in OIC spec.
Modified the code such that all simulated resource will be having at least
oic.if.baseline interface at any point of time as per 1.0.0 core spec.

Change-Id: I07c6e4513546d1d4be9c0584408801552c5f4ce4
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7877
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 3cd3700407657c96d02534f6e6be6c2398b97c68)
Reviewed-on: https://gerrit.iotivity.org/gerrit/8047

tizen: Fixed RHSampleApp project file to use SDK path separator

This MSDOS '\' will break support on non Windows tizen-sdk

Change-Id: I83aaa2529d9d317a9f6406beba40ec6de8fddfcf
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5499

modified the observe cancel logic for CoAP over TCP

if qos is NON_CONFIRMABLE, When observe is unobserved, remove
the callback associated on client side. and when the next notification
comes in from server, reply with RESET message to server.
but in case of CoAP over TCP, RESET message is not supported.
so client have to send Observe request to server with
observe flag = OC_RESOURCE_OBSERVE_DEREGISTER.

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

change the condition for BLE connected callback

As BLE connected callback means communication on BLE is available for user,
the callback should be called on DescriptorWrite success callback which is the last step
for BLE communication.
However, since there is a case that gatt descriptor can not be found,
the callback needs to be called on ServicesDiscovered callback in this case.

Change-Id: I9d0daa233a1b605e70857d9fcc584f9224f53e03
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>