From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sat, 16 Apr 2011 20:50:34 +0000 (+0100)
Subject: Add pcap tracing
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=e0090d6f1d84a88b5e4d0b7a83d04354d1ac7fd8;p=ns-moose.git

Add pcap tracing
---

diff --git a/src/simulation/simulation.cc b/src/simulation/simulation.cc
index 131089f..2f38835 100644
--- a/src/simulation/simulation.cc
+++ b/src/simulation/simulation.cc
@@ -108,7 +108,7 @@ int main (int argc, char *argv[])
 
 try {
 
-	std::string csmaTraceFile;
+	std::string csmaTraceFile, pcapTraceFile;
 	std::string ipTraceFile;
 	std::string networkFile;
 	std::string dataFile;
@@ -117,6 +117,7 @@ try {
 	CommandLine cmd;			// Allow CommandLine args
 	cmd.AddValue("link", "Link Layer? (moose|ethernet) [moose]", linkLayer);
 	cmd.AddValue("csma", "CSMA Trace File", csmaTraceFile);
+	cmd.AddValue("pcap", "CSMA PCAP Trace File", pcapTraceFile);
 	cmd.AddValue("ip", "IPv4 Trace File", ipTraceFile);
 	cmd.AddValue("network", "Network Topology File", networkFile);
 	cmd.AddValue("data", "Network Data File", dataFile);
@@ -185,6 +186,10 @@ try {
 		}
 	}
 
+	if(pcapTraceFile != ""){
+		link.csma.EnablePcapAll(pcapTraceFile, true);
+	}
+
 
 	NS_LOG_INFO ("Run Simulation");
 	Simulator::Run ();