Mirrors/wg-portal
1
0
Fork 0
mirror of https://github.com/h44z/wg-portal.git synced 2025-09-15 07:11:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix invalid ip suggestions (#185)

Browse Source
This commit is contained in:
Christoph Haas
2023-10-20 12:13:39 +02:00
parent d78b4f49bd
commit b49ff66c41
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/adapters/database.go
View File

@@ -601,7 +601,7 @@ func (r *SqlRepo) GetPeerIps(ctx context.Context) (map[domain.PeerIdentifier][]d
return result, nil
}
func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context) (map[domain.Cidr][]domain.Cidr, error) {
func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (map[domain.Cidr][]domain.Cidr, error) {
var peerIps []struct {
domain.Cidr
PeerId domain.PeerIdentifier `gorm:"column:peer_identifier"`
@@ -628,14 +628,26 @@ func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context) (map[domain.Cidr][]do
return nil, fmt.Errorf("failed to fetch interface IP's: %w", err)
}
result := make(map[domain.Cidr][]domain.Cidr)
result := make(map[domain.Cidr][]domain.Cidr, len(subnets))
for _, ip := range interfaceIps {
networkAddr := ip.Cidr.NetworkAddr()
result[networkAddr] = append(result[networkAddr], ip.Cidr)
var subnet domain.Cidr // default empty subnet (if no subnet matches, we will add the IP to the empty subnet group)
for _, s := range subnets {
if s.Contains(ip.Cidr) {
subnet = s
break
}
}
result[subnet] = append(result[subnet], ip.Cidr)
}
for _, ip := range peerIps {
networkAddr := ip.Cidr.NetworkAddr()
result[networkAddr] = append(result[networkAddr], ip.Cidr)
var subnet domain.Cidr // default empty subnet (if no subnet matches, we will add the IP to the empty subnet group)
for _, s := range subnets {
if s.Contains(ip.Cidr) {
subnet = s
break
}
}
result[subnet] = append(result[subnet], ip.Cidr)
}
return result, nil
}