[minion-cvs] Fix identifier bug; note incorrect documentation

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerInfo.py 
Log Message:
Fix identifier bug; note incorrect documentation

Index: ServerInfo.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ServerInfo.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ServerInfo.py	27 Apr 2004 06:00:10 -0000	1.84
+++ ServerInfo.py	27 Jul 2004 03:10:03 -0000	1.85
@@ -8,7 +8,8 @@
    descriptors.
    """
 
-__all__ = [ 'ServerInfo', 'ServerDirectory', 'displayServerByRouting' ]
+__all__ = [ 'ServerInfo', 'ServerDirectory', 'displayServerByRouting',
+            'getNicknameByKeyID' ]
 
 import re
 import time
@@ -339,7 +340,7 @@
     def getIPV4Info(self):
         """Returns a mixminion.Packet.IPV4Info object for routing messages
            to this server.  (Returns None for servers running version 0.0.5
-           or earlier.)"""
+           or earlier.)"""#DOCDOC wrong!
         ip = self.getIP()
         if ip is None: return None
         return mixminion.Packet.IPV4Info(ip, self.getPort(), self.getKeyDigest())
@@ -347,7 +348,7 @@
     def getMMTPHostInfo(self):
         """Returns a mixminion.Packet.MMTPHostInfo object for routing messages
            to this server.  (Returns None for servers running version 0.0.7
-           or later.)"""
+           or later.)""" #DOCDOC wrong!
         host = self.getHostname()
         if host is None: return None
         return mixminion.Packet.MMTPHostInfo(
@@ -396,7 +397,7 @@
             return 1
         myOutProtocols = self.getOutgoingMMTPProtocols()
         otherInProtocols = otherDesc.getIncomingMMTPProtocols()
-        if not self.getHostname() and not other.getIP():
+        if not self.getHostname() and not otherDesc.getIP():
             return 0
         for out in myOutProtocols:
             if out in otherInProtocols: