from twisted.web.server import NOT_DONE_YET
from twisted.internet import reactor
-import configparser
+from optparse import OptionParser
+from configparser import ConfigParser
+from configparser import NoOptionError
import ipaddress
import collections
r = ipaddress.IPv6Network(input)
return r
-defcfg = u'''
+defcfg = '''
[DEFAULT]
max_batch_down = 65536
max_queue_time = 10
max_request_time = 54
+[virtual]
+mtu = 1500
+# network
+# [host]
+# [relay]
+
+[server]
+ipif_program = userv root ipif %(host),%(relay),%(mtu),slip %(network)
+
[limits]
max_batch_down = 262144
max_queue_time = 121
def process_cfg():
global network
- global ourself
+ global host
+ global relay
network = ipnetwork(cfg.get('virtual','network'))
+ if network.num_addresses < 3 + 2:
+ raise ValueError('network needs at least 2^3 addresses')
+
try:
- ourself = cfg.get('virtual','server')
- except ConfigParser.NoOptionError:
- ourself = network.hosts().next()
+ host = cfg.get('virtual','host')
+ except NoOptionError:
+ host = network.hosts().next()
+
+ try:
+ relay = cfg.get('virtual','relay')
+ except OptionError:
+ for search in network.hosts():
+ if search = host: continue
+ relay = search
+ break
for cs in cfg.sections():
if not (':' in cs or '.' in cs): continue
c.process_arriving_data(d)
c.new_request(request)
+
+def startup():
+ op = OptionParser()
+ op.add_option('-c', '--config', dest='configfile',
+ default='/etc/hippottd/server.conf')
+ global opts
+ (opts, args) = op.parse_args()
+ if len(args): op.error('no non-option arguments please')
+
+ cfg = ConfigParser()
+