[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[minion-cvs] Normalize whitespace
Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv27991/lib/mixminion/server
Modified Files:
MMTPServer.py PacketHandler.py ServerKeys.py ServerMain.py
ServerQueue.py
Log Message:
Normalize whitespace
Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MMTPServer.py 4 Feb 2003 02:05:02 -0000 1.19
+++ MMTPServer.py 20 Feb 2003 16:57:40 -0000 1.20
@@ -630,7 +630,7 @@
# junk: A list of 32KB padding chunks that we're going to send. We
# pregenerate these to avoid timing attacks.
# isJunk: flag. Is the current chunk padding?
- # expectedDigest: The digest we expect to receive in response to the
+ # expectedDigest: The digest we expect to receive in response to the
# current chunk.
# protocol: The MMTP protocol version we're currently using, or None
# if negotiation hasn't completed.
Index: PacketHandler.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/PacketHandler.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PacketHandler.py 16 Feb 2003 04:50:56 -0000 1.11
+++ PacketHandler.py 20 Feb 2003 16:57:40 -0000 1.12
@@ -59,7 +59,7 @@
for h in self.hashlog:
h.close()
- def processMessage(self, msg):
+ def processMessage(self, msg):
"""Given a 32K mixminion message, processes it completely.
Return one of:
Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ServerKeys.py 13 Feb 2003 06:30:23 -0000 1.12
+++ ServerKeys.py 20 Feb 2003 16:57:40 -0000 1.13
@@ -470,7 +470,7 @@
"KeyID":
formatBase64(serverKeys.getMMTPKeyID()),
"MMTPProtocolsIn" : mmtpProtocolsIn,
- "MMTPProtocolsOut" : mmtpProtocolsOut,
+ "MMTPProtocolsOut" : mmtpProtocolsOut,
}
# If we don't know our IP address, try to guess
Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ServerMain.py 19 Feb 2003 03:41:22 -0000 1.43
+++ ServerMain.py 20 Feb 2003 16:57:40 -0000 1.44
@@ -508,7 +508,7 @@
# we have to do it now.
mixminion.Common.LOG.configure(self.config, keepStderr=0)
if self.config['Server'].get("Daemon",1):
- closeUnusedFDs()
+ closeUnusedFDs()
# FFFF Support for automatic key rotation.
while 1:
@@ -734,7 +734,7 @@
info = sys.exc_info()
LOG.fatal_exc(info,"Exception while configuring server")
LOG.fatal("Shutting down because of exception: %s", info[0])
- sys.exit(1)
+ sys.exit(1)
LOG.info("Starting server: Mixminion %s", mixminion.__version__)
try:
Index: ServerQueue.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerQueue.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ServerQueue.py 17 Feb 2003 14:58:46 -0000 1.8
+++ ServerQueue.py 20 Feb 2003 16:57:40 -0000 1.9
@@ -235,7 +235,7 @@
def cleanQueue(self, secureDeleteFn=None):
"""Removes all timed-out or trash messages from the queue.
- If secureDeleteFn is provided, it is called with a list of
+ If secureDeleteFn is provided, it is called with a list of
filenames to be removed. Otherwise, files are removed using
secureDelete.
@@ -343,7 +343,7 @@
10-second intervals, but sendReadyMessages is invoked only
every 30 minutes, messages will only me retried once every
30 minutes.
- """
+ """
self.retrySchedule = schedule[:]
def _rescan(self):
@@ -365,7 +365,7 @@
retry -- how many times so far have we tried to send?
nextAttempt -- A time before which no further attempts to
deliver should be made.
- """
+ """
try:
self._lock.acquire()
handle = self.queueObject( (retry, None, msg, nextAttempt) )