if dflag is None and DBG.TWISTED in debug_set: return False
return True
except Exception:
- print(traceback.format_exc(), file=org_stderr)
+ print('EXCEPTION (IN BORINGTWISTED CHECK)',
+ traceback.format_exc(), file=org_stderr)
return False
@implementer(twisted.logger.ILogFilterPredicate)
#---------- default config ----------
defcfg = '''
-[DEFAULT]
+[COMMON]
max_batch_down = 65536
max_queue_time = 10
target_requests_outstanding = 3
http_retry = 5
port = 80
vroutes = ''
+ifname_client = hippo%%d
+ifname_server = shippo%%d
#[server] or [<client>] overrides
-ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
+ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip,%(ifname)s %(rnets)s
# relating to virtual network
mtu = 1500
# relating to virtual network
vvnetwork = 172.24.230.192
# vnetwork = <prefix>/<len>
-# vadd r = <ipaddr>
+# vaddr = <ipaddr>
# vrelay = <ipaddr>
server_pat = r'[-.0-9A-Za-z]+'
client_pat = r'[.:0-9a-f]+'
server_re = regexp.compile(server_pat)
- serverclient_re = regexp.compile(server_pat + r' ' + client_pat)
+ serverclient_re = regexp.compile(
+ server_pat + r' ' + '(?:' + client_pat + '|LIMIT)')
for cs in cfg.sections():
- if cs == 'LIMIT':
- # plan A "[LIMIT]"
+ log_debug_config('putatives: section [%s]...' % (cs))
+
+ def log_ignore(why):
+ log_debug_config('putatives: section [%s] X ignore: %s' % (cs, why))
+ print('warning: ignoring config section [%s] (%s)' % (cs, why),
+ file=sys.stderr)
+
+ if cs == 'LIMIT' or cs == 'COMMON':
+ # plan A "[LIMIT]" or "[COMMON]"
+ log_debug_config('putatives: section [%s] A ignore' % (cs))
continue
try:
if server_re.fullmatch(cs):
# plan C "[<servername>]"
+ log_debug_config('putatives: section [%s] C <server>' % (cs))
putative(servers, cs, cs)
continue
if pcs == 'LIMIT':
# plan E "[<servername> LIMIT]"
+ log_debug_config('putatives: section [%s] E <server> LIMIT' % (cs))
continue
try:
# plan D "[<servername> <client>]" part 2
- ci = ipaddr(pc)
+ ci = ipaddr(pcs)
except AddressValueError:
# plan F "[<some thing we do not understand>]"
- # well, we ignore this
- print('warning: ignoring config section %s' % cs, file=sys.stderr)
+ log_ignore('bad-addr')
continue
else: # no AddressValueError
- # plan D "[<servername> <client]" part 3
+ # plan D "[<servername> <client>]" part 3
+ log_debug_config('putatives: section [%s] D <server> <client>'
+ % (cs))
putative(clients, ci, pcs)
putative(servers, pss, pss)
continue
else: # no AddressValueError
# plan B "[<client>" part 2
+ log_debug_config('putatives: section [%s] B <client>' % (cs))
putative(clients, ci, cs)
continue
return (servers, clients)
-def cfg_process_common(c, ss):
- c.mtu = cfg.getint(ss, 'mtu')
+def cfg_process_general(c, ss):
+ c.mtu = cfg1getint(ss, 'mtu')
def cfg_process_saddrs(c, ss):
class ServerAddr():
def __repr__(self):
return 'ServerAddr'+repr((self.port,self.addr))
- c.port = cfg.getint(ss,'port')
+ c.port = cfg1getint(ss,'port')
c.saddrs = [ ]
- for addrspec in cfg.get(ss, 'addrs').split():
+ for addrspec in cfg1get(ss, 'addrs').split():
sa = ServerAddr(c.port, addrspec)
c.saddrs.append(sa)
def cfg_process_vnetwork(c, ss):
- c.vnetwork = ipnetwork(cfg.get(ss,'vnetwork'))
+ c.vnetwork = ipnetwork(cfg1get(ss,'vnetwork'))
if c.vnetwork.num_addresses < 3 + 2:
raise ValueError('vnetwork needs at least 2^3 addresses')
def cfg_process_vaddr(c, ss):
try:
- c.vaddr = cfg.get(ss,'vaddr')
+ c.vaddr = cfg1get(ss,'vaddr')
except NoOptionError:
cfg_process_vnetwork(c, ss)
c.vaddr = next(c.vnetwork.hosts())
return section
raise NoOptionError(key, repr(sections))
+def cfg_get_raw(*args, **kwargs):
+ # for passing to cfg_search
+ return cfg.get(*args, raw=True, **kwargs)
+
def cfg_search(getter,key,sections):
section = cfg_search_section(key,sections)
return getter(section, key)
+def cfg1get(section,key, getter=cfg.get,**kwargs):
+ section = cfg_search_section(key,[section,'COMMON'])
+ return getter(section,key,**kwargs)
+
+def cfg1getint(section,key, **kwargs):
+ return cfg1get(section,key, getter=cfg.getint,**kwargs);
+
def cfg_process_client_limited(cc,ss,sections,key):
- val = cfg_search(cfg.getint, key, sections)
- lim = cfg_search(cfg.getint, key, ['%s LIMIT' % ss, 'LIMIT'])
+ val = cfg_search(cfg1getint, key, sections)
+ lim = cfg_search(cfg1getint, key, ['%s LIMIT' % ss, 'LIMIT'])
cc.__dict__[key] = min(val,lim)
def cfg_process_client_common(cc,ss,cs,ci):
sections = ['%s %s' % (ss,cs),
cs,
ss,
- 'DEFAULT']
+ 'COMMON']
try: pwsection = cfg_search_section('password', sections)
except NoOptionError: return None
- pw = cfg.get(pwsection, 'password')
+ pw = cfg1get(pwsection, 'password')
cc.password = pw.encode('utf-8')
cfg_process_client_limited(cc,ss,sections,'target_requests_outstanding')
#print('CFGIPIF',repr((varmap, sections, c.__dict__)),file=sys.stderr)
section = cfg_search_section('ipif', sections)
- c.ipif_command = cfg.get(section,'ipif', vars=c.__dict__)
+ c.ipif_command = cfg1get(section,'ipif', vars=c.__dict__)
#---------- startup ----------
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
- log_debug_config('%s: %s' % (m, pathname))
+ log_debug_config('%s: %s' % (m, p))
try:
files = os.listdir(pathname)