From 5d7889357ac50ea9ce285df73d768a12f5671707 Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Tue, 23 Apr 2019 21:13:55 +0200 Subject: [PATCH] windows tests: use socat for forwardedPorts --- artiq/windows/qemu.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/artiq/windows/qemu.nix b/artiq/windows/qemu.nix index cc73bed..a4f11c2 100644 --- a/artiq/windows/qemu.nix +++ b/artiq/windows/qemu.nix @@ -15,12 +15,11 @@ let if isolateNetwork then "on" else "off"; - nc = "${netcat}/bin/nc"; - # use netcat instead of `tcp:…` to allow multiple connections + # use socat instead of `tcp:…` to allow multiple connections guestfwds = builtins.concatStringsSep "" (map ({ listenAddr, targetAddr, port }: - ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${nc}\\ ${targetAddr}\\ ${toString port}" + ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${socat}/bin/socat\\ -\\ tcp:${targetAddr}:${toString port}" ) forwardedPorts); args = [ "-enable-kvm"