drivers/bridge: dont use types.ParseCIDR() for fixed value

thaJeztah · thaJeztah · commit da0a006b14e2 · 2021-06-10T18:06:04.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/libnetwork/drivers/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6.go
@@ -8,29 +8,19 @@ import (
 	"net"
 	"os"
 
-	"github.com/docker/docker/libnetwork/types"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
 
-var bridgeIPv6 *net.IPNet
+// bridgeIPv6 is the default, link-local IPv6 address for the bridge (fe80::1/64)
+var bridgeIPv6 = &net.IPNet{IP: net.ParseIP("fe80::1"), Mask: net.CIDRMask(64, 128)}
 
 const (
-	bridgeIPv6Str          = "fe80::1/64"
 	ipv6ForwardConfPerm    = 0644
 	ipv6ForwardConfDefault = "/proc/sys/net/ipv6/conf/default/forwarding"
 	ipv6ForwardConfAll     = "/proc/sys/net/ipv6/conf/all/forwarding"
 )
 
-func init() {
-	// We allow ourselves to panic in this special case because we indicate a
-	// failure to parse a compile-time define constant.
-	var err error
-	if bridgeIPv6, err = types.ParseCIDR(bridgeIPv6Str); err != nil {
-		panic(fmt.Sprintf("Cannot parse default bridge IPv6 address %q: %v", bridgeIPv6Str, err))
-	}
-}
-
 func setupBridgeIPv6(config *networkConfiguration, i *bridgeInterface) error {
 	procFile := "/proc/sys/net/ipv6/conf/" + config.BridgeName + "/disable_ipv6"
 	ipv6BridgeData, err := ioutil.ReadFile(procFile)
diff --git a/libnetwork/drivers/bridge/setup_ipv6_test.go b/libnetwork/drivers/bridge/setup_ipv6_test.go
@@ -43,14 +43,14 @@ func TestSetupIPv6(t *testing.T) {
 
 	var found bool
 	for _, addr := range addrsv6 {
-		if bridgeIPv6Str == addr.IPNet.String() {
+		if bridgeIPv6.String() == addr.IPNet.String() {
 			found = true
 			break
 		}
 	}
 
 	if !found {
-		t.Fatalf("Bridge device does not have requested IPv6 address %v", bridgeIPv6Str)
+		t.Fatalf("Bridge device does not have requested IPv6 address %v", bridgeIPv6)
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ func TestSetupIPv6(t *testing.T) {`
`43`	`43`
`44`	`44`	`var found bool`
`45`	`45`	`for _, addr := range addrsv6 {`
`46`		`- if bridgeIPv6Str == addr.IPNet.String() {`
	`46`	`+ if bridgeIPv6.String() == addr.IPNet.String() {`
`47`	`47`	`found = true`
`48`	`48`	`break`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if !found {`
`53`		`- t.Fatalf("Bridge device does not have requested IPv6 address %v", bridgeIPv6Str)`
	`53`	`+ t.Fatalf("Bridge device does not have requested IPv6 address %v", bridgeIPv6)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`}`