Fix issue for --fixed-cidr when bridge has multiple addresses
#1452
Conversation
| @@ -62,15 +62,15 @@ func GenerateIfaceName(nlh *netlink.Handle, prefix string, len int) (string, err | |||
| } | |||
|
|
|||
| // ElectInterfaceAddresses looks for an interface on the OS with the | |||
| // specified name and returns its IPv4 and IPv6 addresses in CIDR | |||
| // specified name and returns its first IPv4 address, all IPv4 addresses, | |||
There was a problem hiding this comment.
I think it is better that this function "[...] 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."
This will allow us to drop the first *net.IPNet in the return list, which is superflous given we now are adding the v4 list.
Also, erroring out if no v4 is found (and clearly spelling it out in the API comments), will maintain current logic and facilitate caller's job, which would be able to access the v4List[0] element regardless if the funciton succeeded.
v4List, v6List, err := ElectInterfaceAdresses(...)
if err != nil {
return err
}
nw4 := v4List[0]
If CIDR selector specified {
for _, nw := range v4List {
if selector.Contains(nw.IP) {
nw4 = nw
break
}
}
}
I think @cpuguy83 also suggested something similar while reviewing your docker/docker PR.
There was a problem hiding this comment.
Thanks @aboch. The pull request has been updated.
| @@ -52,27 +52,27 @@ func (i *bridgeInterface) exists() bool { | |||
| return i.Link != nil | |||
| } | |||
|
|
|||
| // addresses returns a single IPv4 address and all IPv6 addresses for the | |||
| // addresses returns the first IPv4 address, all IPv4 addresses, and all IPv6 addresses for the | |||
There was a problem hiding this comment.
I'd recommend the same for this bridge function.
yongtang
force-pushed
the
26341-fixed-cidr-multiple-addresses-bridge
branch
2 times, most recently
from
afe6d25 to
6e52938
Compare
|
@aboch Thanks for the review. The PR has been updated. Please take a look and let me know if there are any issues. |
yongtang
force-pushed
the
26341-fixed-cidr-multiple-addresses-bridge
branch
2 times, most recently
from
293cc52 to
36510bd
Compare
|
LGTM |
|
@yongtang Please rebase |
This fix tries to address the issue raised in: moby/moby#26341 where multiple addresses in a bridge may cause `--fixed-cidr` to not have the correct addresses. The issue is that `netutils.ElectInterfaceAddresses(bridgeName)` only returns the first IPv4 address. This fix changes `ElectInterfaceAddresses()` and `addresses()` so that all IPv4 addresses are returned. This will allow the possibility of selectively choose the address needed. Signed-off-by: Yong Tang <[email protected]>
yongtang
force-pushed
the
26341-fixed-cidr-multiple-addresses-bridge
branch
from
36510bd to
e02f9e9
Compare
|
Thanks @aboch. The PR has been rebased and updated. |
This fix tries to address the issue raised in:
moby/moby#26341
where multiple addresses in a bridge may cause
--fixed-cidrto not have the correct addresses.The issue is that
netutils.ElectInterfaceAddresses(bridgeName)only returns the first IPv4 address.This fix changes
ElectInterfaceAddresses()andaddresses()so that all IPv4 addresses are returned. This will allow the possibility of selectively choose the address needed.This fix is related to docker PR:
moby/moby#26659
Signed-off-by: Yong Tang [email protected]