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

Divert: use PF_DIVERT socket on FreeBSD 14 and beyond #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Divert: use PF_DIVERT socket on FreeBSD 14 and beyond #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ AC_ARG_ENABLE(divert-module,
AS_HELP_STRING([--disable-divert-module],[do not build the bundled Divert module]),
[enable_divert_module="$enableval"], [enable_divert_module="$DEFAULT_ENABLE"])
if test "$enable_divert_module" = yes; then
AC_CHECK_DECLS([IPPROTO_DIVERT], [], [enable_divert_module=no], [[#include <netinet/in.h>]])
AC_CHECK_DECLS([PF_DIVERT], [],
AC_CHECK_DECLS([IPPROTO_DIVERT], [], [enable_divert_module=no],
[[#include <netinet/in.h>]]),
[[#include <sys/socket.h>]])
fi
AM_CONDITIONAL([BUILD_DIVERT_MODULE], [test "$enable_divert_module" = yes])
AM_COND_IF([BUILD_DIVERT_MODULE], [AC_CONFIG_FILES([modules/divert/libdaq_static_divert.pc])])
Expand Down
4 changes: 4 additions & 0 deletions modules/divert/daq_divert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ static int divert_daq_instantiate(const DAQ_ModuleConfig_h modcfg, DAQ_ModuleIns
dc->passive = (daq_base_api.config_get_mode(modcfg) == DAQ_MODE_PASSIVE);

/* Open the divert socket. Traffic will not start going to it until we bind it in start(). */
#ifdef PF_DIVERT
if ((dc->sock = socket(PF_DIVERT, SOCK_RAW, 0)) == -1)
#else
if ((dc->sock = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT)) == -1)
#endif
{
SET_ERROR(modinst, "%s: Couldn't open the DIVERT socket: %s", __func__, strerror(errno));
divert_daq_destroy(dc);
Expand Down