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

networking: use OPENVPN_ETH_ALEN instead of ETH_ALEN

Browse source 
With the introduction of SITNL two occurrences of ETH_ALEN
were introduced in the code. This define exists on Linux in
the linux/if_ether.h header, however the latter is included
in linux/if_tun.h which may or may not exist (depending on
how old your system is).

If the system lacks if_tun.h then the compilation fails because
ETH_ALEN cannot be found.

For this reason, swap ETH_ALEN with OPENVPN_ETH_ALEN which is
already used in other places of the code.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20220223080628.4773-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23882.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2022-02-23 09:06:28 +01:00 committed by Gert Doering
parent 07be493796
commit 8d487b4cc5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/openvpn/lladdr.c
View file

@ -13,6 +13,7 @@
#include "misc.h"
#include "run_command.h"
#include "lladdr.h"
#include "proto.h"
int
set_lladdr(openvpn_net_ctx_t *ctx, const char *ifname, const char *lladdr,
@ -26,7 +27,7 @@ set_lladdr(openvpn_net_ctx_t *ctx, const char *ifname, const char *lladdr,
}
#if defined(TARGET_LINUX)
uint8_t addr[ETH_ALEN];
uint8_t addr[OPENVPN_ETH_ALEN];
sscanf(lladdr, MAC_FMT, MAC_SCAN_ARG(addr));
r = (net_addr_ll_set(ctx, ifname, addr) == 0);

3
src/openvpn/networking_sitnl.c
View file

@ -32,6 +32,7 @@
#include "buffer.h"
#include "misc.h"
#include "networking.h"
#include "proto.h"
#include <errno.h>
#include <string.h>
@ -748,7 +749,7 @@ net_addr_ll_set(openvpn_net_ctx_t *ctx, const openvpn_net_iface_t *iface,
req.i.ifi_family = AF_PACKET;
req.i.ifi_index = ifindex;
SITNL_ADDATTR(&req.n, sizeof(req), IFLA_ADDRESS, addr, ETH_ALEN);
SITNL_ADDATTR(&req.n, sizeof(req), IFLA_ADDRESS, addr, OPENVPN_ETH_ALEN);
msg(M_INFO, "%s: lladdr " MAC_FMT " for %s", __func__, MAC_PRINT_ARG(addr),
iface);