Deleted Added
full compact
ip_reass.c (129017) ip_reass.c (130416)
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

--- 13 unchanged lines hidden (view full) ---

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 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94
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

--- 13 unchanged lines hidden (view full) ---

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 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94
30 * $FreeBSD: head/sys/netinet/ip_input.c 129017 2004-05-06 18:46:03Z andre $
30 * $FreeBSD: head/sys/netinet/ip_input.c 130416 2004-06-13 17:29:10Z mlaier $
31 */
32
33#include "opt_bootp.h"
34#include "opt_ipfw.h"
35#include "opt_ipdn.h"
36#include "opt_ipdivert.h"
37#include "opt_ipfilter.h"
38#include "opt_ipstealth.h"

--- 346 unchanged lines hidden (view full) ---

385 sum = in_cksum(m, hlen);
386 }
387 }
388 if (sum) {
389 ipstat.ips_badsum++;
390 goto bad;
391 }
392
31 */
32
33#include "opt_bootp.h"
34#include "opt_ipfw.h"
35#include "opt_ipdn.h"
36#include "opt_ipdivert.h"
37#include "opt_ipfilter.h"
38#include "opt_ipstealth.h"

--- 346 unchanged lines hidden (view full) ---

385 sum = in_cksum(m, hlen);
386 }
387 }
388 if (sum) {
389 ipstat.ips_badsum++;
390 goto bad;
391 }
392
393#ifdef ALTQ
394 if (altq_input != NULL && (*altq_input)(m, AF_INET) == 0)
395 /* packet is dropped by traffic conditioner */
396 return;
397#endif
398
393 /*
394 * Convert fields to host representation.
395 */
396 ip->ip_len = ntohs(ip->ip_len);
397 if (ip->ip_len < hlen) {
398 ipstat.ips_badlen++;
399 goto bad;
400 }

--- 1766 unchanged lines hidden ---
399 /*
400 * Convert fields to host representation.
401 */
402 ip->ip_len = ntohs(ip->ip_len);
403 if (ip->ip_len < hlen) {
404 ipstat.ips_badlen++;
405 goto bad;
406 }

--- 1766 unchanged lines hidden ---