EmaMaker
/
tc-homework2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few type changes to not-yet-defined functions

Tom Henderson 2007-03-26 06:50:33 -07:00
parent 3d8f778457
commit 1a65d66361
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/devices/p2p/p2p-topology.cc
View File

@ -92,23 +92,49 @@ PointToPointTopology::AddPointToPointLink(
return channel;
}
#if 0
#ifdef NOTYET
// Get the net device connecting node n1 to n2. For topologies where
// there are possibly multiple devices connecting n1 and n2 (for example
// wireless with two devices on different channels) this will return
// the first one found.
PointToPointNetDevice* PointToPointTopology::GetNetDevice(Node* n1, Node* n2)
{
// First get the NetDeviceList capability from node 1
NetDeviceList* ndl1 = n1->GetNetDeviceList();
if (!ndl1) return 0; // No devices, return nil
// Get the list of devices
const NetDeviceList::NetDevices_t& dlist = ndl1->GetAll();
for (NetDeviceList::NetDevices_t::const_iterator i = dlist.Begin();
i != dlist.End(); ++i)
{ // Check each device
NetDevice* nd = *i; // next device
Channel* c = nd->GetChannel();
if (!c) continue; // No channel
if (c->NodeIsPeer(n2)) return nd; // found it
}
return 0; // None found
}
// Get the channel connecting node n1 to node n2
Channel* Topology::GetChannel(Node* n1, Node* n2)
PointToPointChannel* PointToPointTopology::GetChannel(
Node* n1,
Node* n2
)
{
NetDevice* nd = GetNetDevice(n1, n2);
if (!nd) return 0; // No net device, so no channel
return nd->GetChannel();
}
Queue* Topology::GetQueue(Node* n1, Node* n2)
Queue* PointToPointTopology::GetQueue(Node* n1, Node* n2)
{
NetDevice* nd = GetNetDevice(n1, n2);
if (!nd) return 0; // No net device, so in queue
return nd->GetQueue();
}
Queue* Topology::SetQueue(Node* n1, Node* n2, const Queue& q)
Queue* PointToPointTopology::SetQueue(Node* n1, Node* n2, const Queue& q)
{
NetDevice* nd = GetNetDevice(n1, n2);
if (!nd) return 0; // No net device, can't set queue
@ -116,7 +142,9 @@ Queue* Topology::SetQueue(Node* n1, Node* n2, const Queue& q)
return nd->SetQueue(q);
}
#endif
#ifdef GFR
P2PChannel* Topology::AddDuplexLink(Node* n1, const IPAddr& ip1,
Node* n2, const IPAddr& ip2,
const Rate& rate, const Time& delay)
@ -148,28 +176,6 @@ P2PChannel* Topology::AddDuplexLink(Node* n1, const IPAddr& ip1,
return dynamic_cast<P2PChannel*>(nd1->GetChannel()); // Always succeeds
}
// Get the net device connecting node n1 to n2. For topologies where
// there are possibly multiple devices connecting n1 and n2 (for example
// wireless with two devices on different channels) this will return
// the first one found.
NetDevice* Topology::GetNetDevice(Node* n1, Node* n2)
{
// First get the NetDeviceList capability from node 1
NetDeviceList* ndl1 = n1->GetNetDeviceList();
if (!ndl1) return 0; // No devices, return nil
// Get the list of devices
const NetDeviceList::NetDevices_t& dlist = ndl1->GetAll();
for (NetDeviceList::NetDevices_t::const_iterator i = dlist.Begin();
i != dlist.End(); ++i)
{ // Check each device
NetDevice* nd = *i; // next device
Channel* c = nd->GetChannel();
if (!c) continue; // No channel
if (c->NodeIsPeer(n2)) return nd; // found it
}
return 0; // None found
}
// Get the channel connecting node n1 to node n2
Channel* Topology::GetChannel(Node* n1, Node* n2)
{

7
src/devices/p2p/p2p-topology.h
View File

@ -32,8 +32,7 @@ class PointToPointChannel;
class Node;
class IPAddr;
class DataRate;
//class PointToPointNetDevice;
//class Queue;
class Queue;
//class Time;
class PointToPointTopology {
@ -50,9 +49,9 @@ public:
const Time&);
// Get the connecting node n1 to node n2
static Channel* GetChannel(Node*, Node*);
static PointToPointChannel* GetChannel(Node*, Node*);
// Get the NetDevice connecting node n1 to n2
static NetDevice* GetNetDevice(Node*, Node*);
static PointToPointNetDevice* GetNetDevice(Node*, Node*);
/// Get the queue associated with a link between two nodes
static Queue* GetQueue(Node*, Node*);
// Set the queue associated with a link between two nodes