platform/upstream/iotivity.git
7 years agoFix static analysis defect in NSProviderInterface.c
jake [Wed, 1 Feb 2017 06:09:31 +0000 (15:09 +0900)]
Fix static analysis defect in NSProviderInterface.c
 - Add mutex unlock in exception code.

Change-Id: Ic244e65ee0efb814264e8f1d29ee61f3a42f3e25
Signed-off-by: jake <jaehong2.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16943
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1774]Add BLE, NFC, RA flag for RI endpoint
bg.chun [Mon, 23 Jan 2017 07:13:55 +0000 (16:13 +0900)]
[IOT-1774]Add BLE, NFC, RA flag for RI endpoint

BLE, NFC, RA is not working due to endpoint.
So add BLE, NFC, RA flag for RI endpoint to make work
BLE, NFC, RA adapter

Change-Id: Iaf7ba69e5b28465876ef3abb986479cacb91e1b7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16691
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix Tizen build issue related BLE MTU negotiation.
jihwan.seo [Tue, 24 Jan 2017 05:46:59 +0000 (14:46 +0900)]
fix Tizen build issue related BLE MTU negotiation.

Change-Id: I4df80bd64137c38f6b1683e6b9eb859b00436182
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16715
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoIOT-1583: Removing /W3 warning from resource/csdk/security.
Pawel Winogrodzki [Tue, 6 Dec 2016 02:09:45 +0000 (18:09 -0800)]
IOT-1583: Removing /W3 warning from resource/csdk/security.

I'm also refactoring some SConscript files in order to enable
/W3 and /WX only for specific directories and I'm adding
_CRT_NONSTDC_NO_WARNINGS to disable warnings about issues we cannot
change anyway, because the code has to build for multiple platforms.

Change-Id: Ifef66b6c59540df2ceb40a54af47865d56a302d7
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16329
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoAdd API to set a seed value for UUID generation,
Chul Lee [Mon, 9 Jan 2017 12:04:05 +0000 (21:04 +0900)]
Add API to set a seed value for UUID generation,
to ensure that a device always uses the same UUID.
If the seed value is not set, a UUID is generated randomly.

Patch #1 : Initial upload
Patch #2 : add header file include on srmutility.c.
Patch #3 : Updated according to comments.
Patch #4 : Fix build error
Patch #5 : rebase
Patch #6 : Fix coredump
Patch #7-8 : Retrigger
Patch #9-10 : Updated according to comments.
Patch #11-13 : Retrigger

Change-Id: I6ce668866b5881386a52ef8cb9de5226b8595749
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16921
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoChange default settings to allow Ownership Transfer
Dan Mihai [Tue, 24 Jan 2017 01:42:16 +0000 (17:42 -0800)]
Change default settings to allow Ownership Transfer

If a Device did not provide a CBOR file that includes appropriate
ACLs, generate a CBOR file that allows Ownership Transfer, using the
Random PIN method.

The default read-only ACE for /oic/sec/acl has been removed, because
it is not required by provisioningclient.

There are new ACEs allowing read+write by default for /oic/sec/doxm,
/oic/sec/pstat and /oic/sec/cred. Those are required by the current
Onboarding design.

Change-Id: I52a80bfc7f0a84ef19888d78eea9223fbf09241c
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13569
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoprovisioning: Fix OIC_LOG args (FTBFS on tizen)
Philippe Coval [Fri, 27 Jan 2017 17:42:18 +0000 (18:42 +0100)]
provisioning: Fix OIC_LOG args (FTBFS on tizen)

It was observed when building with SECURED=1

Also use local include as it's not part of system

Change-Id: I7c1cf2090df7aeb2dc3084e9e469c8acee0ced2c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16837
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
7 years agoFix a defect to access a NULL variable
Jihun Ha [Tue, 31 Jan 2017 06:34:10 +0000 (15:34 +0900)]
Fix a defect to access a NULL variable

If OICMalloc fails, mediatorDevId gets to be NULL, which causes a crash
in calling getDeviceID API with mediatorDevId.

Change-Id: Ie59211187e6be896f0f4d0387884092812521a84
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16905
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd a log message for better understanding in OT
Jihun Ha [Wed, 25 Jan 2017 08:11:52 +0000 (17:11 +0900)]
Add a log message for better understanding in OT

Change-Id: I8409ae00196bcfd0ead8118cb21e38c51f8d4c07
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16759
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Add trace api for using ttrace
Eunji, Lee [Wed, 11 Jan 2017 09:02:48 +0000 (18:02 +0900)]
tizen: Add trace api for using ttrace
android: Add trace api for using ftrace

This patch includes implementation of alternative trace api set for android.
Since Atrace (android trace) api is available at android level 23,
we implement trace api by using ftrace directly.

Change-Id: I5370a190f340816934b77a83159c7c7ba9c8a17e
Signed-off-by: Eunji, Lee <eunjieji.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16467
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoprovide setConfigure API related BT including EDR, BLE by cautil.
jihwan seo [Tue, 17 Jan 2017 07:19:34 +0000 (16:19 +0900)]
provide setConfigure API related BT including EDR, BLE by cautil.

It can be set Adv Flag that check whether start Adv
in initialize step or not.
and It will resolve battery consumption issue.

Change-Id: I09791c1d8ca71373c36309150dbc97c5031a8bc2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16491
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoEnable discovery in Zigbee plugin in IoTivity's Plugin Interface module.
Joseph Morrow [Mon, 5 Dec 2016 17:33:11 +0000 (09:33 -0800)]
Enable discovery in Zigbee plugin in IoTivity's Plugin Interface module.

The PISetup() API needed to be called. It was never being called from the
sample application. Therefore no one knew how to perform the discovery.
This should unblock anyone looking to use this plugin.

Change-Id: Idcb269a48958ee3b262356a054c78ca6e0109315
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15165
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoservice: [IOT-1562] Fix for unittest with SECURED at RE/RC
KIM JungYong [Mon, 28 Nov 2016 08:33:18 +0000 (17:33 +0900)]
service: [IOT-1562] Fix for unittest with SECURED at RE/RC

[KIM JungYong]
When IoTivity was built with SECURED and TEST,
some of test case at RE and RC occurring crash.
because RE and RC has not set the precondition of security.

In this patch, added the security flow and persistence storage files at RE.
related security test case is disabled at RC.

[Philippe Coval]
Ported from 1.2-rel to master branch

Change-Id: I4094bd01cba84d395c408a56f4c57d4ebcb45b44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1562
Reviewed-on: https://gerrit.iotivity.org/gerrit/14837
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16867
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoAdd ACLs to java SimpleClientService so example runs when SECURED=1
George Nash [Fri, 13 Jan 2017 22:53:22 +0000 (14:53 -0800)]
Add ACLs to java SimpleClientService so example runs when SECURED=1

The ioc_svr_db_server ACL file is a copy of the ACL file from
resource/examples. This currently installs the .dat file from
the simpleserver sample.

Build:
scons BUILD_JAVA=1

Run example:
export LD_LIBRARY_PATH=<iotivity>/out/linux/x86_64/release/

java -cp java/examples-java/simpleclientserver/build/libs/simpleclientserver.jar:\
java/iotivity-linux/build/libs/iotivity-linux.jar \
org.iotivity.base.examples.SimpleClientServer

Change-Id: I02617ad852231a730cdf75f8a0b01c01ee0daeb2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16399
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoFix maybe-uninitialized warning in ca_adapter_net_ssl.c
George Nash [Thu, 26 Jan 2017 19:00:13 +0000 (11:00 -0800)]
Fix maybe-uninitialized warning in ca_adapter_net_ssl.c

The compilar was warning that the variables macKeyLen, ivSize, and keySize
could be used uninitialized. Very unlikely but really easy to fix.

Change-Id: Ie3a8872194c3ffe3a43576cdc399f8a1e99e3387
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16799
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoFixed unused-const-variable compiler warning
George Nash [Thu, 26 Jan 2017 21:43:18 +0000 (13:43 -0800)]
Fixed unused-const-variable compiler warning

Removed the CBOR_MAX_SIZE const variable.

In other parts of the code the CBOR_MAX_SIZE is used to
check if realocation can be used to resolve an out-of-memory
cborEncoderResult.

In credresource.c it is not used and can be removed.

Change-Id: I967b84375dd7f3d3532f191aa503d2d80542ffb1
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16805
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agocsdk: move OCEntityHandlerResponse from stack to heap
Hauke Mehrtens [Mon, 3 Oct 2016 19:00:28 +0000 (21:00 +0200)]
csdk: move OCEntityHandlerResponse from stack to heap

OCEntityHandlerResponse is over 50KByte and I got a stack overflow on MIPS
running on LEDE without this patch. Instead of storing
OCEntityHandlerResponse on the program stack, allocate some memory on
the heap and free it afterwards again.

This fixes one part of this issue for me:
https://jira.iotivity.org/browse/IOT-1374

Change-Id: I365a5c7a34dce2dfb0897a20b57a13ba566748ec
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12729
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoFixed typo of "Enviornment" to Environment so that greps for the term don't fail.
Nivedita Singhvi [Wed, 11 Jan 2017 00:35:51 +0000 (16:35 -0800)]
Fixed typo of "Enviornment" to Environment so that greps for the term don't fail.

Change-Id: Ie1964490f5a2d613f6079e296e68f9ba6fde2c60
Signed-off-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16293
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years ago[IOT-1782] fixing protocol enumeration for use in introspection response.
Srikrishna Gurugubelli [Fri, 27 Jan 2017 18:11:18 +0000 (10:11 -0800)]
[IOT-1782] fixing protocol enumeration for use in introspection response.

Change-Id: I06a55b629a383ba1f47dab384bae3e45097b51af
Signed-off-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16841
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agocsdk: move OCClientResponse from stack to heap
Hauke Mehrtens [Mon, 3 Oct 2016 21:22:36 +0000 (23:22 +0200)]
csdk: move OCClientResponse from stack to heap

OCClientResponse is about 50KByte and should not be stored on the
stack. On LEDE with MIPS, musl libc this causes a segmentation fault.
Moving this structure to the heap is the simple solution for this
problem, but this structure should be shrined.

There are probably more places were this is stored on the stack and
will cause problems. This fixes the other issue I saw in
https://jira.iotivity.org/browse/IOT-1374

Change-Id: I45d8aee4a8151fea51d3318acb1eea61ce579060
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12731
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoWindows: fix the default TARGET_ARCH
Dan Mihai [Fri, 20 Jan 2017 17:22:17 +0000 (09:22 -0800)]
Windows: fix the default TARGET_ARCH

Fix recent regression from commit
5198fa0c4abe18c5122d16984ce0c70c63dba882.

Change-Id: I7b7e36441f5f63cb89aeeb3fa2ba0b34ad1ce5ff
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16631
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoIOT-1776 Fix Windows TCP Transport
Way Vadhanasin [Wed, 25 Jan 2017 18:06:09 +0000 (10:06 -0800)]
IOT-1776 Fix Windows TCP Transport

This change makes the TCP transport on Windows functional when the application
picks resource based on COAP+TCP.

Change-Id: I9d6965afc0cbdadf4c9597f1b24a04ccafc17855
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16763
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoreplace NotifyCharacteristic property with indicate in Tizen BLE server.
jihwan.seo [Wed, 25 Jan 2017 05:37:57 +0000 (14:37 +0900)]
replace NotifyCharacteristic property with indicate in Tizen BLE server.

Change-Id: Icd9725c864fc3a64aae8ecc54502ba1b12a6e3c7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16757
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix BLE MTU nego issue in writeDescriptor logic
jihwan.seo [Wed, 25 Jan 2017 05:30:58 +0000 (14:30 +0900)]
fix BLE MTU nego issue in writeDescriptor logic

Change-Id: I84fa340afda3ecdee0a1f85bf0f63073c26d2a59
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16755
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1704]Apply new api OCDoRequest() to samples.
bg.chun [Fri, 6 Jan 2017 02:04:46 +0000 (11:04 +0900)]
[IOT-1704]Apply new api OCDoRequest() to samples.

Apply new api OCDoRequest() to samples.
And remove deprecated api OCDoResource().
related with below commit
[IOT-1704]Deprecate OCDoResource and add OCDoRequest
https://gerrit.iotivity.org/gerrit/#/c/16725/

Change-Id: I762b4e4c00caa1d52b471e46f2a0e7299402a7f7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16183
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdded Android interface API setPinType().
saurabh.s9 [Fri, 27 Jan 2017 09:56:56 +0000 (15:26 +0530)]
Added Android interface API setPinType().

Change-Id: I98ba58c440d252cc3f32dd589e1a0eed3935b675
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16525
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoFix unused-const-variable compiler warning
George Nash [Thu, 26 Jan 2017 20:43:30 +0000 (12:43 -0800)]
Fix unused-const-variable compiler warning

The variable MSECS_PER_SEC was declared but not used.
There were two ways to solve this compiler warning.
  1. Delete variable
  2. Use variable

Option 2 was used for this change. In several locations that the
hardcoded number 1000 was used that was clearly intended to be
MSECS_PER_SEC. This also results in a few locations where
multiplication by MSECS_PER_SEC is used to conver the time to
micro seconds.

While doing this one location was updated to also use the USECS_PER_SEC
const variable.

Change-Id: I448fc1ca614b0d8be7ea4836da6406dbd69ef325
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16801
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1775]Fix obsHeaderOpt check logic
bg.chun [Tue, 24 Jan 2017 11:47:16 +0000 (20:47 +0900)]
[IOT-1775]Fix obsHeaderOpt check logic

Fix obsHeaderOpt check logic like below
AsIs
check protocolId and optionId are exist
ToBe
check optionId is exist or protocolId and optionId are exist

Change-Id: I96acc0ef5c69b17aab0f722135cb09ab61bce1d2
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16729
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1704]Deprecate OCDoResource and add OCDoRequest
bg.chun [Tue, 24 Jan 2017 10:36:53 +0000 (19:36 +0900)]
[IOT-1704]Deprecate OCDoResource and add OCDoRequest

Deprecate OCDoResource which free given payload
and add new api OCDoRequest which does not free
given payload

Change-Id: Id9f8d3cec126c39512150850a806bd55f5cc009b
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16725
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoSsladapter unit tests update
Oleksii Beketov [Wed, 11 Jan 2017 13:46:38 +0000 (15:46 +0200)]
Ssladapter unit tests update

Ssladapter unit tests updated to correspond new ciphersuites list

Change-Id: I0f4a6327f0eb9aa6038974db89a8b3bb2c6814c3
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16323
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 374fc66bb7a04871853000d0ae58ac3a18ad4772)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16577
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agoCheck if stack is init'ed in call to OCProcess()
Mandeep Shetty [Thu, 19 Jan 2017 19:05:02 +0000 (11:05 -0800)]
Check if stack is init'ed in call to OCProcess()

OCProcess() returned OC_STACK_OK even when the stack was
not initialized.

Note that even with returning OC_STACK_OK, it was
effectively a no-op as all the other calls in OCProcess() checked for
initialization.

Change-Id: I84423f19390ae840e785e340bc458a5b41b0795a
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16589
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agobuild: Suggest to download supported tinycbor
Philippe Coval [Thu, 24 Nov 2016 16:47:25 +0000 (17:47 +0100)]
build: Suggest to download supported tinycbor

Note this patch is appropriate for release versions (or branches)
 while master or development branches can follow upstream's master branch
 and eventually synched when needed.

Bug: https://jira.iotivity.org/browse/IOT-1600
Change-Id: I361a75fa9dd52739dce0daa8e14333c95e6c9284
Origin: https://gerrit.iotivity.org/gerrit/#/c/14763/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 16d6391f55577bae92cd458ef6a8dbafc57dc81b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14805
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Mike Finch <mike.f.finch@lowes.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: C.J. Collier <cjcollier@linuxfoundation.org>
7 years agoFixed a crash error caused on IP network get down
Jaewook Jung [Fri, 20 Jan 2017 03:15:54 +0000 (12:15 +0900)]
Fixed a crash error caused on IP network get down

Because CAGetIPInterfaceInformation() allocates memory to
CAEndpoint_t at once, OICFree also should be called once.

Change-Id: I7cb85761e1d49e73d357928c77b364555d82c87f
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16621
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoFree options and pdu in the end of the tests.
Ziran Sun [Tue, 10 Jan 2017 10:42:00 +0000 (10:42 +0000)]
Free options and pdu in the end of the tests.

Change-Id: Ic036417c8aa02d76f5d9c8a1805c5c18a050fe13
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16277
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years ago[IOT-1771]Adding Doxygen comments for Subscribe and Unsubscribe API for expected...
abitha.s [Mon, 23 Jan 2017 10:03:34 +0000 (15:33 +0530)]
[IOT-1771]Adding Doxygen comments for Subscribe and Unsubscribe API for expected call order

Change-Id: Ic0c0e8f72076640796b29aaf3586324222e186fe
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16695
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1773]Removing redundant return code by modifying Java APIs to return void.
abitha.s [Tue, 24 Jan 2017 08:55:37 +0000 (14:25 +0530)]
[IOT-1773]Removing redundant return code by modifying Java APIs to return void.

As error status is thrown in exception

Change-Id: I3bd917cb1840db51ade54e49033b2281416d7add
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16723
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[Hotfix] Add DTLS handshake callback invocation after DTLS handshake done.
Chul Lee [Tue, 17 Jan 2017 09:14:30 +0000 (18:14 +0900)]
[Hotfix] Add DTLS handshake callback invocation after DTLS handshake done.

Change-Id: I482f3d56dc1528c1287691d168b5272878065bbe
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16485
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 9f35361d0a8d313d98128a604c7ee22c4fd54138)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16683
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoFix ownership transfer issues
Jongmin Choi [Fri, 13 Jan 2017 06:41:34 +0000 (15:41 +0900)]
Fix ownership transfer issues

Fix issues related to ownership transfer
- Port change after failed ownership transfer

Patch #1: initial upload
Patch #2: build error fix

Change-Id: Ia6df0e7b862f73fab166ccb2c8ceee6c348b8189
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 75bd7cd65fc5bdd362120ca2ac10d5d09a7755c5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16417
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoupdate description related start/stop advertisement API.
jihwan.seo [Thu, 19 Jan 2017 10:22:19 +0000 (19:22 +0900)]
update description related start/stop advertisement API.

Change-Id: I6ece93384e0204957b3dd406b0796c50544b5220
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16583
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1731] To support start/stop LE advertising API for Tizen
jihwan.seo [Sat, 7 Jan 2017 08:15:22 +0000 (17:15 +0900)]
[IOT-1731] To support start/stop LE advertising API for Tizen

- enable C++ API for stop/start adv
- base patch is https://gerrit.iotivity.org/gerrit/#/c/16221/

Change-Id: I344a243b13cd9c63f6de7918718c07f17df480bc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16711
Reviewed-by: Jiwon Cha <jw_wonny.cha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoAdd initialization in Android BLE client and server
jihwanseo [Fri, 20 Jan 2017 02:06:27 +0000 (11:06 +0900)]
Add initialization in Android BLE client and server

Declared initial value to Android BLE client and server.

Change-Id: Ic18026b4930e9a3c5cfe5fe512bfbe49f5711f1a
Signed-off-by: jihwanseo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16689
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jiwon Cha <jw_wonny.cha@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoWindows: add support for WITH_TCP=0
Dan Mihai [Thu, 19 Jan 2017 23:24:38 +0000 (15:24 -0800)]
Windows: add support for WITH_TCP=0

Change-Id: I77881dd255b1aa2b246eb17c5894bebda0262b33
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16615
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoCleanup Java documentation warnings
George Nash [Mon, 23 Jan 2017 17:57:05 +0000 (09:57 -0800)]
Cleanup Java documentation warnings

Cleanup the warings in OcCloudProvisioning and OcRepresentation

Change-Id: I4516b8fbd13b6a157291ce34080f985eb21bed4a
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16705
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agobuild: Suggest to download supported mbedtls
Philippe Coval [Thu, 24 Nov 2016 16:47:25 +0000 (17:47 +0100)]
build: Suggest to download supported mbedtls

Note this patch is appropriate for release versions (or branches)
 while master or development branches can follow upstream's master branch
 and eventually synched when needed.

Change-Id: Iae857f9d5bab9a5d1174d38823faff25666299cb
Bug: https://jira.iotivity.org/browse/IOT-1600
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14765
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 8cb98d358a94a06e3b18ca6131c3c6b58fc32e76)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15357
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoIOT-1749: Enabling multi-threaded builds in Windows.
Pawel Winogrodzki [Fri, 13 Jan 2017 02:51:32 +0000 (18:51 -0800)]
IOT-1749: Enabling multi-threaded builds in Windows.

I've modified the global env configuration and run.bat in order
to make parallel builds possible and generate private symbols files
at the same time.

Change-Id: I770b5a57e4fb8b437b727d7937f37a411e2f6cca
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16553
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1772]Returning copy of TopicList in Cpnsumer Service API for APP
abitha.s [Mon, 23 Jan 2017 11:58:30 +0000 (17:28 +0530)]
[IOT-1772]Returning copy of TopicList in Cpnsumer Service API for APP

Change-Id: Iab88c037ec30ad961bada01579daf0c4d470596d
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16701
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd a logic to filter a OT/MOT case which should return a failure
Jihun Ha [Mon, 23 Jan 2017 09:33:01 +0000 (18:33 +0900)]
Add a logic to filter a OT/MOT case which should return a failure

It should return an ES_OWNERSHIP_IS_NOT_SYNCHRONIZED error under the below
condition:
 - An ownership information is stored in a mediator PDM DB
 - The found enrollee is an owned state but owned by other mediator

Additionally, add getOwnerID API to get a device owner id if an enrollee is owned

Change-Id: Iafabaf5731babad152f2b155007c6299b79af53c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16685
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[Easy-setup] Enable to build of tizen mediator.
KIM JungYong [Mon, 23 Jan 2017 11:29:36 +0000 (20:29 +0900)]
[Easy-setup] Enable to build of tizen mediator.

When building of Easy-setup for tizen, mediator was not built before.
In this patch mediator api for tizen will be build.

Change-Id: I215a81c414c039777d8c9a918f2840cbfb4bb471
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16699
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1744] Fix for race-condition crash
George Nash [Fri, 20 Jan 2017 22:02:48 +0000 (14:02 -0800)]
[IOT-1744] Fix for race-condition crash

The resource-container was crashing when due to failure to
grab a lock when the resorce container was being stopped

This resulted in code trying to use the resource container
at the same time it was being unregistered resulting in
a segfault.

Note: RemoteResourceUnitTest.onCacheCBCalled test is still
failing due to a different issue. That test must be fixed
before IOT-1744 can be closed.

Bug: https://jira.iotivity.org/browse/IOT-1744
Change-Id: I2dc5061c1693cc81c4f54a65a5233790fb5336d2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16637
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoTo support MTU negotiation for BLE (android client to tizen server)
jihwan.seo [Fri, 30 Dec 2016 03:26:51 +0000 (12:26 +0900)]
To support MTU negotiation for BLE (android client to tizen server)

Android to Android, Tizen to Tizen will be supported by next patch.

Change-Id: I736724df83c57a2193ab591bd7463dd2368642ea
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16275
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: MyeongGi Jeong <myeong.jeong@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoApply the logic which can start transport type in initialize step.
jihwan.seo [Mon, 16 Jan 2017 08:41:06 +0000 (17:41 +0900)]
Apply the logic which can start transport type in initialize step.

In case of some scenario that just one library is used
in here and there.
There are many resource wastes related unused transport adapter.
thru, It is better to provide it manually.

Change-Id: Id34bad8db3a323c723af95330ef243041ba6fa34
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16433
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoChange notification-service resource type
cc [Mon, 23 Jan 2017 01:43:30 +0000 (10:43 +0900)]
Change notification-service resource type

It is required to change notification-service resource type to pass CTT as below.
x.org. naming scheme is accepted as vendor specific resource name
during OCF F2F meeting in Vegas.

oic.wk.xxx -> x.org.iotivity.xxx

Change-Id: I7e9d50c315ad7cd4beda6b4454e525dc03d3bfb5
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16687
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agomodified cloud samples to work in tls mode
Jung Seungho [Mon, 2 Jan 2017 08:09:24 +0000 (17:09 +0900)]
modified cloud samples to work in tls mode

- add TLS ciphersuites logic in samples
- add libraries related to TLS ciphersuites in SConscript

Change-Id: If1b7e95552deab984c4ac8f3432e31bd63dbd286
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16039
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16573
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agofix ocpmapi lib option for iotivity.pc
Youngman [Fri, 20 Jan 2017 08:24:25 +0000 (17:24 +0900)]
fix ocpmapi lib option for iotivity.pc
- because the default value of EXC_PROV_SUPPORT is 0, a script related to it should be modified

Change-Id: I44cd08856687b2c8606145aeade9002fcf3db108
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16627
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 3d38ef8ad73c9111efc1a21bb29dcbeddc0be063)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16625

7 years agoParseChain update
Oleksii Beketov [Wed, 18 Jan 2017 13:59:21 +0000 (15:59 +0200)]
ParseChain update

1. ParseChain modified to get rid of 0x0 termination restriction.
Upon now the certificate chain may contain mix of PEM or DER
certificates with or without any separating symbols.
2. Add unit test for ParseChain

Change-Id: I6a2d6664c323e415e79fbddf63842b29fe15e338
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15509
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16541
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoChange resource type, URI, and all relevant words in Easy setup service
Jihun Ha [Fri, 20 Jan 2017 02:25:53 +0000 (11:25 +0900)]
Change resource type, URI, and all relevant words in Easy setup service

On decision of OCF meeting, resource types and URIs of easy setup resources
are decided to be changed:
* Resource type
  oic.wk.prov -> oic.r.easysetup
  oic.wk.wifi -> oic.r.wificonf
  oic.wk.cloudserver -> oic.r.coapcloudconf
  oic.wk.devconf -> oic.r.devconf
* URI
  /ProvisioningResURI -> /EasySetupResURI
  /WiFiProvisioningResURI -> /WiFiConfResURI
  /CloudServerProvisioningResURI -> /CoapCloudConfResURI
  /DevConfProvisioningResURI -> /DevConfResURI

Along with those changes, all classes, functions, structures' names are
changed, respectively.

Change-Id: I45a34e69be3348dd5adb9f7478995bee53be80e5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16581
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix SSL
Dan Mihai [Fri, 20 Jan 2017 23:24:08 +0000 (15:24 -0800)]
Fix SSL

Fix an apparent incorrect merge from commit
efb16a3d282851cbb70a8de693d2a300ce6f43dd. Provisioningclient wasn't
working anymore.

Change-Id: I990f854bdd96127286d97d1ed00dca10ca9632bd
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16679
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1769] Add OC_STACK_NOT_ACCEPTABLE status code
Alex Kelley [Fri, 20 Jan 2017 20:08:49 +0000 (12:08 -0800)]
[IOT-1769] Add OC_STACK_NOT_ACCEPTABLE status code
to fix build break.

Change-Id: I8590a9e78df7e5f8ba5c4938dad8d3b7d277b0bc
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16635
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoCleanup documentation warnings in the notification service java code
George Nash [Thu, 19 Jan 2017 20:40:50 +0000 (12:40 -0800)]
Cleanup documentation warnings in the notification service java code

Change-Id: I2c646eec70caba07ce8cafe4bdc9ad382e35ff1c
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16609
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoCleanup documentation warnings in the resourcecontainer java code
George Nash [Fri, 13 Jan 2017 23:52:01 +0000 (15:52 -0800)]
Cleanup documentation warnings in the resourcecontainer java code

Change-Id: Ia19f5d6470b6ea8ef8018bd40dc5edf13808e56b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16407
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoAdd ACLs to java SimpleService so examples run when SECURED=1
George Nash [Fri, 13 Jan 2017 00:54:58 +0000 (16:54 -0800)]
Add ACLs to java SimpleService so examples run when SECURED=1

The ModeType in SimpleClient is changed to CLIENT_SERVER
This is a work around for IOT-693

the ioc_svr_db_server ACL file is a copy of the ACL file from
resource/examples.

The example will run against the simpleservice simpleclient in
resource.

Build:
scons BUILD_JAVA=1

Run examples:
export LD_LIBRARY_PATH=<iotivity>/out/linux/x86_64/release/

java -cp java/examples-java/simpleserver/build/libs/simpleserver.jar:\
java/iotivity-linux/build/libs/iotivity-linux.jar \
org.iotivity.base.examples.SimpleServer

java -cp java/examples-java/simpleclient/build/libs/simpleclient.jar:\
java/iotivity-linux/build/libiotivity-linux.jar \
org.iotivity.base.examples.SimpleClient

Change-Id: I56b627a5edfac823934b5966a06e4bbd8ac561e2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16363
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years ago[IOT-1601]Adding logic to validate oxmsel updationg in owned=true
js126.lee [Mon, 28 Nov 2016 09:17:59 +0000 (18:17 +0900)]
[IOT-1601]Adding logic to validate oxmsel updationg in owned=true

This patch is related to CT1.7.8.3 case.
CTT has been agreed this patch.

Change-Id: Ia1e18bd940b69bfcf13c717a334a91a42f3f8402
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14841
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 13a35f5aebde095c6e4015d5ebcd93c4753dc69b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15303
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoFix for patchset 15853
Dmitriy Zhuravlev [Fri, 30 Dec 2016 07:28:14 +0000 (09:28 +0200)]
Fix for patchset 15853

Fixed OTM error caused by patchset 15853.
Added close notify alert sending to DeletePeerList()

Change-Id: Ib5363f8d16358a388df0f003e9111f1d56ccca62
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16001
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>
(cherry picked from commit 085d7a8af264f8731ee11014f711d9f39b678376)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16413
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoUpdate StartMultipleOwnershipTransfer to prevent unnecessary communications
Chul Lee [Tue, 17 Jan 2017 09:32:41 +0000 (18:32 +0900)]
Update StartMultipleOwnershipTransfer to prevent unnecessary communications

Change-Id: I151244bed344640fdcb396cd4d2be1f82a64ca0e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16489
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 415884f01a5f7f3a5faf84acb615c5327e396312)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16579

7 years agoFix mutex unlock in case of dtls retransmit fail
Joonghwan Lee [Thu, 12 Jan 2017 04:45:17 +0000 (13:45 +0900)]
Fix mutex unlock in case of dtls retransmit fail

Patch 1: Initial upload
Patch 2: Build retrigger

Change-Id: I50bfe828a7522d245b7382f0252e465ca31eaff1
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16339
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit eb93a8761e73e511bf03abb2a0ee473a3dd304af)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16565
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
7 years agoSend alert after bad client hello
Joonghwan Lee [Thu, 22 Dec 2016 02:51:40 +0000 (11:51 +0900)]
Send alert after bad client hello

Fix the following situation:
1. client tries OTM to server
2. OTM completed
3. network of server goes down and up => DTLS session has been removed
4. client tries to send a request to secure resource(e.g., /oic/sec/acl)
5. server prints bad client error(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO), and then ignore this
6. client never gets a response of it even if re-tries to sent same message

Change-Id: Ie2cd3eaa49fc8782522126799994a5cd47cfaf4e
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15853
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7241811f3c1fba031aff1f1fc90f81f6a8a9a038)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15855
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
7 years agoFix invalid parameters of log level.
KIM JungYong [Tue, 17 Jan 2017 04:32:35 +0000 (13:32 +0900)]
Fix invalid parameters of log level.

In the log of notification provider service,
some of parameters was invalid typo(NS_ERROR).
this mean that log level ERROR.
In this patch, typo is fixed.

Change-Id: I8d623aec975dccb8f2a5118d1ac4c00d21add605
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16465
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoRemove RD_CLIENT preprocessor.
cc [Mon, 16 Jan 2017 04:48:38 +0000 (13:48 +0900)]
Remove RD_CLIENT preprocessor.

RD_CLIENT preprocessor for relay notification are removed,
because resource directoty option has been set for default.
No need to set the option with WITH_CLOUD any more when building.

Change-Id: I3170b60f29c836dcf1ef18a1069a0bee09b4bd94
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16425
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoIntrospection support
Srikrishna Gurugubelli [Fri, 13 Jan 2017 23:23:04 +0000 (15:23 -0800)]
Introspection support

Change-Id: Ic1524b10e7ab44831ee09503b5a2bb69ad3ff0b8
Signed-off-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16405
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoIOT-1761 Fix memory leak in InProcServerWrapper::sendResponse
Way Vadhanasin [Thu, 19 Jan 2017 07:20:47 +0000 (23:20 -0800)]
IOT-1761 Fix memory leak in InProcServerWrapper::sendResponse

This change ensures that the OCPayload object gets cleaned up properly in
InProcServerWrapper::sendResponse().

Change-Id: Id242fc3823c2c2cb5db3dd75324c3fa9fb2cd8c0
Signed-off-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16571
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoAdditional functionality for MOT and pin handling.
Alex Kelley [Tue, 6 Dec 2016 01:11:55 +0000 (17:11 -0800)]
Additional functionality for MOT and pin handling.
 - Add APIs to do MOT discovery of a specific device.
 - Add APIs to check to see if the caller is a subowner.
 - Add context to display and input pin callbacks.
 - Add device information to input pin callback.
 - Enable C++ security APIs to be built for Windows.
 - Update ProvisioningClient and Sampleserver_RandomPin
   to  use the new APIs.
 - Enable MOT to always build on Windows.

Change-Id: I27af9d3c2c7065b8643f77be3ac4c9b2dc5ffe80
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16403
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoFix for multiple discovery paylod in response.
KIM JungYong [Tue, 17 Jan 2017 05:21:45 +0000 (14:21 +0900)]
Fix for multiple discovery paylod in response.

When consumer do discovery request to cloud,
cloud server can response on multiple device's result by one of response.
consumer service does not handle multiple discovery payload befour.

When applying this changes, consumer service can handle
multiple discovery payloads.

Change-Id: I516ac933daf435b436158ae4983f0ffedefe32c0
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16469
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate MOT condition check logic & easysetup MOT function signature
Parkhi [Wed, 18 Jan 2017 12:03:41 +0000 (21:03 +0900)]
Update MOT condition check logic & easysetup MOT function signature

 - if user didn't want to MOT, MOT process is skipped.

Change-Id: I4ea7e41eab398d7d8f9bc46fdc9a7940c9423500
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16529
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Use easy-setup mediator
Philippe Coval [Wed, 18 Jan 2017 14:06:18 +0000 (15:06 +0100)]
tizen: Use easy-setup mediator

Change-Id: I2b0681b70218613c0df0d82e0f46fdc61668296e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16543
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFixed account server TC
yeonghun.nam [Wed, 28 Sep 2016 00:03:53 +0000 (09:03 +0900)]
Fixed account server TC

1. DB reset for each test case

Change-Id: I7cc9d46af2ffe6136b13231d9b0e015ee6799dcf
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit c8ea7c0831a5a268b3a4ac4fda81d3b420121645)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16547
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoTLS suites
Oleksii Beketov [Thu, 5 Jan 2017 11:42:25 +0000 (13:42 +0200)]
TLS suites

1. Suites added:
   TLS_RSA_WITH_AES_256_CBC_SHA256          0x3D
   TLS_RSA_WITH_AES_128_GCM_SHA256          0x009C
   TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256  0xC02B
   TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384  0xC024
   TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384  0xC02C
   TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_256   0xC027
2. Removed:
   TLS_RSA_WITH_AES_256_CBC_SHA             0x35
   TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA     0xC009
3. SSL code refactored
4. Added unit tests for new cipher suites
5. CAsslGenerateOwnerPsk modified to support all suites

Change-Id: If22925d175751a08121c66b90cc2907dd27ebee5
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15443
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16523
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoFixed a build error about BLE
Jaewook Jung [Wed, 18 Jan 2017 01:22:50 +0000 (10:22 +0900)]
Fixed a build error about BLE

When trying to build android without BLE transport, the build error is caused.
caleconnectionmanager.c is included only when built with BLE transport,
so the functions on it should not be called without BLE.

Change-Id: Ic9ad006ec21e93774c5df46747b296e64cfb76fb
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16517
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agofix TC fail issue
eunok.shin [Tue, 4 Oct 2016 08:35:49 +0000 (17:35 +0900)]
fix TC fail issue

Change-Id: Ib378acbee3db935aeb308742899039ee798662b8
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12751
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16559
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years ago[IOT-1616] CSM bug fixed in the cloud interface
yeonghun.nam [Wed, 14 Dec 2016 06:34:43 +0000 (15:34 +0900)]
[IOT-1616] CSM bug fixed in the cloud interface
 - CSM bug fixed to support the device which does not support CSM

Change-Id: Iad570aa5e6776c58842927b95bb86581ab703848
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 4d94c16126d47892e4c434641ee7ac390430e5d1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16095
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agomodified log format for daily log
Jung Seungho [Wed, 18 Jan 2017 13:15:03 +0000 (22:15 +0900)]
modified log format for daily log

Change-Id: Ieee45141bef410df49aaadb6a9366a0d76f4a90e
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16535
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agobuild: Install provisioning ESException.h
Jihun Ha [Wed, 18 Jan 2017 08:28:59 +0000 (17:28 +0900)]
build: Install provisioning ESException.h

Add ESException.h to 'inc' folder and a list of install target headers

Change-Id: Ib0b7e7bbab9cf5d8f7cc0c69e223d966e4b055b0
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/16521/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16521
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Suggest to download supported tinycbor
Philippe Coval [Mon, 18 Jul 2016 23:51:09 +0000 (16:51 -0700)]
build: Suggest to download supported tinycbor

Note this patch is appropriate for frozen versions
 while master or development branches can follow tinycbor master
 and eventually synched when needed.

Change-Id: Ic764a3aa7231982d24fcdd17d661425500000000
Bug: https://lists.iotivity.org/pipermail/iotivity-dev/2016-November/006160.html
Origin: https://gerrit.iotivity.org/gerrit/9565
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Gregg Reynolds <dev@mobileink.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 10c287fa62763927619d5fb0a20c8a43f2e41e62)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15355
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agomodify dtls define for iotivity.pc
Youngman [Thu, 5 Jan 2017 03:54:59 +0000 (12:54 +0900)]
modify dtls define for iotivity.pc

Change-Id: I202ddf448b3e36d142aff20a62ac4f9286c1829c
Signed-off-by: Youngman <yman.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16317
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
7 years agobuild: Ship provisionning headers
Philippe Coval [Wed, 18 Jan 2017 12:03:56 +0000 (13:03 +0100)]
build: Ship provisionning headers

New headers should be installed if part of public API:

- OCProvisionningManager.hpp
- OCCloudProvisioning.hpp

Change-Id: I29a322f2dae9b0d978cdd05d4ca3ad71729d1923
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16533
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agomodified log property and certificate path
Jung Seungho [Mon, 16 Jan 2017 04:08:10 +0000 (13:08 +0900)]
modified log property and certificate path

Change-Id: I8a0322b946e324afcdda32520bf90f7859dbcdd7
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16421
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 3bb1fbe764edc51deb73e3704e5df65a17364600)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16483
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoUpdate MOT condition check logic
Parkhi [Wed, 18 Jan 2017 06:08:16 +0000 (15:08 +0900)]
Update MOT condition check logic

 - when enrollee didn't support MOT, mediator didn't call MOT function.

Change-Id: I2b2bd932a5d00e7c783a8351819b61d6eb71d948
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16475
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1616] CSM signaling supported in CoAP D2S communication
yeonghun.nam [Mon, 12 Dec 2016 06:47:24 +0000 (15:47 +0900)]
[IOT-1616] CSM signaling supported in CoAP D2S communication

- 7.01 CSM implementation (based on draft-ietf-core-coap-tcp-tls-05)
- 4.02 bad option response when unrecognized critical option is included in the message
- unrecognized request method throws 4.05 Method Not Allowed, and unrecognized response throws 4.00 Bad Request

Change-Id: I1fe6815f93f373086b00bd1381d86c9bee86c656
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 8e85103153f9e624e7206b3afd7fa1d5db67bcf4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16091
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoeasy-setup: Rename header to EasySetup.hpp
Philippe Coval [Tue, 17 Jan 2017 08:48:05 +0000 (09:48 +0100)]
easy-setup: Rename header to EasySetup.hpp

Prevent potential name clash on case insensitive filesystems:

./service/easy-setup/mediator/richsdk/inc/EasySetup.h
./service/easy-setup/enrollee/inc/easysetup.h

Mediator one is C++ so we rename it to .hpp

Change-Id: I6d784378b5065b162d06abb2338bf70e0147d864
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16479
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Support SECURED mode in resource-directory test
Philippe Coval [Sat, 14 Jan 2017 13:24:41 +0000 (14:24 +0100)]
build: Support SECURED mode in resource-directory test

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: Ib924adced10d24d5d7afc8b6964bf560dae60b5a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16411
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoCloud provisioning modification in listener return type.
Sunil Kumar K R [Wed, 21 Dec 2016 06:07:23 +0000 (11:37 +0530)]
Cloud provisioning modification in listener return type.

patch2: Cloud provisioning Listener modification
patch3: Signout bug fix

Change-Id: Ibf43255ff82891b3ef7026763b5d2796fe839abf
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15865
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16415
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years ago[IOT-1573] Account User search revised in device-to-cloud communication
yeonghun.nam [Mon, 21 Nov 2016 09:12:21 +0000 (18:12 +0900)]
[IOT-1573] Account User search revised in device-to-cloud communication

 - user search logic added in Account Server
   - GET /oic/account/search?uid=u0001;uid=u0002
       (to search users using multiple "OR" conditions)
   - GET /oic/account/search?name=mike,email=mike@aaa.com
       (to search users using multiple "AND" conditions)

patch #4 : unnecessary logs are removed

Change-Id: Ib7aa014434a41d8a5092780b3dfc8de688faa465
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 1f1e81ef5bdd2cff068a87ffe73ca647c8f2f8d6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14599
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 0624859461d9f3a0927853b23d0f5ab49eafcfca)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16083
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agoLatent defect issue solved in AS based on statistical analysis result
yeonghun.nam [Tue, 6 Dec 2016 04:50:15 +0000 (13:50 +0900)]
Latent defect issue solved in AS based on statistical analysis result

Change-Id: Ib80244e04a16354a31efb667126124daeb81896f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit d39eed202efcd989dc4d971638b6e5713835c077)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16089
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years ago[IOT-1604] Fix cloud routing code
Jung Seungho [Fri, 25 Nov 2016 05:58:59 +0000 (14:58 +0900)]
[IOT-1604] Fix cloud routing code

- Fix on do GET request to discovered resource server.
- changed DiResource to RouteResource
- code clean up

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

Change-Id: If1ccc98bb4d8e288d5264d1cadaf540ef0ca4794
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit f1e992e402ce526f3b2d9b4dd769d91a9f8888d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16087
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
7 years agobuild: restrict compiler options to supported architectures
Hauke Mehrtens [Sat, 10 Dec 2016 17:35:04 +0000 (18:35 +0100)]
build: restrict compiler options to supported architectures

For Linux we currently only support the following architectures:
'x86', 'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64'
explicitly check for those architectures.

There is not option with v7a-hard in os_arch_map so it is not possible
to select this for target_arch, remove the options here because they
are unused.

Change-Id: I7078530bc2a89b88c7049cc53e8bb3fbe5d75ca8
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15433
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years ago[IOT-1538] Add support for Protocol-Independent ID
Dan Mihai [Fri, 13 Jan 2017 00:52:43 +0000 (16:52 -0800)]
[IOT-1538] Add support for Protocol-Independent ID

Per OCF Core CR 64: add support for a protocol-independent ID of a
device, in /oic/d, for use with de-duping information discovered via
more than one protocol (OCF, AllJoyn, UPnP, WS-Discovery, etc.). The
other protocols already carry a UUID for this purpose.

Change-Id: I2c6f5f2a29d09b2a120d450708360bcd61c08b3c
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14261
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoTag specific version of upstream libcoap
Dave Thaler [Wed, 4 Jan 2017 02:10:11 +0000 (18:10 -0800)]
Tag specific version of upstream libcoap

Change-Id: I797814f281ee6315a00054d4cc9cbc977bdf7e0d
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16123
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agobuild: do not set TARGET_ARCH to default
Hauke Mehrtens [Sat, 10 Dec 2016 17:15:32 +0000 (18:15 +0100)]
build: do not set TARGET_ARCH to default

This check is useless, scons already checks this and returns such an
error message:
Invalid value for option TARGET_ARCH: mips.  Valid values are: ['x86',
'x86_64', 'arm', 'arm-v7a', 'armeabi-v7a', 'arm64']

Change-Id: I3f7dd3b9fcae875ab20349203fb77537f24be763
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15431
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agodisable BT transport in iotivity.spec by default.
jihwan.seo [Mon, 16 Jan 2017 01:54:09 +0000 (10:54 +0900)]
disable BT transport in iotivity.spec by default.

since BT is not mandatory transport type,
it causes a waste of resource(memory).
thru, it is better to disable.

Change-Id: Ic2eabf0166383f7d391197a1fd0a4ac1ed6d185d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16419
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agofix java build failure issue
jihwan.seo [Mon, 16 Jan 2017 04:15:47 +0000 (13:15 +0900)]
fix java build failure issue

Change-Id: I81328799cf95ebd85ea7de72faeef783f7be8e71
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1556] Changes in cloud according to the stateless request/response model (group...
yeonghun.nam [Tue, 15 Nov 2016 06:03:30 +0000 (15:03 +0900)]
[IOT-1556] Changes in cloud according to the stateless request/response model (group features)

The cloud implementation is revised, due to the protocol update to the stateless request/response model in the device-to-cloud communication.

- Group Management
  - Group creation implementation
  - add/update/delete properties
  - delete group
  - get group information

patch #6: POST /oic/acl/group/ response correction

Change-Id: I7db5836bff5b4cb33a7effa523f9388ff4240262
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14333
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 834187fe46f97e101496d0d5f156efdbd330f3fa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16081