platform/upstream/iotivity.git
7 years agoMerge branch 'master' into cloud-interface
Jee Hyeok Kim [Tue, 24 Jan 2017 01:16:10 +0000 (10:16 +0900)]
Merge branch 'master' into cloud-interface

Change-Id: Id2fa035c6257309fe67772cf74f260d0a0e39a12
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@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

7 years ago[IOT-1556] Changes in cloud according to the stateless in CloudInterface and AccountS...
Jung Seungho [Tue, 15 Nov 2016 07:26:51 +0000 (16:26 +0900)]
[IOT-1556] Changes in cloud according to the stateless in CloudInterface and AccountServer

- appended uid in AclInvite, Account and AccoutSession in CI
- apppeded uid, members in AclGroup, ResourceFind, ResourcePresence and DevicePresence
- added logic for verifying accesstoken in AccountManger in AS
- fixed testcase

Change-Id: I468c13127452edaee7301b9cafd0ab9f28bbf65d
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14341
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>
(cherry picked from commit 186bc52a19653b48a154d8dfb1815e1cabce2efc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14583
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16079

7 years ago[IOT-1751]Adding Log tag for JNI of Notification Service
abitha.s [Mon, 16 Jan 2017 08:51:47 +0000 (14:21 +0530)]
[IOT-1751]Adding Log tag for JNI of Notification Service

1. Logs are added with TAG for fetching JNI logs
2. error is renamed for the case of Incorrect input value as JNI_INVALID_VALUE

Change-Id: I80e611cfdafdf7785c227db66d07cd7a517d505c
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16431
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agofix the build error when appcliation build resource encapsulation
Jooseok Park [Tue, 17 Jan 2017 04:16:25 +0000 (13:16 +0900)]
fix the build error when appcliation build resource encapsulation

 - add the missing header file in installed target header

Change-Id: I71b65d6df422bd758e543118c2580ac770213399
Signed-off-by: JooseokPark <jooseok.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16461
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 66daa4b7a6664d4ca0352571e083a90f442556a8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16463
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
7 years agoUpdate ESResult according to OTM is subdivided.
Parkhi [Mon, 16 Jan 2017 06:15:10 +0000 (15:15 +0900)]
Update ESResult according to OTM is subdivided.

- ES_USER_DENIED_CONFIRMATION_REQ
- ES_AUTHENTICATION_FAILURE_WITH_WRONG_CERT
- ES_AUTHENTICATION_FAILURE_WITH_WRONG_PIN

Change-Id: Iaca2ae2551161685fed738b9a588945938b3cd43
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16373
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoCloud ACE update
Jongmin Choi [Thu, 20 Oct 2016 02:03:41 +0000 (11:03 +0900)]
Cloud ACE update

- APIs added to update Cloud ACE using aclid and acid
- aceid input removed from device side update API

Patch #1: initial upload
Patch #2: update ACE fix
Patch #4: Issue fixed related to update ACE and individual ACE update.
          Also Acl modification
Patch #5: Rebased to latest 1.2-rel
Patch #7: isValidACE method added and other issue fix
Patch #8-9: delete logic fix, getAclACE added, unnecessary code deleted

Change-Id: I8b15fe4556536b4af4d597564ccab4cf66c55e44
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13049
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 1a2e71f9c470c7cc17157f83deb4488ee83050a4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15279

7 years agoRestore rootca.crt in provisioning sample
Jongmin Choi [Thu, 15 Dec 2016 08:40:36 +0000 (17:40 +0900)]
Restore rootca.crt in provisioning sample

Revert https://gerrit.iotivity.org/gerrit/#/c/15451/
and restore rootca.crt in provisioning sample
due to Tizen gbsbuild error

Patch #1: Initial upload

Change-Id: I4691a7bbce822a1cd342c9aa874d3fb8a0fa0a29
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15689
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit c0645c683cf5f2978824b177f9f58bcb790a8462)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16097

7 years agoAdd PEM support to credential publicData
Andrii Shtompel [Mon, 26 Dec 2016 17:04:13 +0000 (19:04 +0200)]
Add PEM support to credential publicData

Change-Id: Id5bfd6b1a08c295b49981bd7b938ec5d23522db4
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15945
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 33a394c80fa6427e541654fb9ce763ec6f750534)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16429

7 years ago[IOT-1527] GroupManager according to the revised group resource model
yeonghun.nam [Tue, 25 Oct 2016 07:35:52 +0000 (16:35 +0900)]
[IOT-1527] GroupManager according to the revised group resource model

1. GroupManager to manage group management requests
  - GET oic/acl/group/<gid>
  - POST oic/acl/group/<gid>
  - POST oic/acl/group/<gid>?op=add
  - POST oic/acl/group/<gid>?op=delete
  - DELETE oic/acl/group/<gid>
2. User Authorization based group management

patch #28 #1: resources are not recorded to the group if devices regarding to the resources are already registered to the group
patch #28 #2: verification logic is added; when a device is registered to the parent group, recources of the device can be registered to subgroups

Change-Id: I5d90a0eea537e43fe06789db1897c90a766e01c5
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit a59953bbc30e99b58eec487d035ead886bb51185)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14549
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16075

7 years ago[IOT-1527] add GroupBrokerManager, GroupPolicyManager to check authorization
eunok.shin [Thu, 20 Oct 2016 10:01:48 +0000 (19:01 +0900)]
[IOT-1527] add GroupBrokerManager, GroupPolicyManager to check authorization

Change-Id: Ie812c968c2b6daa5c7c544e7352b4f94a7d7994d
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13611
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit a72600e7f7dc16a74109af58032c5eb7ff454a7d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14557
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16077

7 years agotizen: avoid to duplicate headers
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
tizen: avoid to duplicate headers

Rely on pkg-config instead.

Change-Id: Ieff754b33a21015a17fc9a8d107ee29f1376dfa1
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Install notification headers
Philippe Coval [Mon, 16 Jan 2017 20:01:49 +0000 (21:01 +0100)]
build: Install notification headers

It look like project public headers
 are installed to 2 level depth
 subdirectories (service/$domain/*.h*)

Change-Id: I36ab613ff6aaf7d960e6ba1e94263f8cfdf7c559
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16451
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoFix the notification service SConscript
Jooseok Park [Mon, 16 Jan 2017 07:53:23 +0000 (16:53 +0900)]
Fix the notification service SConscript

 - when application use the notification service, build error occurs.
 - i.e) /usr/include/service/notification/NSConsumerInterface.h:35:22: fatal error: NSCommon.h: No such file or directory
 - Although NSConsumerInterface.h includes NSCommon.h, NSCommon.h file is not installed in SConscript.
 - So, need to add NSCommon.h in installed header

Change-Id: I2f28f84504d68c5506c89513d74adcdf32d2bbfc
Signed-off-by: JooseokPark <jooseok.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16427
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Install easy-setup headers
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
build: Install easy-setup headers

It look like project public headers
 are installed to 2 level depth
 subdirectories (service/$domain/*.h*)

Change-Id: Ia7a66caf5381d24b56f0c5ac1a91929eff9ba7d7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agobuild: Add ES NS paths to pkg-config
Philippe Coval [Mon, 16 Jan 2017 20:01:50 +0000 (21:01 +0100)]
build: Add ES NS paths to pkg-config

Public easy-setup and notification headers,
are copied in 2 level depths directory.

Change-Id: I7c9fd3a4bd1143c5ea05e7902292af23cf5e8934
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16455
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoRevert "[IOT-1714]Add wifi.p2p connection status changed intent receiver"
bg.chun [Wed, 11 Jan 2017 13:00:44 +0000 (22:00 +0900)]
Revert "[IOT-1714]Add wifi.p2p connection status changed intent receiver"

This reverts commit 20ad24fe08bc485ccc629b0c552976f3b7ca089b.
IOT-1704 make tcp_adapter not working

Change-Id: I2d55b91310163855314724cf924bb20dfc505e4d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16319
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years ago[IOT-1533] fixed KeepAlive resource for receiving PUT, POST Message
Jung Seungho [Mon, 31 Oct 2016 00:58:36 +0000 (09:58 +0900)]
[IOT-1533] fixed KeepAlive resource for receiving PUT, POST Message

Change-Id: Ie52fe040cd11319a34219efc942a2e102663ecba
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13847
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 40f1a0f47e270d611fc8349276a87daba8ec4a60)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14553
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 7c1dd4e9bbdb5f0b6c39bec9f51515bd22aa379a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15301

7 years ago[IOT-1527] change public api about group resoure
eunok.shin [Wed, 12 Oct 2016 10:20:35 +0000 (19:20 +0900)]
[IOT-1527] change public api about group resoure

Change-Id: I8e372299b38b18c43a883ad29b9362eed16de70c
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit c5ef5fae4f08b1fcb9c5c3c6dc50b6798c3fe975)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14547
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 947a5ce5295e2fc7078a67a3d73e3040946c98de)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16073

7 years ago[IOT-1532] added GroupAclManager for managing group between acl
Jung Seungho [Mon, 7 Nov 2016 05:08:26 +0000 (14:08 +0900)]
[IOT-1532] added GroupAclManager for managing group between acl

Change-Id: I5d99b4fbfcd0e3464411754919356326a75def3c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13579
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>
(cherry picked from commit 35f6b5689995e5143ef7cbc1bace9688dd07d9a9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14551
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 025cc2ce8e3dfdb4d99f9ddd70e9125b7d0840a4)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15299

7 years agofix to pending terminate logic when call OCStop.
jihwan.seo [Wed, 11 Jan 2017 08:01:05 +0000 (17:01 +0900)]
fix to pending terminate logic when call OCStop.

Change-Id: If5e02f49b8d0a69c6b2d1ed90ba9370f9da6328e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.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-1628] fixed TC failure in the resource discovery in the cloud RD
yeonghun.nam [Thu, 1 Dec 2016 09:48:21 +0000 (18:48 +0900)]
[IOT-1628] fixed TC failure in the resource discovery in the cloud RD

- According to the latest RD implementation, the resource discovery TC is fixed where the device presence information is stored in the DB in advance

Change-Id: I85c2c848cf3b0a60fa22014faa09e00985fe6688
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: hwa.chung <hwa.chung@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years ago[IOT-1599] fix message publish in MQ
Jung Seungho [Thu, 24 Nov 2016 04:11:55 +0000 (13:11 +0900)]
[IOT-1599] fix message publish in MQ

removed logic for checking 'message' property
https://jira.iotivity.org/browse/IOT-1599

Change-Id: I1edc3eb68d97156ce3befe44205e2d1ff6006b7c
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14715
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 647b538360333cdf408eba9e4a62b37dfef1cc71)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14725

7 years ago[IOT-1587] Fix cloud certificate to follow TLS specification
Jee Hyeok Kim [Tue, 22 Nov 2016 08:39:38 +0000 (17:39 +0900)]
[IOT-1587] Fix cloud certificate to follow TLS specification

1. Update cloud sample certificate to meet TLS specification of proposal.
   (Add uuid:xxx value to public certificate CN field)

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

Change-Id: I9aacd8f31f50862a0b962cef3d68a389710d4568
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14609
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit c686e58be7d876aba42c9fef69049e04275d0478)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15701

7 years ago[IOT-1668] removed MQ_MESSAGE property, when topic is generated
Jung Seungho [Mon, 12 Dec 2016 00:39:28 +0000 (09:39 +0900)]
[IOT-1668] removed MQ_MESSAGE property, when topic is generated

Path set #2~4 : fixed tastcase in MQBrokerResourceTest

Change-Id: Ia323f7603e0181163e5786658c890e50174c2c16
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15697

7 years agoadded acl logic, when sign up, device delete and Request/Response relay.
Jung Seungho [Sun, 9 Oct 2016 23:50:59 +0000 (08:50 +0900)]
added acl logic, when sign up, device delete and Request/Response relay.

- added create acl, when sign up
- added remove acl, when device delete
- added verify, when Request/Response relay
- relocate singleton object(getInstance) to AclManager
Patch #10: modified updateAclACE and add getAclACE, getACE Method in related class of Acl
Patch #11: reflected on the comments from Glen
Patch #14: modify addAclACE in AclManager and addACE in Acl to return generated aceids
Patch #15: fixed bug in AclVerifyResource and AccountManager
Patch #19: reflected on the comments from Eunok and fixed minor bug
Patch #22: fixed merge conflict

Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Change-Id: I0507d2a994b1adf3d78bda4d1608cb7d9ec6c850
Reviewed-on: https://gerrit.iotivity.org/gerrit/12867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 4fc4224f5c9e24a5b9dbfc10bbec2bac553ee4fb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15283

7 years agoCopy sample CA certificate from cloud directory
Jongmin Choi [Mon, 12 Dec 2016 01:57:19 +0000 (10:57 +0900)]
Copy sample CA certificate from cloud directory

This patch copies rootca.crt directly from cloud/certificate directory
to security sample directory so certificates are in sync
when cloud certificates are updated

Patch #1: Initial upload
Patch #2: Old rootca deleted

Change-Id: I75a9076ee55d4024de24a8f7f1a74237fcb523c0
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 21e04b0d5ff9ce6e123005fe8edb9d2f7b3ae253)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15699

7 years ago[IOT-1536] add logic checking the device presence when finding resource.
eunok.shin [Fri, 28 Oct 2016 07:56:38 +0000 (16:56 +0900)]
[IOT-1536] add logic checking the device presence when finding resource.

Change-Id: I6cbfb62855a80d03bf0aebf505505222a146ca38
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13817
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>
(cherry picked from commit 9f5c6903aa2187ca8b7326416f764bed044b1c61)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14543
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 8f56d068bc3b7d15dd3d07503ee010e595734dc7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15285

7 years agoRevert "add comment in cloud interface"
Philippe Coval [Tue, 3 Jan 2017 08:07:49 +0000 (09:07 +0100)]
Revert "add comment in cloud interface"

This reverts commit 58527286c09390f3bdd7876666aa02677fdfdf9f.

Change-Id: Ic920258819ae8ebcc14592279c07b20600000000
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16071
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdding NULL checking input parameter in SRMRequestHandler
js126.lee [Wed, 11 Jan 2017 04:48:25 +0000 (13:48 +0900)]
Adding NULL checking input parameter in SRMRequestHandler

Patch 1: upload patch

Change-Id: I869fd8d2d3198033be3cb36fe4fa1e7f602ba823
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16299
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 4728815858d3a7e4f990dd99cf888f8d4a00f921)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16301

7 years agoAdd NULL check in StartRetransmit function.
Chul Lee [Wed, 11 Jan 2017 07:59:02 +0000 (16:59 +0900)]
Add NULL check in StartRetransmit function.

Change-Id: Ia7772c1cd574be8b001a43e7b6b482663dc2a2b4
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit f6aa06556591d0fbfb056788457123d69fb7b893)
Reviewed-on: https://gerrit.iotivity.org/gerrit/16335

7 years ago[IOT-1740]Adding UnSubscribe functionality in Notification Consumer
abitha.s [Wed, 11 Jan 2017 05:53:53 +0000 (11:23 +0530)]
[IOT-1740]Adding UnSubscribe functionality in Notification Consumer

1. Added Unsubscribe function in C++, JNI and Java APIs
2. Added sample application chages to test Unsubscribe function from C++ sample
3. Added return code for missng API to return the result of API

patch 4: removed return code from Java and JNI apis.(will add a separate commit with review comments incorporated

Change-Id: I478ccc25b999be8b1d40a9aaec49dc241f22f055
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1684] Re-enable SECURED=1 build for Darwin
George Nash [Wed, 11 Jan 2017 16:18:31 +0000 (08:18 -0800)]
[IOT-1684] Re-enable SECURED=1 build for Darwin

Change-Id: I79de134ece441f0da52d78fef26ff27e60b6e15f
Signed-off-by: George Nash <george.nash@intel.com>
Bug: https://jira.iotivity.org/browse/IOT-1684
Reviewed-on: https://gerrit.iotivity.org/gerrit/16325
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoFixed Thread-unsafe code in caqueueingthread.c
hyuna0213.jo [Thu, 12 Jan 2017 04:01:33 +0000 (13:01 +0900)]
Fixed Thread-unsafe code in caqueueingthread.c

mutex should be destroyed after deleting data queue.

Change-Id: I191d9519da47421d0e296d02cedd6af5eb757bdd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16337
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoBuild: Remove CSDK oc and boost dependency
Gabriel Schulhof [Wed, 21 Dec 2016 08:05:27 +0000 (10:05 +0200)]
Build: Remove CSDK oc and boost dependency

Bug: https://jira.iotivity.org/browse/IOT-1694
Change-Id: Ib77261260d3597986f461f23af311b479dad56c8
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15871
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoFix a build break on Windows X86.
Mike Fenelon [Thu, 12 Jan 2017 21:38:03 +0000 (13:38 -0800)]
Fix a build break on Windows X86.

The newly added memmem function uses size_t in the function
definition. However size_t is not defined at the time memmem.h
is included. Adding crtdefs.h into memmem.h to fix.

Change-Id: I7a474e7befbf3bdc5dd8aa0bd4ca45d6bfa28d71
Signed-off-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16359
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
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 agoCleanup documentation warnings in RcsSetResponse.java
George Nash [Tue, 10 Jan 2017 20:14:05 +0000 (12:14 -0800)]
Cleanup documentation warnings in RcsSetResponse.java

Change-Id: Idb9ae0f96ab9c138e2178c8560cbd07ca8e3b6e8
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16289
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoCleanup documentation warnings in Provider.java
George Nash [Thu, 12 Jan 2017 00:12:58 +0000 (16:12 -0800)]
Cleanup documentation warnings in Provider.java

Change-Id: I93b748e53034b6480ca4984a6ab3b0e550a37a08
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoCleanup documentation warnings in EasySetup.java
George Nash [Tue, 10 Jan 2017 20:39:33 +0000 (12:39 -0800)]
Cleanup documentation warnings in EasySetup.java

Change-Id: I3cfdbc0bdb110853f972925ab632ceb6a8255bc2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16291
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: Rick Bell <richard.s.bell@intel.com>
7 years agotizen: exit on build failures
Philippe Coval [Thu, 12 Jan 2017 10:56:02 +0000 (11:56 +0100)]
tizen: exit on build failures

Change-Id: Idba6c2f3a35854d468b4e32bc3db5b4420bd94bb
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16345
Reviewed-by: Mats Wichmann <mats@linux.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agotizen: Support Tizen:2 by avoiding python accelerator
Philippe Coval [Thu, 12 Jan 2017 10:56:02 +0000 (11:56 +0100)]
tizen: Support Tizen:2 by avoiding python accelerator

Change-Id: I8714771d36a158fafc838c8d5e71d8e563682a1b
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
7 years agoAdd API about Notification consumer unsubscription provider.
KIM JungYong [Mon, 9 Jan 2017 10:20:29 +0000 (19:20 +0900)]
Add API about Notification consumer unsubscription provider.

Added API :
NSResult NSUnsubscribe(const char * providerId);

When added api is called, consumer service will send cancel subscription
and remove information of parameter provider Id.

Change-Id: I2536283e5f0c91477ed4364a1ee230b0ff97b308
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoDeprecate OCSetDeviceInfo and registerDeviceInfo
Dan Mihai [Tue, 10 Jan 2017 04:16:39 +0000 (20:16 -0800)]
Deprecate OCSetDeviceInfo and registerDeviceInfo

Mark OCSetDeviceInfo and registerDeviceInfo as deprecated and replace
sample apps' calls to these APIs.

Change-Id: I7c318010d893df94bfe2b4599281b02f44dfcf16
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
7 years agoIOT-1658 Added missing C Export functions to the Windows build
Morten Nielsen [Tue, 10 Jan 2017 05:39:08 +0000 (21:39 -0800)]
IOT-1658 Added missing C Export functions to the Windows build

Added several critical methods that for some reason was missing from the
export list. Without these
methods it's impossible to perform service discovery and interaction, as
you can't work with the payloads.

You can from a Visual Studio command prompt run the following command to
get a list of the methods that are exported:
    dumpbin /EXPORTS octbstack.dll

This will confirm before/after that the methods are there or not. I've
successfully added this locally which enabled
me to invoke all of these methods from .NET Interop.

Change-Id: Ibb5857b00fa4c82228c3621ea63c4de3439649b6
Signed-off-by: Morten Nielsen <mn@iter.dk>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agossl: call mbedtls_version_get_string() only if available
Hauke Mehrtens [Sun, 8 Jan 2017 00:39:35 +0000 (01:39 +0100)]
ssl: call mbedtls_version_get_string() only if available

The function mbedtls_version_get_string()  is only available if
MBEDTLS_VERSION_C is set in the mbedtls configuration. Check this
before calling this function and print the mbedtls version this was
compiled against instead if mbedtls_version_get_string()  is not
available.

This fixes a compile problem when MBEDTLS_VERSION_C is not set.

Change-Id: I54c2c2a3fc1f9d35afa475500e3db68420a1b54a
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
7 years ago[IOT-1731] To support start/stop LE advertising API for android
jihwan.seo [Sat, 7 Jan 2017 06:20:26 +0000 (15:20 +0900)]
[IOT-1731] To support start/stop LE advertising API for android

since some application related gatt server
want to have multi-connect scenario.
we should provide start/stop advertising API.
Change-Id: I3201e563cdd07bb84c38639f9a2b6743122b2385
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoRemove unused code
Parkhi [Mon, 9 Jan 2017 01:31:27 +0000 (10:31 +0900)]
Remove unused code

Change-Id: I1cf6d1a0272387ae0a0d8c2005114235b3222df1
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16241
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoCleanup documentation warnings in RcsResourceObject.java
George Nash [Tue, 10 Jan 2017 19:14:54 +0000 (11:14 -0800)]
Cleanup documentation warnings in RcsResourceObject.java

Change-Id: I3a27baf1d01b7edff871371982a6a1dc0917171e
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16287
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoCleanup documentation warnings in RcsLockedAttributes.java
George Nash [Tue, 10 Jan 2017 18:36:56 +0000 (10:36 -0800)]
Cleanup documentation warnings in RcsLockedAttributes.java

Change-Id: If4d37ace9f61cbdd681ecb050d62e093f1759128
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16283
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>