[minion-cvs] Fix numerous bugs. Headers and delivery now work again...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py Config.py Fragments.py 
Log Message:
Fix numerous bugs.  Headers and delivery now work again; server-side fragment reassembly does not.

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- ClientMain.py	21 Aug 2003 21:34:02 -0000	1.107
+++ ClientMain.py	25 Aug 2003 23:44:30 -0000	1.108
@@ -104,7 +104,7 @@
     #         fullServerList, digestMap)
     # DIR/dir.gz *or* DIR/dir: A (possibly gzipped) directory file.
     # DIR/imported/: A directory of server descriptors.
-    MAGIC = "ClientKeystore-0.2"
+    MAGIC = "ClientKeystore-0.3"
 
     # The amount of time to require a path to be valid, by default.
     #
@@ -1521,8 +1521,8 @@
             routingType = mixminion.Packet.FRAGMENT_TYPE
             routingInfo = ""
             if servers2[-1]['Delivery/Fragmented'].get('Maximum-Fragments',1) < len(payloads):
-                raise UIError("Oops; %s won't reassable a message this large.",
-                              servers2.getNickname())
+                raise UIError("Oops; %s won't reassable a message this large."%
+                              servers2[-1].getNickname())
 
         #XXXX006 don't use the same path for all the packets!
         for p in payloads:
@@ -2242,7 +2242,7 @@
     options, args = getopt.getopt(args, "hvf:D:t:H:P:R:i:",
              ["help", "verbose", "config=", "download-directory=",
               "to=", "hops=", "path=", "reply-block=",
-              "input=", "queue", "no-queue"
+              "input=", "queue", "no-queue",
               "subject=", "from=", "in-reply-to=", "references=", ])
 
     if not options:
@@ -2362,7 +2362,7 @@
         if message:
             msgLen = len(message)
             if address.exitType == SMTP_TYPE:
-                maxlen = path2[-1]["Delivery/SMTP"]["Maximum-Size"] * 1024
+                maxLen = path2[-1]["Delivery/SMTP"]["Maximum-Size"] * 1024
                 if msgLen > maxLen:
                     LOG.warn("Message is too long for server %s--looking for another..."
                              % path2[-1].getNickname())
@@ -2375,7 +2375,7 @@
                              server.getNickname())
                     path2[-1] = server
             elif address.exitType == MBOX_TYPE:
-                maxlen = path2[-1]["Delivery/MBOX"]["Maximum-Size"] * 1024
+                maxLen = path2[-1]["Delivery/MBOX"]["Maximum-Size"] * 1024
                 if msgLen > maxLen:
                     raise UIError("Message is too long for MBOX server %s, and client-side reconstruction is not yet supported"
                                   % path2[-1].getNickname())

Index: Config.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Config.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Config.py	25 Aug 2003 21:05:33 -0000	1.55
+++ Config.py	25 Aug 2003 23:44:30 -0000	1.56
@@ -795,7 +795,6 @@
         _ConfigFile.__init__(self, fname, string)
 
 
-
     def prevalidate(self, contents):
         # See if we've been passed a server configuration.
         foundServer = 0

Index: Fragments.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Fragments.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Fragments.py	25 Aug 2003 21:05:34 -0000	1.6
+++ Fragments.py	25 Aug 2003 23:44:30 -0000	1.7
@@ -129,6 +129,10 @@
         self.db = FragmentDB(dir+"_db")
         self.rescan()
 
+    def cleanQueue(self, deleteFn=None):
+        """DOCDOC"""
+        self.store.cleanQueue(deleteFn)
+
     def sync(self):
         """Flush pending changes to disk."""
         self.db.sync()