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

Bug 821 - AODV asserts with function logging enabled

Browse Source
This commit is contained in:
Pavel Boyko
2010-02-21 15:37:31 -05:00
parent f6f567b84e
commit 70b9d522d3
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/routing/aodv/aodv-packet.cc
View File

@@ -39,10 +39,19 @@ TypeHeader::TypeHeader (MessageType t) :
{
}
TypeId
TypeHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::aodv::TypeHeader")
.SetParent<Header> ()
;
return tid;
}
TypeId
TypeHeader::GetInstanceTypeId () const
{
return TypeId ();
return GetTypeId ();
}
uint32_t
@@ -134,10 +143,20 @@ RreqHeader::RreqHeader (uint8_t flags, uint8_t reserved, uint8_t hopCount, uint3
{
}
TypeId
RreqHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::aodv::RreqHeader")
.SetParent<Header> ()
.AddConstructor<RreqHeader> ()
;
return tid;
}
TypeId
RreqHeader::GetInstanceTypeId () const
{
return TypeId ();
return GetTypeId ();
}
uint32_t
@@ -261,10 +280,20 @@ RrepHeader::RrepHeader (uint8_t prefixSize, uint8_t hopCount, Ipv4Address dst,
m_lifeTime = uint32_t (lifeTime.GetMilliSeconds ());
}
TypeId
RrepHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::aodv::RrepHeader")
.SetParent<Header> ()
.AddConstructor<RrepHeader> ()
;
return tid;
}
TypeId
RrepHeader::GetInstanceTypeId () const
{
return TypeId ();
return GetTypeId ();
}
uint32_t
@@ -392,10 +421,20 @@ RrepAckHeader::RrepAckHeader () :
{
}
TypeId
RrepAckHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::aodv::RrepAckHeader")
.SetParent<Header> ()
.AddConstructor<RrepAckHeader> ()
;
return tid;
}
TypeId
RrepAckHeader::GetInstanceTypeId () const
{
return TypeId ();
return GetTypeId ();
}
uint32_t
@@ -446,10 +485,20 @@ RerrHeader::RerrHeader () :
{
}
TypeId
RerrHeader::GetTypeId ()
{
static TypeId tid = TypeId ("ns3::aodv::RerrHeader")
.SetParent<Header> ()
.AddConstructor<RerrHeader> ()
;
return tid;
}
TypeId
RerrHeader::GetInstanceTypeId () const
{
return TypeId ();
return GetTypeId ();
}
uint32_t

5
src/routing/aodv/aodv-packet.h
View File

@@ -58,6 +58,7 @@ public:
///\name Header serialization/deserialization
//\{
static TypeId GetTypeId ();
TypeId GetInstanceTypeId () const;
uint32_t GetSerializedSize () const;
void Serialize (Buffer::Iterator start) const;
@@ -109,6 +110,7 @@ public:
///\name Header serialization/deserialization
//\{
static TypeId GetTypeId ();
TypeId GetInstanceTypeId () const;
uint32_t GetSerializedSize () const;
void Serialize (Buffer::Iterator start) const;
@@ -184,6 +186,7 @@ public:
Ipv4Address (), Time lifetime = MilliSeconds (0));
///\name Header serialization/deserialization
//\{
static TypeId GetTypeId ();
TypeId GetInstanceTypeId () const;
uint32_t GetSerializedSize () const;
void Serialize (Buffer::Iterator start) const;
@@ -248,6 +251,7 @@ public:
///\name Header serialization/deserialization
//\{
static TypeId GetTypeId ();
TypeId GetInstanceTypeId () const;
uint32_t GetSerializedSize () const;
void Serialize (Buffer::Iterator start) const;
@@ -289,6 +293,7 @@ public:
///\name Header serialization/deserialization
//\{
static TypeId GetTypeId ();
TypeId GetInstanceTypeId () const;
uint32_t GetSerializedSize () const;
void Serialize (Buffer::Iterator i) const;