Skip to content

Commit

Permalink
Merge pull request #82 from apoorvabhargava/fix-dce-iperf-example
Browse files Browse the repository at this point in the history
Remove unused interface object
  • Loading branch information
Matthieu Coudron authored Jun 25, 2018
2 parents faaead2 + 753117f commit aa5de62
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions example/dce-iperf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ int main (int argc, char *argv[])
pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
pointToPoint.SetChannelAttribute ("Delay", StringValue ("1ms"));

NetDeviceContainer devices, devices2;
NetDeviceContainer devices;
devices = pointToPoint.Install (nodes);
devices2 = pointToPoint.Install (nodes);

DceManagerHelper dceManager;
dceManager.SetTaskManagerAttribute ("FiberManagerType", StringValue ("UcontextFiberManager"));
Expand Down Expand Up @@ -92,8 +91,6 @@ int main (int argc, char *argv[])
Ipv4AddressHelper address;
address.SetBase ("10.1.1.0", "255.255.255.252");
Ipv4InterfaceContainer interfaces = address.Assign (devices);
address.SetBase ("10.1.2.0", "255.255.255.252");
interfaces = address.Assign (devices2);

// setup ip routes
Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
Expand All @@ -107,6 +104,7 @@ int main (int argc, char *argv[])

DceApplicationHelper dce;
ApplicationContainer apps;
std::ostringstream serverIp;

dce.SetStackSize (1 << 20);

Expand All @@ -115,7 +113,13 @@ int main (int argc, char *argv[])
dce.ResetArguments ();
dce.ResetEnvironment ();
dce.AddArgument ("-c");
dce.AddArgument ("10.1.1.2");

// Extract server IP address
Ptr<Ipv4> ipv4Server = nodes.Get (1)->GetObject<Ipv4> ();
Ipv4Address serverAddress = ipv4Server->GetAddress (1, 0).GetLocal ();
serverAddress.Print (serverIp);

dce.AddArgument (serverIp.str());
dce.AddArgument ("-i");
dce.AddArgument ("1");
dce.AddArgument ("--time");
Expand Down

0 comments on commit aa5de62

Please sign in to comment.