From owner-p4-projects@FreeBSD.ORG  Mon Jul 27 13:49:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5F34610656CA; Mon, 27 Jul 2009 13:49:46 +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 1AC6F10656C8
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 13:49:46 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 08D338FC08
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 13:49:46 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6RDnjUO084498
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 13:49:45 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6RDnj7V084496
	for perforce@freebsd.org; Mon, 27 Jul 2009 13:49:45 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 27 Jul 2009 13:49:45 GMT
Message-Id: <200907271349.n6RDnj7V084496@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166618 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: Mon, 27 Jul 2009 13:49:47 -0000

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

Change 166618 by pgj@petymeg-current on 2009/07/27 13:48:58

	Improve error handling in tcp_stats().

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#25 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#25 (text+ko) ====

@@ -246,7 +246,7 @@
 {
 	const struct tcp_stat *s;
 	struct stat_type *sttp;
-	int stt_flags;
+	int stt_flags, error;
 
 #ifdef INET6
 	if (tcp_done != 0)
@@ -271,7 +271,12 @@
 	}
 
 	if (netstat_stat(stat_TCP, sttp, stt_flags, kvmd) < 0) {
-		return;
+		error = netstat_stat_geterror(sttp);
+		if (error == NETSTAT_ERROR_KVM)
+			warnx("netstat_stat: %s", kvm_geterr(kvmd));
+		else
+			warnx("netstat_stat: %s", netstat_strerror(error));
+		goto out;
 	}
 
 	s = netstat_get_tcpstats(sttp);
@@ -387,6 +392,7 @@
 	p(ecn_shs, "\t%ju successful ECN handshake%s\n");
 	p(ecn_rcwnd, "\t%ju time%s ECN reduced the congestion window\n");
 
+out:
 	netstat_stat_free(sttp);
 #undef p
 #undef p1a