Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused interface object #82

Merged
merged 2 commits into from
Jun 25, 2018
Merged

Remove unused interface object #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2ea6b7
Remove unused interface object
apoorvabhargava Jun 7, 2018
753117f
Remove unused devices and interface from dce-iperf example
apoorvabhargava Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions example/dce-iperf.cc
View file
Open in desktop
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