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

Fix check_addr_clash argument order

Browse source 
In init_tun() make sure to pass the --local and --remote addresses in
the host order so that they can be compared to the --ifconfig addresses.

Change-Id: I5adbe0a79f078221c4bb5f3d39391a81b4d8adce
Signed-off-by: Ralf Lici <ralf@mandelbit.com>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Message-Id: <20240917091433.24092-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29261.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Ralf Lici 2024-09-17 11:14:33 +02:00 committed by Gert Doering
parent ac3a7fd935
commit 7d345b19e2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/openvpn/tun.c
View file

@ -877,9 +877,10 @@ init_tun(const char *dev, /* --dev option */
{
if (curele->ai_family == AF_INET)
{
const in_addr_t local = ntohl(((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr);
check_addr_clash("local",
tt->type,
((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr,
local,
tt->local,
tt->remote_netmask);
}
@ -889,9 +890,10 @@ init_tun(const char *dev, /* --dev option */
{
if (curele->ai_family == AF_INET)
{
const in_addr_t remote = ntohl(((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr);
check_addr_clash("remote",
tt->type,
((struct sockaddr_in *)curele->ai_addr)->sin_addr.s_addr,
remote,
tt->local,
tt->remote_netmask);
}