# HG changeset patch # User Mathieu Lacage # Date 1186125821 -7200 # Node ID 06484dd65e76102a44fd4d3fee289c7f901f6c02 # Parent 44bfdaa47ba99e38118ffaf948069403d288db79 add GetUid methods to all headers and trailers diff -r 44bfdaa47ba9 -r 06484dd65e76 src/internet-node/arp-header.cc --- a/src/internet-node/arp-header.cc Fri Aug 03 09:15:25 2007 +0200 +++ b/src/internet-node/arp-header.cc Fri Aug 03 09:23:41 2007 +0200 @@ -25,6 +25,12 @@ namespace ns3 { +const char * +ArpHeader::GetUid (void) +{ + return "ArpHeader.ns3"; +} + ArpHeader::~ArpHeader () {} diff -r 44bfdaa47ba9 -r 06484dd65e76 src/internet-node/arp-header.h --- a/src/internet-node/arp-header.h Fri Aug 03 09:15:25 2007 +0200 +++ b/src/internet-node/arp-header.h Fri Aug 03 09:23:41 2007 +0200 @@ -30,8 +30,11 @@ /** * \brief The packet header for an ARP packet */ -class ArpHeader : public Header { - public: +class ArpHeader : public Header +{ +public: + static const char *GetUid (void); + virtual ~ArpHeader (); void SetRequest (MacAddress sourceHardwareAddress, diff -r 44bfdaa47ba9 -r 06484dd65e76 src/internet-node/ipv4-header.cc --- a/src/internet-node/ipv4-header.cc Fri Aug 03 09:15:25 2007 +0200 +++ b/src/internet-node/ipv4-header.cc Fri Aug 03 09:23:41 2007 +0200 @@ -30,6 +30,12 @@ bool Ipv4Header::m_calcChecksum = false; +const char * +Ipv4Header::GetUid (void) +{ + return "Ipv4Header.ns3"; +} + Ipv4Header::Ipv4Header () : m_payloadSize (0), m_identification (0), diff -r 44bfdaa47ba9 -r 06484dd65e76 src/internet-node/ipv4-header.h --- a/src/internet-node/ipv4-header.h Fri Aug 03 09:15:25 2007 +0200 +++ b/src/internet-node/ipv4-header.h Fri Aug 03 09:23:41 2007 +0200 @@ -29,8 +29,10 @@ /** * \brief Packet header for IPv4 */ -class Ipv4Header : public Header { +class Ipv4Header : public Header +{ public: + static const char *GetUid (void); /** * \brief Construct a null IPv4 header */ diff -r 44bfdaa47ba9 -r 06484dd65e76 src/internet-node/udp-header.cc --- a/src/internet-node/udp-header.cc Fri Aug 03 09:15:25 2007 +0200 +++ b/src/internet-node/udp-header.cc Fri Aug 03 09:23:41 2007 +0200 @@ -26,6 +26,12 @@ bool UdpHeader::m_calcChecksum = false; +const char * +UdpHeader::GetUid (void) +{ + return "UdpHeader.ns3"; +} + /* The magic values below are used only for debugging. * They can be used to easily detect memory corruption * problems so you can see the patterns in memory. diff -r 44bfdaa47ba9 -r 06484dd65e76 src/internet-node/udp-header.h --- a/src/internet-node/udp-header.h Fri Aug 03 09:15:25 2007 +0200 +++ b/src/internet-node/udp-header.h Fri Aug 03 09:23:41 2007 +0200 @@ -30,8 +30,11 @@ /** * \brief Packet header for UDP packets */ -class UdpHeader : public Header { +class UdpHeader : public Header +{ public: + static const char *GetUid (void); + /** * \brief Constructor * diff -r 44bfdaa47ba9 -r 06484dd65e76 src/node/ethernet-header.cc --- a/src/node/ethernet-header.cc Fri Aug 03 09:15:25 2007 +0200 +++ b/src/node/ethernet-header.cc Fri Aug 03 09:23:41 2007 +0200 @@ -29,6 +29,12 @@ namespace ns3 { +const char * +EthernetHeader::GetUid (void) +{ + return "EthernetHeader.ns3"; +} + EthernetHeader::EthernetHeader (bool hasPreamble) : m_enPreambleSfd (hasPreamble), m_lengthType (0) diff -r 44bfdaa47ba9 -r 06484dd65e76 src/node/ethernet-header.h --- a/src/node/ethernet-header.h Fri Aug 03 09:15:25 2007 +0200 +++ b/src/node/ethernet-header.h Fri Aug 03 09:23:41 2007 +0200 @@ -45,8 +45,11 @@ * the packet. Eventually the class will be improved to also support * VLAN tags in packet headers. */ -class EthernetHeader : public Header { +class EthernetHeader : public Header +{ public: + static const char *GetUid (void); + /** * \brief Construct a null ethernet header * \param hasPreamble if true, insert and remove an ethernet preamble from the diff -r 44bfdaa47ba9 -r 06484dd65e76 src/node/ethernet-trailer.cc --- a/src/node/ethernet-trailer.cc Fri Aug 03 09:15:25 2007 +0200 +++ b/src/node/ethernet-trailer.cc Fri Aug 03 09:23:41 2007 +0200 @@ -30,6 +30,12 @@ bool EthernetTrailer::m_calcFcs = false; +const char * +EthernetTrailer::GetUid (void) +{ + return "EthernetTrailer.ns3"; +} + EthernetTrailer::EthernetTrailer () { Init(); diff -r 44bfdaa47ba9 -r 06484dd65e76 src/node/ethernet-trailer.h --- a/src/node/ethernet-trailer.h Fri Aug 03 09:15:25 2007 +0200 +++ b/src/node/ethernet-trailer.h Fri Aug 03 09:23:41 2007 +0200 @@ -33,8 +33,11 @@ * ethernet packet. The actual FCS functionality is not yet coded and * so this acts more as a placeholder. */ -class EthernetTrailer : public Trailer { +class EthernetTrailer : public Trailer +{ public: + static const char *GetUid (void); + /** * \brief Construct a null ethernet trailer */ diff -r 44bfdaa47ba9 -r 06484dd65e76 src/node/llc-snap-header.cc --- a/src/node/llc-snap-header.cc Fri Aug 03 09:15:25 2007 +0200 +++ b/src/node/llc-snap-header.cc Fri Aug 03 09:23:41 2007 +0200 @@ -25,6 +25,12 @@ namespace ns3 { +const char * +LlcSnapHeader::GetUid (void) +{ + return "LlcSnapHeader.ns3"; +} + LlcSnapHeader::LlcSnapHeader () {} diff -r 44bfdaa47ba9 -r 06484dd65e76 src/node/llc-snap-header.h --- a/src/node/llc-snap-header.h Fri Aug 03 09:15:25 2007 +0200 +++ b/src/node/llc-snap-header.h Fri Aug 03 09:23:41 2007 +0200 @@ -27,8 +27,11 @@ namespace ns3 { -class LlcSnapHeader : public Header { - public: +class LlcSnapHeader : public Header +{ +public: + static const char *GetUid (void); + LlcSnapHeader (); virtual ~LlcSnapHeader ();