From owner-freebsd-current@FreeBSD.ORG Thu Jan 26 15:25:25 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE10E106564A for ; Thu, 26 Jan 2012 15:25:25 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 9AD0F8FC15 for ; Thu, 26 Jan 2012 15:25:25 +0000 (UTC) Received: by ggnq2 with SMTP id q2so353152ggn.13 for ; Thu, 26 Jan 2012 07:25:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; bh=lOpVPoD2caxgnKclrEyr/mUzeKGUQkhTF9/sNhml9gs=; b=WMZ2HjMNqJdIEpCe6gRUS7w+rtoy6P/qLThgCCwo94sxR9crwIdhAYPhqiMr5K8YgZ wWrrPomLCxEqRKXg9URUVo1kdO/tFtyoj4dNLYGdwPKNz2Vf8ltmQW6x9HvDaZa2/F++ TcwI3tfVL8ITZTL3nnSyuZmx/a516q2wv26zw= MIME-Version: 1.0 Received: by 10.182.0.106 with SMTP id 10mr2599229obd.72.1327591524801; Thu, 26 Jan 2012 07:25:24 -0800 (PST) Received: by 10.182.74.167 with HTTP; Thu, 26 Jan 2012 07:25:24 -0800 (PST) Date: Thu, 26 Jan 2012 18:25:24 +0300 Message-ID: From: Sergey Kandaurov To: FreeBSD Current Content-Type: multipart/mixed; boundary=f46d043c077e3e1d7004b76ffde2 Subject: [patch] fstat: print the owner process for UNIX domain sockets X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2012 15:25:25 -0000 --f46d043c077e3e1d7004b76ffde2 Content-Type: text/plain; charset=ISO-8859-1 Hi. This patch adds support for fstat(1) to identify which process opened the specified socket file, to bring in line with regular files. E.g.: # fstat /var/run/devd.pipe USER CMD PID FD MOUNT INUM MODE SZ|DV R/W NAME root devd 1259 4* local stream fffffe0002a1a870 /var/run/devd.pipe # fstat /var/run/logpriv USER CMD PID FD MOUNT INUM MODE SZ|DV R/W NAME root syslogd 1495 5* local dgram fffffe0002a1a3c0 /var/run/logpriv Comments are welcome. Index: usr.bin/fstat/fstat.c =================================================================== --- usr.bin/fstat/fstat.c (revision 230505) +++ usr.bin/fstat/fstat.c (working copy) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -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; -- wbr, pluknet --f46d043c077e3e1d7004b76ffde2 Content-Type: application/octet-stream; name="fstat_un.diff" Content-Disposition: attachment; filename="fstat_un.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gxvxo1v60 SW5kZXg6IHVzci5iaW4vZnN0YXQvZnN0YXQuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB1c3IuYmluL2ZzdGF0 L2ZzdGF0LmMJKHJldmlzaW9uIDIzMDUwNSkKKysrIHVzci5iaW4vZnN0YXQvZnN0YXQuYwkod29y a2luZyBjb3B5KQpAQCAtMzgsNiArMzgsNyBAQCBfX0ZCU0RJRCgiJEZyZWVCU0QkIik7CiAjaW5j bHVkZSA8c3lzL3NvY2tldHZhci5oPgogI2luY2x1ZGUgPHN5cy9zeXNjdGwuaD4KICNpbmNsdWRl IDxzeXMvcXVldWUuaD4KKyNpbmNsdWRlIDxzeXMvdW4uaD4KIAogI2luY2x1ZGUgPG5ldGluZXQv aW4uaD4KIApAQCAtMjI0LDI4ICsyMjUsNTMgQEAgc3RhdGljIHZvaWQKIHByaW50X2ZpbGVfaW5m byhzdHJ1Y3QgcHJvY3N0YXQgKnByb2NzdGF0LCBzdHJ1Y3QgZmlsZXN0YXQgKmZzdCwKICAgICBj b25zdCBjaGFyICp1bmFtZSwgY29uc3QgY2hhciAqY21kLCBpbnQgcGlkKQogeworCXN0cnVjdCBz b2Nrc3RhdCBzb2NrOwogCXN0cnVjdCB2bnN0YXQgdm47CiAJREVWUyAqZDsKIAljb25zdCBjaGFy ICpmaWxlbmFtZTsKIAlpbnQgZXJyb3IsIGZzbWF0Y2ggPSAwOwogCWNoYXIgZXJyYnVmW19QT1NJ WDJfTElORV9NQVhdOwogCisJZXJyb3IgPSAwOwogCWZpbGVuYW1lID0gTlVMTDsKIAlpZiAoY2hl Y2tmaWxlICE9IDApIHsKLQkJaWYgKGZzdC0+ZnNfdHlwZSAhPSBQU19GU1RfVFlQRV9WTk9ERSAm JgotCQkgICAgZnN0LT5mc190eXBlICE9IFBTX0ZTVF9UWVBFX0ZJRk8pCisJCXN3aXRjaCAoZnN0 LT5mc190eXBlKSB7CisJCWNhc2UgUFNfRlNUX1RZUEVfVk5PREU6CisJCWNhc2UgUFNfRlNUX1RZ UEVfRklGTzoKKwkJCWVycm9yID0gcHJvY3N0YXRfZ2V0X3Zub2RlX2luZm8ocHJvY3N0YXQsIGZz dCwgJnZuLCBlcnJidWYpOworCQkJYnJlYWs7CisJCWNhc2UgUFNfRlNUX1RZUEVfU09DS0VUOgor CQkJZXJyb3IgPSBwcm9jc3RhdF9nZXRfc29ja2V0X2luZm8ocHJvY3N0YXQsIGZzdCwgJnNvY2ss IGVycmJ1Zik7CisJCQlicmVhazsKKwkJZGVmYXVsdDoKIAkJCXJldHVybjsKLQkJZXJyb3IgPSBw cm9jc3RhdF9nZXRfdm5vZGVfaW5mbyhwcm9jc3RhdCwgZnN0LCAmdm4sIGVycmJ1Zik7CisJCX0K IAkJaWYgKGVycm9yICE9IDApCiAJCQlyZXR1cm47CiAKIAkJZm9yIChkID0gZGV2czsgZCAhPSBO VUxMOyBkID0gZC0+bmV4dCkKLQkJCWlmIChkLT5mc2lkID09IHZuLnZuX2ZzaWQpIHsKLQkJCQlm c21hdGNoID0gMTsKLQkJCQlpZiAoKHVuc2lnbmVkKWQtPmlubyA9PSB2bi52bl9maWxlaWQpIHsK LQkJCQkJZmlsZW5hbWUgPSBkLT5uYW1lOwotCQkJCQlicmVhazsKKwkJCXN3aXRjaCAoZnN0LT5m c190eXBlKSB7CisJCQljYXNlIFBTX0ZTVF9UWVBFX1ZOT0RFOgorCQkJY2FzZSBQU19GU1RfVFlQ RV9GSUZPOgkJCQorCQkJCWlmIChkLT5mc2lkID09IHZuLnZuX2ZzaWQpIHsKKwkJCQkJZnNtYXRj aCA9IDE7CisJCQkJCWlmICgodW5zaWduZWQpZC0+aW5vID09IHZuLnZuX2ZpbGVpZCkgeworCQkJ CQkJZmlsZW5hbWUgPSBkLT5uYW1lOworCQkJCQkJYnJlYWs7CisJCQkJCX0KIAkJCQl9CisJCQkJ YnJlYWs7CisJCQljYXNlIFBTX0ZTVF9UWVBFX1NPQ0tFVDoKKwkJCQlpZiAoc29jay5kb21fZmFt aWx5ID09IEFGX1VOSVgpIHsKKwkJCQkJZnNtYXRjaCA9IDE7CisJCQkJCWlmIChzdHJjbXAoKChz dHJ1Y3Qgc29ja2FkZHJfdW4gKikKKwkJCQkJICAgICgmc29jay5zYV9sb2NhbCkpLT5zdW5fcGF0 aCwKKwkJCQkJICAgIGQtPm5hbWUpID09IDApIHsKKwkJCQkJCWZpbGVuYW1lID0gZC0+bmFtZTsK KwkJCQkJCWJyZWFrOworCQkJCQl9CisJCQkJfQorCQkJCWJyZWFrOwogCQkJfQogCQlpZiAoZnNt YXRjaCA9PSAwIHx8IChmaWxlbmFtZSA9PSBOVUxMICYmIGZzZmxnID09IDApKQogCQkJcmV0dXJu Owo= --f46d043c077e3e1d7004b76ffde2--