Page MenuHomeFreeBSD
Files F144451452

D19839.id56184.diff
No OneTemporary
Actions

D19839.id56184.diff
View Options

Index: head/usr.sbin/nfsdumpstate/Makefile
===================================================================
--- head/usr.sbin/nfsdumpstate/Makefile
+++ head/usr.sbin/nfsdumpstate/Makefile
@@ -1,6 +1,15 @@
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= nfsdumpstate
MAN= nfsdumpstate.8
+
+.if ${MK_INET_SUPPORT} != "no"
+CFLAGS+= -DINET
+.endif
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
.include <bsd.prog.mk>
Index: head/usr.sbin/nfsdumpstate/nfsdumpstate.c
===================================================================
--- head/usr.sbin/nfsdumpstate/nfsdumpstate.c
+++ head/usr.sbin/nfsdumpstate/nfsdumpstate.c
@@ -121,13 +121,14 @@
{
struct nfsd_dumplist dumplist;
int cnt, i;
+ char nbuf[INET6_ADDRSTRLEN];
dumplist.ndl_size = DUMPSIZE;
dumplist.ndl_list = (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 @@
dp[cnt].ndcl_nlocks,
dp[cnt].ndcl_ndelegs,
dp[cnt].ndcl_nolddelegs);
- if (dp[cnt].ndcl_addrfam == 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_addr,
+ nbuf, sizeof(nbuf)) != NULL)
+ printf("%-45s ", nbuf);
+ else
+ printf("%-45s ", " ");
+ break;
+#endif
+ }
for (i = 0; i < dp[cnt].ndcl_clid.nclid_idlen; i++)
printf("%02x", dp[cnt].ndcl_clid.nclid_id[i]);
printf("\n");

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 12:32 PM (10 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28579292
Default Alt Text
D19839.id56184.diff (1 KB)

Event Timeline