Skip to content

Commit

Permalink
net/libdnet: Use libpfctl
Browse files Browse the repository at this point in the history
Several old ioctl commands have been removed in 15/main, which broke
compilation for this port. Rely on libpfctl instead.

There are some breaking pf API changes in 14 which involves regarding
the ioctl syscalls. This port is an old outdated port which explicitly
used those older syscalls. This port also is dependency of net/scapy
which is run in our CI for testing. So fix it with blanket approval.

For more information see:
https://lists.freebsd.org/archives/freebsd-pf/2023-April/000345.html

PR:		273899
Approved by:	portmgr (just-fix-it)
Sponsored by:   Rubicon Communications, LLC ("Netgate")
  • Loading branch information
kprovost authored and 5u623l20 committed Sep 19, 2023
1 parent f13d625 commit a36ac4e
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 2 deletions.
8 changes: 6 additions & 2 deletions net/libdnet/Makefile
@@ -1,7 +1,7 @@
PORTNAME= libdnet
PORTVERSION= 1.13
DISTVERSIONPREFIX= v
PORTREVISION?= 3
PORTREVISION?= 4
CATEGORIES?= net

MAINTAINER?= onatan@gmail.com
Expand All @@ -11,7 +11,11 @@ WWW= https://github.com/5u623l20/libdnet/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE

USES?= autoreconf libtool
LIB_DEPENDS= libpfctl.so:net/libpfctl

USES?= autoreconf libtool localbase

LDFLAGS+= -lpfctl

USE_GITHUB= yes
GH_ACCOUNT= 5u623l20
Expand Down
83 changes: 83 additions & 0 deletions net/libdnet/files/patch-src_fw-pf.c
@@ -0,0 +1,83 @@
--- src/fw-pf.c.orig 2019-03-19 17:55:02 UTC
+++ src/fw-pf.c
@@ -15,6 +15,7 @@
#include <net/if.h>
#include <netinet/in.h>
#include <net/pfvar.h>
+#include <libpfctl.h>

#include <assert.h>
#include <errno.h>
@@ -115,7 +116,7 @@ static int
}

static int
-pr_to_fr(const struct pf_rule *pr, struct fw_rule *fr)
+pr_to_fr(const struct pfctl_rule *pr, struct fw_rule *fr)
{
memset(fr, 0, sizeof(*fr));

@@ -205,12 +206,14 @@ fw_add(fw_t *fw, const struct fw_rule *rule)
#ifdef HAVE_PF_CHANGE_GET_TICKET
{
struct fw_rule fr;
+ struct pfctl_rule pfrule;

if (ioctl(fw->fd, DIOCGETRULES, &pcr) < 0)
return (-1);
while ((int)--pcr.nr >= 0) {
- if (ioctl(fw->fd, DIOCGETRULE, &pcr) == 0 &&
- pr_to_fr(&pcr.rule, &fr) == 0) {
+ if (pfctl_get_rule(fw->fd, pcr.nr, pcr.ticket, pcr.anchor,
+ pcr.action, &pfrule, pcr.anchor_call) == 0 &&
+ pr_to_fr(&pfrule, &fr) == 0) {
if (_fw_cmp(rule, &fr) == 0) {
errno = EEXIST;
return (-1);
@@ -244,13 +247,15 @@ fw_delete(fw_t *fw, const struct fw_rule *rule)
#ifdef HAVE_PF_CHANGE_GET_TICKET
{
struct fw_rule fr;
+ struct pfctl_rule pfrule;
int found = 0;

if (ioctl(fw->fd, DIOCGETRULES, &pcr) < 0)
return (-1);
while ((int)--pcr.nr >= 0) {
- if (ioctl(fw->fd, DIOCGETRULE, &pcr) == 0 &&
- pr_to_fr(&pcr.rule, &fr) == 0) {
+ if (pfctl_get_rule(fw->fd, pcr.nr, pcr.ticket, pcr.anchor,
+ pcr.action, &pfrule, pcr.anchor_call) == 0 &&
+ pr_to_fr(&pfrule, &fr) == 0) {
if (_fw_cmp(rule, &fr) == 0) {
found = 1;
break;
@@ -282,6 +287,7 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg)
fw_loop(fw_t *fw, fw_handler callback, void *arg)
{
struct pfioc_rule pr;
+ struct pfctl_rule pfrule;
struct fw_rule fr;
uint32_t n, max;
int ret = 0;
@@ -292,8 +298,9 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg)

for (n = 0, max = pr.nr; n < max; n++) {
pr.nr = n;
-
- if ((ret = ioctl(fw->fd, DIOCGETRULE, &pr)) < 0)
+
+ if ((ret = pfctl_get_rule(fw->fd, pr.nr, pr.ticket, pr.anchor,
+ pr.action, &pfrule, pr.anchor_call)) < 0)
break;
#ifdef PF_TABLE_NAME_SIZE
/* XXX - actually in r1.125, not 1.126 */
@@ -301,7 +308,7 @@ fw_loop(fw_t *fw, fw_handler callback, void *arg)
pr.rule.dst.addr.type == PF_ADDR_TABLE)
continue;
#endif
- if (pr_to_fr(&pr.rule, &fr) < 0)
+ if (pr_to_fr(&pfrule, &fr) < 0)
continue;
if ((ret = callback(&fr, arg)) != 0)
break;

0 comments on commit a36ac4e

Please sign in to comment.