From: "flichtenheld (Code Review)" Date: Sun, 5 Apr 2026 20:39:31 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <9084e5f77c8403789068208b51b07e5249dc6925-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="OYPTnA3qKII="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: networking_sitnl: Make sitnl_parse_rtattr* return void List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --OYPTnA3qKII= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1614?usp=3Demail to review the following change. Change subject: networking_sitnl: Make sitnl_parse_rtattr* return void ...................................................................... networking_sitnl: Make sitnl_parse_rtattr* return void It returned a constant value so it didn't actually do anything. Identified by cppcheck. Change-Id: Idfe2afd9616e17f0f80a914ff054ae18f0b6972b Signed-off-by: Frank Lichtenheld --- M src/openvpn/networking_sitnl.c 1 file changed, 5 insertions(+), 16 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/14/1614/1 diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c index baf6f89..b3f8e2b 100644 --- a/src/openvpn/networking_sitnl.c +++ b/src/openvpn/networking_sitnl.c @@ -1351,7 +1351,7 @@ return ret; } -static int +static void sitnl_parse_rtattr_flags(struct rtattr *tb[], size_t max, struct rtattr *r= ta, size_t len, unsigned short flags) { @@ -1375,14 +1375,12 @@ { msg(D_ROUTE, "%s: %zu bytes not parsed! (rta_len=3D%u)", __func__,= len, rta->rta_len); } - - return 0; } -static int +static void sitnl_parse_rtattr(struct rtattr *tb[], size_t max, struct rtattr *rta, si= ze_t len) { - return sitnl_parse_rtattr_flags(tb, max, rta, len, 0); + sitnl_parse_rtattr_flags(tb, max, rta, len, 0); } #define sitnl_parse_rtattr_nested(tb, max, rta) \ @@ -1394,23 +1392,14 @@ char *type =3D arg; struct ifinfomsg *ifi =3D NLMSG_DATA(n); struct rtattr *tb[IFLA_MAX + 1]; - int ret; - ret =3D sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n= )); - if (ret < 0) - { - return ret; - } + sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n)); if (tb[IFLA_LINKINFO]) { struct rtattr *tb_link[IFLA_INFO_MAX + 1]; - ret =3D sitnl_parse_rtattr_nested(tb_link, IFLA_INFO_MAX, tb[IFLA_= LINKINFO]); - if (ret < 0) - { - return ret; - } + sitnl_parse_rtattr_nested(tb_link, IFLA_INFO_MAX, tb[IFLA_LINKINFO= ]); if (!tb_link[IFLA_INFO_KIND]) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1614?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Idfe2afd9616e17f0f80a914ff054ae18f0b6972b Gerrit-Change-Number: 1614 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --OYPTnA3qKII= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

networking_sitnl: Make sitnl_parse_rtattr* =
return void

It returned a constant value so it didn't actuallydo anything.

Identified by cppcheck.

Change-Id: Idfe2afd961= 6e17f0f80a914ff054ae18f0b6972b
Signed-off-by: Frank Lichtenheld <fran= k@...2641...>
---
M src/openvpn/networking_sitnl.c
1 file chang= ed, 5 insertions(+), 16 deletions(-)

git pull ss=
h://gerrit.openvpn.net:29418/openvpn refs/changes/14/1614/1
diff --=
git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c
index baf6f89..b3f8e2b 100644
--- a/src/openvpn/= networking_sitnl.c
+++ b/src/openvpn/networking_sitnl.c
@@ -1351,7 +1351,7 @@
return ret;<= br> }

-static int
+s= tatic void
sitnl_parse_rtattr_flags(struct rtattr *tb[], s= ize_t max, struct rtattr *rta, size_t len,
= unsigned short flags)
{
@@ -1375= ,14 +1375,12 @@
{
msg(D_ROUTE= , "%s: %zu bytes not parsed! (rta_len=3D%u)", __func__, len, rta-= >rta_len);
}
-
- re= turn 0;
}

-static int
+static void
sitnl_parse_rtattr(struct rtattr= *tb[], size_t max, struct rtattr *rta, size_t len)
{
- return sitnl_parse_rta= ttr_flags(tb, max, rta, len, 0);
+ sitnl_parse_rtattr_flags(tb, max, rta, len, 0);
= }

#define sitnl_parse_rtattr_nest= ed(tb, max, rta) \
@@ -1394,23 +1392,14 @@
= char *type =3D arg;
struct ifinfomsg *ifi =3D NLM= SG_DATA(n);
struct rtattr *tb[IFLA_MAX + 1];- int ret;
<= /span>
- ret =3D sitnl_pars= e_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n));
- if (ret < 0)
- {
- return ret;
- }
+= sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n));

if (tb[IFLA_LINKINFO])
= {
struct rtattr *tb_link[IFLA_INFO_MAX + 1];

- = ret =3D sitnl_parse_rtattr_nested(tb_link, IFLA_INFO_MAX, tb[IFLA_LINKINF= O]);
- if (ret &= lt; 0)
- {
- return ret;
- }
+ sitnl_parse_rtattr_nested(t= b_link, IFLA_INFO_MAX, tb[IFLA_LINKINFO]);


if (!tb_link[IFLA_INFO_KIND])

{<= br>

To view, visit change 1614. To unsubscribe, or for= help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idfe2afd9616e17f0f80a914ff05= 4ae18f0b6972b
Gerrit-Change-Number: 1614
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --OYPTnA3qKII=--