D41647.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41647.diff
View Options

	diff --git a/contrib/pf/ftp-proxy/filter.c b/contrib/pf/ftp-proxy/filter.c
	--- a/contrib/pf/ftp-proxy/filter.c
	+++ b/contrib/pf/ftp-proxy/filter.c
	@@ -169,7 +169,7 @@
	void
	init_filter(const char opt_qname, const char opt_tagname, int opt_verbose)
	{
	- struct pf_status status;
	+ struct pfctl_status *status;

	qname = opt_qname;
	tagname = opt_tagname;
	@@ -182,10 +182,13 @@
	dev = open("/dev/pf", O_RDWR);
	if (dev == -1)
	err(1, "open /dev/pf");
	- if (ioctl(dev, DIOCGETSTATUS, &status) == -1)
	+ status = pfctl_get_status(dev);
	+ if (status == NULL)
	err(1, "DIOCGETSTATUS");
	- if (!status.running)
	+ if (!status->running)
	errx(1, "pf is disabled");
	+
	+ pfctl_free_status(status);
	}

	int
	diff --git a/contrib/pf/tftp-proxy/filter.c b/contrib/pf/tftp-proxy/filter.c
	--- a/contrib/pf/tftp-proxy/filter.c
	+++ b/contrib/pf/tftp-proxy/filter.c
	@@ -173,7 +173,7 @@
	void
	init_filter(char *opt_qname, int opt_verbose)
	{
	- struct pf_status status;
	+ struct pfctl_status *status;

	qname = opt_qname;

	@@ -187,14 +187,17 @@
	syslog(LOG_ERR, "can't open /dev/pf");
	exit(1);
	}
	- if (ioctl(dev, DIOCGETSTATUS, &status) == -1) {
	+ status = pfctl_get_status(dev);
	+ if (status == NULL) {
	syslog(LOG_ERR, "DIOCGETSTATUS");
	exit(1);
	}
	- if (!status.running) {
	+ if (!status->running) {
	syslog(LOG_ERR, "pf is disabled");
	exit(1);
	}
	+
	+ pfctl_free_status(status);
	}

	int