[Zope-CVS] CVS: Packages/tcpwatch - CHANGES.txt:1.4 tcpwatch.py:1.7

[Shane Hathaway]

Update of /cvs-repository/Packages/tcpwatch
In directory cvs.zope.org:/tmp/cvs-serv20900

Modified Files:
	CHANGES.txt tcpwatch.py 
Log Message:
Accept 'user at host' as a hostname in proxy connections


=== Packages/tcpwatch/CHANGES.txt 1.3 => 1.4 ===
--- Packages/tcpwatch/CHANGES.txt:1.3	Tue Jun 17 09:54:18 2003
+++ Packages/tcpwatch/CHANGES.txt	Fri Apr  2 17:31:01 2004
@@ -1,7 +1,15 @@
 
+Next release
+
+  - Log file numbers are now sequential.
+
+  - "user at host" is now accepted as a destination hostname.
+
+
 Version 1.2.1
 
-  - A typo made it impossible to use two command line options.  Fixed.
+  - A typo made it impossible to use two of the command line options.
+    Fixed.
 
 
 Version 1.2


=== Packages/tcpwatch/tcpwatch.py 1.6 => 1.7 ===
--- Packages/tcpwatch/tcpwatch.py:1.6	Mon Mar  1 11:53:27 2004
+++ Packages/tcpwatch/tcpwatch.py	Fri Apr  2 17:31:01 2004
@@ -1183,6 +1183,9 @@
         else:
             port = 80
 
+        if '@' in host:
+            username, host = host.split('@')
+
         obs = self._obs
         if obs is not None:
             eo = EndpointObserver(obs, 0)