diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-06-07 22:00:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-06-07 22:00:35 +0000 |
| commit | 6f58780a6184cf619f657834b3e7ead2235ab291 (patch) | |
| tree | d11d3943c960dc4d1bae629371a1b3e5e7b2bab1 | |
| parent | d515a8e6303faf856b96d9c4aee87efbb7629ca0 (diff) | |
I do not believe this
| -rw-r--r-- | sys/netinet/ip_fil.c | 8 | ||||
| -rw-r--r-- | sys/netinet/ip_nat.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c index ed26ec6c7dc..ad7890d73b9 100644 --- a/sys/netinet/ip_fil.c +++ b/sys/netinet/ip_fil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_fil.c,v 1.23 1999/04/22 16:12:40 niklas Exp $ */ +/* $OpenBSD: ip_fil.c,v 1.24 1999/06/07 22:00:32 deraadt Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. * @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.23 1999/04/22 16:12:40 niklas Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.24 1999/06/07 22:00:32 deraadt Exp $"; #endif #ifndef SOLARIS @@ -1028,11 +1028,9 @@ frdest_t *fdp; * If small enough for interface, can just send directly. */ if (ip->ip_len <= ifp->if_mtu) { -# ifndef sparc ip->ip_id = htons(ip->ip_id); ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); -# endif if (!ip->ip_sum) ip->ip_sum = in_cksum(m, hlen); # if BSD >= 199306 @@ -1098,9 +1096,7 @@ frdest_t *fdp; error = ENOBUFS; /* ??? */ goto sendorfree; } -# ifndef sparc mhip->ip_off = htons((u_short)mhip->ip_off); -# endif mhip->ip_sum = 0; mhip->ip_sum = in_cksum(m, mhlen); *mnext = m; diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c index 412cfbf2f5f..219d56b6bec 100644 --- a/sys/netinet/ip_nat.c +++ b/sys/netinet/ip_nat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_nat.c,v 1.20 1999/02/05 05:58:52 deraadt Exp $ */ +/* $OpenBSD: ip_nat.c,v 1.21 1999/06/07 22:00:34 deraadt Exp $ */ /* * Copyright (C) 1995-1998 by Darren Reed. * @@ -10,7 +10,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_nat.c,v 1.20 1999/02/05 05:58:52 deraadt Exp $"; +static const char rcsid[] = "@(#)$Id: ip_nat.c,v 1.21 1999/06/07 22:00:34 deraadt Exp $"; #endif #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL) @@ -161,11 +161,7 @@ u_32_t n; if (!n) return; -#ifdef sparc - sum1 = (~(*sp)) & 0xffff; -#else sum1 = (~ntohs(*sp)) & 0xffff; -#endif sum1 += ~(n) & 0xffff; sum1 = (sum1 >> 16) + (sum1 & 0xffff); /* Again */ |