head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.134
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.132
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.130
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.128
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.126
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.124
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.122
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.120
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.118
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.116
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.114
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.112
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.110
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.108
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.106
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.104
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.102
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.100
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.98
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.96
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.94
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.92
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.90
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.86
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.66
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.88
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.84
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.82
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.80
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.78
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.76
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.74
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.72
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.70
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.68
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.64
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.62
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.60
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.58
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.56
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.54
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.52
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.50
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.48
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.46
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.44
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.42
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.40
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.38
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.36
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.34
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.32
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.30
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.28
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.26
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.24
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.22
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.20
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.18
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.16
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.14
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.12
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.10
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.8
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.6
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2009.09.07.04.08.54;	author dsainty;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Linux doesn't support direction-specific filters.  Conform to the new
set_filters() interface introduced by Pkgsrc, but generate errors if
the outbound filters are defined.

Compile tested only (but it does at least compile!), on Linux with
/usr/include/pcap-bpf.h.  No functional change on systems that previously
successfully built.
@
text
@$NetBSD$

Linux doesn't support direction-specific filters.  Conform to the new
set_filters() interface, but generate errors if the outbound filters are
defined.

--- pppd/sys-linux.c.orig	2009-09-07 15:42:24.000000000 +1200
+++ pppd/sys-linux.c	2009-09-07 15:50:01.000000000 +1200
@@@@ -1293,23 +1293,38 @@@@
 /*
  * set_filters - set the active and pass filters in the kernel driver.
  */
-int set_filters(struct bpf_program *pass, struct bpf_program *active)
+int set_filters(struct bpf_program *pass_in, struct bpf_program *pass_out,
+                struct bpf_program *active_in, struct bpf_program *active_out)
 {
 	struct sock_fprog fp;
 
-	fp.len = pass->bf_len;
-	fp.filter = (struct sock_filter *) pass->bf_insns;
-	if (ioctl(ppp_dev_fd, PPPIOCSPASS, &fp) < 0) {
-		if (errno == ENOTTY)
-			warn("kernel does not support PPP filtering");
-		else
-			error("Couldn't set pass-filter in kernel: %m");
+	if (pass_in->bf_len > 0) {
+		fp.len = pass_in->bf_len;
+		fp.filter = (struct sock_filter *) pass_in->bf_insns;
+		if (ioctl(ppp_dev_fd, PPPIOCSPASS, &fp) < 0) {
+			if (errno == ENOTTY)
+				warn("kernel does not support PPP filtering");
+			else
+				error("Couldn't set pass-filter in kernel: %m");
+			return 0;
+		}
+	}
+	if (pass_out->bf_len > 0) {
+		error("Linux doesn't support pass-filter-out, "
+			"use pass-filter-in for both directions.");
 		return 0;
 	}
-	fp.len = active->bf_len;
-	fp.filter = (struct sock_filter *) active->bf_insns;
-	if (ioctl(ppp_dev_fd, PPPIOCSACTIVE, &fp) < 0) {
-		error("Couldn't set active-filter in kernel: %m");
+	if (active_in->bf_len > 0) {
+		fp.len = active_in->bf_len;
+		fp.filter = (struct sock_filter *) active_in->bf_insns;
+		if (ioctl(ppp_dev_fd, PPPIOCSACTIVE, &fp) < 0) {
+			error("Couldn't set active-filter in kernel: %m");
+			return 0;
+		}
+	}
+	if (active_out->bf_len > 0) {
+		error("Linux doesn't support active-filter-out, "
+			"use active-filter-in for both directions.");
 		return 0;
 	}
 	return 1;
@