From decc3fdcdf42fd87827f9dd8b8ef2d76dea6cc91 Mon Sep 17 00:00:00 2001 From: Quentin De Coninck Date: Tue, 7 Jul 2020 17:27:12 +0200 Subject: [PATCH] let's try something else to disable mptcp on specific clients --- experiments/iperf_scenario.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/experiments/iperf_scenario.py b/experiments/iperf_scenario.py index e7f51ef..76994d5 100644 --- a/experiments/iperf_scenario.py +++ b/experiments/iperf_scenario.py @@ -54,16 +54,12 @@ class IPerfScenario(Experiment): super(IPerfScenario, self).clean() def run(self): - self.topo.command_to(self.topo_config.router, "tcpdump -i any -w router.pcap &") + self.topo.command_to(self.topo_config.router, "tcpdump -i any -w router.pcap &") # First run servers for l, s in enumerate(self.topo_config.servers): self.topo.command_to(s, self.get_server_cmd(server_id=l)) - # Disable MPTCP on all congestion clients - for c in self.topo_config.clients[1:]: - self.topo.command_to(c, "sysctl -w net.mptcp.mptcp_enabled=0") - # And set nb of subflows for fullmesh self.topo.command_to(self.topo_config.client, "echo {} > /sys/module/mptcp_fullmesh/parameters/num_subflows".format(self.fm_subflows)) @@ -75,8 +71,14 @@ class IPerfScenario(Experiment): self.topo.command_to(self.topo_config.clients[1], cmd) cmd = "sleep 20 && {} &".format(self.get_client_iperf_cmd(self.topo_config.get_server_ip(interface_index=2), 20, 2)) self.topo.command_to(self.topo_config.clients[2], cmd) - cmd = self.get_client_iperf_cmd(self.topo_config.get_server_ip(), 50, 0) + cmd = "{} &".format(self.get_client_iperf_cmd(self.topo_config.get_server_ip(), 50, 0)) self.topo.command_to(self.topo_config.client, cmd) + self.topo.command_to(self.topo_config.client, "sleep 2") + # This is hacky + self.topo.command_global("sysctl -w net.mptcp.mptcp_enabled=0") + + self.topo.command_to(self.topo_config.client, "sleep 50") + self.topo.command_to(self.topo_config.client, "echo 1 > /sys/module/mptcp_fullmesh/parameters/num_subflows")