Ondrej Tomcik [Mon, 15 May 2017 09:10:34 +0000 (11:10 +0200)]
Implement reconnection and ping-pong between cloud services. Make
heartbeat configurable. Fix tests.
Change-Id: I2483f6548f906fd1cf780d63e1ce82fb2b66ca86
Signed-off-by: Ondrej Tomcik <ondrej.tomcik@kistler.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19907
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Philippe Coval [Mon, 15 May 2017 10:03:48 +0000 (12:03 +0200)]
resource: Avoid to expose internal headers
Change-Id: Ifa7b2c20e1b793b14d48557cc1d194be24fcd622
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19909
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Soemin Tjong [Wed, 10 May 2017 01:09:10 +0000 (18:09 -0700)]
IOT-2228: Stop observe once.
https://jira.iotivity.org/browse/IOT-2228
Prevent raised exception in OC library.
Change-Id: I8774cac155b446a166f574a2e5c357c6a53ba1f2
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19761
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Dan Mihai [Mon, 15 May 2017 18:53:57 +0000 (11:53 -0700)]
Fix Windows build break
Increase the default compiler limit. Error started with recent change
05671f38527acd30ff5a761b3c0a7cde933a0b17.
Fixing:
fatal error C1128: number of sections exceeded object file format
limit: compile with /bigobj.
Change-Id: I1e4c1284c7fb7057a14355d7362397ed2919c37d
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19961
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Andrii Shtompel [Sat, 13 May 2017 12:08:23 +0000 (15:08 +0300)]
Fix provisioning/unittest after apply #19593
Following changes were made for provisioning/unittest:
1. Use default SVR DB for client (from provisioning/sample)
2. Use default SVR DB for server1 (server_justworks.dat)
3. Use default SVR DB for server2 (server_justworks.dat) + set unique uuid
4. Increase timeout's to the same value's as in provisioning client
5. Increase from 3s to 5s servers initialization time
Change-Id: I5ae27fdd4e89163e0f437cdf05070dad7079dbb8
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19865
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Andrii Shtompel [Fri, 12 May 2017 13:14:52 +0000 (16:14 +0300)]
Fix provisioning unit tests
1. Fix SRPSaveOwnCertChainTestNullKey
2. Fix SRPSaveOwnCertChainTest
Change-Id: I7f669edca162ab87178817b131359bfc3b059c7b
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19829
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Nathan Heldt-Sheller [Sat, 13 May 2017 04:26:48 +0000 (21:26 -0700)]
[IOT-2224] ace2 Resource "wc" type
Implement phase-out of "*" href and replace with
"wc" types:
"*" = ALL_RESOURCES
"+" = ALL_DISCOVERABLE
"-" = ALL_NON_DISCOVERABLE
Add support for "wc" type to Policy Engine.
Change-Id: I738110de4d132dc5e60c73c79ad8e6b0d535d8d5
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19861
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Dan Mihai [Mon, 15 May 2017 17:59:35 +0000 (10:59 -0700)]
Fix Windows build break
Verify that the block data ID is smaller than UINT8_MAX, then cast
its value to uint8_t.
Fixes compiler warning/error:
resource\csdk\connectivity\src\cablockwisetransfer.c(893):
error C2220: warning treated as error - no 'object' file generated
resource\csdk\connectivity\src\cablockwisetransfer.c(893):
warning C4267: 'function': conversion from 'size_t' to 'uint8_t',
possible loss of data
scons: *** [out\windows\amd64\debug\resource\csdk\connectivity\src\cablockwisetransfer.obj] Error 2
Change-Id: Iae032d52614cf6d10b8ec229430dddbb6f8ee114
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19927
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Sharma [Mon, 15 May 2017 12:07:07 +0000 (17:37 +0530)]
Fix broken build for Proxy
Change-Id: I97fcdc8510a10172b52567fbf2c99db19e490a78
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19917
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Tue, 16 May 2017 04:00:56 +0000 (13:00 +0900)]
Fix 'isCloudAccessible' API which returned a wrong value
"rt" property is written inside "rep" property.
Change-Id: I2cf76661d9c04b32587333a5aefb4474f863d3e7
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18991
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Mushfiqul Islam Antu [Mon, 15 May 2017 11:46:04 +0000 (17:46 +0600)]
Updated Randompin resource di
Randompin Resource di has been changed to be same as justworks
resource di, which is causing fail in pair wise link menu of
provisioningclient app(As pairwise link is not supported for
2 different device with same di)
[Update] changed di to be visually distinct
Change-Id: Ibcf7d6f1d7e65a32ee7113ddaec958ab8073aa08
Signed-off-by: Mushfiqul Islam Antu <i.mushfiq@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19915
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Uze Choi [Tue, 2 May 2017 05:48:38 +0000 (05:48 +0000)]
NSConsumerTest2.cpp string typo
Sample application has string typo.
Change-Id: I8eb8c70e89199cb123dff1991759edb38056dec5
Reviewed-on: https://gerrit.iotivity.org/gerrit/19521
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Senthil Kumar G S [Thu, 11 May 2017 12:09:31 +0000 (17:39 +0530)]
[IOT-2117][Bug][Data loss] No check for snprintf return.
Added code to properly handle the return value of snprintf().
Change-Id: I12bb53e32279d0ac7c09740389e6d3124b19c4dc
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19657
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jaewook Jung [Mon, 15 May 2017 11:39:16 +0000 (20:39 +0900)]
Fix defects detected by static code analyzer
- 'addr' of CAEndpoint is a char array so the address of the array cannot
be null.
- 'requestData' is not dynamic-allocated memory.
Change-Id: Ibcb9f5011b01f19e4624b4d71dcb0181637480b3
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19913
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Senthil Kumar G S [Mon, 15 May 2017 15:28:18 +0000 (20:58 +0530)]
Fix for IOT-2253.
Perform Null check before calling the member functions of OC::OCSecureResource.
This patch solves the crash issue.
Change-Id: Ieb292eee8724bf5ceb2918de424c76c9b780fa16
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19921
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Dan Mihai [Mon, 15 May 2017 18:42:23 +0000 (11:42 -0700)]
Fix Windows build break.
Fixing:
D:\GitRoot\1.3-rel\extlibs\gtest\googletest-release-1.7.0\include\
gtest/gtest.h(1577): error C2220: warning treated as error -
no 'object' file generated
resource\csdk\connectivity\test\ssladapter_test.cpp(3194):
note: see reference to function template instantiation
'testing::AssertionResult testing::internal::CmpHelperNE<int,bool>(
const char *,const char *,const T1 &,const T2 &)' being compiled
with
[
T1=int,
T2=bool
]
D:\GitRoot\1.3-rel\extlibs\gtest\googletest-release-1.7.0\include\
gtest/gtest.h(1577): warning C4805: '!=': unsafe mix of type
'const int' and type 'const bool' in operation
Change-Id: I055105a058c16242ef17ee01a1e9267178a48751
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19929
Reviewed-by: Ibrahim Esmat <iesmat@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Kevin Kane [Mon, 15 May 2017 16:28:50 +0000 (09:28 -0700)]
[IOT-2257] Add OCGetACL2Resource to DLL exports on Windows
Change-Id: I8d9b95b466c3804963c1c0760488cc00ff883529
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19925
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Dan Mihai [Fri, 12 May 2017 22:45:08 +0000 (15:45 -0700)]
IOT-2242 Port recent TCP adapter fix to Windows
Port change
be6cd0c7bacf86e45c498d18633f360b55c5a036 to Windows.
Unfortunately, Jenkins ignored the Windows build error for that change.
Change-Id: I059fa2d6b3bdd345f490239ea8a89612dbe8ceb9
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19855
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Philippe Coval [Fri, 12 May 2017 13:26:58 +0000 (15:26 +0200)]
build: Enable libc++ std::this_thread::sleep_for if unavailable
This was needed to support gcc-4.{6..7} on GNU/Linux Ubuntu 14
So I defined _GLIBCXX_USE_NANOSLEEP if not enabled at configure time,
To avoid messing up configurations it is only set for 4.7 and earlier,
but can extended to other versions if needed (4.8 seems OK).
Also config file is inserted before any header when it was needed.
Observed issue on Ubuntu 14.04.5 x86_64 with g++-4.7 package
(g++ (Ubuntu/Linaro 4.7.3-12ubuntu1) 4.7.3) is:
resource/src/InProcClientWrapper.cpp: \
In member function 'void OC::InProcClientWrapper::listeningFunc()': \
resource/src/InProcClientWrapper.cpp:107:13: \
error: 'sleep_for' is not a member of 'std::this_thread'
Bug: https://jira.iotivity.org/browse/IOT-2158
Change-Id: Ib63aa289e91cc5926946786ae2ce03525d83a37c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19831
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Philippe Coval [Tue, 9 May 2017 17:27:29 +0000 (19:27 +0200)]
scene-manager: Fix permission of sources
Change-Id: I80afc952fc139154bcdad3097b3e3c24d7dcd3e5
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19911
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jaewook Jung [Thu, 11 May 2017 08:10:13 +0000 (17:10 +0900)]
[IOT-2170] Fixed an android crash error on OCAccountManager
Change-Id: Id698fe5fbff845a7a5c4ba7f77db56d37a712393
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19795
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Mushfiqu Islam Antu [Sun, 14 May 2017 13:38:48 +0000 (19:38 +0600)]
[IOT-2251] Resolve getValue() & setValue() APIs for argument string, Attribute Value
getValue() & setValue() APIs returned "no matching function argument" while being callled with the argument: string, AttributeValue
Previously this worked fine, this problem is being generated because of the commit:
https://gerrit.iotivity.org/gerrit/#/c/19585
Change-Id: Ibcf7d6f1d7e65a32ee7113ddaec958ab8073aa07
Signed-off-by: Mushfiqu Islam Antu <i.mushfiq@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19901
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Nathan Heldt-Sheller [Fri, 12 May 2017 04:33:07 +0000 (21:33 -0700)]
Update .json/.dat files for ocserverbasicops and occlientbasicops
Apps located in /resource/csdk/stack/samples/linux/secure directory.
Edited .json to conform to OCF 1.0 SVR schema (e.g. /acl2, /pstat.dos, etc.),
and re-encoded to CBOR using json2cbor.
Depends on 19593.
Change-Id: Ie06b5b349c727e85403b6b7f0a63242993682e4a
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19817
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Todd Malsbary [Mon, 24 Apr 2017 21:55:03 +0000 (14:55 -0700)]
[IOT-1940] Include Uri-Path in blockwise requests.
This is correctly done for unicast requests but not for multicast
requests.
Bug: https://jira.iotivity.org/browse/IOT-1940
Change-Id: I9fa2d498ec4bec0cece2a75c51be2a64e05ce5f5
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19263
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Todd Malsbary [Fri, 5 May 2017 22:20:15 +0000 (15:20 -0700)]
[IOT-2218] Encode empty arrays as 80 ([]), not 80 F6 ([null]).
Bug: https://jira.iotivity.org/browse/IOT-2218
Change-Id: Iaa0086ac69d02d2d36169efb3f304c71cefc7425
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19689
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Oleksandr Dmytrenko [Tue, 25 Apr 2017 11:43:02 +0000 (14:43 +0300)]
[IOT-2083] TLSAdapter.Test_11
Change-Id: I4d6379193291d01d50ecbca2df25a51dc20b75c8
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19255
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Tue, 9 May 2017 17:22:11 +0000 (19:22 +0200)]
notification: Fix permission of sources
Change-Id: Ice7d0015aa1780e65875a0c0bd3a3d35fcbe68bd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19749
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Senthil Kumar G S [Sun, 14 May 2017 08:03:00 +0000 (13:33 +0530)]
[IOT-2250] Mediator Android App Crash Fix.
The problem occurred due to incorrect type casting in mediator android sdk.
Change-Id: I3723f3d70be4295328544ab0f9cb129a5ed326ec
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19893
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Fri, 12 May 2017 18:50:10 +0000 (20:50 +0200)]
csdk: Include config header before any header
It was needed for g++-4.7
Bug: https://jira.iotivity.org/browse/IOT-2244
Change-Id: Iee671616a6e32824be45f1e9424b48e9e073b237
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19837
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Fri, 12 May 2017 22:23:44 +0000 (07:23 +0900)]
[IOT-2036] Update Easy-Setup SDK
Change host of Remote Enrollee if secured one exists
Change-Id: I08af7865fe98deb6f2008fc147dcaf842f3bbb8d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19807
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Dmitriy Zhuravlev [Sat, 13 May 2017 10:02:36 +0000 (13:02 +0300)]
[IOT-2036] Disable DOS checking
Workaround to pass Easy-Setup samples
Change-Id: Ib62f8de9f8a039ec9c6d1f7e6eb0a2f5544a905c
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19863
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Dmitriy Zhuravlev [Sat, 13 May 2017 14:56:26 +0000 (17:56 +0300)]
[IOT-2036] Fix empty string device ID
Allow to load PSK suites in case of empty deviceId
Change-Id: Idaf55bb3624c2f1d1a1825b0cdcaaa1bdd7d5caf
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19867
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
saurabh.s9 [Mon, 8 May 2017 09:06:57 +0000 (14:36 +0530)]
[IOT-2104] corrected misused OIC_LOG_V
Change-Id: I50e28232eaeb26d3d34ce068313a5c6c844cde7f
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19705
Reviewed-by: Mats Wichmann <mats@linux.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Nathan Heldt-Sheller [Wed, 3 May 2017 07:59:24 +0000 (00:59 -0700)]
[IOT-1895] [IOT-2179] [IOT-1957] /acl2 Resource
ACE2 adds the "wc" property to the "resource" type, and the
"conntype" property to the "subject" type, allowing for more
flexible wildcards, and removing possible unintended collisions.
/acl2 also conforms to a different schema, so the CBOR encode/
decode functions are updated.
The unit tests are currently still using oic.sec.ace structures,
and will need to be updated to oic.sec.ace2 (see IOT-2192)
Updated provisiongclient and provisioning .json/.dat files to
use /acl2.
[x] update OicSecAce_t to support ace2
[x] update OicSecResource_t to support */+/- rsrc wildcards
[x] update AclToCBORPayload() to support /acl2
[x] update JSONToAclBin() to support /acl2
[x] update CBORPayloadToAcl() to support /acl2
[x] remove /oic/sec/acl resource
[x] verify provclient/justworks using above revisions
[x] verify unitttest using above revisions
Change-Id: If5a7105ac223537cd2249cec519e5657f651da3e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19593
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Dan Mihai [Fri, 12 May 2017 06:06:51 +0000 (23:06 -0700)]
[IOT-2236] Allow POST to /oic/sec/acl
Restore the old behavior of starting parsing the payload with
ehRet == OC_EH_OK. This behavior has been modified incorrectly
by recent change
170dceb649c7aab72a087feec0b3e37bd8829848.
Change-Id: I13e5aa1e5f3a840668182d36ffb58d309cd8c1ad
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19819
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Andrii Shtompel [Wed, 10 May 2017 12:49:03 +0000 (15:49 +0300)]
[IOT-2134] Delete "Change default database" menu item
Change-Id: I6b1baa009aaa97364e5d1cd25e50ae03f3345c74
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19783
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Dmitriy Zhuravlev [Tue, 9 May 2017 08:25:46 +0000 (11:25 +0300)]
[IOT-2036] Fix default error initialization
OC_EH_INTERNAL_SERVER_ERROR changed to OC_EH_OK in HandleACLPostRequest
since it does not change in positive cases
Change-Id: I51ea056dde853909681b07be6ce328e0657cac0f
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19739
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Oleksandr Dmytrenko [Mon, 8 May 2017 16:03:01 +0000 (19:03 +0300)]
[IOT-2136] OCCloudAclFindMyGroup: Member ID mandatory param
OCCloudAclFindMyGroup returns OC_STACK_INVALID param when Member ID is NULL
Change-Id: I5b3834b2b7dc7b2a479c2363f0423347a8b6c12f
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19715
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
ol.beketov [Thu, 4 May 2017 13:42:08 +0000 (16:42 +0300)]
[IOT-2092] Check null pointer before dereference
Change-Id: Ib8032c41e8910087be5c5b30fee9a7b4a3992f01
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19623
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Andrii Shtompel [Thu, 11 May 2017 12:13:18 +0000 (15:13 +0300)]
[IOT-2147] Disable 50-83 requests in CloudClient
Change-Id: I3c8fc1d162580b2590f46da10896bd0573b47d2a
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19797
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Andrii Shtompel [Wed, 10 May 2017 10:27:14 +0000 (13:27 +0300)]
[IOT-2137] Add aceId NULL check to OCCloudAcl functions
Change-Id: Id143d92e3fd2f12001ddc9f26eec91fc230f8143
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19777
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
hyuna0213.jo [Wed, 10 May 2017 05:09:08 +0000 (14:09 +0900)]
[IOT-2146] Fixed Thread-unsafe code in tcp adapter
- Remove potential thread safety bugs in catcpserver
Change-Id: I95dba029b47e2a14b3217565a401c631b0b84cc2
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19767
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: koushik girijala <g.koushik@samsung.com>
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>
Soemin Tjong [Thu, 4 May 2017 01:45:35 +0000 (18:45 -0700)]
IoT-2208: fix IPCA to get device's DMV and PIID
https://jira.iotivity.org/browse/IOT-2208
IPCA should not use OCPlatform::getPropertyValue() to obtain the data
model versions and protocol independent ID of the remote server.
It is incorrect as they return the values of the local server
(i.e. the app's own device info).
Change-Id: I7e8f64d9c7ebebd1b9bb4ec9290fbbdd1e0fa412
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19645
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Dmitriy Zhuravlev [Fri, 5 May 2017 15:45:12 +0000 (18:45 +0300)]
[IOT-2036] Fix mediator sample app
In 1.2.1 secure port was common for all secure resources.
Update sample to use OCF 1.0 endpoint information.
Change-Id: I105f8097c69b15a89b7b799817e2887b575f2770
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19667
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Dmitriy Zhuravlev [Thu, 27 Apr 2017 12:37:40 +0000 (15:37 +0300)]
[IOT-2156] Fix secure client stack sample
Update sample to use IoTivity 1.3 OCEndpointPayload format
Change-Id: I5094d504f3dfe69622eecb767039480c27ab03df
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19365
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
ol.beketov [Fri, 5 May 2017 10:42:51 +0000 (13:42 +0300)]
Key buffer length fix
CA_SECURE_ENDPOINT_PUBLIC_KEY_MAX_LENGTH enlarged to
fix cloud client unability to connect to cloud.
Change-Id: Ic16c186c3e493aaca8f8a1817bbcc1a2b4f799c8
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19659
Reviewed-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Andrii Shtompel [Mon, 8 May 2017 16:10:51 +0000 (19:10 +0300)]
[IOT-1610] Add TCP secure port to CAGetAssignedPortNumber
Change-Id: Iedcedb015eeebf6ce8847a084f475c2c48ec4506
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19717
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Oleksii Beketov <ol.beketov@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Soemin Tjong [Mon, 8 May 2017 23:42:55 +0000 (16:42 -0700)]
IOT-2223: Fix build break.
https://jira.iotivity.org/browse/IOT-2223
Use strlen instead of strnlen_s.
Change-Id: I11e837da3d9e31e092093732f48f72b4171319a4
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19731
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Todd Malsbary [Fri, 5 May 2017 19:54:38 +0000 (12:54 -0700)]
Fix debug build with RD_MODE=CLIENT,SERVER.
Change-Id: Ieefb03c920ecdac3bd20411d6b00f885136c5cf3
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19685
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Sushil Yadav [Tue, 9 May 2017 10:09:04 +0000 (15:39 +0530)]
[IOT-1893] Delete Request Logic Fixed.
Change-Id: I0df40af7c198e3e26aa5450da3489e5876628acc
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19743
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jung Seungho [Wed, 10 May 2017 09:24:33 +0000 (18:24 +0900)]
fixed interval time in keepalive resource and logic to disconnect after sign up
Change-Id: I4cbf263f6ca2bfdc2614d3678b309aaa32dfe239
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19771
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Randeep Singh [Wed, 3 May 2017 13:08:39 +0000 (18:38 +0530)]
[IOT-2124] Added check after OICCalloc
Change-Id: Ia0ea3e17b4a3357d8c40309fc62967a25c5f2365
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19591
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
arya.k [Fri, 5 May 2017 11:53:40 +0000 (17:23 +0530)]
[IOT-1891] [RI] Issue fix OBSERVE Cancellation High QoS
When cancel observe is requested by client, the callback should return
a sequence number greater than MAX_SEQUENCE_NUMBER, and with no observe
header option.
Currently it is returning 0 which is not correct.So stack has been
modified to return a higher sequence number with the callback
for cancel observe confirmed response.
Change-Id: I85ea87454e3ca96f22fe7e414189ec0be7ea8dd8
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19651
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Dan Mihai [Thu, 4 May 2017 12:26:13 +0000 (05:26 -0700)]
Windows: Work around SCons race condition
Change-Id: I6fff6cfc4fed1c23b60500f34615702e9d00fc65
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19615
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
arya.k [Wed, 3 May 2017 08:45:03 +0000 (14:15 +0530)]
[IOT-1892] [RI] Thread sample, updated PUT log for LINUX.
Change-Id: Ibe1da9655d467a8f6b59142b4e3e0bc148e1683c
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19587
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
arya.k [Fri, 5 May 2017 10:56:48 +0000 (16:26 +0530)]
[IOT-2214] [RI Sample] Issue fix SimpleClientHQ pre exiting
on first POST response received.
Change-Id: I15bd7b53526c9a8efb6894267948d9275ad89dd7
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19661
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
eunok.shin [Tue, 2 May 2017 07:14:14 +0000 (16:14 +0900)]
remove unneccessary option in group sample app
Change-Id: I7e700633e014abf44bef2f6a18388783c3c1b672
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19525
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jay Sharma [Wed, 10 May 2017 12:13:51 +0000 (17:43 +0530)]
[NS] Valgrind issue fix for Notification service.
Bug: https://jira.iotivity.org/browse/IOT-2200
Change-Id: I4a4906f33dabdf46d616c1f5d6e83f25250264be
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19781
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Todd Malsbary [Fri, 5 May 2017 22:15:45 +0000 (15:15 -0700)]
[IOT-2217] Fix crash in BuildIntrospectionResponseRepresentation.
Bug: https://jira.iotivity.org/browse/IOT-2217
Change-Id: Ibd07bb064557e67db6b62f3464acf7fc13311d7d
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19687
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Harry [Tue, 9 May 2017 07:11:27 +0000 (12:41 +0530)]
[IOT-2225] Fix for endpoints parse error for secured resources.
[Cause]
ListenOCContainer::EpsLLToVector() method checks type of head->family
against OC_DEFAULT_FLAGS, OC_IP_USE_V4 and OC_IP_USE_V6. But this does
not work for secured resources as endpoints family type are ORed with
OC_FLAG_SECURE too. Because of this behaviour OCResource->getAllHosts()
retuns 0 endpoints for secured resource.
[Fix]
Checking the head->family against OC_IP_USE_V4 and OC_IP_USE_V6 using
bitwise AND instead of equalness.
Bug: https://jira.iotivity.org/browse/IOT-2225
Change-Id: I5741071496538539f9d4d013b5c8c1681ecc58b7
Signed-off-by: Harry <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19737
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jay Sharma [Wed, 10 May 2017 03:13:56 +0000 (08:43 +0530)]
[Scene-Manager] Fix for the request/response mismatch for execute scene API
- Added mutex lock in reponse handler of execute scene API.
- Unit test case fix.
Bug : https://jira.iotivity.org/browse/IOT-2100
Change-Id: I89a737c3f6f09f7b2c648708366d193cac1f278f
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19711
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Poovizhi [Wed, 10 May 2017 09:57:04 +0000 (15:27 +0530)]
[IOT-2118] Fix for the issue of Notification android apps crashing at start
1)The sample apps crashed upon start due to the stop presence call
invoked during start. We observe crash only on calling stopPresence.
Hence removing the call from the application.
2)The library names in Sconscript has an extra space added during merge
which causes the app to fail to load the library. Hence adding
the necessary corrections.
Change-Id: I007753d90e06c1f008a0916e443db0087faae363
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19773
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Abhishek Sharma [Tue, 9 May 2017 11:11:25 +0000 (16:41 +0530)]
[IOT-2161] Fix RM initialization for Android
Change-Id: I08a422c7aa76584c5373e9125502243a8652e588
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19745
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Fri, 28 Apr 2017 09:53:50 +0000 (18:53 +0900)]
[IOT-2115][NS]Change for unsafe function about string.
in this patch, strcpy was changed to strncpy in the NS unit test.
Bug: https://jira.iotivity.org/browse/IOT-2115
Change-Id: I1e0b1a089b5e6aa402146348390a24588738c5f2
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19427
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Pawel Winogrodzki [Wed, 3 May 2017 07:19:05 +0000 (00:19 -0700)]
IOT-1583: Fixing /W3 warnings in /resource directory - part 5.
Fixing most of the remaining /W3s inside the resource/ directory.
Change-Id: I4f84d75fc3018035ee4f9e17df7befb6ed4b26af
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19585
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
George Nash [Mon, 8 May 2017 23:34:01 +0000 (16:34 -0700)]
[IOT-2221] Add OCResource.setHost API to Java API
In addition to adding the setHost method the documentation
for the findResource was updated to reflect the same
documentation change made to the C++ findResource code to
account for the getAllHosts/setHost methods.
Bug: https://jira.iotivity.org/browse/IOT-2221
Change-Id: Ib33c122bced1832b2298c4701d0406f83ba63aaa
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19729
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Philippe Coval [Thu, 27 Apr 2017 09:49:09 +0000 (11:49 +0200)]
mbedtls: Cleanup before reset sources
Problem occurred since I added fail on error (set -e),
when building for different OS in the same tree
(ie: Linux, then Tizen)
Observed error is:
EXEC_MODE=true ./prep.sh
scons SECURED=1 WITH_TCP=1 MULTIPLE_OWNER=1 WITH_CLOUD=1 WITH_MQ=SUB,PUB
./gbsbuild.sh SECURED=1 WITH_TCP=1 MULTIPLE_OWNER=1 WITH_CLOUD=1 WITH_MQ=SUB,PUB
error: tests/data_files/server1-bothnames.crt: \
already exists in working directory
Workaround was to ignore failure errors (like it was in 1.2-rel) using:
bash ./gbsbuild.sh ...
Bug: https://jira.iotivity.org/browse/IOT-2084
Change-Id: I59fc87f40e41a0095bb6deed042b2a6f7ced0dc1
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19361
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
yeonghun.nam [Mon, 8 May 2017 05:54:44 +0000 (14:54 +0900)]
deleted unused group sample device app
Change-Id: I24266775d0ed7a967d20fe6d19a644d4361da6cd
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19695
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
yeonghun.nam [Mon, 8 May 2017 06:23:13 +0000 (15:23 +0900)]
bug fixed (group_invite sample app for D2S communication)
Change-Id: I4e578e75cc33649fefdaa440f660c06fc12ead4a
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19697
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Minji Park [Mon, 8 May 2017 06:48:24 +0000 (15:48 +0900)]
Fix observe/observe cancel request handling in cloud interface
Change-Id: Ib6b6c014b891aa09bd4927c84d7236b0e271adf1
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19699
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jung Seungho [Mon, 8 May 2017 06:51:20 +0000 (15:51 +0900)]
bug fixed (CI Server Crashed related to the number of parameter)
Change-Id: Ic94a778fc395b61a89aad733e27b7db634a90451
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19701
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jee Hyeok Kim [Tue, 2 May 2017 04:22:23 +0000 (13:22 +0900)]
Remove vendor specific rt
Change-Id: Ie2ae985a8e977822e7ed2d616c86dfde4907f3a4
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19517
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Kevin Kane [Fri, 5 May 2017 21:17:11 +0000 (14:17 -0700)]
[IOT-2216] Make /oic/sec/roles discoverable per SWG CR 1616
Change-Id: I2bb543ea9517703f9188b48ae79f653d4a52c8b3
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19679
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Abhishek Sharma [Mon, 24 Apr 2017 07:42:38 +0000 (13:12 +0530)]
Enable code coverage generation for Proxy
Change-Id: I4aaee3a4770e2fa644e1e4be5ae395ee575d435a
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19221
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Pawel Winogrodzki [Wed, 3 May 2017 06:29:30 +0000 (23:29 -0700)]
IOT-1583: Fixing /W3 warnings in /resource directory - part 3.
Fixing all /W3s inside connectivity, routing, security and stack
directories.
Change-Id: I9e99d5f813d6f3f399983759da0b98eeb03c9388
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19559
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Pawel Winogrodzki [Wed, 3 May 2017 01:34:33 +0000 (18:34 -0700)]
IOT-1583: Fixing /W3 warnings in /resource directory - part 4.
Fixing most of the remaining /W3s inside the resource/ directory.
Change-Id: I557ede767450db13476fb3585fb6b5cac0737733
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19561
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Omar Maabreh <omarm@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Alex Kelley [Fri, 21 Apr 2017 00:02:37 +0000 (17:02 -0700)]
[IOT-1936] Allow a device's Preconfigured Pin to be changed
These changes do the following:
1. Pass additional information in the request to add a Preconfigured
Pin to identify it as an update to a Preconfigured Pin credential.
2. Add additional checks to determine if the credential being updated
is a Preconfigured Pin credential.
3. Remove an existing Preconfigured Pin credential (if it exists)
before adding a new one.
Change-Id: I75bfc8a55e25a2da0ec366fa6628e98430c29d00
Signed-off-by: Alex Kelley <alexke@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19537
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Srikrishna Gurugubelli [Mon, 8 May 2017 23:20:59 +0000 (16:20 -0700)]
IOT-2201:Change introspection property name to n
Change-Id: I3116c66448070af5a5edf0a1681d8737f314d24f
Signed-off-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19647
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Tested-by: Mike Fenelon <mike.fenelon@microsoft.com>
Philippe Coval [Thu, 30 Mar 2017 11:38:53 +0000 (13:38 +0200)]
resource-encapsulation: Capture reference in lambda expression
Observer issue using clang on GNU/Linux was:
PrimitiveResourceTest.cpp:165:30: \
error: variable 'value' cannot be implicitly captured in a lambda with no capture-default specified
ocRep[KEY] = value;
note: 'value' declared here
constexpr int value{ 1999 };
note: lambda expression begins here
[](const std::string&, const std::string&, const OC::QueryParamsMap&, OC::GetCallback cb)
Change-Id: I033c46a49645ab333a031593da82f3df52b835ab
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19325
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Sushil Yadav [Tue, 2 May 2017 11:54:32 +0000 (17:24 +0530)]
[IOT-2150] The subscribePresence() API doxygen comments modified.
Change-Id: Id63409f69a7e127152d310a4f0b3e09aa2cb63f8
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19531
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Veeraj Khokale [Fri, 5 May 2017 09:00:33 +0000 (14:30 +0530)]
[IOT-2135] [RI][Linux][SampleApp] Occlientcoll app not sending PUT Request
Remove device address and port from put request query URI
Change-Id: I5b5a81b36e160c049d6f8970f9d809534741fc11
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19655
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Randeep Singh [Tue, 11 Apr 2017 08:16:28 +0000 (13:46 +0530)]
[IOT-1969] Removed unwanted check
Change-Id: I3f3e140488a4da4f392edff065a631f1a717698e
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18685
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Nathan Heldt-Sheller [Mon, 1 May 2017 06:23:55 +0000 (23:23 -0700)]
[IOT-1958] CR 22 State Specific Property Access for /acl Resource
Implementation of CR 22 feature to deny UPDATE to /acl if any
Property in the POST representation is read-only in the current
/pstat.dos.s state.
Change-Id: I3e0ecca464e94002439f8a8f785d63d503ff1f9f
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19483
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
bg.chun [Thu, 4 May 2017 05:54:41 +0000 (14:54 +0900)]
[IOT-2155]Update doxygen comments for guide getAllHosts/setHost to get tcp port.
Update doxygem commets for guide getAllHosts/setHost to get tcp port.
Change-Id: Ib6f2f0047f6e330fe6f2225611e97651bb73aa1f
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19609
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Soemin Tjong [Wed, 3 May 2017 22:55:18 +0000 (15:55 -0700)]
IoT-2195: Make IPCA samples handle multiple paths
https://jira.iotivity.org/browse/IOT-2195
Follow similar implementation in SimpleClient.cpp, substitute only the
security database.
Change-Id: I2cfbdb304ec1acf427c967860fd943415de4ea07
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19599
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Todd Malsbary [Thu, 27 Apr 2017 21:50:25 +0000 (14:50 -0700)]
[IOT-2175] Make "pri" property optional and default to 1.
Prior parsing code rejected payloads without "pri" property.
Bug: https://jira.iotivity.org/browse/IOT-2175
Change-Id: Id28d663382d426c99e698352c22637a9359a0194
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19381
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Pawel Winogrodzki [Wed, 3 May 2017 00:57:11 +0000 (17:57 -0700)]
IOT-1583: Fixing /W3 warnings in /resource directory - part 2.
Fixing all /W3s inside resource-directory.
Change-Id: I1abb83e96d3553ee1c6f8ef7b69986f57142d588
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19557
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Pawel Winogrodzki [Tue, 2 May 2017 07:41:38 +0000 (00:41 -0700)]
IOT-1583: Fixing /W3 warnings in /resource directory - part 1.
Fixing all /W4s inside the IPCA directory and a few minor
once inside service/.
Change-Id: I4054c9dff35ac415e0866652ba7fb9c39720f213
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19555
Reviewed-by: Omar Maabreh <omarm@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Philippe Coval [Wed, 26 Apr 2017 07:48:55 +0000 (09:48 +0200)]
build: clean previously generated config files
Before this fix the observed behaviour was:
scons
find . -iname "iotivity_config.h"
./resource/c_common/iotivity_config.h
scons -c .
find . -iname "iotivity_config.h"
./resource/c_common/iotivity_config.h
with scons-2.5.1 on on Ubuntu 17.04
Bug: https://jira.iotivity.org/browse/IOT-2111
Change-Id: I967b050c9cc57a45df9e138807c0227397073dfd
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19299
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Joe Leong <jleong@vtmgroup.com>
Reviewed-by: Way Vadhanasin <wayvad@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Senthil Kumar G S [Wed, 3 May 2017 14:28:10 +0000 (19:58 +0530)]
[IOT-2190][Simulator] Replaced all strings with macro values from octypes.h
Hard-coded device and platform property keys, 'if's, 'rt's, etc are replaced by the
macro constants defined in octypes.h
Change-Id: I1139401793300dada81c2f30cc4a343831d5171f
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19589
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Todd Malsbary [Tue, 2 May 2017 18:52:27 +0000 (11:52 -0700)]
[IOT-1941] Add support for all oic.wk.d properties to
OCSetPropertyValue, OCGetPropertyValue.
Bug: https://jira.iotivity.org/browse/IOT-1941
Change-Id: Ia594c1e0dc8c47b4bbc430e630b5ad025544d2fd
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19539
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abitha Shankar [Wed, 3 May 2017 07:02:56 +0000 (12:32 +0530)]
[IOT-2215] Loading notification wrapper library fails in Android version 6 & above
libnotification_provider_wrapper.so & libnotification_consumer_wrapper.so
fails to load in android version 6 and above due to invalid
'DT_NEEDED' entry error. SONAME is added, since in higher
android versions search by soname is now implemented.
Change-Id: Ie5c311d6c378ec87ea837d53ad6c0297f717af70
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19583
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
abitha.s [Fri, 5 May 2017 06:01:58 +0000 (11:31 +0530)]
[IOT-2148]Fix for removeTopic() API crash
Change-Id: I424f5e3842577bc85d73ceb1fa68eb7b09e22ca4
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19649
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Dan Mihai [Tue, 2 May 2017 22:11:07 +0000 (15:11 -0700)]
[IOT-2189] Fix dos transition
Also, improve logging and add failed assert for inconsistent state of
the SVR.
Change-Id: Id18916c88a3e5a3caf769d3a17069e670db522ef
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19549
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Dan Mihai [Tue, 2 May 2017 00:25:39 +0000 (17:25 -0700)]
[IOT-2121] [IOT-2116] Fix CTT "message mac does not match"
Test case CT1.7.2.1-2 from CTT v1.5.6 fails with "message mac does
not match":
- After CTT successfully posted the owner credential
- While trying to establish a new DTLS session, using the new
credential
Change-Id: I282632d1071c76afba629081d6853d376c347473
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19515
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Tested-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Nathan Heldt-Sheller [Mon, 1 May 2017 06:07:46 +0000 (23:07 -0700)]
[IOT-1958] CR 22 State Specific Property Access for /cred Resource
Implementation of CR 22 feature to deny UPDATE to /cred if any
Property in the POST representation is read-only in the current
/pstat.dos.s state.
Change-Id: I2acb34b8ceff1eeba0a4b12101fa60d7c2dee9dc
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19481
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Srikrishna Gurugubelli [Mon, 1 May 2017 16:52:49 +0000 (09:52 -0700)]
[IOT-1965] Introspection update to follow spec
Change-Id: I5e6c0d1a016e409429498835587c73d5ef0b7fea
Signed-off-by: Srikrishna Gurugubelli <srikguru@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19513
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Soemin Tjong [Wed, 1 Mar 2017 05:39:06 +0000 (21:39 -0800)]
Add completion callback to IPCACloseHandle().
This addresses the scenario where the app needs to be certain when all
callbacks related to the handle it is closing are completed.
Change-Id: I75b211d477405be27c6c804bc89e529088aa1a90
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18217
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit
932638ede757aa7feef4a85303af456543532a0d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/19013
Poovizhi [Tue, 18 Apr 2017 14:16:05 +0000 (19:46 +0530)]
Fix for the crash in RI sample app
The roomserver app crashes due to Invalid free in ocserverrequest.c
Flow: sendResponse->OCDoResponse->HandleAggregateResponse->DeleteServerResponse->OCPayloadDestroy
The payload is already freed in the caller function of sendResponse in InProcServerWrapper.cpp
OCPayloadDestroy is called twice during sendResponse causing a crash in the app.
Hence removing the OCPayloadDestroy called in the method DeleteServerResponse
Change-Id: If8155238120789736c39b396b65989a2dfc59ded
Signed-off-by: Poovizhi <poovizhi.a@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19155
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Jay Sharma [Fri, 28 Apr 2017 18:12:12 +0000 (23:42 +0530)]
[RE] Added NULL check in Android sample application.
Bug : https://jira.iotivity.org/browse/IOT-2141
Change-Id: I6a77b388b401d9ee5364e9de2859e1c91978fca5
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19447
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>