Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/iplattach/ipfattach/ and s/ipldetach/ipfdetach/

Browse Source
This commit is contained in:
martti 2007-06-04 12:38:58 +00:00
parent 8d9552c610
commit fff7fd04df
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/ipf/ip_fil.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_fil.c,v 1.12 2007/05/15 22:52:20 martin Exp $ */
/* $NetBSD: ip_fil.c,v 1.13 2007/06/04 12:38:58 martti Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
@ -177,14 +177,14 @@ static int write_output __P((struct ifnet *, struct mbuf *,
#endif
int iplattach()
int ipfattach()
{
fr_running = 1;
return 0;
}
int ipldetach()
int ipfdetach()
{
fr_running = -1;
return 0;

10
dist/ipf/ml_ipl.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ml_ipl.c,v 1.4 2004/03/28 09:00:54 martti Exp $ */
/* $NetBSD: ml_ipl.c,v 1.5 2007/06/04 12:38:58 martti Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
@ -31,7 +31,7 @@
#define IPL_NAME "/dev/ipl"
#endif
extern int iplattach(), iplopen(), iplclose(), iplioctl(), iplread();
extern int ipfattach(), iplopen(), iplclose(), iplioctl(), iplread();
extern int nulldev(), iplidentify(), errno;
struct cdevsw ipldevsw =
@ -46,7 +46,7 @@ struct dev_ops ipl_ops =
{
1,
iplidentify,
iplattach,
ipfattach,
iplopen,
iplclose,
iplread,
@ -140,7 +140,7 @@ static unload(vdp, vdi)
int i;
(void) vn_remove(IPL_NAME, UIO_SYSSPACE, FILE);
return ipldetach();
return ipfdetach();
}
@ -160,5 +160,5 @@ struct vdioctl_load *vdi;
error = vn_create(IPL_NAME, UIO_SYSSPACE, &vattr, EXCL, 0, &vp);
if (error == 0)
VN_RELE(vp);
return iplattach(0);
return ipfattach(0);
}

10
sys/dist/ipf/netinet/fil.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: fil.c,v 1.35 2007/05/30 06:27:11 darrenr Exp $ */
/* $NetBSD: fil.c,v 1.36 2007/06/04 12:38:58 martti Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@ -154,7 +154,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.35 2007/05/30 06:27:11 darrenr Exp $");
__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.36 2007/06/04 12:38:58 martti Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 2.243.2.104 2007/05/11 13:41:51 darrenr Exp";
@ -6944,13 +6944,13 @@ void *ctx;
if (fr_running > 0)
error = 0;
else
error = iplattach();
error = ipfattach();
if (error == 0)
fr_running = 1;
else
(void) ipldetach();
(void) ipfdetach();
} else {
error = ipldetach();
error = ipfdetach();
if (error == 0)
fr_running = -1;
}

6
sys/dist/ipf/netinet/ip_fil.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_fil.h,v 1.11 2007/05/15 22:52:49 martin Exp $ */
/* $NetBSD: ip_fil.h,v 1.12 2007/06/04 12:38:58 martti Exp $ */
/*
* Copyright (C) 1993-2001, 2003 by Darren Reed.
@ -1410,8 +1410,8 @@ extern char *memstr __P((const char *, char *, size_t, size_t));
extern int count4bits __P((u_32_t));
extern int frrequest __P((int, ioctlcmd_t, void *, int, int));
extern char *getifname __P((struct ifnet *));
extern int iplattach __P((void));
extern int ipldetach __P((void));
extern int ipfattach __P((void));
extern int ipfdetach __P((void));
extern u_short ipf_cksum __P((u_short *, int));
extern int copyinptr __P((void *, void *, size_t));
extern int copyoutptr __P((void *, void *, size_t));

8
sys/dist/ipf/netinet/ip_fil_netbsd.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_fil_netbsd.c,v 1.36 2007/05/15 22:52:49 martin Exp $ */
/* $NetBSD: ip_fil_netbsd.c,v 1.37 2007/06/04 12:38:58 martti Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@ -282,14 +282,14 @@ void
ipfilterattach(int count)
{
# if 0
if (iplattach() != 0)
if (ipfattach() != 0)
printf("IP Filter failed to attach\n");
# endif
}
#endif
int iplattach()
int ipfattach()
{
int s;
#if defined(NETBSD_PF) && (__NetBSD_Version__ >= 104200000)
@ -419,7 +419,7 @@ pfil_error:
* Disable the filter by removing the hooks from the IP input/output
* stream.
*/
int ipldetach()
int ipfdetach()
{
int s;
#if defined(NETBSD_PF) && (__NetBSD_Version__ >= 104200000)

8
sys/lkm/netinet/if_ipl/mln_ipl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mln_ipl.c,v 1.38 2005/12/11 12:24:49 christos Exp $ */
/* $NetBSD: mln_ipl.c,v 1.39 2007/06/04 12:38:59 martti Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mln_ipl.c,v 1.38 2005/12/11 12:24:49 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: mln_ipl.c,v 1.39 2007/06/04 12:38:59 martti Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -81,7 +81,7 @@ if_ipl_lkmload(struct lkm_table *lkmtp, int cmd)
if (lkmexists(lkmtp))
return (EEXIST);
error = iplattach();
error = ipfattach();
if (error == 0) {
if (FR_ISPASS(fr_pass))
defpass = "pass";
@ -116,7 +116,7 @@ if_ipl_lkmunload(struct lkm_table *lkmtp, int cmd)
int error = 0;
if (fr_running > 0) {
error = ipldetach();
error = ipfdetach();
if (error == 0)
fr_running = -1;
}