summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--README6
-rw-r--r--docs/index.rst2
3 files changed, 9 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 8ac3ed29..f765d13a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,11 +1,11 @@
Bug tracker at http://code.google.com/p/psutil/issues
-2.1.0 - XXXX-XX-XX
+2.1.0 - 2014-04-08
------------------
ENHANCEMENTS
- * 387: system-wide open connections.
+ * 387: system-wide open connections a-la netstat.
BUG FIXES
diff --git a/README b/README
index 97967728..8fbc8f81 100644
--- a/README
+++ b/README
@@ -113,6 +113,12 @@ Network
{'eth0': netio(bytes_sent=485291293, bytes_recv=6004858642, packets_sent=3251564, packets_recv=4787798, errin=0, errout=0, dropin=0, dropout=0),
'lo': netio(bytes_sent=2838627, bytes_recv=2838627, packets_sent=30567, packets_recv=30567, errin=0, errout=0, dropin=0, dropout=0)}
>>>
+ >>> psutil.net_connections()
+ [pconn(fd=115, family=2, type=1, laddr=('10.0.0.1', 48776), raddr=('93.186.135.91', 80), status='ESTABLISHED', pid=1254),
+ pconn(fd=117, family=2, type=1, laddr=('10.0.0.1', 43761), raddr=('72.14.234.100', 80), status='CLOSING', pid=2987),
+ pconn(fd=-1, family=2, type=1, laddr=('10.0.0.1', 60759), raddr=('72.14.234.104', 80), status='ESTABLISHED', pid=None),
+ pconn(fd=-1, family=2, type=1, laddr=('10.0.0.1', 51314), raddr=('72.14.234.83', 443), status='SYN_SENT', pid=None)
+ ...]
Other system info
=================
diff --git a/docs/index.rst b/docs/index.rst
index ab1d1be9..3b55e8c7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -627,7 +627,7 @@ Process class
Utility method which returns the parent process as a :class:`Process`
object pre-emptively checking whether PID has been reused. If no parent
- PID is known returns ``None``.
+ PID is known return ``None``.
.. method:: status()