equal
deleted
inserted
replaced
34 Ptr<CsmaChannel> |
34 Ptr<CsmaChannel> |
35 CsmaTopology::CreateCsmaChannel( |
35 CsmaTopology::CreateCsmaChannel( |
36 const DataRate& bps, |
36 const DataRate& bps, |
37 const Time& delay) |
37 const Time& delay) |
38 { |
38 { |
39 Ptr<CsmaChannel> channel = CreateObject<CsmaChannel> (bps, delay); |
39 Ptr<CsmaChannel> channel = CreateObject<CsmaChannel> ("BitRate", bps, "Delay", delay); |
40 |
40 |
41 return channel; |
41 return channel; |
42 } |
42 } |
43 |
43 |
44 #if 0 |
44 #if 0 |
46 CsmaTopology::AddCsmaEthernetNode( |
46 CsmaTopology::AddCsmaEthernetNode( |
47 Ptr<Node> n1, |
47 Ptr<Node> n1, |
48 Ptr<CsmaChannel> ch, |
48 Ptr<CsmaChannel> ch, |
49 Mac48Address addr) |
49 Mac48Address addr) |
50 { |
50 { |
51 Ptr<CsmaNetDevice> nd1 = CreateObjectWith<CsmaNetDevice> ("Node", Ptr<Node> (n1), |
51 Ptr<CsmaNetDevice> nd1 = CreateObject<CsmaNetDevice> ("Node", Ptr<Node> (n1), |
52 "Address", addr, |
52 "Address", addr, |
53 "EncapsulationMode", "EthernetV1"); |
53 "EncapsulationMode", "EthernetV1"); |
54 |
54 |
55 Ptr<Queue> q = Queue::CreateDefault (); |
55 Ptr<Queue> q = Queue::CreateDefault (); |
56 nd1->AddQueue(q); |
56 nd1->AddQueue(q); |