diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2019-06-03 19:37:14 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2019-06-03 19:37:14 +0000 |
| commit | de982ef60d84e1287ec3c2e8bd81b3c067abd2b0 (patch) | |
| tree | 4ea293732470c54440b862c90d9a1277211ab922 /sys/contrib/ipfilter/netinet | |
| parent | c9719c9a6d431e78a09d166dcf48a04934804b78 (diff) | |
| download | src-de982ef60d84e1287ec3c2e8bd81b3c067abd2b0.tar.gz src-de982ef60d84e1287ec3c2e8bd81b3c067abd2b0.zip | |
Properly define the fourth argument to ipf_check, the main entry point
into ipfilter. A proper definition simplifies dtrace scripts a little.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=348575
Diffstat (limited to 'sys/contrib/ipfilter/netinet')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/fil.c | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 5978773492b0..07256aed9d89 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -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; { diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h index daaaa6a0776f..45f2118e1ddc 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.h +++ b/sys/contrib/ipfilter/netinet/ip_fil.h @@ -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, cred_t *, int *)); 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 |