Change in openvpn[release/2.6]: dco linux: avoid redefining ovpn enums (2.6)
A message that is not in the archive (sent off-list or not yet received): gerrit.1753960651000.I41c5dfc7489352a9534ff6b1585a5a81e0623ab1@...2715...
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/+/1122?usp=email
to review the following change.
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 commit1d3c2b67a73a0aa011c13e62f876d24e49d41df0.
---
M src/openvpn/dco_linux.h
M src/openvpn/ovpn_dco_linux.h
2 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/22/1122/1
src/openvpn/dco_linux.h +2 -2
@@ -26,11 +26,11 @@#include "event.h" -#include "ovpn_dco_linux.h" -#include <netlink/socket.h> #include <netlink/netlink.h> +#include "ovpn_dco_linux.h" +typedef enum ovpn_key_slot dco_key_slot_t ;typedef enum ovpn_cipher_alg dco_cipher_t ;
src/openvpn/ovpn_dco_linux.h +7 -2
@@ -237,14 +237,17 @@ OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, }; +#ifndef IFLA_OVPN_MAX +enum ovpn_ifla_attrs {IFLA_OVPN_UNSPEC =0 ,IFLA_OVPN_MODE , - __IFLA_OVPN_AFTER_LAST, -IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST -1 , + __IFLA_OVPN_MAX, }; +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) +enum ovpn_mode { __OVPN_MODE_FIRST =0 , OVPN_MODE_P2P = __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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos, ralf_lici.
ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email )
Change subject: dco linux: avoid redefining ovpn enums (2.6)
......................................................................
Patch Set 1:
(1 comment)
File src/openvpn/dco_linux.h:
http://gerrit.openvpn.net/c/openvpn/+/1122/comment/5affea11_fc2bbcdc :
PS1, Line 32: #include "ovpn_dco_linux.h"
should we add a comment here that instructs to keep this include always last? (and maybe explain why?)
Signature · 20 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: release/2.6 Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1 Gerrit-Change-Number: 1122 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld <[email protected]...> Gerrit-Reviewer: ordex <[email protected]...> Gerrit-Reviewer: plaisthos <[email protected]...> Gerrit-Reviewer: ralf_lici <[email protected]...> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-Attention: plaisthos <[email protected]...> Gerrit-Attention: flichtenheld <[email protected]...> Gerrit-Attention: ralf_lici <[email protected]...> Gerrit-Comment-Date: Thu, 31 Jul 2025 21:02:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
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=email
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 commit1d3c2b67a73a0aa011c13e62f876d24e49d41df0.
---
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
src/openvpn/dco_linux.h +4 -2
@@ -26,11 +26,13 @@#include "event.h" -#include "ovpn_dco_linux.h" -#include <netlink/socket.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" +typedef enum ovpn_key_slot dco_key_slot_t ;typedef enum ovpn_cipher_alg dco_cipher_t ;
src/openvpn/ovpn_dco_linux.h +7 -2
@@ -237,14 +237,17 @@ OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, }; +#ifndef IFLA_OVPN_MAX +enum ovpn_ifla_attrs {IFLA_OVPN_UNSPEC =0 ,IFLA_OVPN_MODE , - __IFLA_OVPN_AFTER_LAST, -IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST -1 , + __IFLA_OVPN_MAX, }; +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) +enum ovpn_mode { __OVPN_MODE_FIRST =0 , OVPN_MODE_P2P = __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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: ordex <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: ralf_lici <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ralf_lici <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: ordex, plaisthos, ralf_lici.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email )
Change subject: dco linux: avoid redefining ovpn enums (2.6)
......................................................................
Patch Set 2:
(1 comment)
File src/openvpn/dco_linux.h:
http://gerrit.openvpn.net/c/openvpn/+/1122/comment/3ccd01a6_50ffc7c4 :
PS1, Line 32: #include "ovpn_dco_linux.h"
Quoted 1 line
should we add a comment here that instructs to keep this include always last? (and maybe explain why […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: ordex <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: ralf_lici <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: ordex <[email protected]...>
Gerrit-Attention: ralf_lici <[email protected]...>
Gerrit-Comment-Date: Fri, 01 Aug 2025 09:18:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: ordex <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos, ralf_lici.
ordex has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email )
Change subject: dco linux: avoid redefining ovpn enums (2.6)
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: ordex <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: ralf_lici <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: ralf_lici <[email protected]...>
Gerrit-Comment-Date: Fri, 01 Aug 2025 10:49:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v2 1/1 dco linux: avoid redefining ovpn enums (2.6)
In reply to a message not in the archiveStarting 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 commit1d3c2b67a73a0aa011c13e62f876d24e49d41df0.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1122
This mail reflects revision 2 of this Change.
Acked-by according to Gerrit (reflected above):
Antonio Quartulli <[email protected]...>
src/openvpn/dco_linux.h +4 -2
@@ -26,11 +26,13 @@#include "event.h" -#include "ovpn_dco_linux.h" -#include <netlink/socket.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" +typedef enum ovpn_key_slot dco_key_slot_t ;typedef enum ovpn_cipher_alg dco_cipher_t ;
src/openvpn/ovpn_dco_linux.h +7 -2
@@ -237,14 +237,17 @@ OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, }; +#ifndef IFLA_OVPN_MAX +enum ovpn_ifla_attrs {IFLA_OVPN_UNSPEC =0 ,IFLA_OVPN_MODE , - __IFLA_OVPN_AFTER_LAST, -IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST -1 , + __IFLA_OVPN_MAX, }; +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) +enum ovpn_mode { __OVPN_MODE_FIRST =0 , OVPN_MODE_P2P = __OVPN_MODE_FIRST,
@@ -253,4 +256,6 @@ __OVPN_MODE_AFTER_LAST, }; +#endif /* ifndef IFLA_OVPN_MAX */ +#endif /* _UAPI_LINUX_OVPN_DCO_H_ */
[Openvpn-devel] [PATCH applied] Re: dco linux: avoid redefining ovpn enums (2.6)
As the commit message says, this is a backport of the master commit 1d3c2b67a73a with a slight change in the header inclusion order (needed for the 2.6 code base). Antonio has ACKed it, the BBs confirm it does not break anything.
Your patch has been applied to the release/2.6 branch.
commit 1fbbe91d292fb925f5af73b512d7d1c83abfe714
Author: Frank Lichtenheld Date: Fri Aug 1 15:03:02 2025 +0200
dco linux: avoid redefining ovpn enums (2.6)
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Antonio Quartulli <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32470.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#3) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by ordex
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 commit1d3c2b67a73a0aa011c13e62f876d24e49d41df0.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32470.html
---
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/3
src/openvpn/dco_linux.h +4 -2
@@ -26,11 +26,13 @@#include "event.h" -#include "ovpn_dco_linux.h" -#include <netlink/socket.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" +typedef enum ovpn_key_slot dco_key_slot_t ;typedef enum ovpn_cipher_alg dco_cipher_t ;
src/openvpn/ovpn_dco_linux.h +7 -2
@@ -237,14 +237,17 @@ OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, }; +#ifndef IFLA_OVPN_MAX +enum ovpn_ifla_attrs {IFLA_OVPN_UNSPEC =0 ,IFLA_OVPN_MODE , - __IFLA_OVPN_AFTER_LAST, -IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST -1 , + __IFLA_OVPN_MAX, }; +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) +enum ovpn_mode { __OVPN_MODE_FIRST =0 , OVPN_MODE_P2P = __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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: ordex <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: ralf_lici <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1122?usp=email )
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 commit1d3c2b67a73a0aa011c13e62f876d24e49d41df0.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32470.html
---
M src/openvpn/dco_linux.h
M src/openvpn/ovpn_dco_linux.h
2 files changed, 11 insertions(+), 4 deletions(-)
src/openvpn/dco_linux.h +4 -2
@@ -26,11 +26,13 @@#include "event.h" -#include "ovpn_dco_linux.h" -#include <netlink/socket.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" +typedef enum ovpn_key_slot dco_key_slot_t ;typedef enum ovpn_cipher_alg dco_cipher_t ;
src/openvpn/ovpn_dco_linux.h +7 -2
@@ -237,14 +237,17 @@ OVPN_PACKET_ATTR_MAX = __OVPN_PACKET_ATTR_AFTER_LAST - 1, }; +#ifndef IFLA_OVPN_MAX +enum ovpn_ifla_attrs {IFLA_OVPN_UNSPEC =0 ,IFLA_OVPN_MODE , - __IFLA_OVPN_AFTER_LAST, -IFLA_OVPN_MAX = __IFLA_OVPN_AFTER_LAST -1 , + __IFLA_OVPN_MAX, }; +#define IFLA_OVPN_MAX (__IFLA_OVPN_MAX - 1) +enum ovpn_mode { __OVPN_MODE_FIRST =0 , OVPN_MODE_P2P = __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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Gerrit-Change-Number: 1122
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: ordex <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: ralf_lici <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged