[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Note that getIPs has moved from DNSFarm to NetUtils; re...
Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv25902/lib/mixminion/server
Modified Files:
ServerKeys.py
Log Message:
Note that getIPs has moved from DNSFarm to NetUtils; resolve Bug #12.
Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ServerKeys.py 19 Oct 2003 05:21:45 -0000 1.52
+++ ServerKeys.py 20 Oct 2003 18:20:28 -0000 1.53
@@ -22,8 +22,8 @@
import mixminion._minionlib
import mixminion.Crypto
+import mixminion.NetUtils
import mixminion.Packet
-import mixminion.server.DNSFarm
import mixminion.server.HashLog
import mixminion.server.MMTPServer
import mixminion.server.ServerMain
@@ -1145,9 +1145,9 @@
if _KNOWN_LOCAL_HOSTNAMES.has_key(name):
return
try:
- r = mixminion.server.DNSFarm.getIPs(name)
+ r = mixminion.NetUtils.getIPs(name)
for family, addr, _ in r:
- if family == mixminion.server.DNSFarm.AF_INET:
+ if family == mixminion.NetUtils.AF_INET:
if addr.startswith("127.") or addr.startswith("0."):
raise UIError("Hostname %r resolves to reserved address %s"
%(name, addr))