From owner-svn-src-user@FreeBSD.ORG  Tue Mar  6 19:43:27 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 34A831065672;
	Tue,  6 Mar 2012 19:43:27 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 250528FC12;
	Tue,  6 Mar 2012 19:43:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q26JhQUt054614;
	Tue, 6 Mar 2012 19:43:27 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26JhQ1H054611;
	Tue, 6 Mar 2012 19:43:26 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201203061943.q26JhQ1H054611@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Tue, 6 Mar 2012 19:43:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232617 - user/andre/tcp_workqueue/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 19:43:27 -0000

Author: andre
Date: Tue Mar  6 19:43:26 2012
New Revision: 232617
URL: http://svn.freebsd.org/changeset/base/232617

Log:
  In soreceive_stream() don't drop an already dequeued mbuf chain by
  overwriting the return mbuf pointer with newly received data after
  a loop.  Instead append the new mbuf chain to the existing one.
  
  Fix up sb_lastrecord when dequeuing mbuf's so that sbappend_stream()
  doesn't get confused.
  
  For the remainder copy case in the mbuf delivery part deduct the
  copied length len instead of the whole mbuf length.  Additionally
  don't depend on 'n' being being available which isn't true in the
  case of MSG_PEEK.
  
  Submitted by:	trociny (slightly different version)

Modified:
  user/andre/tcp_workqueue/sys/kern/uipc_socket.c

Modified: user/andre/tcp_workqueue/sys/kern/uipc_socket.c
==============================================================================
--- user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Tue Mar  6 19:19:33 2012	(r232616)
+++ user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Tue Mar  6 19:43:26 2012	(r232617)
@@ -2044,7 +2044,7 @@ deliver:
 	if (mp0 != NULL) {
 		/* Dequeue as many mbufs as possible. */
 		if (!(flags & MSG_PEEK) && len >= sb->sb_mb->m_len) {
-			for (*mp0 = m = sb->sb_mb;
+			for (m = sb->sb_mb;
 			     m != NULL && m->m_len <= len;
 			     m = m->m_next) {
 				len -= m->m_len;
@@ -2052,10 +2052,15 @@ deliver:
 				sbfree(sb, m);
 				n = m;
 			}
+			n->m_next = NULL;
 			sb->sb_mb = m;
+			sb->sb_lastrecord = sb->sb_mb;
 			if (sb->sb_mb == NULL)
 				SB_EMPTY_FIXUP(sb);
-			n->m_next = NULL;
+			if (*mp0 != NULL)
+				m_cat(*mp0, m);
+			else
+				*mp0 = m;
 		}
 		/* Copy the remainder. */
 		if (len > 0) {
@@ -2066,9 +2071,9 @@ deliver:
 			if (m == NULL)
 				len = 0;	/* Don't flush data from sockbuf. */
 			else
-				uio->uio_resid -= m->m_len;
+				uio->uio_resid -= len;
 			if (*mp0 != NULL)
-				n->m_next = m;
+				m_cat(*mp0, m);
 			else
 				*mp0 = m;
 			if (*mp0 == NULL) {