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

AODV_Precursor killed

Browse Source
This commit is contained in:
Borovkova Elena
2009-07-07 18:39:57 +04:00
parent 7c51201748
commit 051a833eaf
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/routing/aodv/aodv-rtable.cc
View File

@@ -71,33 +71,26 @@ aodv_rt_entry::~aodv_rt_entry()
bool
aodv_rt_entry::pc_insert(Ipv4Address id)
{
AODV_Precursor p (id);
if (! pc_lookup(id, p))
if (! pc_lookup(id))
{
rt_pclist.push_back(p);
rt_pclist.push_back(id);
return true;
}
else return false;
}
bool
aodv_rt_entry::pc_lookup(Ipv4Address id, AODV_Precursor & p)
aodv_rt_entry::pc_lookup(Ipv4Address id)
{
for(std::vector<AODV_Precursor>::const_iterator i = rt_pclist.begin(); i != rt_pclist.end(); ++i)
if (i->pc_addr == id)
{
p = *i;
return true;
}
for(std::vector<Ipv4Address>::const_iterator i = rt_pclist.begin(); i != rt_pclist.end(); ++i)
if (*i == id) return true;
return false;
}
bool
aodv_rt_entry::pc_delete(Ipv4Address id)
{
AODV_Precursor p(id);
std::vector<AODV_Precursor>::iterator i = std::remove(rt_pclist.begin(), rt_pclist.end(), p);
std::vector<Ipv4Address>::iterator i = std::remove(rt_pclist.begin(), rt_pclist.end(), id);
if(i == rt_pclist.end())
return false;
else
@@ -181,10 +174,6 @@ static AodvRtableTest g_AodvRtableTest;
bool
AodvRtableTest::RunTests ()
{
AODV_Precursor pc1(Ipv4Address("1.1.1.1"));
AODV_Precursor pc2(Ipv4Address("2.2.2.2"));
NS_TEST_ASSERT(!(pc1==pc2));
aodv_rt_entry entry1;
Ipv4Address dst1("3.3.3.3");
Ipv4Address dst2("1.2.3.4");
@@ -193,9 +182,7 @@ AodvRtableTest::RunTests ()
NS_TEST_ASSERT(entry2 == dst2);
entry2.pc_insert(dst1);
AODV_Precursor pc3(dst1);
NS_TEST_ASSERT(entry2.pc_lookup(dst1, pc2));
NS_TEST_ASSERT(pc3==pc2);
NS_TEST_ASSERT(entry2.pc_lookup(dst1));
NS_TEST_ASSERT(!entry2.pc_delete(dst2));
NS_TEST_ASSERT(entry2.pc_delete(dst1));
NS_TEST_ASSERT(entry2.pc_empty());

25
src/routing/aodv/aodv-rtable.h
View File

@@ -37,25 +37,7 @@ namespace aodv {
#define INFINITY2 0xff
#define DELETE_PERIOD 10 // seconds. TODO: remove defines
/**
* \ingroup aodv
*
* \brief AODV Precursor list data structure
*/
class AODV_Precursor
{
friend class AODV;
friend class aodv_rt_entry;
public:
AODV_Precursor(Ipv4Address const & a) : pc_addr(a) {}
bool operator==(AODV_Precursor const & o) const
{
return (pc_addr == o.pc_addr);
}
protected:
/// Precursor address
Ipv4Address pc_addr;
};
/**
* \ingroup aodv
@@ -80,10 +62,9 @@ public:
/**
* Lookup precursor by address
* \param id precursor address
* \param p precursor with address id if exists
* \return true on success
*/
bool pc_lookup(Ipv4Address id, AODV_Precursor & p);
bool pc_lookup(Ipv4Address id);
/**
* \brief Delete precursor
* \param id precursor address
@@ -134,7 +115,7 @@ private:
/// Next hop IP address
Ipv4Address rt_nexthop;
/// List of precursors
std::vector<AODV_Precursor> rt_pclist;
std::vector<Ipv4Address> rt_pclist;
/**
* \brief Expiration or deletion time of the route
* Lifetime field in the routing table plays dual role --