mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-29 07:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix ip range pick initial range; add test

Browse source
This commit is contained in:
Owen 2025-02-14 15:49:23 -05:00
parent 2ff6d1d117
commit a418195b28
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
2 changed files with 196 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
server/lib/ip.ts
View file

@ -100,7 +100,7 @@ function bigIntToIp(num: bigint, version: IPVersion): string {
/**
* Converts CIDR to IP range
*/
function cidrToRange(cidr: string): IPRange {
export function cidrToRange(cidr: string): IPRange {
const [ip, prefix] = cidr.split('/');
const version = detectIpVersion(ip);
const prefixBits = parseInt(prefix);
@ -132,15 +132,22 @@ export function findNextAvailableCidr(
blockSize: number,
startCidr?: string
): string | null {
if (existingCidrs.length === 0) return null;
if (!startCidr && existingCidrs.length === 0) {
return null;
}
// If no existing CIDRs, use the IP version from startCidr
const version = startCidr
? detectIpVersion(startCidr.split('/')[0])
: 4; // Default to IPv4 if no startCidr provided
// Determine IP version from first CIDR
const version = detectIpVersion(existingCidrs[0].split('/')[0]);
// Use appropriate default startCidr if none provided
startCidr = startCidr || (version === 4 ? "0.0.0.0/0" : "::/0");
// Ensure all CIDRs are same version
if (existingCidrs.some(cidr => detectIpVersion(cidr.split('/')[0]) !== version)) {
// If there are existing CIDRs, ensure all are same version
if (existingCidrs.length > 0 &&
existingCidrs.some(cidr => detectIpVersion(cidr.split('/')[0]) !== version)) {
throw new Error('All CIDRs must be of the same IP version');
}