Merge branch 'ipv6'

1 files changed, 6 insertions, 2 deletions

diff --git a/fot.py b/fot.py
index ff277e4..c6e3e6c 100755
--- a/fot.py
+++ b/fot.py
@@ -9,7 +9,7 @@ import os, re
 
 from ConfigParser import ConfigParser
 
-import login
+import login, ipv6
 
 config = ConfigParser()
 
@@ -178,7 +178,11 @@ def start_server(server):
 	print '%s' % server
 
 	factory = BotFactory(server, config.get(server, 'nickname'))
-	reactor.connectTCP(config.get(server, 'host'), config.getint(server, 'port'), factory)
+	if config.has_option(server, 'host6'):
+		bind6 = (config.get(server, 'bind6'), 0) if config.has_option(server, 'bind6') else None
+		ipv6.connectTCP6(config.get(server, 'host6'), config.getint(server, 'port6'), factory, bindAddress = bind6)
+	else:
+		reactor.connectTCP(config.get(server, 'host'), config.getint(server, 'port'), factory)
 
 print 'Starting per-network instances...'
 for server in (server for server in config.sections() if server.startswith('server/')):