Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet ip checksum logic no longer damage ip_v



details:   https://anonhg.NetBSD.org/src/rev/72bc73146c97
branches:  trunk
changeset: 547369:72bc73146c97
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sat May 17 17:08:15 2003 +0000

description:
ip checksum logic no longer damage ip_v

diffstat:

 sys/netinet/tcp_input.c |  24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)

diffs (45 lines):

diff -r 7ecfb8ed2579 -r 72bc73146c97 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Sat May 17 16:46:03 2003 +0000
+++ b/sys/netinet/tcp_input.c   Sat May 17 17:08:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.165 2003/05/16 03:58:33 itojun Exp $   */
+/*     $NetBSD: tcp_input.c,v 1.166 2003/05/17 17:08:15 itojun Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.165 2003/05/16 03:58:33 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.166 2003/05/17 17:08:15 itojun Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1213,26 +1213,6 @@
                                bcopy(th, mtod(tcp_saveti, caddr_t) + iphlen,
                                    sizeof(struct tcphdr));
                        }
-                       if (tcp_saveti) {
-                               /*
-                                * need to recover version # field, which was
-                                * overwritten on ip_cksum computation.
-                                */
-                               struct ip *sip;
-                               sip = mtod(tcp_saveti, struct ip *);
-                               switch (af) {
-#ifdef INET
-                               case AF_INET:
-                                       sip->ip_v = 4;
-                                       break;
-#endif
-#ifdef INET6
-                               case AF_INET6:
-                                       sip->ip_v = 6;
-                                       break;
-#endif
-                               }
-                       }
        nosave:;
                }
                if (so->so_options & SO_ACCEPTCONN) {



Home | Main Index | Thread Index | Old Index