From: "flichtenheld (Code Review)" Date: Fri, 1 Aug 2025 09:18:10 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, ralf@...2726..., antonio@...2726... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="kG8+ikMJwCw="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[release/2.6]: dco linux: avoid redefining ovpn enums (2.6) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , ralf_lici Cc: openvpn-devel --kG8+ikMJwCw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos, ralf_lici. Hello ordex, plaisthos, ralf_lici, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1122?usp=3Demail to look at the new patch set (#2). Change subject: dco linux: avoid redefining ovpn enums (2.6) ...................................................................... dco linux: avoid redefining ovpn enums (2.6) 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. This is the port to release/2.6 based on commit 1d3c2b67a73a0aa011c13e62f876d24e49d41df0. Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1 Signed-off-by: Frank Lichtenheld --- M src/openvpn/dco_linux.h M src/openvpn/ovpn_dco_linux.h 2 files changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/22/1122/2 diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_linux.h index 511519a..5179912 100644 --- a/src/openvpn/dco_linux.h +++ b/src/openvpn/dco_linux.h @@ -26,11 +26,13 @@ #include "event.h" -#include "ovpn_dco_linux.h" - #include #include =20 +/* include last since we need to behave differently if the kernel headers + * are from 6.16+ */ +#include "ovpn_dco_linux.h" + typedef enum ovpn_key_slot dco_key_slot_t; typedef enum ovpn_cipher_alg dco_cipher_t; diff --git a/src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h index 73e19b5..34abc6a 100644 --- a/src/openvpn/ovpn_dco_linux.h +++ b/src/openvpn/ovpn_dco_linux.h @@ -237,14 +237,17 @@ OVPN_PACKET_ATTR_MAX =3D __OVPN_PACKET_ATTR_AFTER_LAST - 1, }; +#ifndef IFLA_OVPN_MAX + enum ovpn_ifla_attrs { IFLA_OVPN_UNSPEC =3D 0, IFLA_OVPN_MODE, - __IFLA_OVPN_AFTER_LAST, - IFLA_OVPN_MAX =3D __IFLA_OVPN_AFTER_LAST - 1, + __IFLA_OVPN_MAX, }; +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) + enum ovpn_mode { __OVPN_MODE_FIRST =3D 0, OVPN_MODE_P2P =3D __OVPN_MODE_FIRST, @@ -253,4 +256,6 @@ __OVPN_MODE_AFTER_LAST, }; +#endif /* ifndef IFLA_OVPN_MAX */ + #endif /* _UAPI_LINUX_OVPN_DCO_H_ */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1122?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: release/2.6 Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1 Gerrit-Change-Number: 1122 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: ordex Gerrit-Reviewer: plaisthos Gerrit-Reviewer: ralf_lici Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-Attention: ralf_lici Gerrit-MessageType: newpatchset --kG8+ikMJwCw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos, ralf_lic= i.

flichtenheld uploaded patch set #2 to this change.

<= p>View C= hange

dco linux: avoid redefining ovpn enums (2.6)

Starting with= Linux kernel version 6.16, a couple of ovpn-related enum
definitions we= re introduced in the `include/uapi/linux/if_link.h`
header. Redefining t= hem in openvpn when they are already present in the
system headers can l= ead to conflicts or build issues.

This commit ensures that enum rede= finitions are avoided by conditionally
using the existing definitions fr= om the system header when available.

This is the port to release/2.6= based on commit
1d3c2b67a73a0aa011c13e62f876d24e49d41df0.

Change= -Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Signed-off-by: Frank Lich= tenheld <frank@...2641...>
---
M src/openvpn/dco_linux.h
M s= rc/openvpn/ovpn_dco_linux.h
2 files changed, 11 insertions(+), 4 deletio= ns(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/change=
s/22/1122/2
diff --git a/src/openvpn/dco_linux.h b/src/openvpn/dco_=
linux.h
index 511519a..5179912 100644
--- a= /src/openvpn/dco_linux.h
+++ b/src/openvpn/dco_linux.h
@@ -26,11 +26,13 @@

#include= "event.h"

-#include "ovpn_dco_linux.h"
-
#include <netlink/soc= ket.h>
#include <netlink/netlink.h>

+/* include last= since we need to behave differently if the kernel headers
+ * are from 6.16+ */
+#include "ovpn_dco_linux.h&quo= t;
+
= typedef enum ovpn_key_slot dco_key_slot_t;
typedef enum o= vpn_cipher_alg dco_cipher_t;

diff --git a= /src/openvpn/ovpn_dco_linux.h b/src/openvpn/ovpn_dco_linux.h
index 73e19b5..34abc6a 100644
--- a/src/openvpn/ovpn_dco_= linux.h
+++ b/src/openvpn/ovpn_dco_linux.h
= @@ -237,14 +237,17 @@
OVPN_PACKET_ATTR_MAX =3D __OVPN_PAC= KET_ATTR_AFTER_LAST - 1,
};

+#ifndef IFLA_OVPN_MAX
= +
enum ovpn_if= la_attrs {
IFLA_OVPN_UNSPEC =3D 0,
IFLA= _OVPN_MODE,

- __IFLA_OVPN_AFTER_LAST,
- IFLA_OVPN_MAX =3D __IFLA_OVPN_AFTER_LAST - 1,
+ __IFLA_OVPN_MAX,
};=

+#= define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1)
+
enum ovpn_mode {
= __OVPN_MODE_FIRST =3D 0,
OVPN_MODE_P2P =3D __OVPN_MODE_F= IRST,
@@ -253,4 +256,6 @@
__OVPN_MODE_AFT= ER_LAST,
};

+#endif /* ifndef IFLA_OVPN_MAX */
+
#endif /* _UAPI_= LINUX_OVPN_DCO_H_ */

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

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585= a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: ordex <antonio@...2726...&= gt;
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: ralf_lici <ralf@...2726...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: ralf_lici <ralf@...2804...= .>
Gerrit-MessageType: newpatchset
--kG8+ikMJwCw=--