From owner-p4-projects@FreeBSD.ORG  Sun Jun 14 00:52:58 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1FA141065673; Sun, 14 Jun 2009 00:52:57 +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 D1A371065670
	for <perforce@FreeBSD.org>; Sun, 14 Jun 2009 00:52:56 +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 BEC948FC1C
	for <perforce@FreeBSD.org>; Sun, 14 Jun 2009 00:52:56 +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 n5E0qurC011037
	for <perforce@FreeBSD.org>; Sun, 14 Jun 2009 00:52:56 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5E0qudP011035
	for perforce@freebsd.org; Sun, 14 Jun 2009 00:52:56 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 14 Jun 2009 00:52:56 GMT
Message-Id: <200906140052.n5E0qudP011035@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 164314 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: Sun, 14 Jun 2009 00:52:58 -0000

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

Change 164314 by pgj@petymeg-current on 2009/06/14 00:52:12

	Fix port information storage and port name rendering

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#28 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#16 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#28 (text+ko) ====

@@ -743,12 +743,12 @@
 		    C(in->s_addr));
 	}
 	result = _netstat_at_allocate(type, address, NULL);
-	result->at_port = port;
+	result->at_port = ntohs(port);
 	sp = getservbyport((int)port, proto);
 	if ((sp != NULL || port == 0) && !anonport)
 		sprintf(result->at_portname, "%.15s", sp ? sp->s_name : "*");
 	else
-		sprintf(result->at_portname, "%d", ntohs(port));
+		sprintf(result->at_portname, "%d", result->at_port);
 
 	return (result);
 #undef C

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

@@ -933,7 +933,10 @@
 	sprintf(line, "%.*s.", Wflag ? 39 : (Aflag && !numeric) ? 12 : 16,
 	    netstat_at_get_name(atp));
 	cp = index(line, '\0');
-	sprintf(cp, "%.15s ", netstat_at_get_portname(atp));
+	if (numeric && (netstat_at_get_port(atp) > 0))
+		sprintf(cp, "%d ", netstat_at_get_port(atp));
+	else
+		sprintf(cp, "%.15s ", netstat_at_get_portname(atp));
 	width = Wflag ? 45 : Aflag ? 18 : 22;
 	printf("%-*.*s ", width, width, line);
 }