bump lib network to 92d1fbe1eb0883cf11d283cea8e658275146411d
full diff:09cdcc8c0e...92d1fbe1eb
relevant changes included (omitting some changes that were added _and_ reverted in this bump): - docker/libnetwork#2433 Fix parseIP error when parseIP before get AddressFamily - fixes docker/libnetwork#2431 parseIP Error ip=[172 17 0 2 0 0 0 0 0 0 0 0 0 0 0 0] - https://github.com/docker/libnetwork/issues/2289 - this was a regression introduced in docker/libnetwork#2416 Fix hardcoded AF_INET for IPv6 address handling - docker/libnetwork#2440 Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commitbab58c1924
) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
b6190c2713
commit
44ca36c7cf
4 changed files with 29 additions and 14 deletions
|
@ -3,7 +3,7 @@
|
||||||
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
|
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
|
||||||
# updating the binary version, consider updating github.com/docker/libnetwork
|
# updating the binary version, consider updating github.com/docker/libnetwork
|
||||||
# in vendor.conf accordingly
|
# in vendor.conf accordingly
|
||||||
LIBNETWORK_COMMIT=09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
|
LIBNETWORK_COMMIT=92d1fbe1eb0883cf11d283cea8e658275146411d
|
||||||
|
|
||||||
install_proxy() {
|
install_proxy() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
|
|
@ -39,7 +39,7 @@ github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0
|
||||||
# libnetwork
|
# libnetwork
|
||||||
|
|
||||||
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
|
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
|
||||||
github.com/docker/libnetwork 09cdcc8c0eab3946c2d70e8f6225b05baf1e90d1
|
github.com/docker/libnetwork 92d1fbe1eb0883cf11d283cea8e658275146411d
|
||||||
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
|
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
|
||||||
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
|
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
|
||||||
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
|
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
|
||||||
|
|
34
vendor/github.com/docker/libnetwork/ipvs/netlink.go
generated
vendored
34
vendor/github.com/docker/libnetwork/ipvs/netlink.go
generated
vendored
|
@ -315,6 +315,7 @@ func assembleStats(msg []byte) (SvcStats, error) {
|
||||||
func assembleService(attrs []syscall.NetlinkRouteAttr) (*Service, error) {
|
func assembleService(attrs []syscall.NetlinkRouteAttr) (*Service, error) {
|
||||||
|
|
||||||
var s Service
|
var s Service
|
||||||
|
var addressBytes []byte
|
||||||
|
|
||||||
for _, attr := range attrs {
|
for _, attr := range attrs {
|
||||||
|
|
||||||
|
@ -327,11 +328,7 @@ func assembleService(attrs []syscall.NetlinkRouteAttr) (*Service, error) {
|
||||||
case ipvsSvcAttrProtocol:
|
case ipvsSvcAttrProtocol:
|
||||||
s.Protocol = native.Uint16(attr.Value)
|
s.Protocol = native.Uint16(attr.Value)
|
||||||
case ipvsSvcAttrAddress:
|
case ipvsSvcAttrAddress:
|
||||||
ip, err := parseIP(attr.Value, s.AddressFamily)
|
addressBytes = attr.Value
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
s.Address = ip
|
|
||||||
case ipvsSvcAttrPort:
|
case ipvsSvcAttrPort:
|
||||||
s.Port = binary.BigEndian.Uint16(attr.Value)
|
s.Port = binary.BigEndian.Uint16(attr.Value)
|
||||||
case ipvsSvcAttrFWMark:
|
case ipvsSvcAttrFWMark:
|
||||||
|
@ -353,6 +350,16 @@ func assembleService(attrs []syscall.NetlinkRouteAttr) (*Service, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parse Address after parse AddressFamily incase of parseIP error
|
||||||
|
if addressBytes != nil {
|
||||||
|
ip, err := parseIP(addressBytes, s.AddressFamily)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
s.Address = ip
|
||||||
|
}
|
||||||
|
|
||||||
return &s, nil
|
return &s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -416,6 +423,7 @@ func (i *Handle) doCmdWithoutAttr(cmd uint8) ([][]byte, error) {
|
||||||
func assembleDestination(attrs []syscall.NetlinkRouteAttr) (*Destination, error) {
|
func assembleDestination(attrs []syscall.NetlinkRouteAttr) (*Destination, error) {
|
||||||
|
|
||||||
var d Destination
|
var d Destination
|
||||||
|
var addressBytes []byte
|
||||||
|
|
||||||
for _, attr := range attrs {
|
for _, attr := range attrs {
|
||||||
|
|
||||||
|
@ -426,11 +434,7 @@ func assembleDestination(attrs []syscall.NetlinkRouteAttr) (*Destination, error)
|
||||||
case ipvsDestAttrAddressFamily:
|
case ipvsDestAttrAddressFamily:
|
||||||
d.AddressFamily = native.Uint16(attr.Value)
|
d.AddressFamily = native.Uint16(attr.Value)
|
||||||
case ipvsDestAttrAddress:
|
case ipvsDestAttrAddress:
|
||||||
ip, err := parseIP(attr.Value, d.AddressFamily)
|
addressBytes = attr.Value
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
d.Address = ip
|
|
||||||
case ipvsDestAttrPort:
|
case ipvsDestAttrPort:
|
||||||
d.Port = binary.BigEndian.Uint16(attr.Value)
|
d.Port = binary.BigEndian.Uint16(attr.Value)
|
||||||
case ipvsDestAttrForwardingMethod:
|
case ipvsDestAttrForwardingMethod:
|
||||||
|
@ -453,6 +457,16 @@ func assembleDestination(attrs []syscall.NetlinkRouteAttr) (*Destination, error)
|
||||||
d.Stats = DstStats(stats)
|
d.Stats = DstStats(stats)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parse Address after parse AddressFamily incase of parseIP error
|
||||||
|
if addressBytes != nil {
|
||||||
|
ip, err := parseIP(addressBytes, d.AddressFamily)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
d.Address = ip
|
||||||
|
}
|
||||||
|
|
||||||
return &d, nil
|
return &d, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
vendor/github.com/docker/libnetwork/vendor.conf
generated
vendored
5
vendor/github.com/docker/libnetwork/vendor.conf
generated
vendored
|
@ -26,11 +26,12 @@ google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
|
||||||
github.com/godbus/dbus 5f6efc7ef2759c81b7ba876593971bfce311eab3 # v4.0.0
|
github.com/godbus/dbus 5f6efc7ef2759c81b7ba876593971bfce311eab3 # v4.0.0
|
||||||
github.com/gorilla/mux c5c6c98bc25355028a63748a498942a6398ccd22 # v1.7.1
|
github.com/gorilla/mux c5c6c98bc25355028a63748a498942a6398ccd22 # v1.7.1
|
||||||
github.com/hashicorp/consul 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 # v0.5.2
|
github.com/hashicorp/consul 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 # v0.5.2
|
||||||
|
github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354 # v1.0.0
|
||||||
github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
|
github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
|
||||||
github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e
|
github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 # v1.0.0
|
||||||
github.com/hashicorp/memberlist 3d8438da9589e7b608a83ffac1ef8211486bcb7c
|
github.com/hashicorp/memberlist 3d8438da9589e7b608a83ffac1ef8211486bcb7c
|
||||||
github.com/sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372
|
github.com/sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372
|
||||||
github.com/hashicorp/go-sockaddr 6d291a969b86c4b633730bfc6b8b9d64c3aafed9
|
github.com/hashicorp/go-sockaddr c7188e74f6acae5a989bdc959aa779f8b9f42faf # v1.0.2
|
||||||
github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870
|
github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870
|
||||||
github.com/mattn/go-shellwords 02e3cf038dcea8290e44424da473dd12be796a8a # v1.0.3
|
github.com/mattn/go-shellwords 02e3cf038dcea8290e44424da473dd12be796a8a # v1.0.3
|
||||||
github.com/miekg/dns e57bf427e68187a27e22adceac868350d7a7079b # v1.0.7
|
github.com/miekg/dns e57bf427e68187a27e22adceac868350d7a7079b # v1.0.7
|
||||||
|
|
Loading…
Reference in a new issue