NetBSD Problem Report #44889
From yamt@NetBSD.org Thu Apr 21 04:45:05 2011
Return-Path: <yamt@NetBSD.org>
Received: by www.NetBSD.org (Postfix, from userid 1270)
id 058B963C226; Thu, 21 Apr 2011 04:45:05 +0000 (UTC)
Message-Id: <20110421044505.058B963C226@www.NetBSD.org>
Date: Thu, 21 Apr 2011 04:45:05 +0000 (UTC)
From: yamt@NetBSD.org
Reply-To: yamt@NetBSD.org
To: gnats-bugs@NetBSD.org
Subject: netstat -d option is broken
X-Send-Pr-Version: 3.95
>Number: 44889
>Category: bin
>Synopsis: netstat -d option is broken
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: bin-bug-people
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Thu Apr 21 04:50:01 +0000 2011
>Closed-Date: Fri Feb 24 17:43:30 +0000 2012
>Last-Modified: Fri Feb 24 17:43:30 +0000 2012
>Originator: YAMAMOTO Takashi
>Release: NetBSD-current
>Organization:
>Environment:
>Description:
at least -d option of netstat seems broken.
>How-To-Repeat:
grep XXX-elad in usr.bin/netstat.
>Fix:
>Release-Note:
>Audit-Trail:
From: matthew sporleder <msporleder@gmail.com>
To: gnats-bugs@netbsd.org, gnats-admin@netbsd.org
Cc:
Subject: re: bin/44889
Date: Sun, 12 Feb 2012 09:52:18 -0500
From elad in irc:
Index: if.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/src/usr.bin/netstat/if.c,v
retrieving revision 1.72
diff -u -p -r1.72 if.c
--- if.c =A0 =A0 =A0 =A016 Sep 2011 15:39:27 -0000 =A0 =A0 =A01.72
+++ if.c =A0 =A0 =A0 =A012 Feb 2012 03:54:15 -0000
@@ -83,7 +83,8 @@ struct =A0 =A0 =A0 =A0iftot {
=A0 =A0 =A0 =A0int ift_dr; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* drops=
*/
=A0};
-static void print_addr(struct sockaddr *, struct sockaddr **, struct
if_data *);
+static void print_addr(struct sockaddr *, struct sockaddr **, struct if_da=
ta *,
+ =A0 =A0struct ifnet *);
=A0static void sidewaysintpr(u_int, u_long);
=A0static void iftot_banner(struct iftot *);
@@ -220,7 +221,7 @@ intpr_sysctl(void)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0printf("%-5s %-5" PRIu64, na=
me, ifd->ifi_mtu);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 print_addr(rti_info[RTAX_IFP]=
, rti_info, ifd);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 print_addr(rti_info[RTAX_IFP]=
, rti_info, ifd, NULL);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0case RTM_NEWADDR:
@@ -238,24 +239,25 @@ intpr_sysctl(void)
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0get_rtaddrs(ifam->ifam_addrs=
, sa, rti_info);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0printf("%-5s %-5" PRIu64, na=
me, ifd->ifi_mtu);
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 print_addr(rti_info[RTAX_IFA]=
, rti_info, ifd);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 print_addr(rti_info[RTAX_IFA]=
, rti_info, ifd, NULL);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0}
=A0}
-
-static void
-intpr_kvm(u_long ifnetaddr, void (*pfunc)(const char *))
-{
- =A0 =A0 =A0 struct ifnet ifnet;
- =A0 =A0 =A0 union {
+union ifaddr_u {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct ifaddr ifa;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct in_ifaddr in;
=A0#ifdef INET6
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct in6_ifaddr in6;
=A0#endif /* INET6 */
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct iso_ifaddr iso;
- =A0 =A0 =A0 } ifaddr;
+};
+
+static void
+intpr_kvm(u_long ifnetaddr, void (*pfunc)(const char *))
+{
+ =A0 =A0 =A0 struct ifnet ifnet;
+ =A0 =A0 =A0 union ifaddr_u ifaddr;
=A0 =A0 =A0 =A0u_long ifaddraddr;
=A0 =A0 =A0 =A0struct ifnet_head ifhead; =A0 =A0 =A0 /* TAILQ_HEAD */
=A0 =A0 =A0 =A0char name[IFNAMSIZ + 1]; =A0 =A0 =A0 =A0/* + 1 for `*' */
@@ -321,7 +323,7 @@ intpr_kvm(u_long ifnetaddr, void (*pfunc
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cp =3D (CP(ifaddr.ifa.ifa_ad=
dr) - CP(ifaddraddr)) +
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0CP(&ifaddr);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sa =3D (struct sockaddr *)cp=
;
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 print_addr(sa, (void *)&ifadd=
r, &ifnet.if_data);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 print_addr(sa, (void *)&ifadd=
r, &ifnet.if_data, &ifnet);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ifaddraddr =3D (u_long)ifaddr.ifa.ifa_list.t=
qe_next;
=A0 =A0 =A0 =A0}
@@ -329,7 +331,8 @@ intpr_kvm(u_long ifnetaddr, void (*pfunc
=A0}
=A0static void
-print_addr(struct sockaddr *sa, struct sockaddr **rtinfo, struct if_data *=
ifd)
+print_addr(struct sockaddr *sa, struct sockaddr **rtinfo, struct if_data *=
ifd,
+ =A0 =A0struct ifnet *ifnet)
=A0{
=A0 =A0 =A0 =A0char hexsep =3D '.'; =A0 =A0 =A0 =A0 =A0 =A0 =A0/* for hexpr=
int */
=A0 =A0 =A0 =A0static const char hexfmt[] =3D "%02x%c"; =A0/* for hexprint =
*/
@@ -380,13 +383,14 @@ print_addr(struct sockaddr *sa, struct s
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0n =3D 17;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0printf("%-*.*s ", n, n, cp);
-#if 0 /* XXX-elad */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (aflag) {
+#if 1 /* XXX-elad */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (aflag && ifnet) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0u_long multiaddr;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct in_multi inm;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 union ifaddr_u *ifaddr =3D (u=
nion ifaddr_u *)rtinfo;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0multiaddr =3D (u_long)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ifaddr.in.ia_multiadd=
rs.lh_first;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ifaddr->in.ia_multiad=
drs.lh_first;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while (multiaddr !=3D 0) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0kread(multia=
ddr, (char *)&inm,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 sizeof =
inm);
@@ -397,7 +401,7 @@ print_addr(struct sockaddr *sa, struct s
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (u_long=
)inm.inm_list.le_next;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
-#endif /* 0 */
+#endif /* 1 */
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
=A0#ifdef INET6
=A0 =A0 =A0 =A0case AF_INET6:
@@ -441,14 +445,15 @@ print_addr(struct sockaddr *sa, struct s
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0n =3D 17;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0printf("%-*.*s ", n, n, cp);
-#if 0 /* XXX-elad */
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (aflag) {
+#if 1 /* XXX-elad */
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (aflag && ifnet) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0u_long multiaddr;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct in6_multi inm;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct sockaddr_in6 as6;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 union ifaddr_u *ifaddr =3D (u=
nion ifaddr_u *)rtinfo;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0multiaddr =3D (u_long)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ifaddr.in6.ia6_multia=
ddrs.lh_first;
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ifaddr->in6.ia6_multi=
addrs.lh_first;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while (multiaddr !=3D 0) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0kread(multia=
ddr, (char *)&inm,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 sizeof =
inm);
@@ -484,7 +489,7 @@ print_addr(struct sockaddr *sa, struct s
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (u_long=
)inm.in6m_entry.le_next;
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
-#endif /* 0 */
+#endif /* 1 */
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
=A0#endif /*INET6*/
=A0#ifndef SMALL
@@ -548,9 +553,9 @@ print_addr(struct sockaddr *sa, struct s
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(unsigned long long)ifd->ifi=
_collisions);
=A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0if (tflag)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 printf(" %4d", 0 /* XXX-elad ifnet.if_timer *=
/);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 printf(" %4d", ifnet ? ifnet->if_timer : 0); =
/* XXX-elad */
=A0 =A0 =A0 =A0if (dflag)
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 printf(" %5d", 0 /* XXX-elad ifnet.if_snd.ifq=
_drops */);
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 printf(" %5d", ifnet ? ifnet->if_snd.ifq_drop=
s : 0);
/* XXX-elad */
=A0 =A0 =A0 =A0putchar('\n');
=A0}
From: Bernd Ernesti <netbsd@lists.veego.de>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: bin/44889
Date: Sun, 12 Feb 2012 19:28:43 +0100
On Sun, Feb 12, 2012 at 02:55:01PM +0000, matthew sporleder wrote:
[..]
> From elad in irc:
>
> Index: if.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Unreadable.
From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/44889 CVS commit: src/usr.bin/netstat
Date: Sun, 12 Feb 2012 14:11:33 -0500
Module Name: src
Committed By: christos
Date: Sun Feb 12 19:11:33 UTC 2012
Modified Files:
src/usr.bin/netstat: if.c
Log Message:
PR/44889: Yamamoto Takashi: netstat -d option is broken (from Elad)
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/netstat/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->feedback
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Sun, 12 Feb 2012 19:17:52 +0000
State-Changed-Why:
Did christos' commit fix the problem?
From: yamt@mwd.biglobe.ne.jp (YAMAMOTO Takashi)
To: gnats-bugs@NetBSD.org
Cc: gnats-admin@netbsd.org, netbsd-bugs@netbsd.org, wiz@NetBSD.org,
yamt@NetBSD.org
Subject: Re: bin/44889 (netstat -d option is broken)
Date: Fri, 24 Feb 2012 04:39:59 +0000 (UTC)
hi,
> Synopsis: netstat -d option is broken
>
> State-Changed-From-To: open->feedback
> State-Changed-By: wiz@NetBSD.org
> State-Changed-When: Sun, 12 Feb 2012 19:17:52 +0000
> State-Changed-Why:
> Did christos' commit fix the problem?
i don't remember the recipe to reproduce the problem.
if you believe it fixed, please close.
YAMAMOTO Takashi
State-Changed-From-To: feedback->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Fri, 24 Feb 2012 17:43:30 +0000
State-Changed-Why:
Let's assume elad/christos fixed it; if it's still there, we can always reopen.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.