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

remove extra #endif

Browse Source
This commit is contained in:
darrenr 1997-05-26 17:57:21 +00:00
parent b3b931acf8
commit ea9bbec5f5
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/netinet/ip_fil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_fil.c,v 1.14 1997/05/25 12:40:13 darrenr Exp $ */ /* $NetBSD: ip_fil.c,v 1.15 1997/05/26 17:57:21 darrenr Exp $ */
/* /*
* (C)opyright 1993-1997 by Darren Reed. * (C)opyright 1993-1997 by Darren Reed.
@ -9,7 +9,7 @@
*/ */
#if !defined(lint) && defined(LIBC_SCCS) #if !defined(lint) && defined(LIBC_SCCS)
static char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed"; static char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed";
static char rcsid[] = "$Id: ip_fil.c,v 1.14 1997/05/25 12:40:13 darrenr Exp $"; static char rcsid[] = "$Id: ip_fil.c,v 1.15 1997/05/26 17:57:21 darrenr Exp $";
#endif #endif
#ifndef SOLARIS #ifndef SOLARIS
@ -589,7 +589,7 @@ caddr_t data;
* routines below for saving IP headers to buffer * routines below for saving IP headers to buffer
*/ */
int iplopen(dev, flags int iplopen(dev, flags
#if ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || (NetBSD >= 199511) || \ # if ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || (NetBSD >= 199511) || \
(__FreeBSD_version >= 220000)) && defined(_KERNEL) (__FreeBSD_version >= 220000)) && defined(_KERNEL)
, devtype, p) , devtype, p)
int devtype; int devtype;
@ -611,7 +611,7 @@ int flags;
int iplclose(dev, flags int iplclose(dev, flags
#if ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || (NetBSD >= 199511) || \ # if ((_BSDI_VERSION >= 199510) || (BSD >= 199506) || (NetBSD >= 199511) || \
(__FreeBSD_version >= 220000)) && defined(_KERNEL) (__FreeBSD_version >= 220000)) && defined(_KERNEL)
, devtype, p) , devtype, p)
int devtype; int devtype;
@ -784,9 +784,9 @@ struct tcpiphdr *ti;
struct tcphdr *tcp; struct tcphdr *tcp;
struct mbuf *m; struct mbuf *m;
int tlen = 0; int tlen = 0;
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000) # if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
struct route ro; struct route ro;
#endif # endif
if (ti->ti_flags & TH_RST) if (ti->ti_flags & TH_RST)
return -1; /* feedback loop */ return -1; /* feedback loop */
@ -798,8 +798,6 @@ struct tcpiphdr *ti;
# endif # endif
if (m == NULL) if (m == NULL)
return -1; return -1;
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
#endif
if (ti->ti_flags & TH_SYN) if (ti->ti_flags & TH_SYN)
tlen = 1; tlen = 1;
@ -833,17 +831,17 @@ struct tcpiphdr *ti;
ip->ip_ttl = ip_defttl; ip->ip_ttl = ip_defttl;
# endif # endif
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000) # if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
bzero((char *)&ro, sizeof(ro)); bzero((char *)&ro, sizeof(ro));
(void) ip_output(m, (struct mbuf *)0, &ro, 0, 0); (void) ip_output(m, (struct mbuf *)0, &ro, 0, 0);
if (ro.ro_rt) if (ro.ro_rt)
RTFREE(ro.ro_rt); RTFREE(ro.ro_rt);
#else # else
/* /*
* extra 0 in case of multicast * extra 0 in case of multicast
*/ */
(void) ip_output(m, (struct mbuf *)0, 0, 0, 0); (void) ip_output(m, (struct mbuf *)0, 0, 0, 0);
#endif # endif
return 0; return 0;
} }
@ -863,7 +861,6 @@ iplinit()
(void) ipfilterattach(); (void) ipfilterattach();
ip_init(); ip_init();
} }
# endif
# endif /* ! __NetBSD__ */ # endif /* ! __NetBSD__ */