[minion-cvs] Count a relay as "attempted" when we try to connect to ...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	MMTPServer.py 
Log Message:
Count a relay as "attempted" when we try to connect to a server, not when we begin sending a packet.

Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- MMTPServer.py	13 Jul 2003 03:45:35 -0000	1.44
+++ MMTPServer.py	15 Jul 2003 01:57:12 -0000	1.45
@@ -829,6 +829,10 @@
         for m in messages:
             if m == "JUNK":
                 self.junk.append(getCommonPRNG().getBytes(MESSAGE_LEN))
+            elif m == 'RENEGOTIATE':
+                pass
+            else:
+                EventStats.log.attemptedRelay() #FFFF addr
         self.messageList.extend(messages)
 
     def getAddr(self):
@@ -900,7 +904,6 @@
             msg = JUNK_CONTROL+msg+sha1(msg+"JUNK")
             self.isJunk = 1
         else:
-            EventStats.log.attemptedRelay() #FFFF addr
             self.expectedDigest = sha1(msg+"RECEIVED")
             self.rejectDigest = sha1(msg+"REJECTED")
             msg = SEND_CONTROL+msg+sha1(msg+"SEND")