kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

libnetwork: ipvlan: use single ipSubnet type

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-07-01 09:13:38 +02:00
parent 9fba1514d2
commit d3e3d43482
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libnetwork/drivers/ipvlan/ipvlan_joinleave.go
View file

@ -171,29 +171,17 @@ func ifaceGateway(dfNet string) (*staticRoute, error) {
}
// getSubnetforIPv4 returns the ipv4 subnet to which the given IP belongs
func (n *network) getSubnetforIPv4(ip *net.IPNet) *ipv4Subnet {
for _, s := range n.config.Ipv4Subnets {
_, snet, err := net.ParseCIDR(s.SubnetIP)
if err != nil {
return nil
}
// first check if the mask lengths are the same
i, _ := snet.Mask.Size()
j, _ := ip.Mask.Size()
if i != j {
continue
}
if snet.Contains(ip.IP) {
return s
}
}
return nil
func (n *network) getSubnetforIPv4(ip *net.IPNet) *ipSubnet {
return getSubnetForIP(ip, n.config.Ipv4Subnets)
}
// getSubnetforIPv6 returns the ipv6 subnet to which the given IP belongs
func (n *network) getSubnetforIPv6(ip *net.IPNet) *ipv6Subnet {
for _, s := range n.config.Ipv6Subnets {
func (n *network) getSubnetforIPv6(ip *net.IPNet) *ipSubnet {
return getSubnetForIP(ip, n.config.Ipv6Subnets)
}
func getSubnetForIP(ip *net.IPNet, subnets []*ipSubnet) *ipSubnet {
for _, s := range subnets {
_, snet, err := net.ParseCIDR(s.SubnetIP)
if err != nil {
return nil

4
libnetwork/drivers/ipvlan/ipvlan_network.go
View file

@ -260,7 +260,7 @@ func (config *configuration) fromOptions(labels map[string]string) error {
func (config *configuration) processIPAM(id string, ipamV4Data, ipamV6Data []driverapi.IPAMData) error {
if len(ipamV4Data) > 0 {
for _, ipd := range ipamV4Data {
s := &ipv4Subnet{
s := &ipSubnet{
SubnetIP: ipd.Pool.String(),
GwIP: ipd.Gateway.String(),
}
@ -269,7 +269,7 @@ func (config *configuration) processIPAM(id string, ipamV4Data, ipamV6Data []dri
}
if len(ipamV6Data) > 0 {
for _, ipd := range ipamV6Data {
s := &ipv6Subnet{
s := &ipSubnet{
SubnetIP: ipd.Pool.String(),
GwIP: ipd.Gateway.String(),
}

11
libnetwork/drivers/ipvlan/ipvlan_store.go
View file

@ -32,16 +32,11 @@ type configuration struct {
IpvlanMode string
IpvlanFlag string
CreatedSlaveLink bool
Ipv4Subnets []*ipv4Subnet
Ipv6Subnets []*ipv6Subnet
Ipv4Subnets []*ipSubnet
Ipv6Subnets []*ipSubnet
}
type ipv4Subnet struct {
SubnetIP string
GwIP string
}
type ipv6Subnet struct {
type ipSubnet struct {
SubnetIP string
GwIP string
}