~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config: Abolish use of ConfigParser's DEFAULT feature
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
e458853
..
0482876
100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-297,7
+297,7
@@
def process_cfg(_opts, putative_servers, putative_clients):
global c
c = ConfigResults()
global c
c = ConfigResults()
- try: c.server = cfg
.
get('SERVER','server')
+ try: c.server = cfg
1
get('SERVER','server')
except NoOptionError: c.server = 'SERVER'
cfg_process_general(c, c.server)
except NoOptionError: c.server = 'SERVER'
cfg_process_general(c, c.server)
@@
-314,24
+314,24
@@
def process_cfg(_opts, putative_servers, putative_clients):
Client(ci, cc)
try:
Client(ci, cc)
try:
- c.vrelay = cfg
.
get(c.server, 'vrelay')
+ c.vrelay = cfg
1
get(c.server, 'vrelay')
except NoOptionError:
for search in c.vnetwork.hosts():
if search == c.vaddr: continue
c.vrelay = search
break
except NoOptionError:
for search in c.vnetwork.hosts():
if search == c.vaddr: continue
c.vrelay = search
break
- try: c.ifname = cfg
.
get(c.server, 'ifname_server', raw=True)
+ try: c.ifname = cfg
1
get(c.server, 'ifname_server', raw=True)
except NoOptionError: pass
cfg_process_ipif(c,
except NoOptionError: pass
cfg_process_ipif(c,
- [c.server, '
DEFAULT
'],
+ [c.server, '
COMMON
'],
(('local','vaddr'),
('peer', 'vrelay'),
('rnets','vnetwork')))
if opts.printconfig is not None:
(('local','vaddr'),
('peer', 'vrelay'),
('rnets','vnetwork')))
if opts.printconfig is not None:
- try: val = cfg
.
get(c.server, opts.printconfig)
+ try: val = cfg
1
get(c.server, opts.printconfig)
except NoOptionError: pass
else: print(val)
sys.exit(0)
except NoOptionError: pass
else: print(val)
sys.exit(0)