From: "cron2 (Code Review)"
Date: Sun, 12 Apr 2026 15:12:16 +0000
In-Reply-To:
References:
Reply-To: gert@...1296..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...,
antonio@...2726...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="vy37Fm1eWCE="; 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: flichtenheld , plaisthos
Cc: openvpn-devel
--vy37Fm1eWCE=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 has uploaded a new patch set (#3) to the change originally created by=
flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1614?usp=3Demail )
The following approvals got outdated and were removed:
Code-Review+2 by ordex
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
Acked-by: Antonio Quartulli
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1614
Message-Id: <20260408204213.9892-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36=
559.html
Signed-off-by: Gert Doering
---
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/3
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: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idfe2afd9616e17f0f80a914ff054ae18f0b6972b
Gerrit-Change-Number: 1614
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: ordex
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
--vy37Fm1eWCE=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 upl=
oaded patch set #3 to the change originally created by flichtenhel=
d.
View Change
The following approvals got outdated and were remove=
d:
Code-Review+2 by ordex
networking_sitnl: Make sitnl_parse_=
rtattr* return void
It returned a constant value so it didn't ac=
tually
do anything.
Identified by cppcheck.
Change-Id: Idf=
e2afd9616e17f0f80a914ff054ae18f0b6972b
Signed-off-by: Frank Lichtenheld =
<frank@...2641...>
Acked-by: Antonio Quartulli <antonio@...2787...=
...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1614
Messa=
ge-Id: <20260408204213.9892-1-gert@...1296...>
URL: https://www.ma=
il-archive.com/openvpn-devel@lists.sourceforge.net/msg36559.html
Signed-=
off-by: Gert Doering <gert@...1296...>
---
M src/openvpn/networ=
king_sitnl.c
1 file changed, 5 insertions(+), 16 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/chang=
es/14/1614/3
diff --git a/src/openvpn/networking_sitnl.c b/src/open=
vpn/networking_sitnl.c
index baf6f89..b3f8e2b 100644=
--- a/src/openvpn/networking_sitnl.c
+++ b/src/op=
envpn/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 *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);
}
=
-
- return 0;
}
-static int
+static void
sitn=
l_parse_rtattr(struct rtattr *tb[], size_t max, struct rtattr *rta, size_t =
len)
{
- return sitnl_parse_rtattr_flags(tb, max, rta, len, 0);
+ sitnl_parse_rtattr_flags(tb, m=
ax, rta, len, 0);
}
#de=
fine sitnl_parse_rtattr_nested(tb, max, rta) \
@@ -1394,23 =
+1392,14 @@
char *type =3D arg;
s=
truct 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_PAYL=
OAD(n));
- if (ret &=
lt; 0)
- {
- return ret;
<=
span style=3D"color: hsl(0, 100%, 40%);">- }
+ sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(i=
fi), IFLA_PAYLOAD(n));
if (tb[IFLA_L=
INKINFO])
{
struct rtattr *tb=
_link[IFLA_INFO_MAX + 1];
- ret =3D sitnl_parse_rtattr_nested(tb_link, IF=
LA_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 change 1614=
. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idfe2afd9616e17f0f80a914ff05=
4ae18f0b6972b
Gerrit-Change-Number: 1614
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: ordex <antonio@...2726...&=
gt;
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
=
--vy37Fm1eWCE=--