[minion-cvs] Fix a bug in handling DROP packets, and send all usage ...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerMain.py 
Log Message:
Fix a bug in handling DROP packets, and send all usage to stdout

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ServerMain.py	7 Jan 2003 03:31:30 -0000	1.22
+++ ServerMain.py	7 Jan 2003 04:49:11 -0000	1.23
@@ -60,6 +60,7 @@
                     # Drop padding before it gets to the mix.
                     LOG.debug("Padding message %s dropped",
                               formatBase64(message[:8]))
+                    self.deliverySucceeded(handle)
                 else:
                     LOG.debug("Processed message %s; inserting into pool",
                               formatBase64(message[:8]))
@@ -418,12 +419,11 @@
 Usage: %s [options]
 Options:
   -h, --help:                Print this usage message and exit.
-  -f <file>, --config=<file> Use a configuration file other than
-                                /etc/mixminiond.conf
+  -f <file>, --config=<file> Use a configuration file other than the default.
 """.strip()
 
 def usageAndExit(cmd):
-    print >>sys.stderr, _SERVER_USAGE %cmd
+    print _SERVER_USAGE %cmd
     sys.exit(0)
 
 def configFromServerArgs(cmd, args):
@@ -536,7 +536,7 @@
                 print >>sys.stderr,("%s requires an integer" %opt)
                 usage = 1
     if usage:
-        print >>sys.stderr, _KEYGEN_USAGE % cmd
+        print _KEYGEN_USAGE % cmd
         sys.exit(1)
 
     config = readConfigFile(configFile)
@@ -579,7 +579,7 @@
         elif opt == '--remove-identity':
             removeIdentity = 1
     if usage:
-        print >>sys.stderr, _REMOVEKEYS_USAGE % cmd
+        print _REMOVEKEYS_USAGE % cmd
         sys.exit(0)
 
     config = readConfigFile(configFile)