Source-Changes-HG archive

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

[src/trunk]: src/sys/netinet6 remove extra NULL check



details:   https://anonhg.NetBSD.org/src/rev/b5c28d6a47fc
branches:  trunk
changeset: 482897:b5c28d6a47fc
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Feb 25 00:29:00 2000 +0000

description:
remove extra NULL check
typo in PULLDOWN_TEST case
note: the fixes does not affect normal configuration.
(sync with kame)

diffstat:

 sys/netinet6/udp6_usrreq.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 01cff971dd20 -r b5c28d6a47fc sys/netinet6/udp6_usrreq.c
--- a/sys/netinet6/udp6_usrreq.c        Fri Feb 25 00:27:18 2000 +0000
+++ b/sys/netinet6/udp6_usrreq.c        Fri Feb 25 00:29:00 2000 +0000
@@ -1,4 +1,5 @@
-/*     $NetBSD: udp6_usrreq.c,v 1.23 2000/02/06 12:49:49 itojun Exp $  */
+/*     $NetBSD: udp6_usrreq.c,v 1.24 2000/02/25 00:29:00 itojun Exp $  */
+/*     $KAME: udp6_usrreq.c,v 1.39 2000/02/23 08:54:23 jinmei Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -178,7 +179,7 @@
        IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE);
        uh = (struct udphdr *)((caddr_t)ip6 + off);
 #else
-       IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udhpdr));
+       IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr));
        if (uh == NULL) {
                udp6stat.udp6s_hdrops++;
                return IPPROTO_DONE;
@@ -297,7 +298,7 @@
                                /*
                                 * Check AH/ESP integrity.
                                 */
-                               if (last != NULL && ipsec6_in_reject(m, last)) {
+                               if (ipsec6_in_reject(m, last)) {
                                        ipsec6stat.in_polvio++;
                                        /* do not inject data into pcb */
                                } else



Home | Main Index | Thread Index | Old Index