F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove netmask from AddDuplexLink signature

Browse Source
This commit is contained in:
Unknown
2007-02-21 07:37:44 -08:00
parent f6e33b54b7
commit 390d3d8089
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/ns-2/simple.tcl.cc
View File

@@ -23,10 +23,14 @@
#include <iostream>
#include <string>
#include <cassert>
#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);