| uipc_socket.c (151888) | uipc_socket.c (151967) |
|---|---|
| 1/*- 2 * Copyright (c) 2004 The FreeBSD Foundation 3 * Copyright (c) 2004-2005 Robert N. M. Watson 4 * Copyright (c) 1982, 1986, 1988, 1990, 1993 5 * The Regents of the University of California. 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 * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 32 */ 33 34#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004 The FreeBSD Foundation 3 * Copyright (c) 2004-2005 Robert N. M. Watson 4 * Copyright (c) 1982, 1986, 1988, 1990, 1993 5 * The Regents of the University of California. 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 * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 32 */ 33 34#include <sys/cdefs.h> |
| 35__FBSDID("$FreeBSD: head/sys/kern/uipc_socket.c 151888 2005-10-30 19:44:40Z rwatson $"); | 35__FBSDID("$FreeBSD: head/sys/kern/uipc_socket.c 151967 2005-11-02 13:46:32Z andre $"); |
| 36 37#include "opt_inet.h" 38#include "opt_mac.h" 39#include "opt_zero.h" 40#include "opt_compat.h" 41 42#include <sys/param.h> 43#include <sys/systm.h> --- 1167 unchanged lines hidden (view full) --- 1211 */ 1212 SOCKBUF_LOCK_ASSERT(&so->so_rcv); 1213 if (m->m_type == MT_OOBDATA) { 1214 if (type != MT_OOBDATA) 1215 break; 1216 } else if (type == MT_OOBDATA) 1217 break; 1218 else | 36 37#include "opt_inet.h" 38#include "opt_mac.h" 39#include "opt_zero.h" 40#include "opt_compat.h" 41 42#include <sys/param.h> 43#include <sys/systm.h> --- 1167 unchanged lines hidden (view full) --- 1211 */ 1212 SOCKBUF_LOCK_ASSERT(&so->so_rcv); 1213 if (m->m_type == MT_OOBDATA) { 1214 if (type != MT_OOBDATA) 1215 break; 1216 } else if (type == MT_OOBDATA) 1217 break; 1218 else |
| 1219 KASSERT(m->m_type == MT_DATA || m->m_type == MT_HEADER, | 1219 KASSERT(m->m_type == MT_DATA, |
| 1220 ("m->m_type == %d", m->m_type)); 1221 so->so_rcv.sb_state &= ~SBS_RCVATMARK; 1222 len = uio->uio_resid; 1223 if (so->so_oobmark && len > so->so_oobmark - offset) 1224 len = so->so_oobmark - offset; 1225 if (len > m->m_len - moff) 1226 len = m->m_len - moff; 1227 /* --- 967 unchanged lines hidden --- | 1220 ("m->m_type == %d", m->m_type)); 1221 so->so_rcv.sb_state &= ~SBS_RCVATMARK; 1222 len = uio->uio_resid; 1223 if (so->so_oobmark && len > so->so_oobmark - offset) 1224 len = so->so_oobmark - offset; 1225 if (len > m->m_len - moff) 1226 len = m->m_len - moff; 1227 /* --- 967 unchanged lines hidden --- |