mirror of
https://github.com/containers/podman.git
synced 2025-12-08 06:39:05 +08:00
vendor latest c/common
Includes my pasta changes. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
2
vendor/github.com/containers/common/libnetwork/internal/util/util.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/internal/util/util.go
generated
vendored
@@ -112,7 +112,7 @@ func GetFreeIPv4NetworkSubnet(usedNetworks []*net.IPNet, subnetPools []config.Su
|
||||
// GetFreeIPv6NetworkSubnet returns a unused ipv6 subnet
|
||||
func GetFreeIPv6NetworkSubnet(usedNetworks []*net.IPNet) (*types.Subnet, error) {
|
||||
// FIXME: Is 10000 fine as limit? We should prevent an endless loop.
|
||||
for i := 0; i < 10000; i++ {
|
||||
for range 10000 {
|
||||
// RFC4193: Choose the ipv6 subnet random and NOT sequentially.
|
||||
network, err := getRandomIPv6Subnet()
|
||||
if err != nil {
|
||||
|
||||
1
vendor/github.com/containers/common/libnetwork/internal/util/validate.go
generated
vendored
1
vendor/github.com/containers/common/libnetwork/internal/util/validate.go
generated
vendored
@@ -129,7 +129,6 @@ func ValidateSetupOptions(n NetUtil, namespacePath string, options types.SetupOp
|
||||
return errors.New("must specify at least one network")
|
||||
}
|
||||
for name, netOpts := range options.Networks {
|
||||
netOpts := netOpts
|
||||
network, err := n.Network(name)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user