Deleted Added
full compact
ip_output.c (125396) ip_output.c (125680)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 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

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ip_output.c 8.3 (Berkeley) 1/21/94
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 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

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ip_output.c 8.3 (Berkeley) 1/21/94
34 * $FreeBSD: head/sys/netinet/ip_output.c 125396 2004-02-03 18:20:55Z ume $
34 * $FreeBSD: head/sys/netinet/ip_output.c 125680 2004-02-11 04:26:04Z bms $
35 */
36
37#include "opt_ipfw.h"
38#include "opt_ipdn.h"
39#include "opt_ipdivert.h"
40#include "opt_ipfilter.h"
41#include "opt_ipsec.h"
42#include "opt_mac.h"

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

494 /*
495 * This packet is just discarded.
496 */
497 ipsecstat.out_polvio++;
498 goto bad;
499
500 case IPSEC_POLICY_BYPASS:
501 case IPSEC_POLICY_NONE:
35 */
36
37#include "opt_ipfw.h"
38#include "opt_ipdn.h"
39#include "opt_ipdivert.h"
40#include "opt_ipfilter.h"
41#include "opt_ipsec.h"
42#include "opt_mac.h"

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

494 /*
495 * This packet is just discarded.
496 */
497 ipsecstat.out_polvio++;
498 goto bad;
499
500 case IPSEC_POLICY_BYPASS:
501 case IPSEC_POLICY_NONE:
502 case IPSEC_POLICY_TCP:
502 /* no need to do IPsec. */
503 goto skip_ipsec;
504
505 case IPSEC_POLICY_IPSEC:
506 if (sp->req == NULL) {
507 /* acquire a policy */
508 error = key_spdacquire(sp);
509 goto bad;

--- 1736 unchanged lines hidden ---
503 /* no need to do IPsec. */
504 goto skip_ipsec;
505
506 case IPSEC_POLICY_IPSEC:
507 if (sp->req == NULL) {
508 /* acquire a policy */
509 error = key_spdacquire(sp);
510 goto bad;

--- 1736 unchanged lines hidden ---