X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/eb6dcb5af291c1c5457c88979ed4b077a4b28367..71f9ddb6f396ddbed730155dea6adbb83d2df841:/hippotatd

diff --git a/hippotatd b/hippotatd
index b08ce66..0482876 100755
--- a/hippotatd
+++ b/hippotatd
@@ -104,7 +104,8 @@ class Client():
 
   def _req_cancel(self, request):
     self._log(DBG.HTTP_CTRL, 'cancel', idof=request)
-    request.finish()
+    try: request.finish()
+    except Exception: pass
 
   def _req_error(self, err, request):
     self._log(DBG.HTTP_CTRL, 'error %s' % err, idof=request)
@@ -296,10 +297,10 @@ def process_cfg(_opts, putative_servers, putative_clients):
 
   global c
   c = ConfigResults()
-  try: c.server = cfg.get('SERVER','server')
+  try: c.server = cfg1get('SERVER','server')
   except NoOptionError: c.server = 'SERVER'
 
-  cfg_process_common(c, c.server)
+  cfg_process_general(c, c.server)
   cfg_process_saddrs(c, c.server)
   cfg_process_vnetwork(c, c.server)
   cfg_process_vaddr(c, c.server)
@@ -313,24 +314,24 @@ def process_cfg(_opts, putative_servers, putative_clients):
     Client(ci, cc)
 
   try:
-    c.vrelay = cfg.get(c.server, 'vrelay')
+    c.vrelay = cfg1get(c.server, 'vrelay')
   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 = cfg1get(c.server, 'ifname_server', raw=True)
   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:
-    try: val = cfg.get(c.server, opts.printconfig)
+    try: val = cfg1get(c.server, opts.printconfig)
     except NoOptionError: pass
     else: print(val)
     sys.exit(0)