From: "ralf_lici (Code Review)"
Date: Mon, 23 Jun 2025 13:12:38 +0000
References:
Reply-To: ralf@...2726..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID: <36119a5eecabf4a2970145c53d64bf470f810f06-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="AF1xgNONUSw="; charset=UTF-8
Subject: [Openvpn-devel] [XS] Change in openvpn[master]: dco linux: avoid
redefining ovpn enums
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , flichtenheld
Cc: openvpn-devel
--AF1xgNONUSw=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1064?usp=3Demail
to review the following change.
Change subject: dco linux: avoid redefining ovpn enums
......................................................................
dco linux: avoid redefining ovpn enums
Starting with Linux kernel version 6.16, a couple of ovpn-related enum
definitions were introduced in the `include/uapi/linux/if_link.h`
header. Redefining them in openvpn when they are already present in the
system headers can lead to conflicts or build issues.
This commit ensures that enum redefinitions are avoided by conditionally
using the existing definitions from the system header when available.
Change-Id: I4fa2d578f9c0a5a8aa24ca1d396102ef2ed9a425
Signed-off-by: Ralf Lici
---
M src/openvpn/dco_linux.h
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1064/1
diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h
index 273a6ad..f6e2d13 100644
--- a/src/openvpn/dco_linux.h
+++ b/src/openvpn/dco_linux.h
@@ -40,6 +40,8 @@
/* OVPN section */
+#ifndef IFLA_OVPN_MAX
+
enum ovpn_mode {
OVPN_MODE_P2P,
OVPN_MODE_MP,
@@ -50,9 +52,12 @@
IFLA_OVPN_MODE,
__IFLA_OVPN_AFTER_LAST,
- IFLA_OVPN_MAX =3D __IFLA_OVPN_AFTER_LAST - 1,
};
=20
+#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1)
+
+#endif /* ifndef IFLA_OVPN_MAX */
+
typedef struct
{
struct nl_sock *nl_sock;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1064?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4fa2d578f9c0a5a8aa24ca1d396102ef2ed9a425
Gerrit-Change-Number: 1064
Gerrit-PatchSet: 1
Gerrit-Owner: ralf_lici
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newchange
--AF1xgNONUSw=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
ralf_lici would like plaisthos and flichtenheld to review this change.
V=
iew Change
dco linux: avoid redefining ovpn enums Starting with =
Linux kernel version 6.16, a couple of ovpn-related enum definitions wer=
e introduced in the `include/uapi/linux/if_link.h` header. Redefining th=
em in openvpn when they are already present in the system headers can le=
ad to conflicts or build issues. This commit ensures that enum redef=
initions are avoided by conditionally using the existing definitions fro=
m the system header when available. Change-Id: I4fa2d578f9c0a5a8aa24=
ca1d396102ef2ed9a425 Signed-off-by: Ralf Lici <ralf@...2726...> --- M src/openvpn/dco_linux.h 1 file changed, 6 insertions(+), 1 del=
etion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/cha=
nges/64/1064/1 diff --git a/src/openvpn/dco_linux.h b/src/openvpn/d=
co_linux.h index 273a6ad..f6e2d13 100644 --=
- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h=
span>@@ -40,6 +40,8 @@ /* OVPN=
section */ +#ifndef IFLA_OVPN_MAX + enum ovpn_mode { OVPN_MO=
DE_P2P, OVPN_MODE_MP, @@ -50,9 +52,12 =
@@ IFLA_OVPN_MODE, =
__IFLA_OVPN_AFTER_LAST, - IFLA_OVPN_MAX =3D __IFLA_OVPN_AFTER_LAST - 1, };=
+#=
define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) + +#endif /* ifndef IFLA_OVPN_MAX */ + typedef struct { struct nl_sock *nl_sock; <=
p>To view, visit change 1064 . To unsubscribe, or for help writing mail filters=
, visit settings .
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4fa2d578f9c0a5a8aa24ca1d396=
102ef2ed9a425
Gerrit-Change-Number: 1064
Gerrit-PatchSet: 1
Gerrit-Owner: ralf_lici <ralf@...2726...>=
;
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-MessageType: newchange
--AF1xgNONUSw=--