system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add support to nfsdumpstate for printing of INET6 addresses for locks.

Browse source 
r346190 added support for printing of INET6 addresses for the "-o" option
(all opens) but missed adding support for INET6 addresses for the "-l" option.
This patch adds that support.

PR:		223036
MFC after:	1 week
This commit is contained in:
Rick Macklem 2019-04-25 21:25:32 +00:00
parent f154ece02e
commit f736b5f9e9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=346709
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
usr.sbin/nfsdumpstate/nfsdumpstate.c
View file

@ -176,6 +176,7 @@ dump_lockstate(char *fname)
{
struct nfsd_dumplocklist dumplocklist;
int cnt, i;
char nbuf[INET6_ADDRSTRLEN];
dumplocklist.ndllck_size = DUMPSIZE;
dumplocklist.ndllck_list = (void *)lp;
@ -183,7 +184,7 @@ dump_lockstate(char *fname)
if (nfssvc(NFSSVC_DUMPLOCKS, &dumplocklist) < 0)
errx(1, "Can't dump locks for %s\n", fname);
printf("%-11s %-36s %-15s %s\n",
printf("%-11s %-36s %-45s %s\n",
"Open/Lock",
" Stateid or Lock Range",
"Clientaddr",
@ -213,11 +214,26 @@ dump_lockstate(char *fname)
lock_flags(lp[cnt].ndlck_flags),
lp[cnt].ndlck_first,
lp[cnt].ndlck_end);
if (lp[cnt].ndlck_addrfam == AF_INET)
printf("%-15s ",
switch (lp[cnt].ndlck_addrfam) {
#ifdef INET
case AF_INET:
printf("%-45s ",
inet_ntoa(lp[cnt].ndlck_cbaddr.sin_addr));
else
printf("%-15s ", " ");
break;
#endif
#ifdef INET6
case AF_INET6:
if (inet_ntop(AF_INET6, &lp[cnt].ndlck_cbaddr.sin6_addr,
nbuf, sizeof(nbuf)) != NULL)
printf("%-45s ", nbuf);
else
printf("%-45s ", " ");
break;
#endif
default:
printf("%-45s ", " ");
break;
}
for (i = 0; i < lp[cnt].ndlck_owner.nclid_idlen; i++)
printf("%02x", lp[cnt].ndlck_owner.nclid_id[i]);
printf(" ");