~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipif: set interface names
[hippotat]
/
hippotatd
diff --git
a/hippotatd
b/hippotatd
index
cb86c2b
..
666fc1b
100755
(executable)
--- a/
hippotatd
+++ b/
hippotatd
@@
-296,7
+296,8
@@
def process_cfg(_opts, putative_servers, putative_clients):
global c
c = ConfigResults()
global c
c = ConfigResults()
- c.server = cfg.get('SERVER','server')
+ try: c.server = cfg.get('SERVER','server')
+ except NoOptionError: c.server = 'SERVER'
cfg_process_common(c, c.server)
cfg_process_saddrs(c, c.server)
cfg_process_common(c, c.server)
cfg_process_saddrs(c, c.server)
@@
-319,6
+320,9
@@
def process_cfg(_opts, putative_servers, putative_clients):
c.vrelay = search
break
c.vrelay = search
break
+ try: c.ifname = cfg.get(c.server, 'ifname_server', raw=True)
+ except NoOptionError: pass
+
cfg_process_ipif(c,
[c.server, 'DEFAULT'],
(('local','vaddr'),
cfg_process_ipif(c,
[c.server, 'DEFAULT'],
(('local','vaddr'),