branch merge

This commit is contained in:
Tom Henderson
2008-04-22 21:19:39 -07:00
205 changed files with 4046 additions and 4120 deletions

View File

@@ -55,8 +55,8 @@ main (int argc, char *argv[])
internet.Install (n);
PointToPointHelper p2p;
p2p.SetChannelParameter ("BitRate", DataRate (38400));
p2p.SetChannelParameter ("Delay", MilliSeconds (20));
p2p.SetChannelParameter ("BitRate", StringValue ("38400bps"));
p2p.SetChannelParameter ("Delay", StringValue ("20ms"));
NetDeviceContainer d01 = p2p.Install (n01);
NetDeviceContainer d02 = p2p.Install (n02);
@@ -89,9 +89,9 @@ main (int argc, char *argv[])
UdpEchoClientHelper client;
client.SetRemote (i01.GetAddress (1), port);
client.SetAppAttribute ("MaxPackets", Uinteger (1));
client.SetAppAttribute ("Interval", Seconds (1.0));
client.SetAppAttribute ("PacketSize", Uinteger (1024));
client.SetAppAttribute ("MaxPackets", UintegerValue (1));
client.SetAppAttribute ("Interval", StringValue ("1s"));
client.SetAppAttribute ("PacketSize", UintegerValue (1024));
apps = client.Install (n.Get (0));
apps.Start (Seconds (2.0));
apps.Stop (Seconds (10.0));