From owner-p4-projects@FreeBSD.ORG  Wed May  7 22:50:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C6231065674; Wed,  7 May 2008 22:50:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1E57F1065689
	for <perforce@freebsd.org>; Wed,  7 May 2008 22:50:58 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D1858FC45
	for <perforce@freebsd.org>; Wed,  7 May 2008 22:50:58 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m47Movpo077396
	for <perforce@freebsd.org>; Wed, 7 May 2008 22:50:57 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m47MovX3077394
	for perforce@freebsd.org; Wed, 7 May 2008 22:50:57 GMT
	(envelope-from andre@freebsd.org)
Date: Wed, 7 May 2008 22:50:57 GMT
Message-Id: <200805072250.m47MovX3077394@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141313 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2008 22:50:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=141313

Change 141313 by andre@andre_flirtbox on 2008/05/07 22:49:59

	Differentiate between mbuf allocation errors and ip_output()
	errors for logging.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_output.c#8 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_output.c#8 (text+ko) ====

@@ -144,6 +144,7 @@
 	int tso = 0;
 	struct tcpopt to;
 	char *s;
+	int ipout = 0;
 #if 0
 	int maxburst = TCP_MAXBURST;
 #endif
@@ -1133,6 +1134,8 @@
 	if (path_mtu_discovery)
 		ip->ip_off |= IP_DF;
 
+	ipout = 1;
+
 	error = ip_output(m, tp->t_inpcb->inp_options, NULL,
 	    ((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0), 0,
 	    tp->t_inpcb);
@@ -1168,8 +1171,8 @@
 		SOCKBUF_UNLOCK_ASSERT(&so->so_snd);	/* Check gotos. */
 
 		if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, NULL, NULL, NULL))) {
-			log(LOG_DEBUG, "%s; %s: error %i while sending\n",
-			    s, __func__, error);
+			log(LOG_DEBUG, "%s; %s: error %i while sending (ip_output %i)\n",
+			    s, __func__, error, ipout);
 			free(s, M_TCPLOG);
 		}