PERFORCE change 141313 for review

[Andre Oppermann]

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

Change 141313 by andre at 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);
 		}