Mon Apr 25 22:05:05 2011 UTC ()
fix assertions


(yamt)
diff -r1.27 -r1.28 src/sys/netinet6/in6_cksum.c
cvs diff -r1.27 -r1.28 src/sys/netinet6/in6_cksum.c (expand / switch to unified diff)

--- src/sys/netinet6/in6_cksum.c 2008/03/10 22:34:40 1.27
+++ src/sys/netinet6/in6_cksum.c 2011/04/25 22:05:05 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: in6_cksum.c,v 1.27 2008/03/10 22:34:40 yamt Exp $ */ 1/* $NetBSD: in6_cksum.c,v 1.28 2011/04/25 22:05:05 yamt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>. 4 * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in 14 * notice, this list of conditions and the following disclaimer in
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
21 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 21 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
22 * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 22 * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
23 * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, 23 * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
24 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 24 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
26 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 26 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 27 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
28 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: in6_cksum.c,v 1.27 2008/03/10 22:34:40 yamt Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: in6_cksum.c,v 1.28 2011/04/25 22:05:05 yamt Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/mbuf.h> 36#include <sys/mbuf.h>
37#include <netinet/in.h> 37#include <netinet/in.h>
38#include <netinet/ip6.h> 38#include <netinet/ip6.h>
39 39
40/* 40/*
41 * Checksum of the IPv6 pseudo header. 41 * Checksum of the IPv6 pseudo header.
42 * 42 *
43 * off is supposed to be the skipped IPv6 header, len is the payload size. 43 * off is supposed to be the skipped IPv6 header, len is the payload size.
44 */ 44 */
45 45
46int 46int
@@ -50,34 +50,34 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,  @@ -50,34 +50,34 @@ in6_cksum(struct mbuf *m, u_int8_t nxt,
50 uint16_t words[16]; 50 uint16_t words[16];
51 struct { 51 struct {
52 struct in6_addr ip6_src; 52 struct in6_addr ip6_src;
53 struct in6_addr ip6_dst; 53 struct in6_addr ip6_dst;
54 } addrs; 54 } addrs;
55 } u; 55 } u;
56 const struct in6_addr *in6_src; 56 const struct in6_addr *in6_src;
57 const struct in6_addr *in6_dst; 57 const struct in6_addr *in6_dst;
58 const struct ip6_hdr *ip6; 58 const struct ip6_hdr *ip6;
59 uint32_t sum; 59 uint32_t sum;
60 const uint16_t *w; 60 const uint16_t *w;
61 const char *cp; 61 const char *cp;
62 62
 63 if (nxt == 0)
 64 return cpu_in_cksum(m, len, off, 0);
 65
63 if (__predict_false(off < sizeof(struct ip6_hdr))) 66 if (__predict_false(off < sizeof(struct ip6_hdr)))
64 panic("in6_cksum: offset too short for IPv6 header"); 67 panic("in6_cksum: offset too short for IPv6 header");
65 if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) 68 if (__predict_false(m->m_len < sizeof(struct ip6_hdr)))
66 panic("in6_cksum: mbuf too short for IPv6 header"); 69 panic("in6_cksum: mbuf too short for IPv6 header");
67 70
68 if (nxt == 0) 
69 return cpu_in_cksum(m, len, off, 0); 
70 
71 /* 71 /*
72 * Compute the equivalent of: 72 * Compute the equivalent of:
73 * struct ip6_hdr_pseudo ip6; 73 * struct ip6_hdr_pseudo ip6;
74 * 74 *
75 * bzero(sizeof(*ip6)); 75 * bzero(sizeof(*ip6));
76 * ip6.ip6ph_nxt = nxt; 76 * ip6.ip6ph_nxt = nxt;
77 * ip6.ip6ph_len = htonl(len); 77 * ip6.ip6ph_len = htonl(len);
78 * ipv6.ip6ph_src = mtod(m, struct ip6_hdr *)->ip6_src; 78 * ipv6.ip6ph_src = mtod(m, struct ip6_hdr *)->ip6_src;
79 * in6_clearscope(&ip6->ip6ph_src); 79 * in6_clearscope(&ip6->ip6ph_src);
80 * ipv6.ip6ph_dst = mtod(m, struct ip6_hdr *)->ip6_dst; 80 * ipv6.ip6ph_dst = mtod(m, struct ip6_hdr *)->ip6_dst;
81 * in6_clearscope(&ip6->ip6ph_dst); 81 * in6_clearscope(&ip6->ip6ph_dst);
82 * sum = one_add(&ip6); 82 * sum = one_add(&ip6);
83 */ 83 */