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

Coding style changes: indentation, spaces.

Browse Source
This commit is contained in:
Andrey Mazo
2009-03-13 21:09:40 +03:00
parent fb0f1aba89
commit aac765a2b1
45 changed files with 6064 additions and 6096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/node/l2-routing-protocol.cc
View File

@@ -3,7 +3,7 @@
* Copyright (c) 2008,2009 IITP RAS
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
@@ -32,9 +32,9 @@ NS_OBJECT_ENSURE_REGISTERED (L2RoutingProtocol);
TypeId
L2RoutingProtocol::GetTypeId (void)
{
static TypeId tid = TypeId ("ns3::L2RoutingProtocol")
.SetParent<Object> ();
return tid;
static TypeId tid = TypeId ("ns3::L2RoutingProtocol")
.SetParent<Object> ();
return tid;
}
L2RoutingProtocol::~L2RoutingProtocol ()

223
src/node/l2-routing-protocol.h
View File

@@ -3,7 +3,7 @@
* Copyright (c) 2008,2009 IITP RAS
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
@@ -45,118 +45,115 @@ class Packet;
*/
class L2RoutingProtocol : public Object
{
public:
static TypeId GetTypeId();
virtual ~L2RoutingProtocol();
/**
* \brief Callback to be invoked when route discovery
* procedure is completed
* \param bool flag indicating whether a route was
* actually found and all needed information is added
* to the packet succesfully
* \param Ptr<Packet> is packet, for which the route
* was resolved
* \attention All needed information for MAC layer
* must be stored in proper tags (like in case of
* HWMP, when WifiMacHeader needs address of next
* hop), or must be added as a packet header(if MAC
* does not need any additional information). So, the
* packet is returned back to L2RoutingNetDevice looks
* like a pure packet with ethernet header (i.e data
* +src +dst + protocol). All information needed to
* L2RoutingNetDevice is outgoing port ID.
* \param Mac48Address Source address of the packet
* \param Mac48Address Destiation address of the
* packet
* \param uint16_t Ethernet 'Protocol' field - stored
* in protocol, needed to form a proper MAC-layer
* header.
* \param uint32_t Output port
*/
typedef Callback<
void,
bool,
Ptr<Packet>,
Mac48Address,
Mac48Address,
uint16_t,
uint32_t
>
RouteReplyCallback;
/**
* \brief All packets must go through RequestRoute
* \returns Can the route be discovered or not
* \param sourceIface The incoming interface of the
* packet
* \param source Source address of the packet
* \param destination Destination address of the
* packet
* \param packet The packet to be resolved (needed the
* whole packet, because we can add tags or headers).
* \param protocolType The protocol ID (must be stored
* for route discovery time to form a proper MAC-layer
* header).
* \param routeReply Callback to be invoked after route
* discovery procedure.
*/
virtual bool RequestRoute(
uint32_t sourceIface,
const Mac48Address source,
const Mac48Address destination,
Ptr<Packet> packet,
uint16_t protocolType,
RouteReplyCallback routeReply
) = 0;
/**
* \brief Attaches ports to the L2RoutingProtocols,
* \returns False if there are not proper devices (like
* HWMP, which requires only WifiNetDevice and works
* only above MeshWifiMac).
* \param ports The array of ports.
*/
virtual bool AttachPorts(std::vector<Ptr<NetDevice> > ports) = 0;
/**
* \brief L2Routing protocol must know the
* L2RoutingNetDevice ID to determine packets as 'came
* from upper layer' and 'received from network' (for
* example, to manage TTL).
* \param interface The interface ID of
* L2RoutingNetDevice
*/
virtual void SetIfIndex(uint32_t interface) = 0;
protected:
struct QueuedPacket {
Ptr<Packet> pkt;
Mac48Address dst;
Mac48Address src;
uint16_t protocol;
uint32_t inPort;
RouteReplyCallback reply;
};
/**
* \brief Set Max queue size per destinztion
* \details Routing Queue is implemented inside the
* routing protocol and keeps one queue per
* destination (to make it easier to find resolved and
* timed out packets).
* \param maxPacketsPerDestination Packets per
* destination that can be stored inside protocol.
*/
virtual void SetMaxQueueSize(int maxPacketsPerDestination) = 0;
/**
* \brief Queue packet with 'Ethernet header'
* \returns false if the queue is full.
*/
virtual bool QueuePacket(struct QueuedPacket packet) = 0;
/**
* \brief Deques packet with 'Ethernet header'
* \returns Ptr<packet> (NULL if queue is empty), src,
* dst, protocol ID, incoming port ID, and reply
* callback
* \param destination The destination address, which
* identifyes queue.
*/
virtual struct QueuedPacket DequeuePacket(Mac48Address destination) = 0;
public:
static TypeId GetTypeId();
virtual ~L2RoutingProtocol();
/**
* \brief Callback to be invoked when route discovery
* procedure is completed
* \param bool flag indicating whether a route was
* actually found and all needed information is added
* to the packet succesfully
* \param Ptr<Packet> is packet, for which the route
* was resolved
* \attention All needed information for MAC layer
* must be stored in proper tags (like in case of
* HWMP, when WifiMacHeader needs address of next
* hop), or must be added as a packet header(if MAC
* does not need any additional information). So, the
* packet is returned back to L2RoutingNetDevice looks
* like a pure packet with ethernet header (i.e data
* +src +dst + protocol). All information needed to
* L2RoutingNetDevice is outgoing port ID.
* \param Mac48Address Source address of the packet
* \param Mac48Address Destiation address of the
* packet
* \param uint16_t Ethernet 'Protocol' field - stored
* in protocol, needed to form a proper MAC-layer
* header.
* \param uint32_t Output port
*/
typedef Callback<void,
bool,
Ptr<Packet>,
Mac48Address,
Mac48Address,
uint16_t,
uint32_t > RouteReplyCallback;
/**
* \brief All packets must go through RequestRoute
* \returns Can the route be discovered or not
* \param sourceIface The incoming interface of the
* packet
* \param source Source address of the packet
* \param destination Destination address of the
* packet
* \param packet The packet to be resolved (needed the
* whole packet, because we can add tags or headers).
* \param protocolType The protocol ID (must be stored
* for route discovery time to form a proper MAC-layer
* header).
* \param routeReply Callback to be invoked after route
* discovery procedure.
*/
virtual bool RequestRoute(
uint32_t sourceIface,
const Mac48Address source,
const Mac48Address destination,
Ptr<Packet> packet,
uint16_t protocolType,
RouteReplyCallback routeReply
) = 0;
/**
* \brief Attaches ports to the L2RoutingProtocols,
* \returns False if there are not proper devices (like
* HWMP, which requires only WifiNetDevice and works
* only above MeshWifiMac).
* \param ports The array of ports.
*/
virtual bool AttachPorts(std::vector<Ptr<NetDevice> > ports) = 0;
/**
* \brief L2Routing protocol must know the
* L2RoutingNetDevice ID to determine packets as 'came
* from upper layer' and 'received from network' (for
* example, to manage TTL).
* \param interface The interface ID of
* L2RoutingNetDevice
*/
virtual void SetIfIndex(uint32_t interface) = 0;
protected:
struct QueuedPacket {
Ptr<Packet> pkt;
Mac48Address dst;
Mac48Address src;
uint16_t protocol;
uint32_t inPort;
RouteReplyCallback reply;
};
/**
* \brief Set Max queue size per destinztion
* \details Routing Queue is implemented inside the
* routing protocol and keeps one queue per
* destination (to make it easier to find resolved and
* timed out packets).
* \param maxPacketsPerDestination Packets per
* destination that can be stored inside protocol.
*/
virtual void SetMaxQueueSize(int maxPacketsPerDestination) = 0;
/**
* \brief Queue packet with 'Ethernet header'
* \returns false if the queue is full.
*/
virtual bool QueuePacket(struct QueuedPacket packet) = 0;
/**
* \brief Deques packet with 'Ethernet header'
* \returns Ptr<packet> (NULL if queue is empty), src,
* dst, protocol ID, incoming port ID, and reply
* callback
* \param destination The destination address, which
* identifyes queue.
*/
virtual struct QueuedPacket DequeuePacket(Mac48Address destination) = 0;
};
}//namespace ns3
#endif

26
src/node/mac48-address-comparator.h
View File

@@ -3,7 +3,7 @@
* Copyright (c) 2008,2009 IITP RAS
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
@@ -24,17 +24,17 @@
#include "ns3/mac48-address.h"
namespace ns3 {
struct mac48addrComparator
{
bool operator()(const Mac48Address addr1, Mac48Address addr2) const
{
uint8_t s1[6], s2[6];
addr1.CopyTo(s1);
addr2.CopyTo(s2);
for(int i = 0; i < 6; i ++)
if(s1[i] > s2[i])
return true;
return false;
}
};
{
bool operator()(const Mac48Address addr1, Mac48Address addr2) const
{
uint8_t s1[6], s2[6];
addr1.CopyTo(s1);
addr2.CopyTo(s2);
for (int i = 0; i < 6; i ++)
if (s1[i] > s2[i])
return true;
return false;
}
};
}//namespace ns3
#endif