diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-09-30 14:06:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-09-30 14:06:39 +0000 |
| commit | 7b075ce766ba84de42886094639a0e8a33fe6131 (patch) | |
| tree | 87a751d661718ec38c2582860526a74573d2e390 | |
| parent | 1ceabeb9762f496e07afac820a51bab62f0206b7 (diff) | |
handle openbsd cases
| -rw-r--r-- | sys/netinet/ip_fil.c | 7 | ||||
| -rw-r--r-- | sys/netinet/ip_fil.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c index 14379a2c868..3296d114a42 100644 --- a/sys/netinet/ip_fil.c +++ b/sys/netinet/ip_fil.c @@ -7,7 +7,7 @@ */ #ifndef lint 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.4 1996/07/18 05:00:58 dm Exp $"; +static char rcsid[] = "$Id: ip_fil.c,v 1.5 1996/09/30 14:06:37 deraadt Exp $"; #endif #ifndef linux @@ -623,7 +623,8 @@ struct mbuf *m; iplci.hlen = (u_char)hlen; iplci.plen = (flags & FR_LOGBODY) ? (u_char)mlen : 0 ; iplci.rule = fin->fin_rule; -# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) +# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ + (defined(OpenBSD) && (OpenBSD >= 199606)) strcpy(iplci.ifname, ifp->if_xname); # else iplci.unit = (u_char)ifp->if_unit; @@ -783,7 +784,7 @@ frdest_t *fdp; dst = (struct sockaddr_in *)&ro->ro_dst; dst->sin_family = AF_INET; dst->sin_addr = fdp->fd_ip.s_addr ? fdp->fd_ip : ip->ip_dst; -#if BSD >= 199306 && !(defined(__NetBSD__)) +#if BSD >= 199306 && !(defined(__NetBSD__) || defined(__OpenBSD__)) # ifdef RTF_CLONING rtalloc_ign(ro, RTF_CLONING); # else diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h index 29b5a1df2aa..c6a99edb2a0 100644 --- a/sys/netinet/ip_fil.h +++ b/sys/netinet/ip_fil.h @@ -6,7 +6,7 @@ * to the original author and the contributors. * * @(#)ip_fil.h 1.35 6/5/96 - * $Id: ip_fil.h,v 1.4 1996/07/18 05:00:59 dm Exp $ + * $Id: ip_fil.h,v 1.5 1996/09/30 14:06:38 deraadt Exp $ */ #ifndef __IP_FIL_H__ @@ -259,7 +259,8 @@ typedef struct ipl_ci { u_char plen; u_short rule; u_long flags:24; /* XXX FIXME do we care about the extra bytes? */ -#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) +#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ + (defined(OpenBSD) && (OpenBSD >= 199606)) u_long filler:8; /* XXX FIXME do we care? */ u_char ifname[IFNAMSIZ]; #else |