[src/netbsd-1-6]: src/sys/netinet Pull up revision 1.154 via patch (requested...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/849f1a5bd18f
branches:  netbsd-1-6
changeset: 529071:849f1a5bd18f
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Sep 06 06:21:17 2002 +0000

description:
Pull up revision 1.154 via patch (requested by itojun in ticket #775):
always consult SS_CANTRCVMORE.  PR 18185

diffstat:

 sys/netinet/tcp_input.c |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 61c75cfe306a -r 849f1a5bd18f sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Fri Sep 06 06:05:22 2002 +0000
+++ b/sys/netinet/tcp_input.c   Fri Sep 06 06:21:17 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.141.4.2 2002/08/28 02:33:36 lukem Exp $        */
+/*     $NetBSD: tcp_input.c,v 1.141.4.3 2002/09/06 06:21:17 lukem Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.141.4.2 2002/08/28 02:33:36 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.141.4.3 2002/09/06 06:21:17 lukem Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1503,8 +1503,12 @@
                         * Drop TCP, IP headers and TCP options then add data
                         * to socket buffer.
                         */
-                       m_adj(m, toff + off);
-                       sbappend(&so->so_rcv, m);
+                       if (so->so_state & SS_CANTRCVMORE)
+                               m_freem(m);
+                       else {
+                               m_adj(m, toff + off);
+                               sbappend(&so->so_rcv, m);
+                       }
                        sorwakeup(so);
                        TCP_SETUP_ACK(tp, th);
                        if (tp->t_flags & TF_ACKNOW)
@@ -2250,8 +2254,12 @@
                        tcpstat.tcps_rcvpack++;
                        tcpstat.tcps_rcvbyte += tlen;
                        ND6_HINT(tp);
-                       m_adj(m, hdroptlen);
-                       sbappend(&(so)->so_rcv, m);
+                       if (so->so_state & SS_CANTRCVMORE)
+                               m_freem(m);
+                       else {
+                               m_adj(m, hdroptlen);
+                               sbappend(&(so)->so_rcv, m);
+                       }
                        sorwakeup(so);
                } else {
                        m_adj(m, hdroptlen);