Deleted Added
full compact
ip_output.c (113384) ip_output.c (114258)
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 113384 2003-04-12 06:11:46Z silby $
34 * $FreeBSD: head/sys/netinet/ip_output.c 114258 2003-04-29 21:36:18Z mdodd $
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"

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

1419 m));
1420 }
1421
1422 case IP_TOS:
1423 case IP_TTL:
1424 case IP_RECVOPTS:
1425 case IP_RECVRETOPTS:
1426 case IP_RECVDSTADDR:
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"

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

1419 m));
1420 }
1421
1422 case IP_TOS:
1423 case IP_TTL:
1424 case IP_RECVOPTS:
1425 case IP_RECVRETOPTS:
1426 case IP_RECVDSTADDR:
1427 case IP_RECVTTL:
1427 case IP_RECVIF:
1428 case IP_FAITH:
1429 error = sooptcopyin(sopt, &optval, sizeof optval,
1430 sizeof optval);
1431 if (error)
1432 break;
1433
1434 switch (sopt->sopt_name) {

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

1452 case IP_RECVRETOPTS:
1453 OPTSET(INP_RECVRETOPTS);
1454 break;
1455
1456 case IP_RECVDSTADDR:
1457 OPTSET(INP_RECVDSTADDR);
1458 break;
1459
1428 case IP_RECVIF:
1429 case IP_FAITH:
1430 error = sooptcopyin(sopt, &optval, sizeof optval,
1431 sizeof optval);
1432 if (error)
1433 break;
1434
1435 switch (sopt->sopt_name) {

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

1453 case IP_RECVRETOPTS:
1454 OPTSET(INP_RECVRETOPTS);
1455 break;
1456
1457 case IP_RECVDSTADDR:
1458 OPTSET(INP_RECVDSTADDR);
1459 break;
1460
1461 case IP_RECVTTL:
1462 OPTSET(INP_RECVTTL);
1463 break;
1464
1460 case IP_RECVIF:
1461 OPTSET(INP_RECVIF);
1462 break;
1463
1464 case IP_FAITH:
1465 OPTSET(INP_FAITH);
1466 break;
1467 }

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

1548 sopt->sopt_valsize = 0;
1549 break;
1550
1551 case IP_TOS:
1552 case IP_TTL:
1553 case IP_RECVOPTS:
1554 case IP_RECVRETOPTS:
1555 case IP_RECVDSTADDR:
1465 case IP_RECVIF:
1466 OPTSET(INP_RECVIF);
1467 break;
1468
1469 case IP_FAITH:
1470 OPTSET(INP_FAITH);
1471 break;
1472 }

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

1553 sopt->sopt_valsize = 0;
1554 break;
1555
1556 case IP_TOS:
1557 case IP_TTL:
1558 case IP_RECVOPTS:
1559 case IP_RECVRETOPTS:
1560 case IP_RECVDSTADDR:
1561 case IP_RECVTTL:
1556 case IP_RECVIF:
1557 case IP_PORTRANGE:
1558 case IP_FAITH:
1559 switch (sopt->sopt_name) {
1560
1561 case IP_TOS:
1562 optval = inp->inp_ip_tos;
1563 break;

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

1575 case IP_RECVRETOPTS:
1576 optval = OPTBIT(INP_RECVRETOPTS);
1577 break;
1578
1579 case IP_RECVDSTADDR:
1580 optval = OPTBIT(INP_RECVDSTADDR);
1581 break;
1582
1562 case IP_RECVIF:
1563 case IP_PORTRANGE:
1564 case IP_FAITH:
1565 switch (sopt->sopt_name) {
1566
1567 case IP_TOS:
1568 optval = inp->inp_ip_tos;
1569 break;

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

1581 case IP_RECVRETOPTS:
1582 optval = OPTBIT(INP_RECVRETOPTS);
1583 break;
1584
1585 case IP_RECVDSTADDR:
1586 optval = OPTBIT(INP_RECVDSTADDR);
1587 break;
1588
1589 case IP_RECVTTL:
1590 optval = OPTBIT(INP_RECVTTL);
1591 break;
1592
1583 case IP_RECVIF:
1584 optval = OPTBIT(INP_RECVIF);
1585 break;
1586
1587 case IP_PORTRANGE:
1588 if (inp->inp_flags & INP_HIGHPORT)
1589 optval = IP_PORTRANGE_HIGH;
1590 else if (inp->inp_flags & INP_LOWPORT)

--- 629 unchanged lines hidden ---
1593 case IP_RECVIF:
1594 optval = OPTBIT(INP_RECVIF);
1595 break;
1596
1597 case IP_PORTRANGE:
1598 if (inp->inp_flags & INP_HIGHPORT)
1599 optval = IP_PORTRANGE_HIGH;
1600 else if (inp->inp_flags & INP_LOWPORT)

--- 629 unchanged lines hidden ---