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

Fixed names

Browse Source
This commit is contained in:
Kirill Andreev
2009-06-10 18:57:27 +04:00
parent 11c6653265
commit 76deab84af
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/mesh/dot11s/dot11s-installator.cc → src/devices/mesh/dot11s/dot11s-installer.cc
View File

@@ -18,14 +18,14 @@
* Authors: Kirill Andreev <andreev@iitp.ru>
*/
#include "ns3/mesh-interface-helper.h"
#include "dot11s-installator.h"
#include "dot11s-installer.h"
#include "peer-management-protocol.h"
#include "hwmp-protocol.h"
namespace ns3 {
namespace dot11s {
bool
Dot11sStackInstallator::InstallDot11sStack (Ptr<MeshPointDevice> mp, bool root)
Dot11sStackInstaller::InstallDot11sStack (Ptr<MeshPointDevice> mp, bool root)
{
//Install Peer management protocol:
Ptr<PeerManagementProtocol> pmp = CreateObject<PeerManagementProtocol> ();
@@ -46,7 +46,7 @@ Dot11sStackInstallator::InstallDot11sStack (Ptr<MeshPointDevice> mp, bool root)
return true;
}
void
Dot11sStackInstallator::Report (const Ptr<MeshPointDevice> mp, std::ostream& os)
Dot11sStackInstaller::Report (const Ptr<MeshPointDevice> mp, std::ostream& os)
{
std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
for (std::vector<Ptr<NetDevice> >::const_iterator i = ifaces.begin(); i != ifaces.end(); ++i)
@@ -64,7 +64,7 @@ Dot11sStackInstallator::Report (const Ptr<MeshPointDevice> mp, std::ostream& os)
pmp->Report (os);
}
void
Dot11sStackInstallator::ResetStats (const Ptr<MeshPointDevice> mp)
Dot11sStackInstaller::ResetStats (const Ptr<MeshPointDevice> mp)
{
std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
for (std::vector<Ptr<NetDevice> >::const_iterator i = ifaces.begin(); i != ifaces.end(); ++i)

2
src/devices/mesh/dot11s/dot11s-installator.h → src/devices/mesh/dot11s/dot11s-installer.h
View File

@@ -24,7 +24,7 @@
#include "ns3/mesh-point-device.h"
namespace ns3 {
namespace dot11s {
class Dot11sStackInstallator
class Dot11sStackInstaller
{
public:
///\brief Installs 802.11s stack. needed by helper only

4
src/devices/mesh/dot11s/wscript
View File

@@ -23,10 +23,10 @@ def build(bld):
'hwmp-mac-plugin.cc',
'hwmp-protocol.cc',
'airtime-metric.cc',
'dot11s-installator.cc',
'dot11s-installer.cc',
]
headers = bld.new_task_gen('ns3header')
headers.module = 'dot11s'
headers.source = [
'dot11s-installator.h',
'dot11s-installer.h',
]

8
src/helper/dot11s-helper.cc
View File

@@ -19,7 +19,7 @@
* Pavel Boyko <boyko@iitp.ru>
*/
#include "dot11s-helper.h"
#include "ns3/dot11s-installator.h"
#include "ns3/dot11s-installer.h"
#include "ns3/simulator.h"
#include "ns3/mesh-point-device.h"
#include "ns3/wifi-net-device.h"
@@ -58,7 +58,7 @@ MeshWifiHelper::Install (const WifiPhyHelper &phyHelper, const MeshInterfaceHelp
for (unsigned int j = 0; j < roots.size (); j ++)
if(node_counter == roots[j])
root = true;
if(!Dot11sStackInstallator::InstallDot11sStack (mp, root))
if(!Dot11sStackInstaller::InstallDot11sStack (mp, root))
{
NS_ASSERT(false);
}
@@ -80,7 +80,7 @@ MeshWifiHelper::Report (const ns3::Ptr<ns3::NetDevice>& device, std::ostream& os
NS_ASSERT (mp != 0);
std::vector<Ptr<NetDevice> > ifaces = mp->GetInterfaces ();
os << "<MeshPointDevice ReportTime=\"" << Simulator::Now().GetSeconds() << "s\" MpAddress=\"" << mp->GetAddress () << "\">\n";
Dot11sStackInstallator::Report (mp, os);
Dot11sStackInstaller::Report (mp, os);
os << "</MeshPointDevice>\n";
}
void
@@ -88,7 +88,7 @@ MeshWifiHelper::ResetStats (const ns3::Ptr<ns3::NetDevice>& device)
{
Ptr <MeshPointDevice> mp = device->GetObject<MeshPointDevice> ();
NS_ASSERT (mp != 0);
Dot11sStackInstallator::ResetStats (mp);
Dot11sStackInstaller::ResetStats (mp);
}
} //namespace ns3