chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move cfg_get_raw into hippotatlib
[hippotat.git]
/
hippotatlib
/
__init__.py
diff --git
a/hippotatlib/__init__.py
b/hippotatlib/__init__.py
index 397dfb2c23459cf4f9a7c17bd4064b63cec2e215..7781c1f54c30b241a5afbec67f063ce2a68dd73c 100644
(file)
--- a/
hippotatlib/__init__.py
+++ b/
hippotatlib/__init__.py
@@
-110,7
+110,8
@@
def logevent_is_boringtwisted(event):
if dflag is None and DBG.TWISTED in debug_set: return False
return True
except Exception:
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)
return False
@implementer(twisted.logger.ILogFilterPredicate)
@@
-136,22
+137,22
@@
max_batch_up = 4000
http_retry = 5
port = 80
vroutes = ''
http_retry = 5
port = 80
vroutes = ''
+ifname_client = hippo%%d
+ifname_server = shippo%%d
#[server] or [<client>] overrides
#[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
mtu = 1500
-[SERVER]
-server = SERVER
# addrs = 127.0.0.1 ::1
# url
# relating to virtual network
vvnetwork = 172.24.230.192
# vnetwork = <prefix>/<len>
# addrs = 127.0.0.1 ::1
# url
# relating to virtual network
vvnetwork = 172.24.230.192
# vnetwork = <prefix>/<len>
-# vadd
r
= <ipaddr>
+# vadd
r
= <ipaddr>
# vrelay = <ipaddr>
# vrelay = <ipaddr>
@@
-432,7
+433,7
@@
def _cfg_process_putatives():
return (servers, clients)
return (servers, clients)
-def cfg_process_
common
(c, ss):
+def cfg_process_
general
(c, ss):
c.mtu = cfg.getint(ss, 'mtu')
def cfg_process_saddrs(c, ss):
c.mtu = cfg.getint(ss, 'mtu')
def cfg_process_saddrs(c, ss):
@@
-483,6
+484,10
@@
def cfg_search_section(key,sections):
return section
raise NoOptionError(key, repr(sections))
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 cfg_search(getter,key,sections):
section = cfg_search_section(key,sections)
return getter(section, key)
@@
-540,7
+545,7
@@
def common_startup(process_cfg):
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
- log_debug_config('%s: %s' % (m, p
athname
))
+ log_debug_config('%s: %s' % (m, p))
try:
files = os.listdir(pathname)
try:
files = os.listdir(pathname)