author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Fri, 24 Oct 2008 12:31:57 +0200 | |
changeset 3786 | 9f384deadb46 |
parent 3553 | 065488d0420c |
child 3789 | 616c83eeb4b9 |
permissions | -rw-r--r-- |
2833
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
2 |
/* |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
3 |
* Copyright (c) 2008 INRIA |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
4 |
* |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
7 |
* published by the Free Software Foundation; |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
8 |
* |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
12 |
* GNU General Public License for more details. |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
13 |
* |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
17 |
* |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
18 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
f3474fd850b2
add missing license headers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2802
diff
changeset
|
19 |
*/ |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
20 |
#include "point-to-point-helper.h" |
2802
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
21 |
#include "ns3/simulator.h" |
2603
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
22 |
#include "ns3/point-to-point-net-device.h" |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
23 |
#include "ns3/point-to-point-channel.h" |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
24 |
#include "ns3/queue.h" |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
25 |
#include "ns3/pcap-writer.h" |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
26 |
#include "ns3/config.h" |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
27 |
#include "ns3/packet.h" |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
28 |
|
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
|
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
namespace ns3 { |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
31 |
|
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
|
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
PointToPointHelper::PointToPointHelper () |
2744
0ac8ce51ffba
initialize factories correctly.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2656
diff
changeset
|
34 |
{ |
0ac8ce51ffba
initialize factories correctly.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2656
diff
changeset
|
35 |
m_queueFactory.SetTypeId ("ns3::DropTailQueue"); |
0ac8ce51ffba
initialize factories correctly.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2656
diff
changeset
|
36 |
m_deviceFactory.SetTypeId ("ns3::PointToPointNetDevice"); |
0ac8ce51ffba
initialize factories correctly.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2656
diff
changeset
|
37 |
m_channelFactory.SetTypeId ("ns3::PointToPointChannel"); |
0ac8ce51ffba
initialize factories correctly.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2656
diff
changeset
|
38 |
} |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
|
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
40 |
void |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
41 |
PointToPointHelper::SetQueue (std::string type, |
3786
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
42 |
std::string n1, const AttributeValue &v1, |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
43 |
std::string n2, const AttributeValue &v2, |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
44 |
std::string n3, const AttributeValue &v3, |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
45 |
std::string n4, const AttributeValue &v4) |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
46 |
{ |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
47 |
m_queueFactory.SetTypeId (type); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
48 |
m_queueFactory.Set (n1, v1); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
49 |
m_queueFactory.Set (n2, v2); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
50 |
m_queueFactory.Set (n3, v3); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
51 |
m_queueFactory.Set (n4, v4); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
52 |
} |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
53 |
|
2603
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
54 |
void |
3381
3cdd9d60f7c7
bug 232, references to Parameter obsolete
Craig Dowell <craigdo@ee.washington.edu>
parents:
3012
diff
changeset
|
55 |
PointToPointHelper::SetDeviceAttribute (std::string n1, const AttributeValue &v1) |
2603
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
56 |
{ |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
57 |
m_deviceFactory.Set (n1, v1); |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
58 |
} |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
59 |
|
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
60 |
void |
3381
3cdd9d60f7c7
bug 232, references to Parameter obsolete
Craig Dowell <craigdo@ee.washington.edu>
parents:
3012
diff
changeset
|
61 |
PointToPointHelper::SetChannelAttribute (std::string n1, const AttributeValue &v1) |
2603
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
62 |
{ |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
63 |
m_channelFactory.Set (n1, v1); |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
64 |
} |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
65 |
|
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
66 |
void |
3403
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
67 |
PointToPointHelper::SetDeviceParameter (std::string name, const AttributeValue &value) |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
68 |
{ |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
69 |
SetDeviceAttribute (name, value); |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
70 |
} |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
71 |
void |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
72 |
PointToPointHelper::SetChannelParameter (std::string name, const AttributeValue &value) |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
73 |
{ |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
74 |
SetChannelAttribute (name, value); |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
75 |
} |
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
76 |
|
ac82ff1f6736
use NS_DEPRECATED for bug 232.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3381
diff
changeset
|
77 |
void |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
78 |
PointToPointHelper::EnablePcap (std::string filename, uint32_t nodeid, uint32_t deviceid) |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
79 |
{ |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
80 |
std::ostringstream oss; |
2839
b30d4ece2bbb
generate .pcap postfix for pcap filenames
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2834
diff
changeset
|
81 |
oss << filename << "-" << nodeid << "-" << deviceid << ".pcap"; |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
82 |
Ptr<PcapWriter> pcap = Create<PcapWriter> (); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
83 |
pcap->Open (oss.str ()); |
3012 | 84 |
pcap->WritePppHeader (); |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
85 |
oss.str (""); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
86 |
oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/Rx"; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
87 |
Config::ConnectWithoutContext (oss.str (), MakeBoundCallback (&PointToPointHelper::RxEvent, pcap)); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
88 |
oss.str (""); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
89 |
oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/TxQueue/Enqueue"; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
90 |
Config::ConnectWithoutContext (oss.str (), MakeBoundCallback (&PointToPointHelper::EnqueueEvent, pcap)); |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
91 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
92 |
void |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
93 |
PointToPointHelper::EnablePcap (std::string filename, NetDeviceContainer d) |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
94 |
{ |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
95 |
for (NetDeviceContainer::Iterator i = d.Begin (); i != d.End (); ++i) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
96 |
{ |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
97 |
Ptr<NetDevice> dev = *i; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
98 |
EnablePcap (filename, dev->GetNode ()->GetId (), dev->GetIfIndex ()); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
99 |
} |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
100 |
} |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
101 |
void |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
102 |
PointToPointHelper::EnablePcap (std::string filename, NodeContainer n) |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
103 |
{ |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
104 |
NetDeviceContainer devs; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
105 |
for (NodeContainer::Iterator i = n.Begin (); i != n.End (); ++i) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
106 |
{ |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
107 |
Ptr<Node> node = *i; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
108 |
for (uint32_t j = 0; j < node->GetNDevices (); ++j) |
3786
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
109 |
{ |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
110 |
devs.Add (node->GetDevice (j)); |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
111 |
} |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
112 |
} |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
113 |
EnablePcap (filename, devs); |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
114 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
115 |
|
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
116 |
void |
2996
a83b94e277d4
EnablePcap()->EnablePcapAll(); EnableAscii()->EnableAsciiAll()
Tom Henderson <tomh@tomh.org>
parents:
2887
diff
changeset
|
117 |
PointToPointHelper::EnablePcapAll (std::string filename) |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
118 |
{ |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
119 |
EnablePcap (filename, NodeContainer::GetGlobal ()); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
120 |
} |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
121 |
|
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
122 |
void |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
123 |
PointToPointHelper::EnableAscii (std::ostream &os, uint32_t nodeid, uint32_t deviceid) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
124 |
{ |
3553
065488d0420c
bug 279: Packets need metadata support for printing without header checking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3403
diff
changeset
|
125 |
Packet::EnablePrinting (); |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
126 |
std::ostringstream oss; |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
127 |
oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/Rx"; |
2802
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
128 |
Config::Connect (oss.str (), MakeBoundCallback (&PointToPointHelper::AsciiRxEvent, &os)); |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
129 |
oss.str (""); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
130 |
oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/TxQueue/Enqueue"; |
2802
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
131 |
Config::Connect (oss.str (), MakeBoundCallback (&PointToPointHelper::AsciiEnqueueEvent, &os)); |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
132 |
oss.str (""); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
133 |
oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/TxQueue/Dequeue"; |
2802
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
134 |
Config::Connect (oss.str (), MakeBoundCallback (&PointToPointHelper::AsciiDequeueEvent, &os)); |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
135 |
oss.str (""); |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
136 |
oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid << "/$ns3::PointToPointNetDevice/TxQueue/Drop"; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
137 |
Config::Connect (oss.str (), MakeBoundCallback (&PointToPointHelper::AsciiDropEvent, &os)); |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
138 |
} |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
139 |
void |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
140 |
PointToPointHelper::EnableAscii (std::ostream &os, NetDeviceContainer d) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
141 |
{ |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
142 |
for (NetDeviceContainer::Iterator i = d.Begin (); i != d.End (); ++i) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
143 |
{ |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
144 |
Ptr<NetDevice> dev = *i; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
145 |
EnableAscii (os, dev->GetNode ()->GetId (), dev->GetIfIndex ()); |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
146 |
} |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
147 |
} |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
148 |
void |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
149 |
PointToPointHelper::EnableAscii (std::ostream &os, NodeContainer n) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
150 |
{ |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
151 |
NetDeviceContainer devs; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
152 |
for (NodeContainer::Iterator i = n.Begin (); i != n.End (); ++i) |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
153 |
{ |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
154 |
Ptr<Node> node = *i; |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
155 |
for (uint32_t j = 0; j < node->GetNDevices (); ++j) |
3786
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
156 |
{ |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
157 |
devs.Add (node->GetDevice (j)); |
9f384deadb46
replace \t with 8 spaces.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3553
diff
changeset
|
158 |
} |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
159 |
} |
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
160 |
EnableAscii (os, devs); |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
161 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
162 |
|
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
163 |
void |
2996
a83b94e277d4
EnablePcap()->EnablePcapAll(); EnableAscii()->EnableAsciiAll()
Tom Henderson <tomh@tomh.org>
parents:
2887
diff
changeset
|
164 |
PointToPointHelper::EnableAsciiAll (std::ostream &os) |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
165 |
{ |
2789
47e92324cf4b
configure tracing post-topology construction, not before.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2786
diff
changeset
|
166 |
EnableAscii (os, NodeContainer::GetGlobal ()); |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
167 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
168 |
|
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
169 |
NetDeviceContainer |
2887
9a637e6daee0
Build -> Install
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2839
diff
changeset
|
170 |
PointToPointHelper::Install (NodeContainer c) |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
171 |
{ |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
172 |
NS_ASSERT (c.GetN () == 2); |
2887
9a637e6daee0
Build -> Install
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2839
diff
changeset
|
173 |
return Install (c.Get (0), c.Get (1)); |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
174 |
} |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
175 |
NetDeviceContainer |
2887
9a637e6daee0
Build -> Install
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2839
diff
changeset
|
176 |
PointToPointHelper::Install (Ptr<Node> a, Ptr<Node> b) |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
177 |
{ |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
178 |
NetDeviceContainer container; |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
179 |
|
2745
58eba4bfcc4a
use the factories.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2744
diff
changeset
|
180 |
Ptr<PointToPointNetDevice> devA = m_deviceFactory.Create<PointToPointNetDevice> (); |
2656
b426a0e0355e
call SetAddress during construction to assign MAC-level addresses.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2603
diff
changeset
|
181 |
devA->SetAddress (Mac48Address::Allocate ()); |
2603
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
182 |
a->AddDevice (devA); |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
183 |
Ptr<Queue> queueA = m_queueFactory.Create<Queue> (); |
3010 | 184 |
devA->SetQueue (queueA); |
2745
58eba4bfcc4a
use the factories.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2744
diff
changeset
|
185 |
Ptr<PointToPointNetDevice> devB = m_deviceFactory.Create<PointToPointNetDevice> (); |
2656
b426a0e0355e
call SetAddress during construction to assign MAC-level addresses.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2603
diff
changeset
|
186 |
devB->SetAddress (Mac48Address::Allocate ()); |
2603
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
187 |
b->AddDevice (devB); |
1308da4cb3bf
move helpers to their own dir.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2433
diff
changeset
|
188 |
Ptr<Queue> queueB = m_queueFactory.Create<Queue> (); |
3010 | 189 |
devB->SetQueue (queueB); |
2745
58eba4bfcc4a
use the factories.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2744
diff
changeset
|
190 |
Ptr<PointToPointChannel> channel = m_channelFactory.Create<PointToPointChannel> (); |
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
191 |
devA->Attach (channel); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
192 |
devB->Attach (channel); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
193 |
container.Add (devA); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
194 |
container.Add (devB); |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
195 |
|
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
196 |
return container; |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
197 |
} |
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
198 |
|
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
199 |
void |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
200 |
PointToPointHelper::EnqueueEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet) |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
201 |
{ |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
202 |
writer->WritePacket (packet); |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
203 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
204 |
void |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
205 |
PointToPointHelper::RxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet) |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
206 |
{ |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
207 |
writer->WritePacket (packet); |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
208 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
209 |
void |
2802
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
210 |
PointToPointHelper::AsciiEnqueueEvent (std::ostream *os, std::string path, Ptr<const Packet> packet) |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
211 |
{ |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
212 |
*os << "+ " << Simulator::Now ().GetSeconds () << " "; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
213 |
*os << path << " " << *packet << std::endl; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
214 |
} |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
215 |
void |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
216 |
PointToPointHelper::AsciiDequeueEvent (std::ostream *os, std::string path, Ptr<const Packet> packet) |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
217 |
{ |
2802
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
218 |
*os << "- " << Simulator::Now ().GetSeconds () << " "; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
219 |
*os << path << " " << *packet << std::endl; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
220 |
} |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
221 |
void |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
222 |
PointToPointHelper::AsciiDropEvent (std::ostream *os, std::string path, Ptr<const Packet> packet) |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
223 |
{ |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
224 |
*os << "d " << Simulator::Now ().GetSeconds () << " "; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
225 |
*os << path << " " << *packet << std::endl; |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
226 |
} |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
227 |
void |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
228 |
PointToPointHelper::AsciiRxEvent (std::ostream *os, std::string path, Ptr<const Packet> packet) |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
229 |
{ |
6beac0ec2c5d
Prepend ascii trace lines with action and time
Tom Henderson <tomh@tomh.org>
parents:
2789
diff
changeset
|
230 |
*os << "r " << Simulator::Now ().GetSeconds () << " "; |
2786
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
231 |
*os << path << " " << *packet << std::endl; |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
232 |
} |
f261e50396ac
add ascii/pcap trace helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2745
diff
changeset
|
233 |
|
2418
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
234 |
|
4ff45fa08781
an initial draft of helper classes. don't work yet.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
235 |
} // namespace ns3 |