svn commit: r230934 - head/usr.bin/fstat

[Sergey Kandaurov]

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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"