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

olsr: fix routing table printing and clarify HNA example

Browse Source
This commit is contained in:
Tommaso Pecorella
2023-09-11 23:23:12 +02:00
parent acef927f99
commit 72e180b6d7
2 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/olsr/examples/olsr-hna.cc
View File

@@ -41,12 +41,12 @@
// One way is to use olsr::RoutingProtocol::SetRoutingTableAssociation ()
// to use which you may run:
//
// ./ns3 run "olsr-hna --assocMethod1=1"
// ./ns3 run "olsr-hna --assocMethod=SetRoutingTable"
//
// The other way is to use olsr::RoutingProtocol::AddHostNetworkAssociation ()
// to use which you may run:
//
// ./ns3 run "olsr-hna --assocMethod2=1"
// ./ns3 run "olsr-hna --assocMethod=AddHostNetwork"
//
#include "ns3/config-store-module.h"
@@ -102,8 +102,8 @@ main(int argc, char* argv[])
uint32_t numPackets = 1;
double interval = 1.0; // seconds
bool verbose = false;
bool assocMethod1 = false;
bool assocMethod2 = false;
std::string assocMethod("SetRoutingTable");
bool reverse = false;
CommandLine cmd(__FILE__);
@@ -113,8 +113,11 @@ main(int argc, char* argv[])
cmd.AddValue("numPackets", "number of packets generated", numPackets);
cmd.AddValue("interval", "interval (seconds) between packets", interval);
cmd.AddValue("verbose", "turn on all WifiNetDevice log components", verbose);
cmd.AddValue("assocMethod1", "Use SetRoutingTableAssociation () method", assocMethod1);
cmd.AddValue("assocMethod2", "Use AddHostNetworkAssociation () method", assocMethod2);
cmd.AddValue("assocMethod",
"How to add the host to the HNA table (SetRoutingTable, "
"AddHostNetwork)",
assocMethod);
cmd.AddValue("reverse", "Send packets from CSMA to WiFi if set to true", reverse);
cmd.Parse(argc, argv);
// Convert to time object
@@ -210,34 +213,39 @@ main(int argc, char* argv[])
ipv4.Assign(csmaDevices);
TypeId tid = TypeId::LookupByName("ns3::UdpSocketFactory");
Ptr<Socket> recvSink = Socket::CreateSocket(csmaNodes.Get(0), tid);
Ptr<Socket> recvSink;
if (!reverse)
{
recvSink = Socket::CreateSocket(csmaNodes.Get(0), tid);
}
else
{
recvSink = Socket::CreateSocket(olsrNodes.Get(0), tid);
}
InetSocketAddress local = InetSocketAddress(Ipv4Address::GetAny(), 80);
recvSink->Bind(local);
recvSink->SetRecvCallback(MakeCallback(&ReceivePacket));
Ptr<Socket> source = Socket::CreateSocket(olsrNodes.Get(0), tid);
InetSocketAddress remote = InetSocketAddress(Ipv4Address("172.16.1.1"), 80);
source->Connect(remote);
Ptr<Socket> source;
if (!reverse)
{
source = Socket::CreateSocket(olsrNodes.Get(0), tid);
InetSocketAddress remote = InetSocketAddress(Ipv4Address("172.16.1.1"), 80);
source->Connect(remote);
}
else
{
source = Socket::CreateSocket(csmaNodes.Get(0), tid);
InetSocketAddress remote = InetSocketAddress(Ipv4Address("10.1.1.1"), 80);
source->Connect(remote);
}
// Obtain olsr::RoutingProtocol instance of gateway node
// (namely, node B) and add the required association
Ptr<Ipv4> stack = olsrNodes.Get(1)->GetObject<Ipv4>();
Ptr<Ipv4RoutingProtocol> rp_Gw = (stack->GetRoutingProtocol());
Ptr<Ipv4ListRouting> lrp_Gw = DynamicCast<Ipv4ListRouting>(rp_Gw);
Ptr<olsr::RoutingProtocol> olsrrp_Gw = Ipv4RoutingHelper::GetRouting<olsr::RoutingProtocol>(
olsrNodes.Get(1)->GetObject<Ipv4>()->GetRoutingProtocol());
Ptr<olsr::RoutingProtocol> olsrrp_Gw;
for (uint32_t i = 0; i < lrp_Gw->GetNRoutingProtocols(); i++)
{
int16_t priority;
Ptr<Ipv4RoutingProtocol> temp = lrp_Gw->GetRoutingProtocol(i, priority);
if (DynamicCast<olsr::RoutingProtocol>(temp))
{
olsrrp_Gw = DynamicCast<olsr::RoutingProtocol>(temp);
}
}
if (assocMethod1)
if (assocMethod == "SetRoutingTable")
{
// Create a special Ipv4StaticRouting instance for RoutingTableAssociation
// Even the Ipv4StaticRouting instance added to list may be used
@@ -252,16 +260,26 @@ main(int argc, char* argv[])
uint32_t(1));
olsrrp_Gw->SetRoutingTableAssociation(hnaEntries);
}
if (assocMethod2)
else if (assocMethod == "AddHostNetwork")
{
// Specify the required associations directly.
olsrrp_Gw->AddHostNetworkAssociation(Ipv4Address("172.16.1.0"), Ipv4Mask("255.255.255.0"));
}
else
{
std::cout << "invalid HnaMethod option (" << assocMethod << ")" << std::endl;
exit(0);
}
// Add a default route to the CSMA node (to enable replies)
Ptr<Ipv4StaticRouting> staticRoutingProt;
staticRoutingProt = Ipv4RoutingHelper::GetRouting<Ipv4StaticRouting>(
csmaNodes.Get(0)->GetObject<Ipv4>()->GetRoutingProtocol());
staticRoutingProt->AddNetworkRouteTo("10.1.1.0", "255.255.255.0", "172.16.1.2", 1);
// Tracing
wifiPhy.EnablePcap("olsr-hna", devices);
csma.EnablePcap("olsr-hna", csmaDevices, false);
wifiPhy.EnablePcap("olsr-hna-wifi", devices);
csma.EnablePcap("olsr-hna-csma", csmaDevices, false);
AsciiTraceHelper ascii;
wifiPhy.EnableAsciiAll(ascii.CreateFileStream("olsr-hna-wifi.tr"));
csma.EnableAsciiAll(ascii.CreateFileStream("olsr-hna-csma.tr"));
@@ -274,6 +292,10 @@ main(int argc, char* argv[])
numPackets,
interPacketInterval);
Ptr<OutputStreamWrapper> routingStream =
Create<OutputStreamWrapper>("olsr-hna.routes", std::ios::out);
Ipv4RoutingHelper::PrintRoutingTableAllAt(Seconds(15), routingStream);
Simulator::Stop(Seconds(20.0));
Simulator::Run();
Simulator::Destroy();

14
src/olsr/model/olsr-routing-protocol.cc
View File

@@ -337,12 +337,14 @@ RoutingProtocol::PrintRoutingTable(Ptr<OutputStreamWrapper> stream, Time::Unit u
*os << std::setw(16) << "Interface";
*os << "Distance" << std::endl;
for (std::map<Ipv4Address, RoutingTableEntry>::const_iterator iter = m_table.begin();
iter != m_table.end();
iter++)
for (auto iter = m_table.begin(); iter != m_table.end(); iter++)
{
*os << std::setw(16) << iter->first;
*os << std::setw(16) << iter->second.nextAddr;
std::ostringstream dest;
std::ostringstream nextHop;
dest << iter->first;
nextHop << iter->second.nextAddr;
*os << std::setw(16) << dest.str();
*os << std::setw(16) << nextHop.str();
*os << std::setw(16);
if (!Names::FindName(m_ipv4->GetNetDevice(iter->second.interface)).empty())
{
@@ -364,7 +366,7 @@ RoutingProtocol::PrintRoutingTable(Ptr<OutputStreamWrapper> stream, Time::Unit u
}
else
{
*os << "HNA Routing Table: empty" << std::endl;
*os << "HNA Routing Table: empty" << std::endl << std::endl;
}
// Restore the previous ostream state
(*os).copyfmt(oldState);