| ip_input.c (215701) | ip_input.c (218909) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1993 3 * The Regents of the University of California. 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 --- 16 unchanged lines hidden (view full) --- 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 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1993 3 * The Regents of the University of California. 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 --- 16 unchanged lines hidden (view full) --- 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 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/netinet/ip_input.c 215701 2010-11-22 19:32:54Z dim $"); | 33__FBSDID("$FreeBSD: head/sys/netinet/ip_input.c 218909 2011-02-21 09:01:34Z brucec $"); |
| 34 35#include "opt_bootp.h" 36#include "opt_ipfw.h" 37#include "opt_ipstealth.h" 38#include "opt_ipsec.h" 39#include "opt_route.h" 40 41#include <sys/param.h> --- 984 unchanged lines hidden (view full) --- 1026 break; 1027 1028 /* 1029 * If there is a preceding segment, it may provide some of 1030 * our data already. If so, drop the data from the incoming 1031 * segment. If it provides all of our data, drop us, otherwise 1032 * stick new segment in the proper place. 1033 * | 34 35#include "opt_bootp.h" 36#include "opt_ipfw.h" 37#include "opt_ipstealth.h" 38#include "opt_ipsec.h" 39#include "opt_route.h" 40 41#include <sys/param.h> --- 984 unchanged lines hidden (view full) --- 1026 break; 1027 1028 /* 1029 * If there is a preceding segment, it may provide some of 1030 * our data already. If so, drop the data from the incoming 1031 * segment. If it provides all of our data, drop us, otherwise 1032 * stick new segment in the proper place. 1033 * |
| 1034 * If some of the data is dropped from the the preceding | 1034 * If some of the data is dropped from the preceding |
| 1035 * segment, then it's checksum is invalidated. 1036 */ 1037 if (p) { 1038 i = GETIP(p)->ip_off + GETIP(p)->ip_len - ip->ip_off; 1039 if (i > 0) { 1040 if (i >= ip->ip_len) 1041 goto dropfrag; 1042 m_adj(m, i); --- 750 unchanged lines hidden --- | 1035 * segment, then it's checksum is invalidated. 1036 */ 1037 if (p) { 1038 i = GETIP(p)->ip_off + GETIP(p)->ip_len - ip->ip_off; 1039 if (i > 0) { 1040 if (i >= ip->ip_len) 1041 goto dropfrag; 1042 m_adj(m, i); --- 750 unchanged lines hidden --- |