| ip_divert.c (101088) | ip_divert.c (105194) |
|---|---|
| 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 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 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 * | 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 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 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 * $FreeBSD: head/sys/netinet/ip_divert.c 101088 2002-07-31 16:42:47Z rwatson $ | 33 * $FreeBSD: head/sys/netinet/ip_divert.c 105194 2002-10-16 01:54:46Z sam $ |
| 34 */ 35 36#include "opt_inet.h" 37#include "opt_ipfw.h" 38#include "opt_ipdivert.h" 39#include "opt_ipsec.h" 40#include "opt_mac.h" 41 --- 268 unchanged lines hidden (view full) --- 310 ip->ip_off = ntohs(ip->ip_off); 311 312 /* Send packet to output processing */ 313 ipstat.ips_rawout++; /* XXX */ 314 error = ip_output((struct mbuf *)&divert_tag, 315 inp->inp_options, &inp->inp_route, 316 (so->so_options & SO_DONTROUTE) | 317 IP_ALLOWBROADCAST | IP_RAWOUTPUT, | 34 */ 35 36#include "opt_inet.h" 37#include "opt_ipfw.h" 38#include "opt_ipdivert.h" 39#include "opt_ipsec.h" 40#include "opt_mac.h" 41 --- 268 unchanged lines hidden (view full) --- 310 ip->ip_off = ntohs(ip->ip_off); 311 312 /* Send packet to output processing */ 313 ipstat.ips_rawout++; /* XXX */ 314 error = ip_output((struct mbuf *)&divert_tag, 315 inp->inp_options, &inp->inp_route, 316 (so->so_options & SO_DONTROUTE) | 317 IP_ALLOWBROADCAST | IP_RAWOUTPUT, |
| 318 inp->inp_moptions); | 318 inp->inp_moptions, NULL); |
| 319 } else { 320 if (m->m_pkthdr.rcvif == NULL) { 321 /* 322 * No luck with the name, check by IP address. 323 * Clear the port and the ifname to make sure 324 * there are no distractions for ifa_ifwithaddr. 325 */ 326 struct ifaddr *ifa; --- 242 unchanged lines hidden --- | 319 } else { 320 if (m->m_pkthdr.rcvif == NULL) { 321 /* 322 * No luck with the name, check by IP address. 323 * Clear the port and the ifname to make sure 324 * there are no distractions for ifa_ifwithaddr. 325 */ 326 struct ifaddr *ifa; --- 242 unchanged lines hidden --- |