From eecff7e35bcb1dbde57c380dc13649c3fc579e92 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 1 Oct 2014 23:33:39 +0100 Subject: [PATCH] test-example: Reorder a config to better test CHILDPERSIST If we move the polypath comm before the tun netlink, the tun will already have been set up by the time polypath spawns its privsep helper. (Since the entries are processed in reverse order.) This means that the CHILDPERSIST phase hook ends up closing the tun fd, which we can see in strace. Signed-off-by: Ian Jackson --- test-example/inside-polypath.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-example/inside-polypath.conf b/test-example/inside-polypath.conf index a3a515a..2986434 100644 --- a/test-example/inside-polypath.conf +++ b/test-example/inside-polypath.conf @@ -1,3 +1,10 @@ +comm polypath { + port 16910; + buffer sysbuffer(4096); + monitor-command "./polypath-interface-monitor-linux"; + interfaces "!secnet-test*"; + permit-loopback True; +}; netlink tun { name "netlink-tun"; # Printed in log messages from this netlink local-address "172.18.232.9"; @@ -7,13 +14,6 @@ netlink tun { buffer sysbuffer(2048); interface "secnet-test-i"; }; -comm polypath { - port 16910; - buffer sysbuffer(4096); - monitor-command "./polypath-interface-monitor-linux"; - interfaces "!secnet-test*"; - permit-loopback True; -}; local-name "test-example/inside/inside"; local-key rsa-private("test-example/inside.key"); local-mobile True; -- 2.30.2