 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstat.c,v 1.106 2013/12/15 18:56:59 mlelstv Exp $	*/
+/*	$NetBSD: fstat.c,v 1.107 2014/01/17 03:28:01 christos Exp $	*/
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #else
-__RCSID("$NetBSD: fstat.c,v 1.106 2013/12/15 18:56:59 mlelstv Exp $");
+__RCSID("$NetBSD: fstat.c,v 1.107 2014/01/17 03:28:01 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 @@ -500,28 +500,27 @@ ftrans(fdfile_t *fp, int i)
 	if (!KVM_READ(fdfile.ff_file, &file, sizeof(file))) {
 		dprintf("can't read file %d at %p for pid %d",
 		    i, fdfile.ff_file, Pid);
 		return;
+	}
 	if (Aflg && file.f_type != DTYPE_VNODE && checkfile == 0)
 		(void)printf("%*lx ",
 *(int)(sizeof(void*)), (long)fdfile.ff_file);
 	switch (file.f_type) {
 	case DTYPE_VNODE:
 		vtrans(file.f_data, i, file.f_flag, (long)fdfile.ff_file);
 		break;
 	case DTYPE_SOCKET:
-		if (checkfile == 0)
+		socktrans(file.f_data, i);
 			socktrans(file.f_data, i);
 		break;
 	case DTYPE_PIPE:
 		if (checkfile == 0)
 			ptrans(&file, file.f_data, i);
 		break;
 	case DTYPE_MISC:
 	case DTYPE_KQUEUE:
 	case DTYPE_CRYPTO:
 	case DTYPE_MQUEUE:
 	case DTYPE_SEM:
 		if (checkfile == 0)
 			misctrans(&file, i);
 		break;
 @@ -588,57 +587,69 @@ vfilestat(struct vnode *vp, struct files
 			badtype = layer_filestat(vp, fsp);
 			break;
 		default: {
 			static char unknown[10];
 			(void)snprintf(unknown, sizeof unknown,
 			    "?(%x)", vp->v_tag);
 			badtype = unknown;
 			break;
+		}
+	}
 	return badtype;
+}
-static void
+static int
-vtrans(struct vnode *vp, int i, int flag, long addr)
+checkfs(struct vnode *vp, struct vnode *vn, struct filestat *fst,
     const char **type, const char **fname)
+{
-	struct vnode vn;
+	*fname = NULL;
-	struct filestat fst;
+	if (!KVM_READ(vp, vn, sizeof(*vn))) {
 	char mode[15], rw[3];
 	const char *badtype, *filename;
 	filename = NULL;
 	if (!KVM_READ(vp, &vn, sizeof(struct vnode))) {
 		dprintf("can't read vnode at %p for pid %d", vp, Pid);
-		return;
+		return 0;
+	}
-	badtype = vfilestat(&vn, &fst);
+	*type = vfilestat(vn, fst);
 	if (checkfile) {
 		int fsmatch = 0;
 		DEVS *d;
 #if 0
-		if (badtype && badtype != dead)
+		if (*type && *type != dead)
-			return;
+			return 0;
-		for (d = devs; d != NULL; d = d->next)
+#endif
-			if (d->fsid == fst.fsid) {
+		for (d = devs; d != NULL; d = d->next) {
 			if (d->fsid == fst->fsid) {
 				fsmatch = 1;
-				if (d->ino == fst.fileid) {
+				if (d->ino == fst->fileid) {
-					filename = d->name;
+					*fname = d->name;
 					break;
+				}
+			}
 		if (fsmatch == 0 || (filename == NULL && fsflg == 0))
-			return;
+		if (fsmatch == 0 || (*fname == NULL && fsflg == 0))
 			return 0;
+	}
 	return 1;
+}
 static void
 vtrans(struct vnode *vp, int i, int flag, long addr)
+{
 	struct vnode vn;
 	char mode[15], rw[3];
 	const char *badtype, *filename;
 	struct filestat fst;
 	if (!checkfs(vp, &vn, &fst, &badtype, &filename))
 		return;
 	if (Aflg)
 		(void)printf("%*lx ", 2*(int)(sizeof(void*)), addr);
 	PREFIX(i);
 	if (badtype == dead) {
 		char buf[1024];
 		(void)snprintb(buf, sizeof(buf), VNODE_FLAGBITS,
 		    vn.v_iflag | vn.v_vflag | vn.v_uflag);
 		(void)printf(" flags %s\n", buf);
 		return;
 	} else if (badtype) {
 		(void)printf(" -         -  %10s    -\n", badtype);
 		return;
+	}
 @@ -989,59 +1000,56 @@ socktrans(struct socket *sock, int i)
 #define	STYPEMAX 5
 	struct socket	so;
 	struct protosw	proto;
 	struct domain	dom;
 	struct inpcb	inpcb;
 #ifdef INET6
 	struct in6pcb	in6pcb;
 #endif
 	struct unpcb	unpcb;
 	struct ddpcb	ddpcb;
 	int len;
 	char dname[32];
 	char lbuf[512], fbuf[512];
 	PREFIX(i);
 	/* fill in socket */
 	if (!KVM_READ(sock, &so, sizeof(struct socket))) {
 		dprintf("can't read sock at %p", sock);
 		goto bad;
+	}
 	/* fill in protosw entry */
 	if (!KVM_READ(so.so_proto, &proto, sizeof(struct protosw))) {
 		dprintf("can't read protosw at %p", so.so_proto);
 		goto bad;
+	}
 	/* fill in domain */
 	if (!KVM_READ(proto.pr_domain, &dom, sizeof(struct domain))) {
 		dprintf("can't read domain at %p", proto.pr_domain);
 		goto bad;
+	}
 	if (checkfile && dom.dom_family != AF_LOCAL)
 		return;
 	if ((len = kvm_read(kd, (u_long)dom.dom_name, dname,
 	    sizeof(dname) - 1)) != sizeof(dname) -1) {
 		dprintf("can't read domain name at %p", dom.dom_name);
 		dname[0] = '\0';
+	}
 	else
 		dname[len] = '\0';
 	if ((u_short)so.so_type > STYPEMAX)
 		(void)printf("* %s ?%d", dname, so.so_type);
 	else
 		(void)printf("* %s %s", dname, stypename[so.so_type]);
 	/*
 	 * protocol specific formatting
+	 *
 	 * Try to find interesting things to print.  For TCP, the interesting
 	 * thing is the address of the tcpcb, for UDP and others, just the
 	 * inpcb (socket pcb).  For UNIX domain, its the address of the socket
 	 * pcb and the address of the connected pcb (if connected).  Otherwise
 	 * just print the protocol number and address of the socket itself.
 	 * The idea is not to duplicate netstat, but to make available enough
 	 * information for further analysis.
 	 */
 	fbuf[0] = '\0';
 	lbuf[0] = '\0';
 @@ -1102,26 +1110,36 @@ socktrans(struct socket *sock, int i)
 			cp = shoconn;
 			if (!(so.so_state & SS_CANTRCVMORE))
 				*cp++ = '<';
 			*cp++ = '-';
 			if (!(so.so_state & SS_CANTSENDMORE))
 				*cp++ = '>';
 			*cp = '\0';
 again:
 			if (kvm_read(kd, (u_long)pcb[p], (char *)&unpcb,
 			    sizeof(struct unpcb)) != sizeof(struct unpcb)){
 				dprintf("can't read unpcb at %p", so.so_pcb);
 				goto bad;
+			}
 			if (checkfile) {
 				struct vnode vn;
 				struct filestat fst;
 				const char *badtype, *filename;
 				if (unpcb.unp_vnode == NULL)
 					return;
 				if (!checkfs(unpcb.unp_vnode, &vn, &fst,
 				    &badtype, &filename))
 					return;
+			}
 			if (unpcb.unp_addr) {
 				struct sockaddr_un *sun =
 					malloc(unpcb.unp_addrlen);
 				if (sun == NULL)
 				    err(1, "malloc(%zu)",
 					unpcb.unp_addrlen);
 				if (kvm_read(kd, (u_long)unpcb.unp_addr,
 				    sun, unpcb.unp_addrlen) !=
 				    (ssize_t)unpcb.unp_addrlen) {
 					dprintf("can't read sun at %p",
 					    unpcb.unp_addr);
 					free(sun);
 @@ -1152,26 +1170,32 @@ again:
 				dprintf("can't read ddpcb at %p", so.so_pcb);
 				goto bad;
+			}
 			at_addrstr(fbuf, sizeof(fbuf), &ddpcb.ddp_fsat);
 			at_addrstr(lbuf, sizeof(lbuf), &ddpcb.ddp_lsat);
+		}
 		break;
 	default:
 		/* print protocol number and socket address */
 		snprintf(fbuf, sizeof(fbuf), " %d %jx", proto.pr_protocol,
 		    (uintmax_t)(uintptr_t)sock);
 		break;
+	}
 	PREFIX(i);
 	if ((u_short)so.so_type > STYPEMAX)
 		(void)printf("* %s ?%d", dname, so.so_type);
 	else
 		(void)printf("* %s %s", dname, stypename[so.so_type]);
 	if (fbuf[0] || lbuf[0])
 		printf(" %s%s%s", fbuf, (fbuf[0] && lbuf[0]) ? " <-> " : "",
 		    lbuf);
 	else if (so.so_pcb)
 		printf(" %jx", (uintmax_t)(uintptr_t)so.so_pcb);
 	(void)printf("\n");
 	return;
 bad:
 	(void)printf("* error\n");
+}
 static void
 ptrans(struct file *fp, struct pipe *cpipe, int i)