Commits · 8c5572103baed470fc51e2940cf438d5646f91e3 · IoTivity / iotivity-classic

18 Oct, 2017 2 commits

Enable self link in collections · 8c557210

Abhishek Pandey authored Oct 12, 2017

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

- Enabled support for self link in collections.
- API OCLinksPayloadArrayCreate() modified to allow self links.
- New parameter (bool) in the API now allows to have a self link with
  "rel":["self", "item"], in links array as per OCF Core Spec.

Change-Id: I1f2e02dd33c993dc4b28fbc447b8d286c1f7f804
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>

8c557210

[EasySetup] Fix links in baseline & ll response · dad17f20

Ankur Bansal authored Sep 14, 2017

Update oic.r.easysetup baseline and link list response to correctly fill
links property.
Use OCLinksPayloadArrayCreate API to create the links payload for batch
& link list interface. OCLinksPayloadArrayCreate API internally takes
care of creating the most part of payload based on the properties of the
resource. This will replace the logic of creating each property of links
payload for each of the easy setup resources from the code.
In link list interface response, add handling for both OCF & OIC
response (for backward compatibility).

Bug:https://jira.iotivity.org/browse/IOT-2711

Change-Id: I46ca2e2d635cb78e8c7fc7c5ef95d9e16327abb9
Signed-off-by: Ankur Bansal <ankur.b1@samsung.com>
(cherry picked from commit 787a73bd)

dad17f20

17 Oct, 2017 9 commits

[IOT-2710][IOT-2806] fix /pstat Update handler · fd5e3b74

Nathan Heldt-Sheller authored Oct 16, 2017

The way CBOR->/pstat binary is written, the Properties in the
current gPstat are added to the binary representation even if
the CBOR payload doesn't contain that Property. This may be ok
in most cases since it means that (if a Property is omitted)
the gPstat value won't be changed from whatever it is.
But this also means that if /pstat.dos.s is Updated,
the /pstat.dos.s Property Update must be done after all other
Properties, so that if a /pstat.dos.s update changes other
/pstat Properties, the new values aren't subsequently overwritten.

Change-Id: I07369355ec3141c40b5178cae41ba02e5e7813fc
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

fd5e3b74

fix logging incorrectly labeled ERROR · 83b83eb6

Nathan Heldt-Sheller authored Oct 16, 2017

Fix a few log messages that are incorrectly logged as ERROR type.

Change-Id: I417b148840fbc6c6df641b0101fdfc3233f8b511
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

83b83eb6

Change OCGetContentFormat into public API · 005ae865

uzchoi authored Jul 31, 2017

OCIsOCFConentFormat API was internal API to provide bool return
according to media content format(cbor, vnd.ocf+cbor).
However, it can be used to app developer when they handle the
collection resource request with linked-list interface due to
backward compatibility requirement.
This change make the bool return into type enum value on
OCPayloadFormat and Accept version.
Corresponding code is also changed.

Change-Id: I6c780d9ad9e4b68da4b5d431ff294931bcde787e
Signed-off-by: uzchoi <uzchoi@samsung.com>

005ae865

IOT-2539 Targeted ignore of type-limits warning · b0f25a42

George Nash authored Oct 13, 2017

This will turn of the type-limits warning in very
targeted area in the code. The code is checking
that the user passed in value is within limits.

Although it is very unlikely to be outsite the
expected values it is possible. Tthis selectivly
shuts off the warning for the two functions the
warning is found in.

Bug: https://jira.iotivity.org/browse/IOT-2539
Change-Id: Id5da64534c05dffd479d911112d5569305c36d48
Signed-off-by: George Nash <george.nash@intel.com>

b0f25a42

[IOT-2786] ignore wrong ACE version in ACL · fcab5a4c

Nathan Heldt-Sheller authored Oct 06, 2017

The current parsing code will accept a v1 ACE in a V2 /acl payload
and vice versa.  It should at least ignore and skip the wrong-version
ACE.

Change-Id: I9cb3fc84671afe25a730484e4fb2904a0d3c5c95
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

fcab5a4c

[IOT-2806] improve pstat->tm logging · eb9e0d48

Nathan Heldt-Sheller authored Oct 12, 2017

Please cherry-pick this patch and re-run TC.

Change-Id: Ic4cfd419bc11c76545e9e385993f4ae71c4bd52e
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

eb9e0d48

[IOT-2746][IS] Static analysis warning fix. · e37fdcb0

Harry authored Oct 13, 2017

Fixed all the static analyzer reported issues in
Simulator native code.

Change-Id: I04c6008c36bb5880bfabee9753433804d43a46bf
Signed-off-by: Harry <h.marappa@samsung.com>

e37fdcb0

IOT-2539 Fix return-type warning · a5fd41ec

George Nash authored Oct 16, 2017

This fixes moved the return value out of the if statment so
the result of the operation will be returned even if
ehRequest->query is null.

Bug: https://jira.iotivity.org/browse/IOT-2539
Bug: https://jira.iotivity.org/browse/IOT-2714
Change-Id: I018776e8800aa51ed9a49a55554949fb869b9495
Signed-off-by: George Nash <george.nash@intel.com>

a5fd41ec

IOT-2539 Remove conversion-null warnings · cd347c9b

George Nash authored Oct 13, 2017

For some reason using EXPECT_EQ or ASSERT_EQ
converts boolean values to char* which results in
the conversion-null warnings.

Places where EXPECT_EQ or ASSERT_EQ were using a
boolean result for the value was replaced with
ASSERT_TRUE, ASSERT_FALSE, EXPECT_TRUE or
EXPECT_FALSE as needed.

Bug: https://jira.iotivity.org/browse/IOT-2539
Change-Id: I9604b6a7f64545e468430cfdb597eaf18e444580
Signed-off-by: George Nash <george.nash@intel.com>

cd347c9b

16 Oct, 2017 12 commits

[IOT-2745] Static Analysis fix. · a8920349

Jay Sharma authored Oct 13, 2017

Java static analysis fix for resource-encapsulation:.
1. Updated exception handling for logging.
2. Updated sample applications and unit test cases.

Bug: https://jira.iotivity.org/browse/IOT-2745
Change-Id: I1aeb1b8b2b3338515cbc9733ef8fa032fd6f068e
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>

a8920349

[IOT-2745][Simulator] Static Analysis issues fix. · 82020f46

Senthil Kumar G S authored Oct 13, 2017

1. Added log in exception catch blocks.
2. Merged conditional blocks and removed unnecessary conditions.
3. Incorporated proper usage of access specifiers such as final and static.

Change-Id: I78be7b865a30c1f8e746ed62213fb576d11505f8
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>

82020f46

[IOT-2745]Static Analysis fixes for Java NS. · ad3e38e8

abitha.s authored Oct 13, 2017

Change-Id: Ibb2a3e429702a0968a9aacc9ccce2c962a8db36b
Signed-off-by: abitha.s <abitha.s@samsung.com>

ad3e38e8

[IOT-2808]Static Analysis warning fixes for NS. · d9b06695

abitha.s authored Oct 13, 2017

1. Indentation fixes.
2. Uninitialized variable fixes

Change-Id: Iea41f46fcd1540cf8ef3985a030fa7b07e399681
Signed-off-by: abitha.s <abitha.s@samsung.com>

d9b06695

[IOT-2808]Static Analysis warning fixes for SM. · f20f1574

abitha.s authored Oct 12, 2017

1. Indentation fixes.
2. Uninitialized variable fixes

Change-Id: Icfeb1b998be90411e6f1c16d37f79ef0a47f699c
Signed-off-by: abitha.s <abitha.s@samsung.com>

f20f1574

IOT-2539 Cleanup -Wformat= warnings · cba0de12

George Nash authored Aug 07, 2017

The -Wformat= warning is given when the conversion specifier
in a printf or scanf command does not match the value actually
passed in.

In this commit all of the issues are found in LOG functions.
If type passed in was a variable size parameter like a pointer or
size_t. The the PRIuPTR value from the inttypes.h
header is used. For ssize_t variables the PRIdPTR was used.

Bug: https://jira.iotivity.org/browse/IOT-2539
Change-Id: I4977253ac7ee68d2e80a26a0963b770b2ce87032
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21771Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
(cherry picked from commit 60d89aa8
)

cba0de12

[IOT-2726] /cred resource rownerid fix · 79ba615e

Aleksey authored Oct 13, 2017

Fixing usage rownerid.

Change-Id: I89f65d4f5ab404d2766fa179c26948439c16a686
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>

79ba615e

[IOT-2633] Add NULL check for reset profile · 6ee2dcb1

Jongmin Choi authored Oct 16, 2017

Add NULL check for reset profile

Change-Id: Ic767c5af6c65dad64f355ab9bbfed8ad054d919b
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>

6ee2dcb1

C++ example for getting server version info. · 4474e50d

Ziran Sun authored Aug 15, 2017

Change-Id: I10eeedfbd1f4ec4231c2611ed8b496997faa13f7
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>

4474e50d

provisioning: Close database in tests · e0acbf30

Philippe Coval authored Aug 24, 2017

Bug: https://jira.iotivity.org/browse/IOT-2599
Change-Id: Ie49d06287bc6fb3b0ac75c0271af3861c729d436
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22075Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
(cherry picked from commit 043d5809)

e0acbf30

[IOT-2494] SVR DB Editor : Add doxm edit features · 92268a18

Sangjoon Je authored Aug 09, 2017

Add doxm add, remove, modify
Apply InputUuid allow empty input or zero input from user

New Feature: https://jira.iotivity.org/browse/IOT-2494
Change-Id: I9c5dc06bdbc29c5ba7e0a8e0a6e898e162e7959d
Signed-off-by: Sangjoon Je <sangjoon.je@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21831Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 04875c73)

92268a18

[IOT-2803] Remove all roles if credid is zero · d8fe0189

Alex Kelley authored Oct 13, 2017

Change-Id: I6905b2c836d61d05b20a47b43c9ce777c2af0f61
Signed-off-by: Alex Kelley <alexke@microsoft.com>

d8fe0189

15 Oct, 2017 2 commits

[IOT-2746][ES] Static analysis warning fix. · de3b02aa

Harry authored Oct 13, 2017

Fixed all the static analyzer reported issues in
ES native code.

Change-Id: Ida916ed651fcdf4f02f3549ce987511ca8d5eaa0
Signed-off-by: Harry <h.marappa@samsung.com>

de3b02aa

[IOT-2811][ES] Fix mediator android app crash. · 474a3b3f

Senthil Kumar G S authored Oct 14, 2017

Reason for crash:-
OcProvisioning.provisionClose() should be called only
when iotivity stack is built with security. But mediator android
app invoked it without checking whether the stack is built with security.

Change-Id: Ic2af9d649a4dce79d2bfd9daebc2c80b7dfaa2eb
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>

474a3b3f

14 Oct, 2017 1 commit

Let Linux build upstream libcoap again · f9954951

Mats Wichmann authored Oct 03, 2017

Cherry pick from master

Two problems:
(1) in a debug build, Linux builds with gcov options. Linux options
(build_common/linux/SConscript) add --coverage to build, -lgcov to link.
However before the two places that do configure checks for functions start
doing so, they clone an environment with LIBS cleared.  Thus when built
in debug mode, all of the links of the generated configure test programs
-lgcov is missing and the binaries don't link, so the tests report
fail. Fix is to add --coverage to link instead, that implies adding the
library at link time, but is not affected by the clearing of the LIBS var.

(2) upstream libcoap was depending on ipv6 features that only are included
if __GNU_SOURCE is defined, change the define from __DEFAULT_SOURCE to
__GNU_SOURCE only for the coap build environment.

This is like Bug IOT-2334 but since that one reports a windows problem
and thus can't be gcov related, it's not a direct linkage.

Change-Id: I5cab20eeeb10ccefe74d403dd204b33b39ed9a26
Signed-off-by: Mats Wichmann <mats@linux.com>

f9954951

13 Oct, 2017 6 commits

IOT-2539 ignore warnings for older compilers · 9cff3985

George Nash authored Jul 26, 2017

Ignore 'missing-field-initializers' warning  if gcc version
is older than 5.0. This is due to a bug in how older
versions of gcc handles C++11 code.
see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36750

Ignore 'missing-braces' waring if gcc version is older
than 5.0 this is also due to a bug in how older versions
of gcc handles C++11 code.
see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25137

This is in preperation to enable the -Werror build flag.

Bug: https://jira.iotivity.org/browse/IOT-2539
Change-Id: Ia098c273bdbcda485fd02d73941207f502ed861a
Signed-off-by: George Nash <george.nash@intel.com>

9cff3985

[IOT-2632] Callback to check peer's CN · 690545bb

Oleksii Beketov authored Oct 12, 2017

Added callback to check peer's certificate Common Name field.

Change-Id: Idb316438a76d70fcc7a91a2e119aadd0c771bde6
Signed-off-by: akk0rd <v.riznyk@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>

690545bb

[IOT-2709] MOT fix · 367287a4

Oleksii Beketov authored Oct 12, 2017

sampleserver_randompin and sampleserver_preconfpin MOT fix

Change-Id: Iadb02e4370604c33b8070ea45f2d8a42ecfafae1
https://jira.iotivity.org/browse/IOT-2709Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>

367287a4

[IOT-2714][ES] Adding Error Codes as per OCF 1.3. · 40dbba29

Senthil Kumar G S authored Oct 13, 2017

i) Added error codes to represent invalid auth type and enc type.
ii) Added logic to send OC_EH_BAD_REQUEST(400) without payload
if POST request comes to "/WiFiConfResURI" or "/EasySetupResURI"
with invalid auth type or enc type.

Also updated the comments for existing error codes.

Change-Id: I246af9a777f1aba1f18474ded74e38c4a5ed9b2c
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>

40dbba29

[Easy Setup] Handling POST on batch with null URI · 84e5622e

Abhishek Pandey authored Oct 06, 2017

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

Change-Id: I1e2a1b7d4edb4971be616a2563227e1bc55a80d9
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>

84e5622e

resource-encapsulation: use OICFree for query · c9431af9

Philippe Coval authored Aug 25, 2017

Track memory allocations using oic_malloc, oic_string.

This will suppress valgrind warning about using delete on C string,
previously, ocEntityHandlerRequest.query was allocated using C strdup,
so free should be used not C++ delete[].

Conflicts:
	service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp

Bug: https://jira.iotivity.org/browse/IOT-2267
Origin: https://gerrit.iotivity.org/gerrit/#/c/22129
Change-Id: I86a3a3dfee8492656ee89de5913617369bf1fbb3
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/22129Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

c9431af9

12 Oct, 2017 6 commits

IOT-2539 Clean unused code warnnings · a855c499

George Nash authored Oct 09, 2017

credresource.c:
Removed the [-Wunused-const-variable=] warning
The CRED_EMPTY_ROOT_MAP_SIZE was used in the past but is no longer
referenced anywhere in the code.

provisioningclient.c:
Removed the [-Wunused-const-variable=] warning
The SUPPORTED_PRMS array was used in the past but is no longer
referenced anywhere in the code.

ocserver.cpp
Removed the [-Wunused-variable] warning
Looking at the logs a instance that gDeviceUUID was used could not
be found at any point in time.

stacktest.cpp:
Removed the [-Wunused-variable] warnings
Variables peer, pinNumber, and pmSel were only used in Direct Pairing
related unit tests which were removed as part of IOT-2306.

provisioningclient.cpp:
Removed the [-Wunused-function] warning
The InputPdACL function was only used by the Direct Pairing code
that was removed as part of IOT-2306.

Bug: https://jira.iotivity.org/browse/IOT-2539
Bug: https://jira.iotivity.org/browse/IOT-2306
Change-Id: I80f52619a04ee7eafc83b79b886c1121f61a6ba1
Signed-off-by: George Nash <george.nash@intel.com>

a855c499

[IOT-2806] RESET clears all bits · 4693e1f4

Nathan Heldt-Sheller authored Oct 11, 2017

The RESET state should clear all the cm and tm bits before
setting the two lsbs (RESET and TAKE_OWNER bits) to 0b01 for
cm and 0b10 for tm.

Change-Id: I2b602153ea806d51bb1367514463ac590d4353db
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

4693e1f4

Check for required properties in POST request. · f88094f0

Todd Malsbary authored Oct 06, 2017

Bug: https://jira.iotivity.org/browse/IOT-2784
Change-Id: I0f7ff269693e50dee3c2ad870febdddcd5c69d8e
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>

f88094f0

[IOT-2710] improve pstat logging · 9675d862

Nathan Heldt-Sheller authored Oct 10, 2017

Help debug issue where CTT Updates /pstat.dos = SRESET and
tm is not being correctly set by IUT.

Change-Id: I2b598b21e3dd30c27b165ff7cdd033727d5b0858
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>

9675d862

[IOT-2764] Fix issue in GetObserverUsingId() · e989d24a

Sushil Yadav authored Sep 26, 2017

The GetObserverUsingId() function should not assumes that observeId > 0.
For presenceResource the observeId = 0 when it is added as observer in
OCStartPresence() calls AddObserver() for presenceResource.

Bug: https://jira.iotivity.org/browse/IOT-2764
Change-Id: I6dceba0e2e8415c8e9d6b42339f30612b626cb0b
Signed-off-by: Sushil Yadav <sushil.ky@samsung.com>

e989d24a

[IOT-2741] Static Analysis warning fixes. · b57f8a66

arya.k authored Sep 06, 2017

Indentation fixes.

Change-Id: I44a6d21a70fba9d8bdb40972c93d78a778c2ee41
Signed-off-by: arya.k <arya.kumar@samsung.com>

b57f8a66

11 Oct, 2017 2 commits

[IOT-2801] Allow /cred change · ab553005

Aleksey authored Oct 11, 2017

This patch allows /cred updates originating from internal stack.

Change-Id: If9dec4776770d96f740118b4dc2ef595c9433e8b
Signed-off-by: Aleksey Volkov <a.volkov@samsung.com>

ab553005

rapidjson: Remove patch from copied scriptlet · 1865a693

Philippe Coval authored Oct 05, 2017

Change-Id: I13331bffd125faddcc053b70f4a01d718282d4bb
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit ce6ab8b1)

1865a693