From bf75c7a25ff1e7175d235bc5c330aada42fbba6b Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Wed, 1 Mar 2017 19:19:49 +0100 Subject: Removed custom ipv6 code. twisted now has built-in ipv6 support; get rid of the ipv6 code as we don't need it anymore. --- fot.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'fot.py') 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/')): -- cgit v1.2.3