| uipc_socket.c (d374e81efdc3cba56fdda9df539773070ca00dfe) | uipc_socket.c (34333b16cdbff9a44599686b809052878716f44e) |
|---|---|
| 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 --- 1202 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 | 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 --- 1202 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 --- |