Deleted Added
full compact
udp_usrreq.c (185571) udp_usrreq.c (185895)
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
3 * The Regents of the University of California.
4 * Copyright (c) 2008 Robert N. M. Watson
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

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

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 * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
32 */
33
34#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995
3 * The Regents of the University of California.
4 * Copyright (c) 2008 Robert N. M. Watson
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

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

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 * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95
32 */
33
34#include <sys/cdefs.h>
35__FBSDID("$FreeBSD: head/sys/netinet/udp_usrreq.c 185571 2008-12-02 21:37:28Z bz $");
35__FBSDID("$FreeBSD: head/sys/netinet/udp_usrreq.c 185895 2008-12-10 23:12:39Z zec $");
36
37#include "opt_ipfw.h"
38#include "opt_inet6.h"
39#include "opt_ipsec.h"
40#include "opt_mac.h"
41
42#include <sys/param.h>
43#include <sys/domain.h>

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

1193 if (inp->inp_faddr.s_addr != INADDR_ANY) {
1194 INP_WUNLOCK(inp);
1195 INP_INFO_WUNLOCK(&V_udbinfo);
1196 return (EISCONN);
1197 }
1198 sin = (struct sockaddr_in *)nam;
1199 if (prison_remote_ip4(td->td_ucred, &sin->sin_addr) != 0) {
1200 INP_WUNLOCK(inp);
36
37#include "opt_ipfw.h"
38#include "opt_inet6.h"
39#include "opt_ipsec.h"
40#include "opt_mac.h"
41
42#include <sys/param.h>
43#include <sys/domain.h>

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

1193 if (inp->inp_faddr.s_addr != INADDR_ANY) {
1194 INP_WUNLOCK(inp);
1195 INP_INFO_WUNLOCK(&V_udbinfo);
1196 return (EISCONN);
1197 }
1198 sin = (struct sockaddr_in *)nam;
1199 if (prison_remote_ip4(td->td_ucred, &sin->sin_addr) != 0) {
1200 INP_WUNLOCK(inp);
1201 INP_INFO_WUNLOCK(&udbinfo);
1201 INP_INFO_WUNLOCK(&V_udbinfo);
1202 return (EAFNOSUPPORT);
1203 }
1204 error = in_pcbconnect(inp, nam, td->td_ucred);
1205 if (error == 0)
1206 soisconnected(so);
1207 INP_WUNLOCK(inp);
1208 INP_INFO_WUNLOCK(&V_udbinfo);
1209 return (error);

--- 86 unchanged lines hidden ---
1202 return (EAFNOSUPPORT);
1203 }
1204 error = in_pcbconnect(inp, nam, td->td_ucred);
1205 if (error == 0)
1206 soisconnected(so);
1207 INP_WUNLOCK(inp);
1208 INP_INFO_WUNLOCK(&V_udbinfo);
1209 return (error);

--- 86 unchanged lines hidden ---