evan/protomask
1
Fork 0
Code

FIx a bug with address assignment

Browse Source
This commit is contained in:
Evan Pratten 2023-08-04 19:08:22 -04:00
parent 41708f15eb
commit 79a861acbf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/fast-nat/src/cpnat.rs
View File

@ -182,13 +182,17 @@ impl CrossProtocolNetworkAddressTableWithIpv4Pool {
let new_address = self let new_address = self
.pool .pool
.iter() .iter()
.map(|(network_address, netmask)| (*network_address, *network_address | !netmask)) .map(|(network_address, netmask)| (*network_address)..(*network_address | !netmask))
.find(|(network_address, _)| self.table.get_ipv6(*network_address).is_none()) .find_map(|mut addr_range| addr_range.find(|addr| !self.table.get_ipv6(*addr).is_some()))
.map(|(_, new_address)| new_address)
.ok_or(Error::Ipv4PoolExhausted(self.max_mappings))?; .ok_or(Error::Ipv4PoolExhausted(self.max_mappings))?;
// Insert the new mapping // Insert the new mapping
self.table.insert(new_address, ipv6, self.timeout); self.table.insert(new_address, ipv6, self.timeout);
log::info!(
"New cross-protocol address mapping: {:02x} -> {:02x}",
ipv6,
new_address
);
// Return the new address // Return the new address
Ok(new_address) Ok(new_address)

2
src/protomask.rs
View File

@ -142,7 +142,7 @@ pub async fn main() {
let mut addr_table = RefCell::new(CrossProtocolNetworkAddressTableWithIpv4Pool::new( let mut addr_table = RefCell::new(CrossProtocolNetworkAddressTableWithIpv4Pool::new(
pool_prefixes pool_prefixes
.iter() .iter()
.map(|prefix| (u32::from(prefix.addr()), prefix.prefix_len() as u32)) .map(|prefix| (u32::from(prefix.addr()), u32::from(prefix.netmask())))
.collect::<Vec<(u32, u32)>>() .collect::<Vec<(u32, u32)>>()
.as_slice(), .as_slice(),
Duration::from_secs(args.reservation_timeout), Duration::from_secs(args.reservation_timeout),