From e726fe9f3e6c8afa0a33522e6ff88a20f669a61d Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Mon, 1 Mar 2010 09:08:59 -0800 Subject: [PATCH] fix thinko in fix for explicit pcap names --- src/helper/csma-helper.cc | 2 +- src/helper/csma-helper.h | 4 ++-- src/helper/emu-helper.cc | 2 +- src/helper/emu-helper.h | 4 ++-- src/helper/point-to-point-helper.cc | 2 +- src/helper/point-to-point-helper.h | 4 ++-- src/helper/trace-helper.cc | 10 +++++----- src/helper/trace-helper.h | 12 ++++++------ src/helper/yans-wifi-helper.cc | 2 +- src/helper/yans-wifi-helper.h | 3 ++- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/helper/csma-helper.cc b/src/helper/csma-helper.cc index e2be9d663..e3b88975d 100644 --- a/src/helper/csma-helper.cc +++ b/src/helper/csma-helper.cc @@ -72,7 +72,7 @@ CsmaHelper::SetChannelAttribute (std::string n1, const AttributeValue &v1) } void -CsmaHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous) +CsmaHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename) { // // All of the Pcap enable functions vector through here including the ones diff --git a/src/helper/csma-helper.h b/src/helper/csma-helper.h index 3d94fd449..018ede502 100644 --- a/src/helper/csma-helper.h +++ b/src/helper/csma-helper.h @@ -207,10 +207,10 @@ private: * * \param prefix Filename prefix to use for pcap files. * \param nd Net device for which you want to enable tracing. - * \param explicitFilename Treat the prefix as an explicit filename if true * \param promiscuous If true capture all possible packets available at the device. + * \param explicitFilename Treat the prefix as an explicit filename if true */ - virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous); + virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename); /** * \brief Enable ascii trace output on the indicated net device. diff --git a/src/helper/emu-helper.cc b/src/helper/emu-helper.cc index b28124aa1..e3033df8d 100644 --- a/src/helper/emu-helper.cc +++ b/src/helper/emu-helper.cc @@ -65,7 +65,7 @@ EmuHelper::SetAttribute (std::string n1, const AttributeValue &v1) } void -EmuHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous) +EmuHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename) { // // All of the Pcap enable functions vector through here including the ones diff --git a/src/helper/emu-helper.h b/src/helper/emu-helper.h index baa24acc6..538f1f3cf 100644 --- a/src/helper/emu-helper.h +++ b/src/helper/emu-helper.h @@ -123,10 +123,10 @@ private: * * \param prefix Filename prefix to use for pcap files. * \param nd Net device for which you want to enable tracing. - * \param explicitFilename Treat the prefix as an explicit filename if true * \param promiscuous If true capture all possible packets available at the device. + * \param explicitFilename Treat the prefix as an explicit filename if true */ - virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous); + virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename); /** * \brief Enable ascii trace output on the indicated net device. diff --git a/src/helper/point-to-point-helper.cc b/src/helper/point-to-point-helper.cc index 2c1642a57..b1d021b22 100644 --- a/src/helper/point-to-point-helper.cc +++ b/src/helper/point-to-point-helper.cc @@ -69,7 +69,7 @@ PointToPointHelper::SetChannelAttribute (std::string n1, const AttributeValue &v } void -PointToPointHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous) +PointToPointHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename) { // // All of the Pcap enable functions vector through here including the ones diff --git a/src/helper/point-to-point-helper.h b/src/helper/point-to-point-helper.h index 3e716c0c2..4eac8cf84 100644 --- a/src/helper/point-to-point-helper.h +++ b/src/helper/point-to-point-helper.h @@ -153,10 +153,10 @@ private: * * \param prefix Filename prefix to use for pcap files. * \param nd Net device for which you want to enable tracing. - * \param explicitFilename Treat the prefix as an explicit filename if true * \param promiscuous If true capture all possible packets available at the device. + * \param explicitFilename Treat the prefix as an explicit filename if true */ - virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool implicitFilename, bool promiscuous); + virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename); /** * \brief Enable ascii trace output on the indicated net device. diff --git a/src/helper/trace-helper.cc b/src/helper/trace-helper.cc index 976cb0bc7..a1d26d1d9 100644 --- a/src/helper/trace-helper.cc +++ b/src/helper/trace-helper.cc @@ -412,16 +412,16 @@ AsciiTraceHelper::DefaultReceiveSinkWithContext (Ptr stream } void -PcapHelperForDevice::EnablePcap (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous) +PcapHelperForDevice::EnablePcap (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename) { - EnablePcapInternal (prefix, nd, explicitFilename, promiscuous); + EnablePcapInternal (prefix, nd, promiscuous, explicitFilename); } void -PcapHelperForDevice::EnablePcap (std::string prefix, std::string ndName, bool explicitFilename, bool promiscuous) +PcapHelperForDevice::EnablePcap (std::string prefix, std::string ndName, bool promiscuous, bool explicitFilename) { Ptr nd = Names::Find (ndName); - EnablePcap (prefix, nd, explicitFilename, promiscuous); + EnablePcap (prefix, nd, promiscuous, explicitFilename); } void @@ -430,7 +430,7 @@ PcapHelperForDevice::EnablePcap (std::string prefix, NetDeviceContainer d, bool for (NetDeviceContainer::Iterator i = d.Begin (); i != d.End (); ++i) { Ptr dev = *i; - EnablePcap (prefix, dev, false, promiscuous); + EnablePcap (prefix, dev, promiscuous); } } diff --git a/src/helper/trace-helper.h b/src/helper/trace-helper.h index f2e393abb..6d9a7a4db 100644 --- a/src/helper/trace-helper.h +++ b/src/helper/trace-helper.h @@ -342,20 +342,20 @@ public: * * @param prefix Filename prefix to use for pcap files. * @param nd Net device for which you want to enable tracing. - * @param explicitFilename Treat the prefix as an explicit filename if true * @param promiscuous If true capture all possible packets available at the device. + * @param explicitFilename Treat the prefix as an explicit filename if true */ - virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous) = 0; + virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename) = 0; /** * @brief Enable pcap output the indicated net device. * * @param prefix Filename prefix to use for pcap files. * @param nd Net device for which you want to enable tracing. - * @param explicitFilename Treat the prefix as an explicit filename if true * @param promiscuous If true capture all possible packets available at the device. + * @param explicitFilename Treat the prefix as an explicit filename if true */ - void EnablePcap (std::string prefix, Ptr nd, bool explicitFilename = false, bool promiscuous = false); + void EnablePcap (std::string prefix, Ptr nd, bool promiscuous = false, bool explicitFilename = false); /** * @brief Enable pcap output the indicated net device using a device previously @@ -363,10 +363,10 @@ public: * * @param filename filename prefix to use for pcap files. * @param ndName The name of the net device in which you want to enable tracing. - * @param explicitFilename Treat the prefix as an explicit filename if true * @param promiscuous If true capture all possible packets available at the device. + * @param explicitFilename Treat the prefix as an explicit filename if true */ - void EnablePcap (std::string prefix, std::string ndName, bool explicitFilename = false, bool promiscuous = false); + void EnablePcap (std::string prefix, std::string ndName, bool promiscuous = false, bool explicitFilename = false); /** * @brief Enable pcap output on each device in the container which is of the diff --git a/src/helper/yans-wifi-helper.cc b/src/helper/yans-wifi-helper.cc index afaabeb4e..7bf7519e1 100644 --- a/src/helper/yans-wifi-helper.cc +++ b/src/helper/yans-wifi-helper.cc @@ -380,7 +380,7 @@ YansWifiPhyHelper::SetPcapDataLinkType (enum SupportedPcapDataLinkTypes dlt) } void -YansWifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous) +YansWifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename) { // // All of the Pcap enable functions vector through here including the ones diff --git a/src/helper/yans-wifi-helper.h b/src/helper/yans-wifi-helper.h index c1252a532..25cd9a476 100644 --- a/src/helper/yans-wifi-helper.h +++ b/src/helper/yans-wifi-helper.h @@ -242,8 +242,9 @@ private: * @param prefix Filename prefix to use for pcap files. * @param nd Net device for which you want to enable tracing. * @param promiscuous If true capture all possible packets available at the device. + * @param explicitFilename Treat the prefix as an explicit filename if true */ - virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool explicitFilename, bool promiscuous); + virtual void EnablePcapInternal (std::string prefix, Ptr nd, bool promiscuous, bool explicitFilename); /** * \brief Enable ascii trace output on the indicated net device.