diff options
| author | Darren Reed <Darren.Reed@Sun.COM> | 2008-09-08 14:46:50 -0700 |
|---|---|---|
| committer | Darren Reed <Darren.Reed@Sun.COM> | 2008-09-08 14:46:50 -0700 |
| commit | 7ddc9b1afd18f260b9fb78ec7732facd91769131 (patch) | |
| tree | 1a305ae7471e9362c1ba0ea3d32834448059eb00 /usr/src/cmd/ipf | |
| parent | 7739299d04f7910358ca2ad79106f174022a9ab2 (diff) | |
| download | illumos-joyent-7ddc9b1afd18f260b9fb78ec7732facd91769131.tar.gz | |
PSARC/2008/219 Committed API for packet interception
PSARC/2008/335 Corrections for Committed API for packet interception
PSARC/2008/557 Revision to net instance notification API
4844507 Solaris needs stable interface for packet filtering software
6705155 ipf_stack_init() assumes kmem_alloc with KM_NOSLEEP never fails
Diffstat (limited to 'usr/src/cmd/ipf')
| -rw-r--r-- | usr/src/cmd/ipf/tools/ip_fil.c | 7 | ||||
| -rw-r--r-- | usr/src/cmd/ipf/tools/ipftest.c | 18 |
2 files changed, 3 insertions, 22 deletions
diff --git a/usr/src/cmd/ipf/tools/ip_fil.c b/usr/src/cmd/ipf/tools/ip_fil.c index 29d69a8b07..a9824140d8 100644 --- a/usr/src/cmd/ipf/tools/ip_fil.c +++ b/usr/src/cmd/ipf/tools/ip_fil.c @@ -7,8 +7,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.9 2005/01/08 14:22:18 darrenr Exp $"; @@ -175,9 +173,8 @@ static int write_output __P((struct ifnet *, struct mbuf *, #endif -int iplattach(ifs, ns) +int iplattach(ifs) ipf_stack_t *ifs; -netstack_t *ns; { ifs->ifs_fr_running = 1; return 0; @@ -311,7 +308,7 @@ int mode; if (error) break; if (tmp) - error = iplattach(ifs, NULL); + error = iplattach(ifs); else error = ipldetach(ifs); } diff --git a/usr/src/cmd/ipf/tools/ipftest.c b/usr/src/cmd/ipf/tools/ipftest.c index 4463e132de..04e1322acf 100644 --- a/usr/src/cmd/ipf/tools/ipftest.c +++ b/usr/src/cmd/ipf/tools/ipftest.c @@ -3,12 +3,10 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "ipf.h" #include "ipt.h" #include <sys/ioctl.h> @@ -40,7 +38,6 @@ void drain_log __P((char *, ipf_stack_t *ifs)); void fixv4sums __P((mb_t *, ip_t *)); ipf_stack_t *get_ifs __P((void)); ipf_stack_t *create_ifs __P((void)); -netstack_t *create_ns __P((void)); #if defined(__NetBSD__) || defined(__OpenBSD__) || SOLARIS || \ @@ -84,7 +81,6 @@ char *argv[]; mb_t mb, *m; ip_t *ip; ipf_stack_t *ifs; - netstack_t *ns; m = &mb; dir = 0; @@ -99,8 +95,6 @@ char *argv[]; initparse(); ifs = create_ifs(); - ns = create_ns(); - ifs->ifs_netstack = ns; #if defined(IPFILTER_DEFAULT_BLOCK) ifs->ifs_fr_pass = FR_BLOCK|FR_NOMATCH; @@ -829,13 +823,3 @@ get_ifs() { return (gifs); } - -netstack_t * -create_ns() -{ - netstack_t *ns; - - KMALLOCS(ns, netstack_t *, sizeof (*ns)); - bzero(ns, sizeof (*ns)); - return (ns); -} |