Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support freebsd's fib feature #550

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

support freebsd's fib feature #550

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b3434c
support freebsd's fib feature
cnbatch May 7, 2024
c97fb48
Update src/openvpn/tun.c
cnbatch May 8, 2024
48c9778
indentation fix
cnbatch May 8, 2024
12a26ac
indentation fix
cnbatch May 8, 2024
4b0bf5d
fixing #ifdef
cnbatch May 8, 2024
65dd617
sorry, it was a typo
cnbatch May 8, 2024
fc485b8
another patch for indentation fix
cnbatch May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 92 additions & 3 deletions src/openvpn/tun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@

#include <string.h>

#ifdef TARGET_FREEBSD
#include <sys/types.h>
#include <sys/sysctl.h>
#endif

#ifdef _WIN32

const static GUID GUID_DEVCLASS_NET = { 0x4d36e972L, 0xe325, 0x11ce, { 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 } };
Expand Down Expand Up @@ -1169,15 +1174,50 @@ do_ifconfig_ipv6(struct tuntap *tt, const char *ifname, int tun_mtu,
openvpn_execve_check(&argv, es, 0, "Solaris ifconfig IPv6 mtu failed");
}
#elif defined(TARGET_OPENBSD) || defined(TARGET_NETBSD) \
|| defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) \
|| defined(TARGET_DRAGONFLY)
|| defined(TARGET_DARWIN) || defined(TARGET_DRAGONFLY)
argv_printf(&argv, "%s %s inet6 %s/%d mtu %d up", IFCONFIG_PATH, ifname,
ifconfig_ipv6_local, tt->netbits_ipv6, tun_mtu);
argv_msg(M_INFO, &argv);

openvpn_execve_check(&argv, es, S_FATAL,
"generic BSD ifconfig inet6 failed");

#if defined(TARGET_OPENBSD) || defined(TARGET_NETBSD) \
cnbatch marked this conversation as resolved.
Show resolved Hide resolved
|| defined(TARGET_DARWIN)
/* and, hooray, we explicitly need to add a route... */
add_route_connected_v6_net(tt, es);
#endif

#elif defined(TARGET_FREEBSD)
cnbatch marked this conversation as resolved.
Show resolved Hide resolved
/* read current fib number, codes are from: */
/* https://github.com/freebsd/freebsd-src/blob/f9716eee8ab45ad906d9b5c5233ca20c10226ca7/sbin/route/route.c#L269 */
int numfibs = 0, defaultfib = 0;
size_t len = sizeof(numfibs);
cnbatch marked this conversation as resolved.
Show resolved Hide resolved
if (sysctlbyname("net.fibs", (void *)&numfibs, &len, NULL, 0) == -1)
numfibs = -1;

len = sizeof(defaultfib);
if (numfibs != -1 &&
sysctlbyname("net.my_fibnum", (void *)&defaultfib, &len, NULL,
0) == -1)
defaultfib = -1;

if (defaultfib <= 0)
{
argv_printf(&argv, "%s %s inet6 %s/%d mtu %d up", IFCONFIG_PATH, ifname,
ifconfig_ipv6_local, tt->netbits_ipv6, tun_mtu);
}
else
{
argv_printf(&argv, "%s %s inet6 %s/%d mtu %d up fib %d", IFCONFIG_PATH, ifname,
ifconfig_ipv6_local, tt->netbits_ipv6, tun_mtu, defaultfib);
}

argv_msg(M_INFO, &argv);

openvpn_execve_check(&argv, es, S_FATAL,
"FreeBSD ifconfig inet6 failed");

#if defined(TARGET_FREEBSD) && __FreeBSD_version >= 1200000 \
&& __FreeBSD_version < 1300000
/* On FreeBSD 12.0-12.4, there is ipv6_activate_all_interfaces="YES"
Expand Down Expand Up @@ -1557,7 +1597,7 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu,
add_route(&r, tt, 0, NULL, es, NULL);
}

#elif defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)
#elif defined(TARGET_DRAGONFLY)

/* example: ifconfig tun2 10.2.0.2 10.2.0.1 mtu 1450 netmask 255.255.255.255 up */
if (tun) /* point-to-point tun */
Expand All @@ -1573,6 +1613,55 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu,
ifname, ifconfig_local, netbits, tun_mtu );
}

argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, es, S_FATAL, "DragonflyBSD ifconfig failed");

#elif defined(TARGET_FREEBSD)

/* read current fib number, codes are from: */
/* https://github.com/freebsd/freebsd-src/blob/f9716eee8ab45ad906d9b5c5233ca20c10226ca7/sbin/route/route.c#L269 */
int numfibs = 0, defaultfib = 0;
size_t len = sizeof(numfibs);
cnbatch marked this conversation as resolved.
Show resolved Hide resolved
if (sysctlbyname("net.fibs", (void *)&numfibs, &len, NULL, 0) == -1)
numfibs = -1;

len = sizeof(defaultfib);
if (numfibs != -1 &&
sysctlbyname("net.my_fibnum", (void *)&defaultfib, &len, NULL,
0) == -1)
defaultfib = -1;

/* example: ifconfig tun2 10.2.0.2 10.2.0.1 mtu 1450 netmask 255.255.255.255 up */
if (tun) /* point-to-point tun */
{
if (defaultfib <= 0)
{
argv_printf(&argv, "%s %s %s %s mtu %d netmask 255.255.255.255 up",
IFCONFIG_PATH, ifname, ifconfig_local,
ifconfig_remote_netmask, tun_mtu);
}
else
{
argv_printf(&argv, "%s %s %s %s mtu %d netmask 255.255.255.255 up fib %d",
IFCONFIG_PATH, ifname, ifconfig_local,
ifconfig_remote_netmask, tun_mtu, defaultfib);
}
}
else /* tun with topology subnet and tap mode (always subnet) */
{
int netbits = netmask_to_netbits2(tt->remote_netmask);
if (defaultfib <= 0)
{
argv_printf(&argv, "%s %s %s/%d mtu %d up", IFCONFIG_PATH,
ifname, ifconfig_local, netbits, tun_mtu );
}
else
{
argv_printf(&argv, "%s %s %s/%d mtu %d up fib %d", IFCONFIG_PATH,
ifname, ifconfig_local, netbits, tun_mtu, defaultfib);
}
}

argv_msg(M_INFO, &argv);
openvpn_execve_check(&argv, es, S_FATAL, "FreeBSD ifconfig failed");

Expand Down