X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=blobdiff_plain;f=client;h=b0250dec14d9083a70d896436306bda8c912a558;hp=a77600ec500077952a0aad5683cb0285217270f8;hb=88487243bc0be906c63258005df75b96bc8165a5;hpb=87a7c0c717c2bd9380e93e4ab25baebbc1e3aa6a

diff --git a/client b/client
index a77600e..b0250de 100755
--- a/client
+++ b/client
@@ -8,7 +8,7 @@ max_requests_outstanding = 4
 
 [virtual]
 mtu = 1500
-# [host]  } maybe computed from `network' (see server defaults)
+# [server]  } maybe computed from `network' (see server defaults)
 
 [server]
 # url     } maybe computed from `addrs' and `port' (see server defaults)
@@ -17,12 +17,30 @@ mtu = 1500
 # password = <password>
 '''
 
+c.clientv = None
+c.max_outstanding = 
+
+def set_client(ci,cs,pw):
+  global password
+  assert(c.clientv is None)
+  c.clientv = ci
+  c.max_outstanding = cfg.getint(cs, 'max_requests_outstanding')
+  password = pw
+
 def process_cfg():
   global url
   global max_requests_outstanding
 
   process_cfg_common_always()
-  
+  process_cfg_server()
+
+  try:
+    c.url = cfg.get('server','url')
+  except NoOptionError:
+    process_cfg_saddrs()
+    sa = c.saddrs[1].url()
+
+  process_cfg_clients(set_client)
 
 common_startup(defcfg)
 process_cfg()