[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Never listen on an IPv6 address for now; we need to fig...
Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv8122/lib/mixminion/server
Modified Files:
MMTPServer.py
Log Message:
Never listen on an IPv6 address for now; we need to figure out non-clique first
Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- MMTPServer.py 24 Nov 2003 19:59:04 -0000 1.58
+++ MMTPServer.py 27 Nov 2003 08:53:03 -0000 1.59
@@ -1092,11 +1092,13 @@
IP = config['Incoming/MMTP'].get('IP')
if IP is None:
IP = "0.0.0.0"
- if ip6_supported:
- IP6 = config['Incoming/MMTP'].get('ListenIP6')
- if IP6 is None:
- IP6 = "::"
-
+ # FFFF Until we get the non-clique situation is supported, we don't
+ # FFFF listen on IPv6.
+ #if ip6_supported:
+ # IP6 = config['Incoming/MMTP'].get('ListenIP6')
+ # if IP6 is None:
+ # IP6 = "::"
+
port = config['Incoming/MMTP'].get('ListenPort')
if port is None:
port = config['Incoming/MMTP']['Port']
@@ -1111,7 +1113,7 @@
self._newMMTPConnection)
self.listeners.append(listener)
listener.register(self)
-
+
self._timeout = config['Server']['Timeout'].getSeconds()
self.clientConByAddr = {}
self.certificateCache = PeerCertificateCache()
@@ -1159,7 +1161,7 @@
and a list of DeliverableMessage objects, start sending all the
corresponding packets to the corresponding sever, doing a DNS
lookup first if necessary.
- """
+ """
serverName = displayServer(routing)
if isinstance(routing, IPV4Info):
self._sendPackets(AF_INET, routing.ip, routing.port,
@@ -1254,7 +1256,7 @@
except AttributeError:
pass
else:
- # No exception: We created the connection successfully.
+ # No exception: We created the connection successfully.
# Thus, register it in clientConByAddr
assert addr == con.getAddr()
con.register(self)