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

merge the minor tweaks

Browse Source
This commit is contained in:
Tom Henderson
2007-07-10 23:11:24 -07:00
parent 8168ddcb40 d57291777f
commit 3fc88faa51
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/routing/static-router.cc
View File

@@ -38,32 +38,24 @@ StaticRouterLSA::StaticRouterLSA()
StaticRouterLSA::StaticRouterLSA (StaticRouterLSA& lsa)
: m_linkStateId(lsa.m_linkStateId), m_advertisingRtr(lsa.m_advertisingRtr)
{
NS_DEBUG("StaticRouterLSA Copy Constructor");
NS_ASSERT_MSG(IsEmpty(), "The LSA must be empty before copy");
for ( ListOfLinkRecords_t::iterator i = lsa.m_linkRecords.begin ();
i != lsa.m_linkRecords.end ();
i++)
{
StaticRouterLinkRecord *pSrc = *i;
StaticRouterLinkRecord *pDst = new StaticRouterLinkRecord;
pDst->m_linkId = pSrc->m_linkId;
pDst->m_linkData = pSrc->m_linkData;
pDst->m_linkType = pSrc->m_linkType;
m_linkRecords.push_back(pDst);
pDst = 0;
}
NS_ASSERT_MSG(IsEmpty(), "The LSA must be empty in its constructor!");
CopyLinkRecords (lsa);
}
StaticRouterLSA&
StaticRouterLSA::operator= (StaticRouterLSA& lsa)
{
NS_DEBUG("StaticRouterLSA Operator =");
NS_ASSERT_MSG(IsEmpty(), "The LSA must be empty before assignment");
m_linkStateId = lsa.m_linkStateId;
m_advertisingRtr = lsa.m_advertisingRtr;
ClearLinkRecords ();
CopyLinkRecords (lsa);
return *this;
}
void
StaticRouterLSA::CopyLinkRecords (StaticRouterLSA& lsa)
{
for ( ListOfLinkRecords_t::iterator i = lsa.m_linkRecords.begin ();
i != lsa.m_linkRecords.end ();
i++)
@@ -76,8 +68,6 @@ StaticRouterLSA::operator= (StaticRouterLSA& lsa)
m_linkRecords.push_back(pDst);
pDst = 0;
}
return *this;
}
StaticRouterLSA::~StaticRouterLSA()

9
src/routing/static-router.h
View File

@@ -115,6 +115,15 @@ public:
* @returns Reference to the overwritten LSA.
*/
StaticRouterLSA& operator= (StaticRouterLSA& lsa);
/**
* Copy any Static Router Link Records in a given Static Router Link
* State Advertisement to the current LSA. Existing Link Records are not
* deleted -- this is a concatenation of Link Records.
*
* @see ClearLinkRecords ()
* @param lsa The LSA to copy the Link Records from.
*/
void CopyLinkRecords (StaticRouterLSA& lsa);
/**
* Add a given Static Router Link Record to a given Static Router Link
* State Advertisement.