From 1d19aa5799f95ef214351cfe7e94ffe64247dbee Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Feb 2018 17:43:13 +0100 Subject: executor: simplify initialize_tun Remove executor_pid, enable_tun and setup_tun. --- pkg/csource/csource.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pkg/csource/csource.go') diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go index 904e0287e..759daa30f 100644 --- a/pkg/csource/csource.go +++ b/pkg/csource/csource.go @@ -81,12 +81,13 @@ func Write(p *prog.Prog, opts Options) ([]byte, error) { ctx.printf("\tuse_temporary_dir();\n") } if opts.Sandbox != "" { - ctx.printf("\tint pid = do_sandbox_%v(0, %v);\n", opts.Sandbox, opts.EnableTun) + ctx.printf("\tint pid = do_sandbox_%v();\n", opts.Sandbox) ctx.print("\tint status = 0;\n") ctx.print("\twhile (waitpid(pid, &status, __WALL) != pid) {}\n") } else { if opts.EnableTun { - ctx.printf("\tsetup_tun(0, %v);\n", opts.EnableTun) + ctx.printf("\tinitialize_tun();\n") + ctx.printf("\tinitialize_netdevices();\n") } ctx.print("\tloop();\n") } @@ -111,12 +112,13 @@ func Write(p *prog.Prog, opts Options) ([]byte, error) { ctx.print("\t\tuse_temporary_dir();\n") } if opts.Sandbox != "" { - ctx.printf("\t\tint pid = do_sandbox_%v(0, %v);\n", opts.Sandbox, opts.EnableTun) + ctx.printf("\t\tint pid = do_sandbox_%v();\n", opts.Sandbox) ctx.print("\t\tint status = 0;\n") ctx.print("\t\twhile (waitpid(pid, &status, __WALL) != pid) {}\n") } else { if opts.EnableTun { - ctx.printf("\t\tsetup_tun(0, %v);\n", opts.EnableTun) + ctx.printf("\t\tinitialize_tun();\n") + ctx.printf("\t\tinitialize_netdevices();\n") } ctx.print("\t\tloop();\n") } @@ -141,12 +143,13 @@ func Write(p *prog.Prog, opts Options) ([]byte, error) { ctx.print("\t\t\t\tuse_temporary_dir();\n") } if opts.Sandbox != "" { - ctx.printf("\t\t\t\tint pid = do_sandbox_%v(procid, %v);\n", opts.Sandbox, opts.EnableTun) + ctx.printf("\t\t\t\tint pid = do_sandbox_%v();\n", opts.Sandbox) ctx.print("\t\t\t\tint status = 0;\n") ctx.print("\t\t\t\twhile (waitpid(pid, &status, __WALL) != pid) {}\n") } else { if opts.EnableTun { - ctx.printf("\t\t\t\tsetup_tun(procid, %v);\n", opts.EnableTun) + ctx.printf("\t\t\t\tinitialize_tun();\n") + ctx.printf("\t\t\t\tinitialize_netdevices();\n") } ctx.print("\t\t\t\tloop();\n") } -- cgit mrf-deployment