[minion-cvs] Fix more server-side bugs introduced by recent patches

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerMain.py 
Log Message:
Fix more server-side bugs introduced by recent patches

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- ServerMain.py	17 May 2004 21:07:12 -0000	1.128
+++ ServerMain.py	17 May 2004 21:18:22 -0000	1.129
@@ -322,7 +322,7 @@
     def __init__(self, location, (ip,port,keyid)):
         """Create a new OutgoingQueue that stores its packets in a given
            location."""
-        mixminion.server.ServerQueue.DeliveryQueue.__init__(self, location)
+        mixminion.server.ServerQueue.PerAddressDeliveryQueue.__init__(self, location)
         self.server = None
         self.incomingQueue = None
         self.keyID = keyid
@@ -725,7 +725,7 @@
         LOG.debug("Initializing directory client")
         self.dirClient = mixminion.ClientDirectory.ClientDirectory(config)
         try:
-            self.dirClient.updateDirectory()
+            self.dirClient.update()
         except UIError, e:
             LOG.warn(str(e))
             LOG.warn("   (I'll use the old directory until I have a new one.)")
@@ -834,7 +834,7 @@
     def updateDirectoryClient(self):
         def c(self=self):
             try:
-                self.dirClient.updateDirectory()
+                self.dirClient.update()
                 nextUpdate = succeedingMidnight(time.time()+30)
                 prng = mixminion.Crypto.getCommonPRNG()
                 # Randomly retrieve the directory within an hour after