From owner-svn-src-stable-11@freebsd.org Mon Apr 29 13:52:35 2019 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1851A158E533; Mon, 29 Apr 2019 13:52:35 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-TO1-obe.outbound.protection.outlook.com (mail-eopbgr670089.outbound.protection.outlook.com [40.107.67.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A4DC781530; Mon, 29 Apr 2019 13:52:34 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from YQBPR0101MB2260.CANPRD01.PROD.OUTLOOK.COM (52.132.70.13) by YQBPR0101MB2259.CANPRD01.PROD.OUTLOOK.COM (52.132.73.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1835.13; Mon, 29 Apr 2019 13:52:32 +0000 Received: from YQBPR0101MB2260.CANPRD01.PROD.OUTLOOK.COM ([fe80::8128:ff77:e6ac:fe1a]) by YQBPR0101MB2260.CANPRD01.PROD.OUTLOOK.COM ([fe80::8128:ff77:e6ac:fe1a%5]) with mapi id 15.20.1835.018; Mon, 29 Apr 2019 13:52:32 +0000 From: Rick Macklem To: Andre Albsmeier , Rick Macklem CC: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable@freebsd.org" , "svn-src-stable-11@freebsd.org" Subject: Re: svn commit: r346775 - stable/11/usr.sbin/nfsdumpstate Thread-Topic: svn commit: r346775 - stable/11/usr.sbin/nfsdumpstate Thread-Index: AQHU/l781N2YjcOh9U+mgYJKrUSIy6ZTJ/Tu Date: Mon, 29 Apr 2019 13:52:32 +0000 Message-ID: References: <201904270213.x3R2DF8A098274@repo.freebsd.org>, <20190429072208.GA73248@bali> In-Reply-To: <20190429072208.GA73248@bali> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16afdf55-c1a7-45df-1ebe-08d6cca9edb2 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328)(7193020); SRVR:YQBPR0101MB2259; x-ms-traffictypediagnostic: YQBPR0101MB2259: x-ms-exchange-purlcount: 2 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:22; x-forefront-prvs: 0022134A87 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(39860400002)(366004)(396003)(376002)(199004)(189003)(256004)(446003)(86362001)(316002)(76176011)(4326008)(7696005)(14444005)(99286004)(68736007)(486006)(11346002)(97736004)(6246003)(786003)(8936002)(6306002)(9686003)(478600001)(74482002)(46003)(64756008)(81166006)(186003)(81156014)(8676002)(66946007)(55016002)(74316002)(110136005)(305945005)(66476007)(66556008)(66446008)(76116006)(966005)(229853002)(73956011)(476003)(53936002)(6436002)(54906003)(14454004)(52536014)(71190400001)(71200400001)(2906002)(53546011)(6506007)(25786009)(33656002)(102836004)(5660300002); DIR:OUT; SFP:1101; SCL:1; SRVR:YQBPR0101MB2259; H:YQBPR0101MB2260.CANPRD01.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: uoguelph.ca does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: TKkD6qQPqlc2vqpT3Z25iEc8QdUC2LVKl5cMc3exqLvkHrPov2hFv4YAEB77NWzWBfAg1lkNF6ruZRXXbl+V2DUmfmxoWgMYmPJiPv5Ps1OTvgjPnyzWoP9MIbe5Y00UmFNRWHaDfBQR4VCvptRRaefXmuAxRUIGTVreWc5zh7ikfILOsE0InOX7WhD5f4La0H/FB6wD5iIg6I9g4r/K/fLtDpFeGbh5yi2OSICs7TbbGMTOiLP/DtsAlIuHSmc9BEMUcMRGU8piyeUgNYAq1/HmjmjJr2J8d1zrYr8eN246HgS94J68lCVLXWO6pSnOnEZcDX3QuOJn338o5Bj5PjYB3qih71Ju83r/Li8YKi2tbMDNOOJt2jp3zmAfpvTzYewYIyZEu2i9PK1ARjKr2O8EHBw4uLaNLuyciHuzCUc= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-Network-Message-Id: 16afdf55-c1a7-45df-1ebe-08d6cca9edb2 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Apr 2019 13:52:32.7966 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: YQBPR0101MB2259 X-Rspamd-Queue-Id: A4DC781530 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Apr 2019 13:52:35 -0000 Yes. Someone pointed out that was needed for some builds to avoid an "unused variable" warning. (I don't get the warning when I do a build.) The change was committed to head as r346856 yesterday with a 1 week MFC. rick ________________________________________ From: Andre Albsmeier Sent: Monday, April 29, 2019 3:22:08 AM To: Rick Macklem Cc: src-committers@freebsd.org; svn-src-all@freebsd.org; svn-src-stable@fre= ebsd.org; svn-src-stable-11@freebsd.org Subject: Re: svn commit: r346775 - stable/11/usr.sbin/nfsdumpstate On Sat, 27-Apr-2019 at 02:13:15 +0000, Rick Macklem wrote: > Author: rmacklem > Date: Sat Apr 27 02:13:15 2019 > New Revision: 346775 > URL: https://svnweb.freebsd.org/changeset/base/346775 > > Log: > MFC: r346190 > Fix nfsdumpstate(8) so that it can print out INET6 callback addresses. > > The patch adds support for printing of INET6 callback addresses. > It also adds the #ifdef INET, INET6 as requested by bz@. We should also put ifdefs around the nbuf def: #ifdef INET6 char nbuf[INET6_ADDRSTRLEN]; #endif -Andre > > Modified: > stable/11/usr.sbin/nfsdumpstate/Makefile > stable/11/usr.sbin/nfsdumpstate/nfsdumpstate.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/usr.sbin/nfsdumpstate/Makefile > =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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/11/usr.sbin/nfsdumpstate/Makefile Sat Apr 27 02:05:04 2019 = (r346774) > +++ stable/11/usr.sbin/nfsdumpstate/Makefile Sat Apr 27 02:13:15 2019 = (r346775) > @@ -1,6 +1,15 @@ > # $FreeBSD$ > > +.include > + > PROG=3D nfsdumpstate > MAN=3D nfsdumpstate.8 > + > +.if ${MK_INET_SUPPORT} !=3D "no" > +CFLAGS+=3D -DINET > +.endif > +.if ${MK_INET6_SUPPORT} !=3D "no" > +CFLAGS+=3D -DINET6 > +.endif > > .include > > Modified: stable/11/usr.sbin/nfsdumpstate/nfsdumpstate.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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/11/usr.sbin/nfsdumpstate/nfsdumpstate.c Sat Apr 27 02:05:04= 2019 (r346774) > +++ stable/11/usr.sbin/nfsdumpstate/nfsdumpstate.c Sat Apr 27 02:13:15= 2019 (r346775) > @@ -121,13 +121,14 @@ dump_openstate(void) > { > struct nfsd_dumplist dumplist; > int cnt, i; > + char nbuf[INET6_ADDRSTRLEN]; > > dumplist.ndl_size =3D DUMPSIZE; > dumplist.ndl_list =3D (void *)dp; > if (nfssvc(NFSSVC_DUMPCLIENTS, &dumplist) < 0) > errx(1, "Can't perform dump clients syscall"); > > - printf("%-13s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %-15s %s\n", > + printf("%-13s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %-45s %s\n", > "Flags", "OpenOwner", "Open", "LockOwner", > "Lock", "Deleg", "OldDeleg", "Clientaddr", "ClientID"); > /* > @@ -143,9 +144,23 @@ dump_openstate(void) > dp[cnt].ndcl_nlocks, > dp[cnt].ndcl_ndelegs, > dp[cnt].ndcl_nolddelegs); > - if (dp[cnt].ndcl_addrfam =3D=3D AF_INET) > - printf("%-15s ", > + switch (dp[cnt].ndcl_addrfam) { > +#ifdef INET > + case AF_INET: > + printf("%-45s ", > inet_ntoa(dp[cnt].ndcl_cbaddr.sin_addr)); > + break; > +#endif > +#ifdef INET6 > + case AF_INET6: > + if (inet_ntop(AF_INET6, &dp[cnt].ndcl_cbaddr.sin6_a= ddr, > + nbuf, sizeof(nbuf)) !=3D NULL) > + printf("%-45s ", nbuf); > + else > + printf("%-45s ", " "); > + break; > +#endif > + } > for (i =3D 0; i < dp[cnt].ndcl_clid.nclid_idlen; i++) > printf("%02x", dp[cnt].ndcl_clid.nclid_id[i]); > printf("\n"); > _______________________________________________ > svn-src-stable-11@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11 > To unsubscribe, send any mail to "svn-src-stable-11-unsubscribe@freebsd.o= rg" -- Linux is only free if your time is worthless.