9bdcbe0447
Major integrations and fixes: - Added BACKBEAT SDK integration for P2P operation timing - Implemented beat-aware status tracking for distributed operations - Added Docker secrets support for secure license management - Resolved KACHING license validation via HTTPS/TLS - Updated docker-compose configuration for clean stack deployment - Disabled rollback policies to prevent deployment failures - Added license credential storage (CHORUS-DEV-MULTI-001) Technical improvements: - BACKBEAT P2P operation tracking with phase management - Enhanced configuration system with file-based secrets - Improved error handling for license validation - Clean separation of KACHING and CHORUS deployment stacks 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
78 lines
1.6 KiB
Go
78 lines
1.6 KiB
Go
package cidranger
|
|
|
|
import (
|
|
"net"
|
|
|
|
rnet "github.com/libp2p/go-cidranger/net"
|
|
)
|
|
|
|
type rangerFactory func(rnet.IPVersion) Ranger
|
|
|
|
type versionedRanger struct {
|
|
ipV4Ranger Ranger
|
|
ipV6Ranger Ranger
|
|
}
|
|
|
|
func newVersionedRanger(factory rangerFactory) Ranger {
|
|
return &versionedRanger{
|
|
ipV4Ranger: factory(rnet.IPv4),
|
|
ipV6Ranger: factory(rnet.IPv6),
|
|
}
|
|
}
|
|
|
|
func (v *versionedRanger) Insert(entry RangerEntry) error {
|
|
network := entry.Network()
|
|
ranger, err := v.getRangerForIP(network.IP)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return ranger.Insert(entry)
|
|
}
|
|
|
|
func (v *versionedRanger) Remove(network net.IPNet) (RangerEntry, error) {
|
|
ranger, err := v.getRangerForIP(network.IP)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ranger.Remove(network)
|
|
}
|
|
|
|
func (v *versionedRanger) Contains(ip net.IP) (bool, error) {
|
|
ranger, err := v.getRangerForIP(ip)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return ranger.Contains(ip)
|
|
}
|
|
|
|
func (v *versionedRanger) ContainingNetworks(ip net.IP) ([]RangerEntry, error) {
|
|
ranger, err := v.getRangerForIP(ip)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ranger.ContainingNetworks(ip)
|
|
}
|
|
|
|
func (v *versionedRanger) CoveredNetworks(network net.IPNet) ([]RangerEntry, error) {
|
|
ranger, err := v.getRangerForIP(network.IP)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return ranger.CoveredNetworks(network)
|
|
}
|
|
|
|
// Len returns number of networks in ranger.
|
|
func (v *versionedRanger) Len() int {
|
|
return v.ipV4Ranger.Len() + v.ipV6Ranger.Len()
|
|
}
|
|
|
|
func (v *versionedRanger) getRangerForIP(ip net.IP) (Ranger, error) {
|
|
if ip.To4() != nil {
|
|
return v.ipV4Ranger, nil
|
|
}
|
|
if ip.To16() != nil {
|
|
return v.ipV6Ranger, nil
|
|
}
|
|
return nil, ErrInvalidNetworkNumberInput
|
|
}
|