From 8fae0f95a7d0c54c02642de3829b69c75de5c775 Mon Sep 17 00:00:00 2001
From: EmaMaker <emamaker@tutanota.com>
Date: Sun, 7 Jan 2024 16:33:44 +0000
Subject: [PATCH] fix tcp burst start times

---
 scratch/task_2001600.cc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scratch/task_2001600.cc b/scratch/task_2001600.cc
index b1d680d1c..63deafaa6 100644
--- a/scratch/task_2001600.cc
+++ b/scratch/task_2001600.cc
@@ -301,18 +301,19 @@ int main(int argc, char* argv[])
     PacketSinkHelper sinkHelper0_2("ns3::TcpSocketFactory", server0_address2);
     ApplicationContainer server0_app2 = sinkHelper0_2.Install(nodes02.Get(0));
     server0_app2.Start(Seconds(0));
+
     // Server 1 that will receive from node 10
     Address server1_address(InetSocketAddress(Ipv4Address::GetAny(), port0));
     PacketSinkHelper sinkHelper1("ns3::TcpSocketFactory", server1_address);
     ApplicationContainer server1_app = sinkHelper1.Install(nodes12.Get(0));
     server1_app.Start(Seconds(0));
 
+
     // Node 11 that sends to server 0
     OnOffHelper onOffHelper_11("ns3::TcpSocketFactory", InetSocketAddress(ipptp02.GetAddress(0), port0));
     onOffHelper_11.SetAttribute("OnTime", StringValue("ns3::ExponentialRandomVariable[Mean=1]"));
     onOffHelper_11.SetAttribute("OffTime", StringValue("ns3::ExponentialRandomVariable[Mean=1]"));   
     onOffHelper_11.SetAttribute("PacketSize", UintegerValue(1821));
-    // onOffHelper_11.SetAttribute("StartTime", StringValue("1.15s"));
     ApplicationContainer node11_app = onOffHelper_11.Install(wifiStaNodes.Get(1));
     node11_app.Start(Seconds(1.15));
     // Node 15 that sends to server 1
@@ -320,7 +321,6 @@ int main(int argc, char* argv[])
     onOffHelper_10.SetAttribute("OnTime", StringValue("ns3::ExponentialRandomVariable[Mean=1]"));
     onOffHelper_10.SetAttribute("OffTime", StringValue("ns3::ExponentialRandomVariable[Mean=1]"));   
     onOffHelper_10.SetAttribute("PacketSize", UintegerValue(1829));
-    // onOffHelper_10.SetAttribute("StartTime", StringValue("3.39s"));
     ApplicationContainer node10_app = onOffHelper_10.Install(wifiStaNodes.Get(0));
     node10_app.Start(Seconds(3.39));
     // Node 15 that sends to server 0
@@ -328,7 +328,7 @@ int main(int argc, char* argv[])
     onOffHelper_15.SetAttribute("OnTime", StringValue("ns3::ExponentialRandomVariable[Mean=1]"));
     onOffHelper_15.SetAttribute("OffTime", StringValue("ns3::ExponentialRandomVariable[Mean=1]"));   
     onOffHelper_15.SetAttribute("PacketSize", UintegerValue(1099));
-    // onOffHelper_15.SetAttribute("StartTime", StringValue("3.71s"));
+
     ApplicationContainer node15_app = onOffHelper_15.Install(wifiStaNodes.Get(5));
     node15_app.Start(Seconds(3.71));
     /* ----- End of TCP Burst ----- */
@@ -360,16 +360,16 @@ int main(int argc, char* argv[])
     // Only tracing switches, routers and wifi ap
     // Using promiscous mode
     if(tracing){
-        ptph24.EnablePcap("task-2-subnet24", ptp24.Get(0), true);
-        ptph24.EnablePcap("task-4-subnet24", ptp24.Get(1), true);
-        ptph49.EnablePcap("task-4-subnet49", ptp49.Get(0), true);
-        ptph49.EnablePcap("task-9-subnet49", ptp49.Get(1), true);
-        ptph39.EnablePcap("task-3-subnet39", ptp39.Get(0), true);
-        ptph39.EnablePcap("task-9-subnet39", ptp39.Get(1), true);
-        ptph45.EnablePcap("task-4-subnet45", ptp45.Get(0), true);
-        ptph45.EnablePcap("task-5-subnet45", ptp45.Get(1), true);
-        ptph35.EnablePcap("task-3-subnet35", ptp35.Get(0), true);
-        ptph35.EnablePcap("task-5-subnet35", ptp35.Get(1), true);
+        ptph24.EnablePcap("task-2-subnet24.pcap", ptp24.Get(0), true, true);
+        ptph24.EnablePcap("task-4-subnet24.pcap", ptp24.Get(1), true, true);
+        ptph49.EnablePcap("task-4-subnet49.pcap", ptp49.Get(0), true, true);
+        ptph49.EnablePcap("task-9-subnet49.pcap", ptp49.Get(1), true, true);
+        ptph39.EnablePcap("task-3-subnet39.pcap", ptp39.Get(0), true, true);
+        ptph39.EnablePcap("task-9-subnet39.pcap", ptp39.Get(1), true, true);
+        ptph45.EnablePcap("task-4-subnet45.pcap", ptp45.Get(0), true, true);
+        ptph45.EnablePcap("task-5-subnet45.pcap", ptp45.Get(1), true, true);
+        ptph35.EnablePcap("task-3-subnet35.pcap", ptp35.Get(0), true, true);
+        ptph35.EnablePcap("task-5-subnet35.pcap", ptp35.Get(1), true, true);
         phy.EnablePcap("task-9-wifi", apDevice, true);
     }    
     /* ----- End of PCAP Tracing ----- */