[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Almost done with 0.0.4rc3.



Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv2764/lib/mixminion/server

Modified Files:
	MMTPServer.py 
Log Message:
Almost done with 0.0.4rc3.

README:
- Add what's-new.

setup, __init__, ServerList:
- Bump versions

test:
- Add a few more unit tests

MMTPServer:
- Improve some log messages



Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- MMTPServer.py	6 Jun 2003 06:08:39 -0000	1.38
+++ MMTPServer.py	6 Jun 2003 07:17:35 -0000	1.39
@@ -655,8 +655,8 @@
                 replyControl = RECEIVED_CONTROL
             isJunk = 0
         else:
-            warn("Unrecognized command from %s.  Closing connection.",
-                 self.address)
+            warn("Unrecognized command (%r) from %s.  Closing connection.",
+                 data[:4], self.address)
             self.shutdown(err=1)
             return
         if expectedDigest != digest:
@@ -665,8 +665,11 @@
             self.shutdown(err=1)
             return
         else:
-            debug("%s packet received from %s; Checksum valid.",
-                  data[:4], self.address)
+            if isJunk:
+                debug("Link padding received from %s; Checksum valid.",
+                      self.address)
+            else:
+                debug("Packet received from %s; Checksum valid.", self.address)
             self.finished = self.__sentAck
             self.beginWrite(replyControl+replyDigest)
             if isJunk: