svn commit: r348850 - stable/11/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Mon Jun 10 12:40:38 2019
New Revision: 348850
URL: https://svnweb.freebsd.org/changeset/base/348850

Log:
  MFC r348575:
  
  Properly define the fourth argument to ipf_check, the main entry point
  into ipfilter. A proper definition simplifies dtrace scripts a little.
  
  Approved by:	re (delphij@)

Modified:
  stable/11/sys/contrib/ipfilter/netinet/fil.c
  stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/fil.c	Mon Jun 10 09:03:08 2019	(r348849)
+++ stable/11/sys/contrib/ipfilter/netinet/fil.c	Mon Jun 10 12:40:38 2019	(r348850)
@@ -2810,7 +2810,7 @@ ipf_check(ctx, ip, hlen, ifp, out
 	mb_t **mp;
 	ip_t *ip;
 	int hlen;
-	void *ifp;
+	struct ifnet *ifp;
 	int out;
 	void *ctx;
 {

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil.h
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_fil.h	Mon Jun 10 09:03:08 2019	(r348849)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_fil.h	Mon Jun 10 12:40:38 2019	(r348850)
@@ -1655,7 +1655,7 @@ typedef struct ipf_main_softc_s {
 			} while (0)
 
 #ifndef	_KERNEL
-extern	int	ipf_check __P((void *, struct ip *, int, void *, int, mb_t **));
+extern	int	ipf_check __P((void *, struct ip *, int, struct ifnet *, int, mb_t **));
 extern	struct	ifnet *get_unit __P((char *, int));
 extern	char	*get_ifname __P((struct ifnet *));
 extern	int	ipfioctl __P((ipf_main_softc_t *, int, ioctlcmd_t,
@@ -1672,7 +1672,7 @@ extern	int	ipl_enable __P((void));
 extern	int	ipl_disable __P((void));
 # ifdef MENTAT
 /* XXX MENTAT is always defined for Solaris */
-extern	int	ipf_check __P((void *, struct ip *, int, void *, int, void *,
+extern	int	ipf_check __P((void *, struct ip *, int, struct ifnet *, int, void *,
 			       mblk_t **));
 #  if SOLARIS
 extern	void	ipf_prependmbt(fr_info_t *, mblk_t *);
@@ -1681,7 +1681,7 @@ extern	int	ipfioctl __P((dev_t, int, intptr_t, int, cr
 extern	int	ipf_qout __P((queue_t *, mblk_t *));
 # else /* MENTAT */
 /* XXX MENTAT is never defined for FreeBSD & NetBSD */
-extern	int	ipf_check __P((void *, struct ip *, int, void *, int, mb_t **));
+extern	int	ipf_check __P((void *, struct ip *, int, struct ifnet *, int, mb_t **));
 extern	int	(*fr_checkp) __P((ip_t *, int, void *, int, mb_t **));
 extern	size_t	mbufchainlen __P((mb_t *));
 #   ifdef	IPFILTER_LKM