F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix thinko in fix for explicit pcap names

Browse Source
This commit is contained in:
Craig Dowell
2010-03-01 09:08:59 -08:00
parent 9dfa71d4e5
commit e726fe9f3e
10 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/helper/csma-helper.cc
View File

@@ -72,7 +72,7 @@ CsmaHelper::SetChannelAttribute (std::string n1, const AttributeValue &v1)
}
void
CsmaHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool explicitFilename, bool promiscuous)
CsmaHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename)
{
//
// All of the Pcap enable functions vector through here including the ones

4
src/helper/csma-helper.h
View File

@@ -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<NetDevice> nd, bool explicitFilename, bool promiscuous);
virtual void EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename);
/**
* \brief Enable ascii trace output on the indicated net device.

2
src/helper/emu-helper.cc
View File

@@ -65,7 +65,7 @@ EmuHelper::SetAttribute (std::string n1, const AttributeValue &v1)
}
void
EmuHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool explicitFilename, bool promiscuous)
EmuHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename)
{
//
// All of the Pcap enable functions vector through here including the ones

4
src/helper/emu-helper.h
View File

@@ -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<NetDevice> nd, bool explicitFilename, bool promiscuous);
virtual void EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename);
/**
* \brief Enable ascii trace output on the indicated net device.

2
src/helper/point-to-point-helper.cc
View File

@@ -69,7 +69,7 @@ PointToPointHelper::SetChannelAttribute (std::string n1, const AttributeValue &v
}
void
PointToPointHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool explicitFilename, bool promiscuous)
PointToPointHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename)
{
//
// All of the Pcap enable functions vector through here including the ones

4
src/helper/point-to-point-helper.h
View File

@@ -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<NetDevice> nd, bool implicitFilename, bool promiscuous);
virtual void EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename);
/**
* \brief Enable ascii trace output on the indicated net device.

10
src/helper/trace-helper.cc
View File

@@ -412,16 +412,16 @@ AsciiTraceHelper::DefaultReceiveSinkWithContext (Ptr<OutputStreamWrapper> stream
}
void
PcapHelperForDevice::EnablePcap (std::string prefix, Ptr<NetDevice> nd, bool explicitFilename, bool promiscuous)
PcapHelperForDevice::EnablePcap (std::string prefix, Ptr<NetDevice> 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<NetDevice> nd = Names::Find<NetDevice> (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<NetDevice> dev = *i;
EnablePcap (prefix, dev, false, promiscuous);
EnablePcap (prefix, dev, promiscuous);
}
}

12
src/helper/trace-helper.h
View File

@@ -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<NetDevice> nd, bool explicitFilename, bool promiscuous) = 0;
virtual void EnablePcapInternal (std::string prefix, Ptr<NetDevice> 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<NetDevice> nd, bool explicitFilename = false, bool promiscuous = false);
void EnablePcap (std::string prefix, Ptr<NetDevice> 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

2
src/helper/yans-wifi-helper.cc
View File

@@ -380,7 +380,7 @@ YansWifiPhyHelper::SetPcapDataLinkType (enum SupportedPcapDataLinkTypes dlt)
}
void
YansWifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool explicitFilename, bool promiscuous)
YansWifiPhyHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename)
{
//
// All of the Pcap enable functions vector through here including the ones

3
src/helper/yans-wifi-helper.h
View File

@@ -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<NetDevice> nd, bool explicitFilename, bool promiscuous);
virtual void EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool promiscuous, bool explicitFilename);
/**
* \brief Enable ascii trace output on the indicated net device.