From f6e33b54b70e64ef002afff5fb7094921505d345 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Feb 2007 06:42:58 -0800 Subject: [PATCH 1/3] trace files should not be opened for appending --- src/common/trace-writer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/trace-writer.cc b/src/common/trace-writer.cc index 653eda218..c668241c1 100644 --- a/src/common/trace-writer.cc +++ b/src/common/trace-writer.cc @@ -82,7 +82,7 @@ TraceWriter::Open (std::string const &filename) { NS_DEBUG ("TraceWriter()::Open (\"" << filename << "\")") - m_filestr.open (filename.c_str(), std::ios::out | std::ios::app); + m_filestr.open (filename.c_str(), std::ios::out); } void @@ -90,7 +90,7 @@ TraceWriter::Open (char const *filename) { NS_DEBUG ("TraceWriter()::Open (\"" << filename << "\")") - m_filestr.open (filename, std::ios::out | std::ios::app); + m_filestr.open (filename, std::ios::out); } void From 390d3d8089e983d0c9ea9f9020daf2f0a48413c8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Feb 2007 07:37:44 -0800 Subject: [PATCH 2/3] Remove netmask from AddDuplexLink signature --- samples/ns-2/simple.tcl.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/samples/ns-2/simple.tcl.cc b/samples/ns-2/simple.tcl.cc index 25cdaf715..3b121e0da 100644 --- a/samples/ns-2/simple.tcl.cc +++ b/samples/ns-2/simple.tcl.cc @@ -23,10 +23,14 @@ #include #include +#include #include "ns3/debug.h" + #include "ns3/simulator.h" #include "ns3/nstime.h" +#include "ns3/trace-writer.h" + #include "ns3/internet-node.h" #include "ns3/serial-channel.h" #include "ns3/mac-address.h" @@ -36,7 +40,6 @@ #include "ns3/udp-socket.h" #include "ns3/ipv4-route.h" #include "ns3/drop-tail.h" -#include "ns3/trace-writer.h" using namespace ns3; @@ -136,7 +139,6 @@ AddDuplexLink( InternetNode* b, const Ipv4Address& addrb, const MacAddress& macaddrb, - const Ipv4Mask& netmask, // const Rate& rate, // const Time& delay, TraceContainer &traceContainer, @@ -145,6 +147,11 @@ AddDuplexLink( std::string qName; SerialChannel* channel = new SerialChannel(); + // Duplex link is assumed to be subnetted as a /30 + // May run this unnumbered in the future? + Ipv4Mask netmask("255.255.255.252"); + assert(netmask.IsMatch(addra,addrb)); + qName = name + "::Queue A"; DropTailQueue* dtqa = new DropTailQueue(qName); dtqa->RegisterTraces (traceContainer); @@ -243,7 +250,6 @@ int main (int argc, char *argv[]) SerialChannel* ch1 = AddDuplexLink ( n0, Ipv4Address("10.1.1.1"), MacAddress("00:00:00:00:00:01"), n2, Ipv4Address("10.1.1.2"), MacAddress("00:00:00:00:00:02"), - Ipv4Mask("255.255.255.0"), traceContainer, channelName); SetupTrace (traceContainer, tracer); @@ -251,7 +257,6 @@ int main (int argc, char *argv[]) SerialChannel* ch2 = AddDuplexLink ( n1, Ipv4Address("10.1.2.1"), MacAddress("00:00:00:00:00:03"), n2, Ipv4Address("10.1.2.2"), MacAddress("00:00:00:00:00:04"), - Ipv4Mask("255.255.255.0"), traceContainer, channelName); SetupTrace (traceContainer, tracer); @@ -259,7 +264,6 @@ int main (int argc, char *argv[]) SerialChannel* ch3 = AddDuplexLink ( n2, Ipv4Address("10.1.3.1"), MacAddress("00:00:00:00:00:05"), n3, Ipv4Address("10.1.3.2"), MacAddress("00:00:00:00:00:06"), - Ipv4Mask("255.255.255.0"), traceContainer, channelName); SetupTrace (traceContainer, tracer); From ac253158627bd418b751f7b17179cc34f261160b Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Feb 2007 12:52:35 -0800 Subject: [PATCH 3/3] Add DEBUG to ipv4-address.cc --- src/node/ipv4-address.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/node/ipv4-address.cc b/src/node/ipv4-address.cc index 00e985e72..c4877a558 100644 --- a/src/node/ipv4-address.cc +++ b/src/node/ipv4-address.cc @@ -18,6 +18,8 @@ * * Author: Mathieu Lacage */ +#include "ns3/debug.h" +NS_DEBUG_COMPONENT_DEFINE("Ipv4Address") \ #include "ipv4-address.h"