Deleted Added
full compact
ip_options.c (182311) ip_options.c (183550)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California.
4 * Copyright (c) 2005 Andre Oppermann, Internet Business Solutions AG.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California.
4 * Copyright (c) 2005 Andre Oppermann, Internet Business Solutions AG.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet/ip_options.c 182311 2008-08-27 23:52:03Z csjp $");
33__FBSDID("$FreeBSD: head/sys/netinet/ip_options.c 183550 2008-10-02 15:37:58Z zec $");
34
35#include "opt_ipstealth.h"
36#include "opt_mac.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/mbuf.h>
41#include <sys/domain.h>

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

93 * options should be processed only if the packet is for us.
94 *
95 * Returns 1 if packet has been forwarded/freed, 0 if the packet should be
96 * processed further.
97 */
98int
99ip_dooptions(struct mbuf *m, int pass)
100{
34
35#include "opt_ipstealth.h"
36#include "opt_mac.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/mbuf.h>
41#include <sys/domain.h>

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

93 * options should be processed only if the packet is for us.
94 *
95 * Returns 1 if packet has been forwarded/freed, 0 if the packet should be
96 * processed further.
97 */
98int
99ip_dooptions(struct mbuf *m, int pass)
100{
101 INIT_VNET_INET(curvnet);
101 struct ip *ip = mtod(m, struct ip *);
102 u_char *cp;
103 struct in_ifaddr *ia;
104 int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0;
105 struct in_addr *sin, dst;
106 n_time ntime;
107 struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
108

--- 575 unchanged lines hidden ---
102 struct ip *ip = mtod(m, struct ip *);
103 u_char *cp;
104 struct in_ifaddr *ia;
105 int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0;
106 struct in_addr *sin, dst;
107 n_time ntime;
108 struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET };
109

--- 575 unchanged lines hidden ---