platform/upstream/iotivity.git
7 years ago[IOT-1446] Fix discovery failure issue
Jongmin Choi [Wed, 12 Oct 2016 12:00:45 +0000 (21:00 +0900)]
[IOT-1446] Fix discovery failure issue

Change logic in the Policy Engine in order to resolve
discovery failure issue

Patch #1: Initial upload
Patch #2: Error message changed

Change-Id: I08ab1dec15cb0f49374d42d97b65a23fe885db39
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13173
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 5c78f31a2d4415c970f38db14e248bfef348a6b0)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13199

7 years agoUpdated Easysetup Security logic.
Parkhi [Tue, 11 Oct 2016 07:12:18 +0000 (16:12 +0900)]
Updated Easysetup Security logic.

 - EnrolleeSecure resource not to re-created during previous request is processed
   for every security provisioning request to get callback from security-logic

Change-Id: I905b1cf708db68583a95bd9cad299212fa00ec84
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13077
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd logic about checking the NULL and modify warning code.
jaesick.shin [Thu, 13 Oct 2016 01:39:56 +0000 (10:39 +0900)]
Add logic about checking the NULL and modify warning code.

This patch include, check the NULL and modify warning code.

Change-Id: Ie28548563357e0c9565ecdcd776cce60d3d42f33
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoModified CloudClient (CPP)
Ashwini Kumar [Fri, 7 Oct 2016 06:36:34 +0000 (12:06 +0530)]
Modified CloudClient (CPP)

to use DEFAULT_PORT 5683

Change-Id: I32c5d5c7e373250ac2af3354c5a345a02d4cdbea
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13017

7 years agoUnit tests for SSL adapter (ca_adapter_net_ssl.c)
Oleksii Beketov [Wed, 12 Oct 2016 14:51:06 +0000 (17:51 +0300)]
Unit tests for SSL adapter (ca_adapter_net_ssl.c)

Change-Id: Ia9bb81012159df0f1b5f87d80e821610aeaa44c1
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13179

7 years ago[IOT-1441] Update DevOwner access policy to remove implicit access in RFPROV.
Nathan Heldt-Sheller [Tue, 11 Oct 2016 20:23:01 +0000 (13:23 -0700)]
[IOT-1441] Update DevOwner access policy to remove implicit access in RFPROV.

With this patch, the DevOwner now will only be able to access SVRs during
RFOTM or RESET states, unless of course there is an ACE installed allowing
explicit access to the DevOwner.

This behavior change is required by the Security Test Matrix v7, published
by the Security WG.

Patch 2: updated with JIRA ticket #

Patch 3: fixed logic bug found by Kevin

Patch 4: corrected commitmsg

Change-Id: I267c9eb78682bc810b7b2399f6606b8379d6e718
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13117
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7958457e535a8a0d15f2a201109b137ba9bc6cf6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13137

7 years agoFixed bug for result of static analysis.
Jihun Ha [Wed, 12 Oct 2016 13:27:36 +0000 (22:27 +0900)]
Fixed bug for result of static analysis.

Change-Id: I6301a61d0e8fd8bfd21585a59455da50b2aabd14
Signed-off-by: Parkhi <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoRemove unused old API.
Parkhi [Tue, 11 Oct 2016 07:34:01 +0000 (16:34 +0900)]
Remove unused old API.

 - delete registerSecurityCallbackHandler api.

Change-Id: I0d4c31af7ac9d5d25c260cf07f5ebf38381609ea
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13081
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1420] Solve that if, rt properties ommited
Jihun Ha [Wed, 12 Oct 2016 10:29:56 +0000 (19:29 +0900)]
[IOT-1420] Solve that if, rt properties ommited

- add rt, if attributes to SceneListResource

Change-Id: I07017fbfb99755d182676e5a946fde505e121e66
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13105
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoAdded changes to remove build warning while building NS Jni Common files
abitha.s [Wed, 12 Oct 2016 13:18:51 +0000 (18:48 +0530)]
Added changes to remove build warning while building NS Jni Common files

Change-Id: I0631be24a2cdfeedaae61a02fb351f047f834ae7
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13177
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUnit Tests added for CoAP-HTTP Proxy module
Rajendra S [Fri, 30 Sep 2016 11:06:36 +0000 (16:36 +0530)]
Unit Tests added for CoAP-HTTP Proxy module

Change-Id: I8554cd9010bbd27ef29f1615a53f62cda4e41d30
Signed-off-by: Rajendra <raje_ndra.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12615
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoFix bugs for result of dynamic analizer.
KIM JungYong [Wed, 12 Oct 2016 10:39:22 +0000 (19:39 +0900)]
Fix bugs for result of dynamic analizer.

1. definitely losted memory was deallocated.
2. pthread creating type was modified for parameter deallocation.
3. invalid c-string copy was fixed.

Change-Id: Iab32535f164029ccd8a82d49968ce0a44e8b8bd1
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13169
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoFix auto_build.py on Python 2.7.10 for Windows
David Antler [Thu, 6 Oct 2016 00:02:52 +0000 (17:02 -0700)]
Fix auto_build.py on Python 2.7.10 for Windows

There are two fixes in this build.

* Prior to this change, Python was putting quotes around the SCons call.
  This behavior differs from Python 2.7.0.

* Prior to this change, "python auto_build.py" would try to build Android
  and fail.  Now we limit auto_build.py to only build Windows binaries on
  a Windows host.

Change-Id: I41ec4986c3dc57821cfdbe48f598e547e1934c71
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12841
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ajay Saini <ajay.saini@intel.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years ago[IOT-1333] Enable message queue(MQ) in tizen platform
jihwanseo [Wed, 21 Sep 2016 08:10:21 +0000 (17:10 +0900)]
[IOT-1333] Enable message queue(MQ) in tizen platform

Change-Id: Ic35205cbeaaa39108cce970324fa4172a980ba7f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12035
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoRemove Disabled TC in CA layer.
Jaehong Jo [Mon, 10 Oct 2016 10:08:30 +0000 (19:08 +0900)]
Remove Disabled TC in CA layer.

Because this should no longer be a valid test.

Change-Id: I739aeafda6b9b86ac298247c19c7ad37dde89c3e
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13035
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agotizen: Scan for licences to be shipped in package
Philippe Coval [Thu, 6 Oct 2016 09:29:15 +0000 (11:29 +0200)]
tizen: Scan for licences to be shipped in package

It's important to have this generated at buildtime,
 specially if tree is patched with missing dependencies,
 like those mentionned at:

 https://wiki.iotivity.org/build

Change-Id: Ie8d9dc0685ddc2df37545e92da4a662ee496bd07
Credit-to: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8177
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agotizen: Disable SECURED by default
Philippe Coval [Wed, 21 Sep 2016 16:58:37 +0000 (18:58 +0200)]
tizen: Disable SECURED by default

Bug: https://jira.iotivity.org/browse/IOT-1295
Change-Id: I22e14a601d30b29005352a5154f617ed66ce1903
Origin: https://gerrit.iotivity.org/gerrit/#/c/12101/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12101
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12493
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoFix for IOT-1394.
Senthil Kumar G S [Wed, 5 Oct 2016 16:01:10 +0000 (21:31 +0530)]
Fix for IOT-1394.

In callbacks for GET, PUT, POST, and OBSERVE requests in
InProcClientWrapper.cpp (CPP layer of RI), the representation was parsed
only for success cases.

But when we are dealing with cloud responses,
they include a payload with error message and code even for error cases.

To catch those responses, we should ignore the status(OCStackResult)
of client response and let the error representation reach till application.

Change-Id: I103957bb79e948693807fc05e8bed461e6b2d8dd
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12831
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoChange settings on deviceInfo and platformInfo in samples as per specs.
Ziran Sun [Mon, 10 Oct 2016 14:17:10 +0000 (15:17 +0100)]
Change settings on deviceInfo and platformInfo in samples as per specs.

Bug: https://jira.iotivity.org/browse/IOT-1435
Change-Id: I9de03c0c6c09d4632503f9ad8f2943c9f1468527
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13051
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoUpdate C API doxygen
ch79.cho [Tue, 11 Oct 2016 06:20:39 +0000 (15:20 +0900)]
Update C API doxygen

C API description is updated for some fields such as subControllability.

Change-Id: Ie44c213657a9ffdd55ec386e8bc953bad709432d
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate and fix of UnitTest for cpp-wrapper
nikhil.a [Fri, 7 Oct 2016 10:45:22 +0000 (16:15 +0530)]
Update and fix of  UnitTest for cpp-wrapper

1)Updated new unittest for consumer and provider
2)Fix for removing segmentation fault

Change-Id: If06e9606c405a3fa2dace726a5c9320399b06e66
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12943
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1430] bug fix for seg fault on start consumer.
KIM JungYong [Mon, 10 Oct 2016 07:11:46 +0000 (16:11 +0900)]
[IOT-1430] bug fix for seg fault on start consumer.

With this patch, segmentation fault is resolved on the starting consumer service.

Change-Id: I929ec45d34a401ea7e6e503d6c686471656f39cf
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13005
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate Cpp Api doxygen
nikhil.a [Wed, 12 Oct 2016 09:24:33 +0000 (14:54 +0530)]
Update Cpp Api doxygen

Change-Id: I4ed23e32956980d816c3a7e6bb0605272df2782f
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13145
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd doxygen comment for java api's of ProviderServicer and ConsumerService.
nikhil.a [Wed, 12 Oct 2016 07:15:01 +0000 (12:45 +0530)]
Add doxygen comment for java api's of ProviderServicer and ConsumerService.

Change-Id: I149a714258db8495473064c98f270b9b01fd2497
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13011
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix bug for invalid remove a context at request.
KIM JungYong [Mon, 10 Oct 2016 08:56:18 +0000 (17:56 +0900)]
Fix bug for invalid remove a context at request.

When receive responce of getting topic information,
consumer serivce remove context manually.
But, it is the invalid way.
With this patch, consumer service does not remove manually.
Context will be removed automatically by RI layer.

Change-Id: I1278dc13bf297b95e513d364f243064b525a7083
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13063
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agochange asynccall Function to synccall function.
jaesick.shin [Mon, 10 Oct 2016 04:10:43 +0000 (13:10 +0900)]
change asynccall Function to synccall function.

this patch include,
1. change sync call about NSProviderSetConsumerTopic Function.
2. change sync call about NSProviderUnsetConsumerTopic Function.

second patch include,
modify invalid return value.

Change-Id: Ia73d6544489dd36f4612c97108ca488f76e038e3
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoBug fix about invalid parsing and modify sconscript.
jaesick.shin [Tue, 11 Oct 2016 03:44:47 +0000 (12:44 +0900)]
Bug fix about invalid parsing and modify sconscript.

this patch include,
1. Bug fix about invalid parsing in jni side
   and send notification was changed to once call.
2. Modify sconscript for android 6.0 devices

Change-Id: I9ae6d68ebf24d944e896db54949f86de62fc0f6e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd device and platform information in sample codes.
Ziran Sun [Thu, 6 Oct 2016 12:48:51 +0000 (13:48 +0100)]
Add device and platform information in sample codes.

Bug: https://jira.iotivity.org/browse/IOT-1384
Change-Id: I8f8e69716534dddb77d6069394267e730a02c14f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12909
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years ago[IOT-1400] fix memory leak related presence in ocstack
jihwan.seo [Thu, 6 Oct 2016 07:57:09 +0000 (16:57 +0900)]
[IOT-1400] fix memory leak related presence in ocstack

Change-Id: Ib838532de9ab732fd1833d9423b2759c8aec0cf7
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 02fa07402283aa6922e4f3ff64c16cfedbfe47c6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13059

7 years ago[IOT-1434] Fix memory leak related server request List.
jihwan.seo [Fri, 7 Oct 2016 10:54:44 +0000 (19:54 +0900)]
[IOT-1434] Fix memory leak related server request List.

when there is no response data for virtual reqeust in server.
it should be removed, since it never remove and
causes a big memory leak.

Change-Id: Ic65692ae8b2c1c27f554f466d00bd0cc1674118f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12947
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit d54b727a3f55d0238393fd14781e0723df4a9e17)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13057

7 years agoSimple mapping between COAP response code and OCStackResult in comment
bg.chun [Fri, 7 Oct 2016 06:22:01 +0000 (15:22 +0900)]
Simple mapping between COAP response code and OCStackResult in comment

like below.
OC_STACK_OK = 0,                /** 203, 205*/
OC_STACK_RESOURCE_CREATED,      /** 201*/
OC_STACK_RESOURCE_DELETED,      /** 202*/

Change-Id: Ia03e07770c1855753cc7d781347bdec5376cd7ac
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years ago[IOT-1417] Fix Sign Up/In/Out Workflow
Andrii Shtompel [Tue, 11 Oct 2016 08:53:09 +0000 (11:53 +0300)]
[IOT-1417] Fix Sign Up/In/Out Workflow

Change-Id: Icfadd8e40fcb8cbf8d962464d8bc1372b302d5c6
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13093
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 26c80763150b1689f2eaa8845569a7b1eab14c2a)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13125

7 years agoFixed [IOT-1414]
Sandeep Sharma [Fri, 7 Oct 2016 12:52:55 +0000 (18:22 +0530)]
Fixed [IOT-1414]

Propagate INVALID_CALLBACK  instead of INVALID_PARAM when Listener is null

Change-Id: Id41c9be5dc33e9220c4809351b8269738eb95f56
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12949
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit dc57a68c8a4eceb0efdf6786d48ce42f76305d8e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13015

7 years ago[IOT-1396] Changed values of OicSecDpom_t to align with oic.sec.pomtype from Security...
Jongmin Choi [Fri, 7 Oct 2016 10:12:22 +0000 (19:12 +0900)]
[IOT-1396] Changed values of OicSecDpom_t to align with oic.sec.pomtype from Security Spec v1.1.12

The bitmask values for the pstat.om and pstat.sm properties were incorrectly
defined.  A few other files (including provisioning tool files) appeared to use
the values incorrectly, and are also fixed as part of this patch.

Patch #2: .json and .dat files changed accordingly
Patch #3: unittest svd db changed accordingly

Change-Id: Ie1d4b13a271eafea38b41313bba6e087b69a2f62
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 8c6fba5b2cf63e48466b8628fa4f542ac67bea58)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13003

7 years ago[IOT-1405, IOT-1418] Bug fixes
Ashwini Kumar [Fri, 7 Oct 2016 13:15:52 +0000 (18:45 +0530)]
[IOT-1405, IOT-1418] Bug fixes

Memory leak issue in Secure resources
scan newline '\n' at end of line

Change-Id: I8e7675fef88670ea6f4fc7c38a1b484cc6e28b50
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 0267c7ab809830f60d4110550f1f9c0bf8b0868f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12999

7 years ago[IOT-1395] Fix for rowneruuid update
Jongmin Choi [Wed, 5 Oct 2016 11:33:05 +0000 (20:33 +0900)]
[IOT-1395] Fix for rowneruuid update

[IOT-1395] Fix for rowneruuid update for CTT testing

Patch #1-2: rowneruuid update enabled
Patch #4: Logic modified

Change-Id: I2d6a53c1868e59ea112def5c45ed869b2b6d86da
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit dd82e65657fb6ef738b044a376d17f0ae86ed3ba)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12997

7 years agoAdd network monitor support for Windows
Dave Thaler [Thu, 6 Oct 2016 19:20:44 +0000 (12:20 -0700)]
Add network monitor support for Windows

Also fix a memory leak in the Linux code

Change-Id: I8d243604a49cf4f2947849ac13624b2c044259d5
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoModify gradle version for building notification service.
KIM JungYong [Tue, 11 Oct 2016 11:29:54 +0000 (20:29 +0900)]
Modify gradle version for building notification service.

Change-Id: I93557aac43c2d1c808495dff1120cff737ccea44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13103
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoCommon adapter for DTLS/TLS
Dmitriy Zhuravlev [Mon, 3 Oct 2016 13:22:11 +0000 (16:22 +0300)]
Common adapter for DTLS/TLS

Format of a certificate changed, so previous X.509 parser
is not able to parse new certificates provided by Cloud:
1) For DTLS and TLS used mbedTLS
2) CKManager removed

Change-Id: Icacf60237a8ce15e996c4bbe4769a230b39c770e
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
X-Origin-Change-Id: I6b47f7b3439b923ec12f26b0e159e3b7a1144658
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13095
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years agoDisable security version discovery
Chul Lee [Tue, 11 Oct 2016 07:53:48 +0000 (16:53 +0900)]
Disable security version discovery

Change-Id: I22183fc82ef953f2fe49966406488d491de18ada
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13083
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years ago[IOT-1380] Use BCryptGenRandom on Windows
Kevin Kane [Sat, 1 Oct 2016 00:13:41 +0000 (17:13 -0700)]
[IOT-1380] Use BCryptGenRandom on Windows

Patch mbedTLS to use BCryptGenRandom on Windows.
Add the mbedtls subtree to .gitignore.

Change-Id: I23367aac194de2531299badc466a0d39e46eda4d
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agocloud server crl
Oleksandr Dmytrenko [Fri, 30 Sep 2016 08:34:01 +0000 (11:34 +0300)]
cloud server crl

Change-Id: Ic920258819ae8ebcc14592279c07b2069a6525ff
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12635
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 5a3f96d0dcb17c0b40738392e9c04dc4b6225cc2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13033

7 years agoRemove build warning realted MQ in android JNI.
jihwan.seo [Thu, 6 Oct 2016 06:04:05 +0000 (15:04 +0900)]
Remove build warning realted MQ in android JNI.

There is a redefined proprocessor in JniOnMQSubscribeListener.h
since octypes.h has it. it should be removed

------------------------------warning---------------------------------------
jni/JniOnMQSubscribeListener.h:26:0: warning: "MAX_SEQUENCE_NUMBER" redefined
 #define MAX_SEQUENCE_NUMBER 0xFFFFFF
----------------------------------------------------------------------------

Change-Id: If57b79b963d700459a59d2fb8704a60ad019e838
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12857
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>
7 years agotizen: Add iotivity namespace for headers
Philippe Coval [Thu, 22 Sep 2016 08:45:45 +0000 (10:45 +0200)]
tizen: Add iotivity namespace for headers

Currently symlink to parent folder,
 this way it's aligned to yocto recipe.

In longer term it would be nice to rely on scons install rules.

Change-Id: Ie8067c13302ccf92936d599bb4f6b3740d3cf009
Bug: https://jira.iotivity.org/browse/IOT-524
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12149
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 5a494b98d65b2950a9331ec77b03ce429ba64cde)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12485

7 years agoAdd ECDSA to cipher suite selection menu
Andrii Shtompel [Thu, 6 Oct 2016 11:16:51 +0000 (14:16 +0300)]
Add ECDSA to cipher suite selection menu

Change-Id: I74efcab80da86123540e5355378ab3b1bb343718
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13031

7 years agoRC3 svace fix (cloudClient + crlresource.c)
Andrii Shtompel [Wed, 5 Oct 2016 15:03:21 +0000 (18:03 +0300)]
RC3 svace fix (cloudClient + crlresource.c)

Change-Id: Ic6093286d89daf6de10ed617c445fbc53d8a3bd1
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13029

7 years ago[IOT-1352] SampleApp(CloudClient) goes into infinite loop while testing some features
Andrii Shtompel [Thu, 29 Sep 2016 15:36:21 +0000 (18:36 +0300)]
[IOT-1352] SampleApp(CloudClient) goes into infinite loop while testing some features

Change-Id: Ib173abc1968051e2a8ef3dc70e1bbff14bc4d732
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13027
Reviewed-by: Kevin Kane <kkane@microsoft.com>
7 years ago[IOT-1347] OCCloudAclIdCreate or OCCloudAclIdGetByDevice API doesn't provide the...
Andrii Shtompel [Thu, 29 Sep 2016 13:41:20 +0000 (16:41 +0300)]
[IOT-1347] OCCloudAclIdCreate or OCCloudAclIdGetByDevice API doesn't provide the ACL ID Directly

Print aclId, gid, gp in external callbacks (application level, provisioning/sample module)
Print acl, crl, group id list, invite response too.

Change-Id: Ifb9f4ee996030894a31b4317c98a8159e345218b
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12563
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13023

7 years agoSplit cloudClient to Client & Server part
Andrii Shtompel [Wed, 14 Sep 2016 14:33:37 +0000 (23:33 +0900)]
Split cloudClient to Client & Server part

1) Server part creates LED resource
2) Only Client part supports d2d requests

Change-Id: I335f7556a1ef247526886175ebcf400cd9e19b99
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11781

7 years agoUpdate a response representation according to requested interface in easy setup
Jihun Ha [Mon, 10 Oct 2016 07:22:08 +0000 (16:22 +0900)]
Update a response representation according to requested interface in easy setup

Referred jira ticket:
[IOT-1408] -
  [ES] Common properties are not exist
[IOT-1410] -
  [ES] /ProvisioningResURI does not support properly for Retrieve
       with interface query

Change-Id: Icb2c8bb5e3c9d796e7f09a7bdd23e895c1f2352d
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoadd logic for invalid char
jaesick.shin [Mon, 10 Oct 2016 00:45:40 +0000 (09:45 +0900)]
add logic for invalid char

this patch include,
add logic for invalid char in notificationprovider example only.
sometimes, input variable has an incorrect value.

Change-Id: Id8fa6152a7a7f15ef5d54425daf896680d6c9447
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd curl license file
ch79.cho [Mon, 10 Oct 2016 08:07:03 +0000 (17:07 +0900)]
Add curl license file

CURL license file is attached so that an example is used the licensed code.

Change-Id: I65e5e136e042329fa6350a7660a24bc5cd3b22ba
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13009
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
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 ago[IOT-1383] Update media server to use device and platform info
Alex Kelley [Wed, 5 Oct 2016 18:55:50 +0000 (11:55 -0700)]
[IOT-1383] Update media server to use device and platform info

Change-Id: I4aa4952b658f9202de3790a4424fea4e7e78f4c3
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoparseChain() fix
Oleksii Beketov [Thu, 6 Oct 2016 12:33:07 +0000 (15:33 +0300)]
parseChain() fix

parseChain() from ca_adapter_net_tls.c that parse chain of X509 certificates
in DER or PEM format bug fixed. Line endings for PEM certificates corrected.

Change-Id: Ieed09114fea10eb5adb6ff88d59ca58074ea19bb
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12045
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 55072b35a3aac687471a16c99a438e5fa6a02fc8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11687

7 years agoAdd more descriptive log messages in easy setup
Jihun Ha [Sat, 8 Oct 2016 04:52:40 +0000 (13:52 +0900)]
Add more descriptive log messages in easy setup

This patch is for removing mis-used log messages and
adding one for more convenient debugging.

Change-Id: I354292210a18e16e74d8ae3c0d66b91a90f31ab9
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12963
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate easysetup's security-provisioning logic.
Parkhi [Fri, 7 Oct 2016 08:23:14 +0000 (17:23 +0900)]
Update easysetup's security-provisioning logic.

 - This patch indicates the method to reduce security-provisioning time
   by improving the secured-resource search process.

Change-Id: I7cb1a9be272dc92451cf5099afb55c15adeb27ec
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12939
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd DeviceID Parameter on SingleDeviceDiscovery function
Jihun Ha [Fri, 7 Oct 2016 15:57:54 +0000 (00:57 +0900)]
Add DeviceID Parameter on SingleDeviceDiscovery function
this Parameter for discover a specified deviceID
If specify the deviceID, It can discover a specified device
when there is one or more device on the network

Change-Id: I99bff0620ee339a42e22e434099772e4175d73d9
Signed-off-by: Sijae Kim <sijae.kim@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12065
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoUpdate build scons for notificaiton android sample.
KIM JungYong [Wed, 5 Oct 2016 12:06:52 +0000 (21:06 +0900)]
Update build scons for notificaiton android sample.

When building notification service on android,
was built just aar file but sample apk.
In this patch building android will be built aar file and sample apk.

Change-Id: I32b9e06600e9063bc8115cd7302c73c938d14e8f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd logic for checking the null
jaesick.shin [Thu, 6 Oct 2016 08:47:31 +0000 (17:47 +0900)]
Add logic for checking the null

Add logic about malloc failed.

Change-Id: I8ac6169f65b00200f9d64fa1572217e53c05435f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoIOT-1398 Remove CheckFunc() on Win32 API
David Antler [Wed, 5 Oct 2016 22:56:42 +0000 (15:56 -0700)]
IOT-1398 Remove CheckFunc() on Win32 API

CheckFunc() is dangerous on Win32 APIs because SCons is not capable
of compensating for __stdcall name mangling on x86 systems using the
Visual Studio compiler.

Change-Id: Iaec49e4d246c02ecfebc5bf70ee0c0620cdde51d
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12839
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 agoFix compilation issue in the security stack
Habib Virji [Thu, 6 Oct 2016 10:41:18 +0000 (11:41 +0100)]
Fix compilation issue in the security stack

- Some variable were left unused.
- ifdef was
- size_t being print with %d

Change-Id: I22524cd67a9cc4e1b8cd7844c2d81903b8084985
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12885
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit a875cebd84216a1f4e3320e67c432e0cb8914be2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12883

7 years agoUpdate the OTM module to guarantee uniqueness of OwnerPSK on the PT side.
Chul Lee [Wed, 5 Oct 2016 11:50:32 +0000 (20:50 +0900)]
Update the OTM module to guarantee uniqueness of OwnerPSK on the PT side.

Change-Id: I22c9e7c2e81b49bb14c90d5c89744ee478ab108d
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12813
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 03adc4fa8aaf36f5de585be00efc6198b38ded14)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12945

7 years ago[IOT-1366] coaps request for secure resource
Randeep Singh [Fri, 30 Sep 2016 06:31:21 +0000 (12:01 +0530)]
[IOT-1366] coaps request for secure resource

with this patch, all the request coming over insecure channel for secured resource will be rejected

Change-Id: I5b24c4095d99f6b6f6080b1f46f1fd4d9f0d8e20
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
(cherry picked from commit 811d62de05664975cc2b36585ba719167d1bc1ea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12875

7 years agoRevert "Update easysetup's security-provisioning logic."
Uze Choi [Fri, 7 Oct 2016 06:36:01 +0000 (06:36 +0000)]
Revert "Update easysetup's security-provisioning logic."

This reverts commit d4ba3134a1178396c0bcc049645081c4a7dc814e.

Change-Id: I4214de42969dfee194a1278a1a68c77446909e9f
Reviewed-on: https://gerrit.iotivity.org/gerrit/12933
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd logic for sending responses according to the interface of requests.
jaesick.shin [Wed, 5 Oct 2016 08:39:16 +0000 (17:39 +0900)]
Add logic for sending responses according to the interface of requests.

This patch include,
Generate response for each of interface
and Add handling about exception cases.

Second patch include,
1. change NS_DEFAULT_INTERFACE to NS_INTERFACE_BASELINE
2. Add first patch logic into Topic case.

Change-Id: I7aa5868fc9a4b4537964c8bdf92b1f15d058d892
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoUpdate easysetup's security-provisioning logic.
Parkhi [Wed, 5 Oct 2016 11:59:08 +0000 (20:59 +0900)]
Update easysetup's security-provisioning logic.

 - This patch indicates the method to reduce security-provisioning time
   by improving the secured-resource search process.

   https://gerrit.iotivity.org/gerrit/#/c/12065/7

Conflicts:
        service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp

Change-Id: Ib2f60d6524b2cf068922c4ddfb17f4bd12b435d1
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12795
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[Hotfix] Modify the incorrect DTLS handshake callback registration for OTM.
Chul Lee [Thu, 6 Oct 2016 10:32:48 +0000 (19:32 +0900)]
[Hotfix] Modify the incorrect DTLS handshake callback registration for OTM.

Change-Id: I60679e8283e252236c9093bcdb3ab9f355f27881
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12881
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoAdded implementation for getDeviceId and setDeviceId
Randeep Singh [Thu, 6 Oct 2016 06:52:04 +0000 (12:22 +0530)]
Added implementation for getDeviceId and setDeviceId

code formatted

Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Change-Id: Ic0d640638bd0c1a258db6c21bbecbd73e2c6dd3f
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
7 years agoChange the property of topic resource
ch79.cho [Thu, 6 Oct 2016 06:21:14 +0000 (15:21 +0900)]
Change the property of topic resource

The resource property of topic is changed from DISCOVERABLE to NONE.

Change-Id: I670dbd26725171b7639061062bdb412e0ace7a81
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12863
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix bug for invalid access variable.
KIM JungYong [Wed, 5 Oct 2016 11:55:36 +0000 (20:55 +0900)]
Fix bug for invalid access variable.

when access consumer main thread but  initialized, service will crash.
So this patch prevent invalid access to not initialized thread handle.

Change-Id: I77d86a712e0efe6bbec17780426df4a5ba98decc
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoFix bug for multiple extras of message.
KIM JungYong [Tue, 4 Oct 2016 05:06:36 +0000 (14:06 +0900)]
Fix bug for multiple extras of message.

When the receive multiple extras in the message from notification provider,
consuemr service misparse as parsing just one extras for incorrect operation of pointers.
In this patch, incorrect operation of pointers is fixed.

Change-Id: Ifacaf247ca836d81031ffe93b0b72d2b46db65f3
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12745
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoAdd more provisioning status and error code in provisioning resource
Jihun Ha [Fri, 30 Sep 2016 08:57:21 +0000 (17:57 +0900)]
Add more provisioning status and error code in provisioning resource

To describe more specific provisioning status and error in easy setup,
some status and error codes are added.

Change-Id: Ibd37d207b55d6d6274380d2fd9aff0771c7c9911
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoRD updates
Habib Virji [Wed, 7 Sep 2016 15:49:21 +0000 (16:49 +0100)]
RD updates

- [Server] Includes a new functionality to store RD details in the database.
- [Server] Use SQLite to store details Published details in the database.
- [UnitTest] Added rdtest to be built as a unittest
- [Service] Moved Client code from resource/csdk/stack/src to
  resource/csdk.
- [Build] Updated auto_build to use RD_MODE flag instead of WITH_RD flag.
- [Cleaning] Removed all RD types in the octypes.h
- [PayloadHandling] rdpayload handling is removed from ocpayload.
- [PayloadHandling] All payload is created in services/resource-directory.
- [PayloadHandling] Uses OCRepPayload to create RD Payload.

Change-Id: I0a32c01ca6b5db1ad36141667e1ee94e545be290
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11519
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoEnable AclVerifyResource line added
Sunil Kumar K R [Mon, 3 Oct 2016 07:02:40 +0000 (12:32 +0530)]
Enable AclVerifyResource line added

Change-Id: Idbc16ae7893ce57eb4f5b0e7473693dab2a05288
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12717
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 76286f9dae19891813b0bba9af33b646415ec86b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12801

7 years agoadded cloud provisioning android application
Sunil Kumar K R [Fri, 23 Sep 2016 10:15:24 +0000 (15:45 +0530)]
added cloud provisioning android application

Change-Id: I4f544c2b665543c4a8f3bec422598f5e7cb8e958
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix the incorrect credential access in SRPProvisionTrustCertChain.
Chul Lee [Wed, 28 Sep 2016 02:32:00 +0000 (11:32 +0900)]
Fix the incorrect credential access in SRPProvisionTrustCertChain.

SRPProvisionTrustCertChain deletes credential list.
But this credential list is read from global credential list through GetCredResourceDataByCredId API.
So credential list should not be deleted in SRPProvisionTrustCertChain.

Change-Id: I8c143d320ead4aea99daaa7d6882c11cfddf26e2
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit d1e4e09eafc15211e0b0a83d6aa8fb1dad8f979f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12793

7 years agoexclude unnecessary jave file related cloud provisioning
jihwan.seo [Tue, 4 Oct 2016 11:56:27 +0000 (20:56 +0900)]
exclude unnecessary jave file related cloud provisioning

Change-Id: I7a2e3d5c1e5662d20734dd70a8adcbbe6f60ed3e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12767
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoCorrect observe callback function in occlient.
Ziran Sun [Mon, 12 Sep 2016 12:42:45 +0000 (13:42 +0100)]
Correct observe callback function in occlient.

1. For observe register request, Sequence number received
in client response falls in range 0 - MAX_SEQUENCE_NUMBER.
2. For observe deregister request and or any failed requests,
the client sequence number value is MAX_SEQUENCE_NUMBER + 1.

Change-Id: Idcc0775179e17ce6df85fb93f127336fede9a42a
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11695
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years ago[IOT-1389]Release netlink socket event in Android ip adapter
bg.chun [Tue, 4 Oct 2016 08:17:44 +0000 (17:17 +0900)]
[IOT-1389]Release netlink socket event in Android ip adapter

Netlink socket event is never released in Android ip adapter.
The reason is the function "CAFindInterfaceChange" should listen event
from netlink socket for release socket event, but it didn`t.
So, we should listen and release netlink event from netlink socket.

Change-Id: I221682d4f0dde5a902670ce54eba797c30c09911
https://jira.iotivity.org/browse/IOT-1389
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12749
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoChange DevOwner access policy to address JIRA 1369
Nathan Heldt-Sheller [Thu, 29 Sep 2016 22:10:20 +0000 (15:10 -0700)]
Change DevOwner access policy to address JIRA 1369

This changes the Policy Engine to grant requests from DevOwner
without checking ACLs ONLY if the device is not in Ready for Normal
Operation state, AND the request is for a SVR.

Change-Id: I9aa4314cc2beb9fdb4629c1e63ea6971f7cc8909
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix build fail of notification android.
KIM JungYong [Fri, 30 Sep 2016 07:49:20 +0000 (16:49 +0900)]
Fix build fail of notification android.

Android building execute on notification SConscript.
And bug for build fail is fixed.

Change-Id: I6fad802576f34c32f5b2a36e3af23e2a89af2d65
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12627
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agotizen: Display verbose log
Philippe Coval [Wed, 7 Sep 2016 07:49:15 +0000 (09:49 +0200)]
tizen: Display verbose log

Split args line to enhance readability.

Bug: https://jira.iotivity.org/browse/IOT-1260
Change-Id: I4c1cdd41dfef7120c336df8e6c6c027f80126909
Origin: https://gerrit.iotivity.org/gerrit/#/c/11509/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11509
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoIOT-1378 Fix windows\CAIPNWMonitor.c
Daniel Ferguson [Thu, 29 Sep 2016 18:33:04 +0000 (11:33 -0700)]
IOT-1378 Fix windows\CAIPNWMonitor.c

* Allow IPv4 and IPv6 to coexist. Previously, these two
  modes were mutually exclusive.

Change-Id: I5c04289590b0edd58dc854722c0288a99b4c70c9
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12577
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years ago[IOT-1330] Fixed build error caused by calling tinydtls build script twice
George Nash [Fri, 30 Sep 2016 20:00:14 +0000 (13:00 -0700)]
[IOT-1330] Fixed build error caused by calling tinydtls build script twice

When building android build with SECURED=1 there is no need to call the tinydtls
build script it is build as part of the csdk.

See: resource/csdk/connectivity/src/SConscript line 60

Change-Id: Idf140944f81ca33369a42f2986e526b38882a3f5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12675
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoMake iotivity compile in a way usable by windows store apps
Dave Thaler [Fri, 30 Sep 2016 23:12:55 +0000 (16:12 -0700)]
Make iotivity compile in a way usable by windows store apps

Replace GetTickCount with GetTickCount64
Replace CryptGenRandom with BCryptGenRandom

Change-Id: I867f1325d576e52c10466abd7620802351b743c5
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12701
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
7 years agoDynamically generate coap_config.h
Dave Thaler [Wed, 21 Sep 2016 06:18:11 +0000 (23:18 -0700)]
Dynamically generate coap_config.h

Change-Id: If9b8199df71940f5b8a860f03292ca81dcd8e6ca
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
7 years agoRefactor unit test linking
David Antler [Thu, 22 Sep 2016 00:44:19 +0000 (17:44 -0700)]
Refactor unit test linking

* Build an octbstack_test static library.
* Link test executables against aforementioned static library.
* Remove octbstack_test.def file.
* Light cleanup of various SCons scripts

Note: This patch also fixes an issue where the build would fail
when TEST=0 was specified on Windows.

Change-Id: Ied7457fd5857396f4ce32bff37380998d66adeff
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12115
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agobuild: Format SConscript as consistant python source
Philippe Coval [Thu, 1 Sep 2016 07:51:13 +0000 (09:51 +0200)]
build: Format SConscript as consistant python source

Use 4 spaces for tabulation

Bug: https://gerrit.iotivity.org/gerrit/#/c/9783/4
Change-Id: I5b27d4c573e43d1c7b069ec417133340f8c36a44
Origin: https://gerrit.iotivity.org/gerrit/#/c/11265/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11265
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoFix build order of iotivity_config.h
David Antler [Mon, 26 Sep 2016 21:01:48 +0000 (14:01 -0700)]
Fix build order of iotivity_config.h

We should run the c_common SConscript to generate iotivity_config.h
before liblogger is built. This is because logger.c will include
"iotivity_config.h".

Change-Id: I6332e403a5ce457e682ff764b9d20899cf26aea3
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
7 years agoMAX_URI_LENGTH was being redefined at multiple places
Habib Virji [Tue, 30 Aug 2016 12:47:15 +0000 (13:47 +0100)]
MAX_URI_LENGTH was being redefined at multiple places

MAX_URI_LENGTH was redefined at multiple places. It is defined in
ocstackconfig.h and should not be redefined at other places. Please
note this was only done in the sample code.

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

Change-Id: I334f028779f202a4371a1409d4e3ce69cd40d121
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agotizen: Ignore tmp folder as used for local building
Philippe Coval [Fri, 15 Jul 2016 08:57:29 +0000 (10:57 +0200)]
tizen: Ignore tmp folder as used for local building

This temporary folder is used to build out of sources.

Change-Id: I88dedd1f019cb67196d1980a6171f513c82b19cb
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agosvace fix
Oleksandr Dmytrenko [Sat, 24 Sep 2016 15:56:50 +0000 (18:56 +0300)]
svace fix

Change-Id: Ibcc7b545bfefb6861bdfecf954ca24b158229150
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12179
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 09b36dbf20ce323a95c97101c7d068cf24138731)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12639

7 years agoPrevent duplication of aclid with same di
Jongmin Choi [Thu, 29 Sep 2016 07:39:00 +0000 (16:39 +0900)]
Prevent duplication of aclid with same di

Prevents duplication of aclid linked to the same di

Patch #1: Initial upload

Change-Id: I586f494877aa57ad3fa51c3acbcb53442da5c363
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 4f299105fbd7572a12aa4fb4647aa952c1013345)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12633

7 years agoUpdate the CADtlsClose API to remove the DTLS peer when closing temporary DTLS session.
Randeep Singh [Fri, 30 Sep 2016 06:10:05 +0000 (11:40 +0530)]
Update the CADtlsClose API to remove the DTLS peer when closing temporary DTLS session.

Change-Id: I5b04178ff5bb291a08961066a2f44b35522849c8
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12617
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
7 years agoFix for request to secure resource server.
KIM JungYong [Thu, 29 Sep 2016 11:43:29 +0000 (20:43 +0900)]
Fix for request to secure resource server.

When send to discovered secure resource server,
client should change port to secure channel port.
But, it is not apply at notification consumer service.
In this patch, when discover secure notification resource
consumer service will send request with changed port for secure.

Change-Id: Ib8101753be76996fa4978d7714e8cf474278f771
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12561
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 agoThrow OcException for invalid (null) parameters in Java Layer of android_api
Larry Sachs [Thu, 29 Sep 2016 17:46:19 +0000 (10:46 -0700)]
Throw OcException for invalid (null) parameters in Java Layer of android_api

[IOT-1323] -- [RI][Android] observe(with QualityOfService) API does not throw OcException while passing parameter-observeType as Null value

Change-Id: If0d7acb0f5bbfda75e2fd774b6cccc8ce21e5650
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
7 years agoAndorid(JNI) Implementation for Cloud Provisioning.
Randeep Singh [Thu, 29 Sep 2016 08:36:44 +0000 (14:06 +0530)]
Andorid(JNI) Implementation for Cloud Provisioning.

Patch #1: Add JNI interface for getAclByDeviceID API.
Patch #2: Fixes.

Change-Id: I0e8b09f9f1be66d202834e56f3d535604f6a766b
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11507
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
7 years agoFix for Jira issue: IOT-1252
Sandipan Patra [Tue, 27 Sep 2016 12:49:56 +0000 (18:19 +0530)]
Fix for Jira issue: IOT-1252

Simulator error codes compatible with OC stack error codes

Change-Id: If03fff46fae4144db4318c5e5d95c97c9ae377fd
Signed-off-by: Sandipan Patra <sandipan.p@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12335
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoSvace fixes for Notification service C++ changes for formatting
abitha.s [Wed, 28 Sep 2016 14:33:27 +0000 (20:03 +0530)]
Svace fixes for Notification service C++ changes for formatting

Change-Id: I58404514f8f5112fa7897dc3771595ba84a8c8f9
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12435
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years ago[IOT-1363] Fix from C++ changes
abitha.s [Tue, 27 Sep 2016 13:32:01 +0000 (19:02 +0530)]
[IOT-1363] Fix from C++ changes

patch 2 : resolved merge conflict

Change-Id: I535084c3e1c9fcf302038ccbf98aaff02cd97167
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>