Skip to content

Commit

Permalink
Remove reference to the pfctlinput2() from domain(9) after 237c1f9.
Browse files Browse the repository at this point in the history
Reviewed by:		glebius
Differential Revision:	https://reviews.freebsd.org/D29751

(cherry picked from commit 8688785)
  • Loading branch information
lemul committed Apr 20, 2021
1 parent b24f2d6 commit 14fffd4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 27 deletions.
3 changes: 3 additions & 0 deletions ObsoleteFiles.inc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
# xargs -n1 | sort | uniq -d;
# done

# 20210413: Remove pfctlinput2
OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz

# 20210329: Remove kernel-only crypto headers from /usr/include
OLD_FILES+=usr/include/crypto/_cryptodev.h
OLD_FILES+=usr/include/crypto/cbc_mac.h
Expand Down
1 change: 0 additions & 1 deletion share/man/man9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,6 @@ MLINKS+=dnv.9 dnvlist.9 \
MLINKS+=domain.9 DOMAIN_SET.9 \
domain.9 domain_add.9 \
domain.9 pfctlinput.9 \
domain.9 pfctlinput2.9 \
domain.9 pffinddomain.9 \
domain.9 pffindproto.9 \
domain.9 pffindtype.9
Expand Down
27 changes: 1 addition & 26 deletions share/man/man9/domain.9
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
.\"
.\" $FreeBSD$
.\"
.Dd April 29, 2020
.Dd April 13, 2021
.Dt DOMAIN 9
.Os
.Sh NAME
.Nm domain_add ,
.Nm pfctlinput ,
.Nm pfctlinput2 ,
.Nm pffinddomain ,
.Nm pffindproto ,
.Nm pffindtype ,
Expand All @@ -47,8 +46,6 @@
.Fn domain_add "void *data"
.Ft void
.Fn pfctlinput "int cmd" "struct sockaddr *sa"
.Ft void
.Fn pfctlinput2 "int cmd" "struct sockaddr *sa" "void *ctlparam"
.Ft struct domain *
.Fn pffinddomain "int family"
.Ft struct protosw *
Expand Down Expand Up @@ -130,27 +127,6 @@ calls the protocol specific
.Fn pr_ctlinput
function for each protocol in that has defined one, in every domain.
.Pp
.Fn pfctlinput2
provides that same functionality of
.Fn pfctlinput ,
but with a few additional checks and a new
.Vt "void *"
argument that is passed directly to the protocol's
.Fn pr_ctlinput
function.
Unlike
.Fn pfctlinput ,
.Fn pfctlinput2
verifies that
.Fa sa
is not
.Dv NULL ,
and that only the protocol families that are the same as
.Fa sa
have their
.Fn pr_ctlinput
function called.
.Pp
.Fn domain_add
adds a new protocol domain to the system.
The argument
Expand Down Expand Up @@ -240,7 +216,6 @@ types if the domain has a default raw protocol.
The functions
.Fn domain_add ,
.Fn pfctlinput ,
.Fn pfctlinput2 ,
.Fn pffinddomain ,
.Fn pffindproto ,
.Fn pffindtype
Expand Down

0 comments on commit 14fffd4

Please sign in to comment.