Deleted Added
full compact
udp_usrreq.c (54952) udp_usrreq.c (55009)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
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 * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
1/*
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
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 * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
34 * $FreeBSD: head/sys/netinet/udp_usrreq.c 54952 1999-12-21 11:14:12Z eivind $
34 * $FreeBSD: head/sys/netinet/udp_usrreq.c 55009 1999-12-22 19:13:38Z shin $
35 */
36
35 */
36
37#include "opt_ipsec.h"
37#include "opt_inet6.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/kernel.h>
42#include <sys/malloc.h>
43#include <sys/mbuf.h>
44#include <sys/domain.h>

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

700 ((struct ip *)ui)->ip_tos = inp->inp_ip_tos; /* XXX */
701 udpstat.udps_opackets++;
702
703#ifdef IPSEC
704 m->m_pkthdr.rcvif = (struct ifnet *)inp->inp_socket;
705#endif /*IPSEC*/
706
707 error = ip_output(m, inp->inp_options, &inp->inp_route,
38#include "opt_inet6.h"
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/malloc.h>
44#include <sys/mbuf.h>
45#include <sys/domain.h>

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

701 ((struct ip *)ui)->ip_tos = inp->inp_ip_tos; /* XXX */
702 udpstat.udps_opackets++;
703
704#ifdef IPSEC
705 m->m_pkthdr.rcvif = (struct ifnet *)inp->inp_socket;
706#endif /*IPSEC*/
707
708 error = ip_output(m, inp->inp_options, &inp->inp_route,
708 inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
709 (inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST))
710 | IP_SOCKINMRCVIF,
709 inp->inp_moptions);
710
711 if (addr) {
712 in_pcbdisconnect(inp);
713 inp->inp_laddr = laddr; /* XXX rehash? */
714 splx(s);
715 }
716 return (error);

--- 175 unchanged lines hidden ---
711 inp->inp_moptions);
712
713 if (addr) {
714 in_pcbdisconnect(inp);
715 inp->inp_laddr = laddr; /* XXX rehash? */
716 splx(s);
717 }
718 return (error);

--- 175 unchanged lines hidden ---