From nobody Sun Sep 22 15:17:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XBV9X51DMz5WXBM; Sun, 22 Sep 2024 15:17:36 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XBV9X2bs3z4nq4; Sun, 22 Sep 2024 15:17:36 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7a99fdf2e1aso463719885a.2; Sun, 22 Sep 2024 08:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727018255; x=1727623055; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=0JPZqxu4KYXq1lt0fsuOq7ZgD3cifygesoOnL/RxVhk=; b=Oe9PfKcEBpVwRq8PvivWBVpI+moYZnzo6SFERuTFOE6tRudiWuKVQ+r79NwVATNo2A tu/uMUL9uZmtaPEK2waCA/QGYvJczRgKW7+n/YNFM8SD7bbUHJf+HH3oypfjTUn6n3TP w4f9+ssz6UZjWx34TJOzsh3Mmg86A27sRx5L/Rh/3CW8fxdgVz95CoPF+PXhvO8rsRzZ 1/jBHkgXteqA5WMqBEDXVM82G2amnJFfEFkJ8bYpA0In41JWkI/RNDryYdAXJ+9KCmlJ 4vDB+01TM/qk2SIHrwmc6xjbKDTfGDWCad+ZxE8oCEX/XVzfBuzod2RNhAk/Nf+N89jQ uY/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727018255; x=1727623055; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0JPZqxu4KYXq1lt0fsuOq7ZgD3cifygesoOnL/RxVhk=; b=QIMl4tL/rkSsn8ui6MxAoMojo8JNhyCUEl/fHWO/ijVOGiBbT4kAZCcMkxXyChKnbN czXwm2E7dOIyT8MkYmYYMjS0t2mzq7fS4ajl+Xi0Vw4DVIP5695YIdBHfuNjXwpvMXze KjjBiPerlFtBIgqKG3dgdpub9ykg+JTKuLjFJmPhvGv2Gg68Wqj+wJYnyeP2PN4BF/wQ Q2wWZL8gi/vpImTnRja0rl8V95eyY808ZJq8ONXhKBan6NSUhCR1ivU8l99ihibCvYzo rUJBEUFF1td3RWb51DC53xqKVWdZEzk8RtRw1mwDlL/OFR1ds8FmHWNCLko/1JJxENnC sDBA== X-Forwarded-Encrypted: i=1; AJvYcCU1QtIDyWaV3xAk8GU8VVnzhM4daJXNTeAltBERTVGQgnje+4kRMR/txOA/GFZXHiGT7Vtg/FoQuICIJEK46p4=@freebsd.org, AJvYcCXlEyPESI1M0Q3MdrLE29+u9/0wbQFuI65laFdlDkdyj8g0MMKs0A27y2m75Hs/AEnLuyctOVstwFkzdZYrqgHco5H03fk=@freebsd.org, AJvYcCXpCgOdZ/QSL7DrCGKNAplewSoP6rJxfk8kgQL/ZbpC9Bf9WSJ9r+FviyfV0nQqD1IkScCOqYbY0LWSX0KwQCK3x21j@freebsd.org X-Gm-Message-State: AOJu0YxTBL+lN3Enw0HneO1W3x2Se3E+sTXBE/W/8wkN39zb8dyqUZJf cZkp8wfkvBHi+s+fErRAcUMc/6Ac7XCYft2kC3twqkFTi95K1zvRZzOHBqeg X-Google-Smtp-Source: AGHT+IFgmMwQG5uXrHE5t0g7NVNRUZXNGlv/OLJLx249e38lw6cF5MRJ6B9LXt5AxXTB6zG4nXmrJw== X-Received: by 2002:a05:620a:2443:b0:7ac:b2d6:9ccf with SMTP id af79cd13be357-7acb82159bfmr1616514685a.61.1727018255351; Sun, 22 Sep 2024 08:17:35 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7acb080729fsm388300485a.42.2024.09.22.08.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 08:17:34 -0700 (PDT) Date: Sun, 22 Sep 2024 11:17:30 -0400 From: Mark Johnston To: Warner Losh Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Bram Subject: Re: git: 94567c8641e2 - main - netstat: Resolve duplicate "dropped-packets" key from libxo output Message-ID: References: <202409201558.48KFwAEN048834@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XBV9X2bs3z4nq4 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Sun, Sep 22, 2024 at 02:19:54PM +0100, Warner Losh wrote: > On Sun, Sep 22, 2024 at 11:29 AM Mark Johnston wrote: > > > On Fri, Sep 20, 2024 at 03:58:10PM +0000, Warner Losh wrote: > > > The branch main has been updated by imp: > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=94567c8641e235763b5b2926416d89d36654cde1 > > > > > > commit 94567c8641e235763b5b2926416d89d36654cde1 > > > Author: Bram > > > AuthorDate: 2024-07-23 08:57:42 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-09-20 15:06:26 +0000 > > > > > > netstat: Resolve duplicate "dropped-packets" key from libxo output > > > > > > The current libxo output uses the "dropped-packets" key for both > > incoming and > > > outgoing packets. This commit distinguishes between the two by > > adding an "in" > > > and "out" suffix. The original "dropped-packets" key is kept for > > backwards > > > compatibility for now. > > > > > > PR: 244589 > > > Reviewed by: imp, zlei > > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1331 > > > --- > > > usr.bin/netstat/if.c | 10 ++++++++-- > > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > > > diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c > > > index 172ea5324ccb..f0af785bce04 100644 > > > --- a/usr.bin/netstat/if.c > > > +++ b/usr.bin/netstat/if.c > > > @@ -501,8 +501,11 @@ intpr(void (*pfunc)(char *), int af) > > > IFA_STAT(ipackets), link|network, 1); > > > show_stat("lu", nerr_len, "received-errors", > > IFA_STAT(ierrors), > > > link, 1); > > > + /* Below is kept for backwards compatibility. Will be > > removed in the future. */ > > > show_stat("lu", nerr_len, "dropped-packets", > > IFA_STAT(iqdrops), > > > link, 1); > > > + show_stat("lu", nerr_len, "dropped-packets-in", > > IFA_STAT(iqdrops), > > > + link, 1); > > > > This breaks plain netstat output, causing a bunch of network tests to > > fail. For instance, "netstat -Wf link -I re0" now prints an extra > > column. > > > > I think we should not bother with backwards compat unless libxo is > > emitting structured output. This can be implemented using the "e" > > format modifier described in the xo_format modified, but I'm not sure > > how to plumb it through show_stat(). > > > > Let's revert until this is fixed? > > > > Works for me. I hadn't noticed before the push. Thanks for bringing it up. Thanks, the tests seem to be fixed now.