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

Merge pull request #2416 from herrwagner/2289-fix-ipv6-hardcode

Browse source 
Fix hardcoded AF_INET for IPv6 address handling
This commit is contained in:
elangovan sivanandam 2019-07-12 06:37:36 -07:00 • committed by GitHub
commit 4779705fb0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnetwork/ipvs/netlink.go
View file

@ -422,8 +422,11 @@ func assembleDestination(attrs []syscall.NetlinkRouteAttr) (*Destination, error)
attrType := int(attr.Attr.Type) attrType := int(attr.Attr.Type)
switch attrType { switch attrType {
case ipvsDestAttrAddressFamily:
d.AddressFamily = native.Uint16(attr.Value)
case ipvsDestAttrAddress: case ipvsDestAttrAddress:
ip, err := parseIP(attr.Value, syscall.AF_INET) ip, err := parseIP(attr.Value, d.AddressFamily)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -438,8 +441,6 @@ func assembleDestination(attrs []syscall.NetlinkRouteAttr) (*Destination, error)
d.UpperThreshold = native.Uint32(attr.Value) d.UpperThreshold = native.Uint32(attr.Value)
case ipvsDestAttrLowerThreshold: case ipvsDestAttrLowerThreshold:
d.LowerThreshold = native.Uint32(attr.Value) d.LowerThreshold = native.Uint32(attr.Value)
case ipvsDestAttrAddressFamily:
d.AddressFamily = native.Uint16(attr.Value)
case ipvsDestAttrActiveConnections: case ipvsDestAttrActiveConnections:
d.ActiveConnections = int(native.Uint16(attr.Value)) d.ActiveConnections = int(native.Uint16(attr.Value))
case ipvsDestAttrInactiveConnections: case ipvsDestAttrInactiveConnections: