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

internet: Cannot assume that traffic control layer is aggregated.

Browse Source 
Click routing support makes use of the Ipv4AddressHelper but
nodes using click routing do not support traffic control at this time.
This commit is contained in:
Tom Henderson
2016-03-10 16:59:27 -08:00
parent ed30b42b1f
commit bebead08b9
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/internet/helper/ipv4-address-helper.cc
View File

@@ -161,15 +161,13 @@ Ipv4AddressHelper::Assign (const NetDeviceContainer &c)
ipv4->SetUp (interface);
retval.Add (ipv4, interface);
// Install the default traffic control configuration if the traffic
// control layer has been aggregated, if this is not
// a loopback interface, and there is no queue disc installed already
Ptr<TrafficControlLayer> tc = node->GetObject<TrafficControlLayer> ();
NS_ASSERT_MSG (tc, "Ipv4AddressHelper::Assign(): NetDevice is associated"
"with a node without the Traffic Control layer installed");
// Install the default traffic control configuration, if this is not a loopback
// interface and there is no queue disc installed already
if (DynamicCast<LoopbackNetDevice> (device) == 0 && tc->GetRootQueueDiscOnDevice (device) == 0)
if (tc && DynamicCast<LoopbackNetDevice> (device) == 0 && tc->GetRootQueueDiscOnDevice (device) == 0)
{
NS_LOG_LOGIC ("Installing default traffic control configuration");
TrafficControlHelper tcHelper = TrafficControlHelper::Default ();
tcHelper.Install (device);
}