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

internet: (fixes #2756) Ipv4AddressGenerator underestimates the number of available addresses in a network

Browse Source
This commit is contained in:
Tommaso Pecorella
2017-06-18 01:07:41 +02:00
parent 10c7ca459b
commit 4c860590a2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internet/model/ipv4-address-generator.cc
View File

@@ -209,7 +209,7 @@ Ipv4AddressGeneratorImpl::Reset (void)
mask |= MOST_SIGNIFICANT_BIT;
m_netTable[i].network = 1;
m_netTable[i].addr = 1;
m_netTable[i].addrMax = ~mask;
m_netTable[i].addrMax = ~m_netTable[i].mask;
m_netTable[i].shift = N_BITS - i;
}
m_entries.clear ();
@@ -250,6 +250,7 @@ Ipv4AddressGeneratorImpl::Init (
uint32_t index = MaskToIndex (mask);
m_netTable[index].network = netBits >> m_netTable[index].shift;
NS_ABORT_MSG_UNLESS (addrBits <= m_netTable[index].addrMax, "Ipv4AddressGeneratorImpl::Init(): Address overflow");
m_netTable[index].addr = addrBits;
return;