Page MenuHomeFreeBSD
Differential D46591

pf: remove redundant checks
ClosedPublic
Actions

Authored by kp on Sep 7 2024, 9:36 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 9, 9:59 AM
Unknown Object (File)
Sat, Feb 22, 2:14 PM
Unknown Object (File)
Sat, Feb 22, 2:02 PM
Unknown Object (File)
Feb 20 2025, 12:17 PM
Unknown Object (File)
Feb 17 2025, 10:47 PM
Unknown Object (File)
Feb 9 2025, 3:54 AM
Unknown Object (File)
Jan 27 2025, 4:01 PM
Unknown Object (File)
Jan 27 2025, 3:28 PM
View All 68 Files
Subscribers
farrokhi
glebius
imp
melifaro
vegeta_tuxpowered.net
zlei

Details

Reviewers
zlei
Group Reviewers
network
pfsense
Commits
rG5130165be136: pf: remove redundant checks
Summary

pf_test() and pf_test6() drop IPv4-ICMP6 and IPv6-ICMP packets. Do
not do the same check in pf_test_rule() again.
ok henning

Obtained from: OpenBSD, bluhm <bluhm@openbsd.org>, de5c2bfb74
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
sys/
netpfil/
pf/
6 lines

Diff 143488

View Options

sys/netpfil/pf/pf.c

Show All 21 Lines
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd November 22, 2014 .Dd January 9, 2015
bruefferUnsubmitted
Not Done
Inline Actions

Leading 0 should be removed.

brueffer: Leading 0 should be removed.
.Dt AUTO_MASTER 5 .Dt AUTO_MASTER 5
.Os .Os
.Sh NAME .Sh NAME
.Nm auto_master .Nm auto_master
.Nd auto_master and map file format .Nd auto_master and map file format
.Sh DESCRIPTION .Sh DESCRIPTION
The automounter configuration consists of the The automounter configuration consists of the
.Nm .Nm
▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines
.Ar location .Ar location
field are replaced with the value of field are replaced with the value of
.Ar key . .Ar key .
This is typically used with wildcards, like: This is typically used with wildcards, like:
.Bd -literal -offset indent .Bd -literal -offset indent
.Li * 192.168.1.1:/share/& .Li * 192.168.1.1:/share/&
.Ed .Ed
.Pp .Pp
The
.Ar location
field may contain references to variables, like:
.Bd -literal -offset indent
.Li sys 192.168.1.1:/sys/${OSNAME}
.Ed
.Pp
Defined variables are:
.Pp
.Bl -tag -width "-OSNAME" -compact
bruefferUnsubmitted
Not Done
Inline Actions

The .Pp should be before .Bl

brueffer: The .Pp should be before .Bl
.It Li ARCH
Expands to the output of
wblockUnsubmitted
Not Done
Inline Actions

s/Expanded/Expands/
Also in the next variables.

wblock: s/Expanded/Expands/ Also in the next variables.
.Li "uname -p" .
bruefferUnsubmitted
Not Done
Inline Actions

This (and the ones below) should be marked up differently... With .Li perhaps? Either way, there needs to be a space between the terminating . and the preceeding stuff.

brueffer: This (and the ones below) should be marked up differently... With .Li perhaps? Either way…
.It Li CPU
Same as ARCH.
.It Li HOST
Expands to the output of
.Li "uname -n" .
.It Li OSNAME
Expands to the output of
.Li "uname -s" .
.It Li OSREL
Expands to the output of
.Li "uname -r" .
.It Li OSVERS
Expands to the output of
.Li "uname -v" .
.El
.Pp
Additional variables can be defined with the
wblockUnsubmitted
Not Done
Inline Actions

Additional variables can be defined with the

wblock: Additional variables can be defined with the
.Fl D
option of
wblockUnsubmitted
Not Done
Inline Actions

"to" is a little unclear there, whether it is being sent "to" that program or the option of that program. Probably this can just be "of".

wblock: "to" is a little unclear there, whether it is being sent "to" that program or the option of…
.Xr automount 8
and
.Xr automountd 8 .
.Pp
To pass a location that begins with To pass a location that begins with
.Li / , .Li / ,
prefix it with a colon. prefix it with a colon.
For example, For example,
.Li :/dev/cd0 . .Li :/dev/cd0 .
.Pp .Pp
This example, when put into This example, when put into
.Pa /etc/auto_example , .Pa /etc/auto_example ,
Show All 29 Lines
Supported special maps are: Supported special maps are:
.Pp .Pp
.Bl -tag -width "-hosts" -compact .Bl -tag -width "-hosts" -compact
.It Li -hosts .It Li -hosts
Query the remote NFS server and map exported shares. Query the remote NFS server and map exported shares.
This map is traditionally mounted on This map is traditionally mounted on
.Pa /net . .Pa /net .
Access to files on a remote NFS server is provided through the Access to files on a remote NFS server is provided through the
.Pa /net/nfs-server-ip/share-name/ .Pf /net/ Ar nfs-server-ip Ns / Ns Ar share-name Ns/
directory without any additional configuration. directory without any additional configuration.
Directories for individual NFS servers are not present until the first access,
wblockUnsubmitted
Not Done
Inline Actions

A little confusing.

Directories for individual NFS servers are not present until the first access, when they are automatically created.

wblock: A little confusing. Directories for individual NFS servers are not present until the first…
when they are automatically created.
.It Li -media .It Li -media
Query devices that are not yet mounted, but contain valid filesystems. Query devices that are not yet mounted, but contain valid filesystems.
Generally used to access files on removable media. Generally used to access files on removable media.
.It Li -null .It Li -null
Prevent Prevent
.Xr automountd 8 .Xr automountd 8
from mounting anything on the mountpoint. from mounting anything on the mountpoint.
.El .El
.Pp
It is possible to add custom special maps by adding them, as executable
maps named
wblockUnsubmitted
Not Done
Inline Actions

maps named
.Pa special_foo ,
to the

wblock: maps named .Pa special_foo , to the
.Pa special_foo ,
to the
.Pa /etc/autofs/
directory.
.Sh EXECUTABLE MAPS .Sh EXECUTABLE MAPS
If the map file specified in If the map file specified in
.Nm .Nm
has execute bit set, the has the execute bit set, the
wblockUnsubmitted
Not Done
Inline Actions

has the execute bit set,

wblock: has the execute bit set,
wblockUnsubmitted
Not Done
Inline Actions

The last "the" on this line should be removed:

has the execute bit set,

wblock: The last "the" on this line should be removed: has the execute bit set,
.Xr automountd 8 .Xr automountd 8
will execute it and parse the standard output instead of parsing will execute it and parse the standard output instead of parsing
the file contents. the file contents.
When called without command line arguments, the executable is
expected to output a list of available map keys separated by
wblockUnsubmitted
Not Done
Inline Actions

Comma is not needed.

wblock: Comma is not needed.
newline characters.
wblockUnsubmitted
Not Done
Inline Actions

newline characters.

wblock: newline characters.
Otherwise, the executable will be called with a key name as
a command line argument.
Output from the executable is expected to be the entry for that key,
wblockUnsubmitted
Not Done
Inline Actions

This is two sentences. The first is clear:

Otherwise, the executable will be called with a key name as
a command line argument.

The second is less clear. Maybe

Output from the executable is expected to be the entry for that key.

(Not sure about specifying leaving the key out, that seems reasonably clear, but an example might be good.)

wblock: This is two sentences. The first is clear: Otherwise, the executable will be called with a…
without the key itself.
wblockUnsubmitted
Not Done
Inline Actions

How about:

not including the key itself.

wblock: How about: not including the key itself.
.Sh INDIRECT VERSUS DIRECT MAPS .Sh INDIRECT VERSUS DIRECT MAPS
Indirect maps are referred to in Indirect maps are referred to in
.Nm .Nm
by entries with a fully qualified path as a mount point, and must contain only by entries with a fully qualified path as a mount point, and must contain only
relative paths as keys. relative paths as keys.
Direct maps are referred to in Direct maps are referred to in
.Nm .Nm
by entries with by entries with
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
It can be symlinked to It can be symlinked to
.Pa /etc/autofs/include . .Pa /etc/autofs/include .
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /etc/auto_master" -compact .Bl -tag -width ".Pa /etc/auto_master" -compact
.It Pa /etc/auto_master .It Pa /etc/auto_master
The default location of the The default location of the
.Pa auto_master .Pa auto_master
file. file.
.It Pa /etc/autofs/
Directory containing shell scripts to implement special maps and directory
service.
bruefferUnsubmitted
Not Done
Inline Actions

Should this be "services"? Could be more than LDAP in the future...

brueffer: Should this be "services"? Could be more than LDAP in the future...
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr autofs 5 , .Xr autofs 5 ,
.Xr automount 8 , .Xr automount 8 ,
.Xr automountd 8 , .Xr automountd 8 ,
.Xr autounmountd 8 .Xr autounmountd 8
.Sh AUTHORS .Sh AUTHORS
The The
.Nm .Nm
configuration file functionality was developed by configuration file functionality was developed by
.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
under sponsorship from the FreeBSD Foundation. under sponsorship from the FreeBSD Foundation.