Просмотр исходного кода

libnetwork/netutils: drop ElectInterfaceAddresses

This is a follow-up of 48ad9e1. This commit removed the function
ElectInterfaceAddresses from utils_linux.go but not their FreeBSD &
Windows counterpart. As these functions are never called, they can be
safely removed.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Albin Kerouanton 2 лет назад
Родитель
Сommit
f6b50d52d4
2 измененных файлов с 0 добавлено и 22 удалено
  1. 0 10
      libnetwork/netutils/utils_freebsd.go
  2. 0 12
      libnetwork/netutils/utils_windows.go

+ 0 - 10
libnetwork/netutils/utils_freebsd.go

@@ -6,16 +6,6 @@ import (
 	"github.com/docker/docker/libnetwork/types"
 )
 
-// ElectInterfaceAddresses looks for an interface on the OS with the specified name
-// and returns returns all its IPv4 and IPv6 addresses in CIDR notation.
-// If a failure in retrieving the addresses or no IPv4 address is found, an error is returned.
-// If the interface does not exist, it chooses from a predefined
-// list the first IPv4 address which does not conflict with other
-// interfaces on the system.
-func ElectInterfaceAddresses(name string) ([]*net.IPNet, []*net.IPNet, error) {
-	return nil, nil, types.NotImplementedErrorf("not supported on freebsd")
-}
-
 // FindAvailableNetwork returns a network from the passed list which does not
 // overlap with existing interfaces in the system
 func FindAvailableNetwork(list []*net.IPNet) (*net.IPNet, error) {

+ 0 - 12
libnetwork/netutils/utils_windows.go

@@ -2,20 +2,8 @@ package netutils
 
 import (
 	"net"
-
-	"github.com/docker/docker/libnetwork/types"
 )
 
-// ElectInterfaceAddresses looks for an interface on the OS with the specified name
-// and returns returns all its IPv4 and IPv6 addresses in CIDR notation.
-// If a failure in retrieving the addresses or no IPv4 address is found, an error is returned.
-// If the interface does not exist, it chooses from a predefined
-// list the first IPv4 address which does not conflict with other
-// interfaces on the system.
-func ElectInterfaceAddresses(name string) ([]*net.IPNet, []*net.IPNet, error) {
-	return nil, nil, types.NotImplementedErrorf("not supported on windows")
-}
-
 // FindAvailableNetwork returns a network from the passed list which does not
 // overlap with existing interfaces in the system
 //