diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-02-13 16:10:10 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-02-13 16:10:10 +0100 |
commit | f0b87e1f7dc6f666bd48e26b7a1f84975d7b09b8 (patch) | |
tree | f2063d41bc35c972fc674a1eac3653624cb26196 | |
parent | 7e7d211de0db4b6c6ad7c721e2be3374d9c1987d (diff) | |
download | psutil-f0b87e1f7dc6f666bd48e26b7a1f84975d7b09b8.tar.gz |
small refactoring to accomodate #1691
-rw-r--r-- | psutil/_pslinux.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py index eb03e8a3..1bd8e987 100644 --- a/psutil/_pslinux.py +++ b/psutil/_pslinux.py @@ -752,6 +752,8 @@ class Connections: """ def __init__(self): + # The string represents the basename of the corresponding + # /proc/net/{proto_name} file. tcp4 = ("tcp", socket.AF_INET, socket.SOCK_STREAM) tcp6 = ("tcp6", socket.AF_INET6, socket.SOCK_STREAM) udp4 = ("udp", socket.AF_INET, socket.SOCK_DGRAM) @@ -956,15 +958,14 @@ class Connections: else: inodes = self.get_all_inodes() ret = set() - for f, family, type_ in self.tmap[kind]: + for proto_name, family, type_ in self.tmap[kind]: + path = "%s/net/%s" % (self._procfs_path, proto_name) if family in (socket.AF_INET, socket.AF_INET6): ls = self.process_inet( - "%s/net/%s" % (self._procfs_path, f), - family, type_, inodes, filter_pid=pid) + path, family, type_, inodes, filter_pid=pid) else: ls = self.process_unix( - "%s/net/%s" % (self._procfs_path, f), - family, inodes, filter_pid=pid) + path, family, inodes, filter_pid=pid) for fd, family, type_, laddr, raddr, status, bound_pid in ls: if pid: conn = _common.pconn(fd, family, type_, laddr, raddr, |