| raw_ip6.c (105199) | raw_ip6.c (109623) |
|---|---|
| 1/* 2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 12 unchanged lines hidden (view full) --- 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * | 1/* 2 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 12 unchanged lines hidden (view full) --- 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * |
| 29 * $FreeBSD: head/sys/netinet6/raw_ip6.c 105199 2002-10-16 02:25:05Z sam $ | 29 * $FreeBSD: head/sys/netinet6/raw_ip6.c 109623 2003-01-21 08:56:16Z alfred $ |
| 30 */ 31 32/* 33 * Copyright (c) 1982, 1986, 1988, 1993 34 * The Regents of the University of California. All rights reserved. 35 * 36 * Redistribution and use in source and binary forms, with or without 37 * modification, are permitted provided that the following conditions --- 329 unchanged lines hidden (view full) --- 367 error = ENOBUFS; 368 goto bad; 369 } 370 icmp6 = mtod(m, struct icmp6_hdr *); 371 type = icmp6->icmp6_type; 372 code = icmp6->icmp6_code; 373 } 374 | 30 */ 31 32/* 33 * Copyright (c) 1982, 1986, 1988, 1993 34 * The Regents of the University of California. All rights reserved. 35 * 36 * Redistribution and use in source and binary forms, with or without 37 * modification, are permitted provided that the following conditions --- 329 unchanged lines hidden (view full) --- 367 error = ENOBUFS; 368 goto bad; 369 } 370 icmp6 = mtod(m, struct icmp6_hdr *); 371 type = icmp6->icmp6_type; 372 code = icmp6->icmp6_code; 373 } 374 |
| 375 M_PREPEND(m, sizeof(*ip6), M_TRYWAIT); | 375 M_PREPEND(m, sizeof(*ip6), 0); |
| 376 ip6 = mtod(m, struct ip6_hdr *); 377 378 /* 379 * Next header might not be ICMP6 but use its pseudo header anyway. 380 */ 381 ip6->ip6_dst = *dst; 382 383 /* --- 360 unchanged lines hidden --- | 376 ip6 = mtod(m, struct ip6_hdr *); 377 378 /* 379 * Next header might not be ICMP6 but use its pseudo header anyway. 380 */ 381 ip6->ip6_dst = *dst; 382 383 /* --- 360 unchanged lines hidden --- |