From owner-svn-src-head@FreeBSD.ORG  Fri Feb  3 09:07:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30CD71065672;
	Fri,  3 Feb 2012 09:07:54 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 034248FC15;
	Fri,  3 Feb 2012 09:07:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1397rO4078876;
	Fri, 3 Feb 2012 09:07:53 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1397r50078874;
	Fri, 3 Feb 2012 09:07:53 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201202030907.q1397r50078874@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Fri, 3 Feb 2012 09:07:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230934 - head/usr.bin/fstat
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Feb 2012 09:07:54 -0000

Author: pluknet
Date: Fri Feb  3 09:07:53 2012
New Revision: 230934
URL: http://svn.freebsd.org/changeset/base/230934

Log:
  Print the owner process for unix domain sockets when restricted to the
  specified files.
  
  PR:		bin/143962
  MFC after:	2 weeks

Modified:
  head/usr.bin/fstat/fstat.c

Modified: head/usr.bin/fstat/fstat.c
==============================================================================
--- head/usr.bin/fstat/fstat.c	Fri Feb  3 09:06:24 2012	(r230933)
+++ head/usr.bin/fstat/fstat.c	Fri Feb  3 09:07:53 2012	(r230934)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/queue.h>
+#include <sys/un.h>
 
 #include <netinet/in.h>
 
@@ -224,28 +225,53 @@ static void
 print_file_info(struct procstat *procstat, struct filestat *fst,
     const char *uname, const char *cmd, int pid)
 {
+	struct sockstat sock;
 	struct vnstat vn;
 	DEVS *d;
 	const char *filename;
 	int error, fsmatch = 0;
 	char errbuf[_POSIX2_LINE_MAX];
 
+	error = 0;
 	filename = NULL;
 	if (checkfile != 0) {
-		if (fst->fs_type != PS_FST_TYPE_VNODE &&
-		    fst->fs_type != PS_FST_TYPE_FIFO)
+		switch (fst->fs_type) {
+		case PS_FST_TYPE_VNODE:
+		case PS_FST_TYPE_FIFO:
+			error = procstat_get_vnode_info(procstat, fst, &vn, errbuf);
+			break;
+		case PS_FST_TYPE_SOCKET:
+			error = procstat_get_socket_info(procstat, fst, &sock, errbuf);
+			break;
+		default:
 			return;
-		error = procstat_get_vnode_info(procstat, fst, &vn, errbuf);
+		}
 		if (error != 0)
 			return;
 
 		for (d = devs; d != NULL; d = d->next)
-			if (d->fsid == vn.vn_fsid) {
-				fsmatch = 1;
-				if ((unsigned)d->ino == vn.vn_fileid) {
-					filename = d->name;
-					break;
+			switch (fst->fs_type) {
+			case PS_FST_TYPE_VNODE:
+			case PS_FST_TYPE_FIFO:			
+				if (d->fsid == vn.vn_fsid) {
+					fsmatch = 1;
+					if ((unsigned)d->ino == vn.vn_fileid) {
+						filename = d->name;
+						break;
+					}
+				}
+				break;
+			case PS_FST_TYPE_SOCKET:
+				if (sock.dom_family == AF_UNIX) {
+					fsmatch = 1;
+					if (strcmp(((struct sockaddr_un *)
+					    (&sock.sa_local))->sun_path,
+					    d->name) == 0) {
+						filename = d->name;
+						break;
+					}
 				}
+				break;
 			}
 		if (fsmatch == 0 || (filename == NULL && fsflg == 0))
 			return;