From nobody@FreeBSD.org  Tue Mar 30 08:42:27 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 975231065676
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 08:42:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id E29788FC1E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 08:42:26 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2U8gQNO010436
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Mar 2010 08:42:26 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o2U8gQPv010435;
	Tue, 30 Mar 2010 08:42:26 GMT
	(envelope-from nobody)
Message-Id: <201003300842.o2U8gQPv010435@www.freebsd.org>
Date: Tue, 30 Mar 2010 08:42:26 GMT
From: Fedor Dikarev <fe@rambler-co.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Changed output of sockstat for AF_INET6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         145194
>Category:       bin
>Synopsis:       [patch] Changed output of sockstat(1) for AF_INET6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 30 08:50:03 UTC 2010
>Closed-Date:    Wed Apr 21 05:41:56 UTC 2010
>Last-Modified:  Fri May 14 08:10:10 UTC 2010
>Originator:     Fedor Dikarev
>Release:        6.x, 7.x and 8.x
>Organization:
Rambler
>Environment:
FreeBSD net.park.rambler.ru 7.2-STABLE FreeBSD 7.2-STABLE #1: Tue Jun  2 10:49:29 MSD 2009     root@net.park.rambler.ru:/usr/obj/usr/src/sys/MNGMT  amd64

>Description:
It's very hard to distinguish where local address and port ends and foreign address and port starts from sockstat output when using IPv6 addressess.
One space between is enough as I think.

>How-To-Repeat:
root:net{R}[125] sockstat$ sockstat -6
www      nginx      58211 9  tcp6   2a02:6b0:1:0:21a:92ff:fe80:f032:802a02:6b0:16:0:10cb:d0b0:7274:4cde:1145
.. and more such lines
>Fix:
Just add one space after local address and port. And get output like this:

root:net{R}[135] sockstat$ sockstat -6
www      nginx      58211 12 tcp6   2a02:6b0:1:0:21a:92ff:fe80:f032:80 2a02:6b0:16:0:10cb:d0b0:7274:4cde:1170

Patch attached with submission follows:

--- sockstat.c  2010-03-30 12:37:25.000000000 +0400
+++ sockstat.c.orig     2010-03-30 12:22:06.000000000 +0400
@@ -609,7 +609,6 @@
                case AF_INET:
                case AF_INET6:
                        pos += printaddr(s->family, &s->laddr);
-                       if((AF_INET6 == s->family) && (pos>=58)) { xprintf(" "); }
                        while (pos < 58)
                                pos += xprintf(" ");
                        pos += printaddr(s->family, &s->faddr);


>Release-Note:
>Audit-Trail:

From: Maxim Konovalov <maxim.konovalov@gmail.com>
To: Fedor Dikarev <fe@rambler-co.ru>
Cc: bug-followup@freebsd.org
Subject: Re: bin/145194: Changed output of sockstat for AF_INET6
Date: Tue, 30 Mar 2010 13:33:48 +0400 (MSD)

 This one looks more correct, doesn't it?
 
 Index: sockstat.c
 ===================================================================
 --- sockstat.c	(revision 205577)
 +++ sockstat.c	(working copy)
 @@ -621,6 +621,8 @@
  		case AF_INET:
  		case AF_INET6:
  			pos += printaddr(s->family, &s->laddr);
 +			if ((AF_INET6 == s->family) && (pos >= 58))
 +				pos += xprintf(" ");
  			while (pos < 58)
  				pos += xprintf(" ");
  			pos += printaddr(s->family, &s->faddr);
 
 %%%
 
 -- 
 Maxim Konovalov
State-Changed-From-To: open->patched 
State-Changed-By: maxim 
State-Changed-When: Tue Mar 30 09:58:35 UTC 2010 
State-Changed-Why:  
Committed to HEAD.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145194 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/145194: commit references a PR
Date: Tue, 30 Mar 2010 09:58:35 +0000 (UTC)

 Author: maxim
 Date: Tue Mar 30 09:58:21 2010
 New Revision: 205874
 URL: http://svn.freebsd.org/changeset/base/205874
 
 Log:
   o Make sockstat -6 output more readable for long ipv6
   addresses (most of them apart from ::1): put a whitespace
   between local and remote address:port pairs.
   
   PR:		bin/145194
   Submitted by:	Fedor Dikarev
   MFC after:	2 weeks
 
 Modified:
   head/usr.bin/sockstat/sockstat.c
 
 Modified: head/usr.bin/sockstat/sockstat.c
 ==============================================================================
 --- head/usr.bin/sockstat/sockstat.c	Tue Mar 30 09:22:33 2010	(r205873)
 +++ head/usr.bin/sockstat/sockstat.c	Tue Mar 30 09:58:21 2010	(r205874)
 @@ -621,6 +621,8 @@ display(void)
  		case AF_INET:
  		case AF_INET6:
  			pos += printaddr(s->family, &s->laddr);
 +			if (s->family == AF_INET6 && pos >= 58)
 +				pos += xprintf(" ");
  			while (pos < 58)
  				pos += xprintf(" ");
  			pos += printaddr(s->family, &s->faddr);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: Fedor Dikarev <fe@rambler-co.ru>
To: Maxim Konovalov <maxim.konovalov@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: bin/145194: Changed output of sockstat for AF_INET6
Date: Tue, 30 Mar 2010 13:38:51 +0400

 30.03.2010 13:33, Maxim Konovalov пишет:
 > This one looks more correct, doesn't it?
 > 
 > Index: sockstat.c
 > ===================================================================
 > --- sockstat.c	(revision 205577)
 > +++ sockstat.c	(working copy)
 > @@ -621,6 +621,8 @@
 >  		case AF_INET:
 >  		case AF_INET6:
 >  			pos += printaddr(s->family, &s->laddr);
 > +			if ((AF_INET6 == s->family) && (pos >= 58))
 > +				pos += xprintf(" ");
 >  			while (pos < 58)
 >  				pos += xprintf(" ");
 >  			pos += printaddr(s->family, &s->faddr);
 > 
 > %%%
 > 
 
 Yes, it'll be better -- I just hurry and made mistake through lack of
 attention.
 
 -- 
 Fedor Dikarev
 Rambler Internet Holding
State-Changed-From-To: patched->closed 
State-Changed-By: maxim 
State-Changed-When: Wed Apr 21 05:41:39 UTC 2010 
State-Changed-Why:  
Merged to RELENG_8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145194 

From: Kenyon Ralph <kenyon@kenyonralph.com>
To: bug-followup@FreeBSD.org, maxim@FreeBSD.org
Cc:  
Subject: Re: bin/145194: [patch] Changed output of sockstat(1) for AF_INET6
Date: Fri, 14 May 2010 00:51:10 -0700

 --EVF5PPMfhYS0aIcm
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 The fix for bin/145194 also fixes these:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/119014
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/81300
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/127475
 
 --=20
 Kenyon Ralph
 
 --EVF5PPMfhYS0aIcm
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: Digital signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAEBCgAGBQJL7QDsAAoJEJj/PvnJuRLV3hoP/2aw81KicVADMirUESEbCLHC
 fJxwi8jdOuPu7wOBSqiN5mIFfWntANKezipTGDCWlJQv3bS1QbzibwsAolZLxt75
 oJxeqxlXbArIuB11Xg7jp6INst46xzsXOlg7p9B5voHditP7TeBQjG/2TnrnifLm
 dww4ZvELA0Nd9G46FPUgERoKT8WJaO5U/1W0+luPXYKAkSImLNa5edIwZXgcCm8x
 UxZwmPTB5/pd0lxmuSl7JVNYQLpc1FyeZ5uCzWkQ5eL7auuIn22y26NVCx/LWAOI
 EsiiJWJ8qznZ8HXsRwU5URwx7Huv0OlvWaKdYKSuPkSCeCxuVLLF7Fqy3YGVKYMh
 GmtxEkonc+sE1kBsQzAEPNjMZdoT34w2SJG8pZHSfdmlLCVrOuPUp+z1qYvWFWUj
 2DAOAwJWP4bPky5EX1H7qCQvRiq9W+O2FC4oOLhhxkD/8N+bgEAbbTm5tiisvX+M
 ++rOCrRhYo3ToaxU7OVaBYYDK8EtfntJcUyJnxTrTOnGiiIuixHZnjV7WTW3sdhS
 xttFc5dM6DoELYJAiVOlb6l0CZYGZyc6PUKp5irN8MM+yypCHE46jtnXAaTijGoz
 r4+xpdBHYUpIES3REKlt9sVBCaIpmWt+rz8ml5fLjt/UpDLol9LZPwCGIOjqC7mZ
 C9x2q0YlgVHEleYgP6YS
 =vB2s
 -----END PGP SIGNATURE-----
 
 --EVF5PPMfhYS0aIcm--

From: Maxim Konovalov <maxim.konovalov@gmail.com>
To: Kenyon Ralph <kenyon@kenyonralph.com>
Cc: bug-followup@freebsd.org
Subject: Re: bin/145194: [patch] Changed output of sockstat(1) for AF_INET6
Date: Fri, 14 May 2010 12:04:53 +0400 (MSD)

 >  The fix for bin/145194 also fixes these:
 >
 >  http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/119014
 >  http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/81300
 >  http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dbin/127475
 >
 Heh, impressive. Thanks for the notice.
 
 -- 
 Maxim Konovalov
>Unformatted:
