upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dco linux: avoid redefining ovpn enums (2.6)

Browse source 
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
1d3c2b67a7.

Change-Id: I41c5dfc7489352a9534ff6b1585a5a81e0623ab1
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Antonio Quartulli <antonio@mandelbit.com>
Message-Id: <20250801130302.372311-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32470.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2025-08-01 15:03:02 +02:00 committed by Gert Doering
parent abd2e52a31
commit 1fbbe91d29
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/openvpn/dco_linux.h
View file

@ -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;

9
src/openvpn/ovpn_dco_linux.h
View file

@ -237,14 +237,17 @@ enum ovpn_netlink_packet_attrs {
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 @@ enum ovpn_mode {
__OVPN_MODE_AFTER_LAST,
};
#endif /* ifndef IFLA_OVPN_MAX */
#endif /* _UAPI_LINUX_OVPN_DCO_H_ */