summaryrefslogtreecommitdiff
path: root/fot.py
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2017-03-01 19:19:49 +0100
committerJon Bergli Heier <snakebite@jvnv.net>2017-03-01 19:19:49 +0100
commitbf75c7a25ff1e7175d235bc5c330aada42fbba6b (patch)
tree90d76c2bf80e6d01dfb2df26a331e648efc58b25 /fot.py
parent40af4d49e0e1b7d171bed4ec81a4b9bb57f3095e (diff)
Removed custom ipv6 code.
twisted now has built-in ipv6 support; get rid of the ipv6 code as we don't need it anymore.
Diffstat (limited to 'fot.py')
-rwxr-xr-xfot.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/fot.py b/fot.py
index 674b042..7c48583 100755
--- a/fot.py
+++ b/fot.py
@@ -10,7 +10,7 @@ import os, re, platform, sys, traceback
from ConfigParser import ConfigParser
-import login, ipv6
+import login
config = ConfigParser()
@@ -239,11 +239,7 @@ def start_server(server):
print '%s' % server
factory = BotFactory(server, config.get(server, 'nickname'))
- 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)
+ reactor.connectTCP(config.get(server, 'host'), config.getint(server, 'port'), factory, bindAddress = (config.get(server, 'bind'), 0))
print 'Starting per-network instances...'
for server in (server for server in config.sections() if server.startswith('server/')):