| tcp_reass.c (271123) | tcp_reass.c (275329) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994, 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 --- 16 unchanged lines hidden (view full) --- 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 * 29 * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/netinet/tcp_reass.c 271123 2014-09-04 19:28:02Z glebius $"); | 33__FBSDID("$FreeBSD: head/sys/netinet/tcp_reass.c 275329 2014-11-30 13:24:21Z glebius $"); |
| 34 35#include "opt_inet.h" 36#include "opt_inet6.h" 37#include "opt_tcpdebug.h" 38 39#include <sys/param.h> 40#include <sys/kernel.h> 41#include <sys/malloc.h> --- 215 unchanged lines hidden (view full) --- 257 tp->rcv_nxt += mq->m_pkthdr.len; 258 tp->t_segqlen -= mq->m_pkthdr.len; 259 flags = M_TCPHDR(mq)->th_flags & TH_FIN; 260 261 if (so->so_rcv.sb_state & SBS_CANTRCVMORE) 262 m_freem(mq); 263 else { 264 mq->m_nextpkt = NULL; | 34 35#include "opt_inet.h" 36#include "opt_inet6.h" 37#include "opt_tcpdebug.h" 38 39#include <sys/param.h> 40#include <sys/kernel.h> 41#include <sys/malloc.h> --- 215 unchanged lines hidden (view full) --- 257 tp->rcv_nxt += mq->m_pkthdr.len; 258 tp->t_segqlen -= mq->m_pkthdr.len; 259 flags = M_TCPHDR(mq)->th_flags & TH_FIN; 260 261 if (so->so_rcv.sb_state & SBS_CANTRCVMORE) 262 m_freem(mq); 263 else { 264 mq->m_nextpkt = NULL; |
| 265 sbappendstream_locked(&so->so_rcv, mq); | 265 sbappendstream_locked(&so->so_rcv, mq, 0); |
| 266 wakeup = 1; 267 } 268 } 269 ND6_HINT(tp); 270 if (wakeup) 271 sorwakeup_locked(so); 272 else 273 SOCKBUF_UNLOCK(&so->so_rcv); 274 return (flags); 275} | 266 wakeup = 1; 267 } 268 } 269 ND6_HINT(tp); 270 if (wakeup) 271 sorwakeup_locked(so); 272 else 273 SOCKBUF_UNLOCK(&so->so_rcv); 274 return (flags); 275} |