fixes

diff --git a/client b/client
index 4e0bb70c9a50c2617b4ad791fb7386c0f8f96966..018da51da4bdc4bb77d43b025971e7e62b5a1d86 100755 (executable)
--- a/client
+++ b/client
@@ -35,6 +35,7 @@ def process_cfg():
   c.routes = cfg.get('virtual','routes')
   c.max_queue_time = cfg.getint(client_cs, 'max_queue_time')
   c.max_batch_up   = cfg.getint(client_cs, 'max_batch_up')
+  c.http_timeout   = cfg.getint(client_cs, 'http_timeout')
 
   process_cfg_ipif(client_cs,
                    (('local', 'client'),

diff --git a/fake-userv b/fake-userv
index cf5c9f00b39aef89bd0f2eee6f4f7d8629e9c2e7..03e8653d0062786dc168d3e9787f3b78f53f76b7 100755 (executable)
--- a/fake-userv
+++ b/fake-userv
@@ -1,9 +1,10 @@
 #!/bin/sh
-set -e
+set -ex
 echo >&2 "$0: invoked as $0 $*"
 exec 3<&0 4>&1 5>&2 >&2 </dev/null
+printenv
 exec xterm -T netns -e unshare -n -- sh -xc '
-  ../userv-utils.git/ipif/service "$@" <&3 >&4 2>&5 &
+  "$@" <&3 >&4 2>&5 &
   sleep 0.1
   env - bash -i
 ' x "$@"

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index 8694e978a436efc06effbbb5b4e3b81c5868d06f..67991b08e8be31eb04fd7b3375cd73196f176211 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -166,7 +166,8 @@ def start_ipif(command, router):
   ipif = _IpifProcessProtocol(router)
   reactor.spawnProcess(ipif,
                        '/bin/sh',['sh','-xc', command],
-                       childFDs={0:'w', 1:'r', 2:2})
+                       childFDs={0:'w', 1:'r', 2:2},
+                       env=None)
 
 def queue_inbound(packet):
   ipif.transport.write(slip.delimiter)