diff options
| author | Sascha Grunert <sgrunert@suse.com> | 2019-05-02 13:23:31 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2019-06-24 17:26:33 +0200 |
| commit | c5c865391282948b12e722bf1e39ea30bc5e98fc (patch) | |
| tree | 44171e70671c955fe6d23b3a2d4bfa4c406a4a73 /libnetwork/cmd | |
| parent | d9ac962114930f71234d1192f272a5f4ed96007a (diff) | |
| download | docker-c5c865391282948b12e722bf1e39ea30bc5e98fc.tar.gz | |
Update sctp package
This commit updates the vendored ishidawataru/sctp and adapts its used
types.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'libnetwork/cmd')
| -rw-r--r-- | libnetwork/cmd/proxy/main.go | 4 | ||||
| -rw-r--r-- | libnetwork/cmd/proxy/network_proxy_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libnetwork/cmd/proxy/main.go b/libnetwork/cmd/proxy/main.go index 3d51de6fb7..c2832b3fe3 100644 --- a/libnetwork/cmd/proxy/main.go +++ b/libnetwork/cmd/proxy/main.go @@ -51,8 +51,8 @@ func parseHostContainerAddrs() (host net.Addr, container net.Addr) { host = &net.UDPAddr{IP: net.ParseIP(*hostIP), Port: *hostPort} container = &net.UDPAddr{IP: net.ParseIP(*containerIP), Port: *containerPort} case "sctp": - host = &sctp.SCTPAddr{IP: []net.IP{net.ParseIP(*hostIP)}, Port: *hostPort} - container = &sctp.SCTPAddr{IP: []net.IP{net.ParseIP(*containerIP)}, Port: *containerPort} + host = &sctp.SCTPAddr{IPAddrs: []net.IPAddr{{IP: net.ParseIP(*hostIP)}}, Port: *hostPort} + container = &sctp.SCTPAddr{IPAddrs: []net.IPAddr{{IP: net.ParseIP(*containerIP)}}, Port: *containerPort} default: log.Fatalf("unsupported protocol %s", *proto) } diff --git a/libnetwork/cmd/proxy/network_proxy_test.go b/libnetwork/cmd/proxy/network_proxy_test.go index 2d226504b6..f0da09f3ca 100644 --- a/libnetwork/cmd/proxy/network_proxy_test.go +++ b/libnetwork/cmd/proxy/network_proxy_test.go @@ -285,7 +285,7 @@ func TestSCTP4Proxy(t *testing.T) { backend := NewEchoServer(t, "sctp", "127.0.0.1:0", EchoServerOptions{}) defer backend.Close() backend.Run() - frontendAddr := &sctp.SCTPAddr{IP: []net.IP{net.IPv4(127, 0, 0, 1)}, Port: 0} + frontendAddr := &sctp.SCTPAddr{IPAddrs: []net.IPAddr{{IP: net.IPv4(127, 0, 0, 1)}}, Port: 0} proxy, err := NewProxy(frontendAddr, backend.LocalAddr()) if err != nil { t.Fatal(err) @@ -298,7 +298,7 @@ func TestSCTP6Proxy(t *testing.T) { backend := NewEchoServer(t, "sctp", "[::1]:0", EchoServerOptions{}) defer backend.Close() backend.Run() - frontendAddr := &sctp.SCTPAddr{IP: []net.IP{net.IPv6loopback}, Port: 0} + frontendAddr := &sctp.SCTPAddr{IPAddrs: []net.IPAddr{{IP: net.IPv6loopback}}, Port: 0} proxy, err := NewProxy(frontendAddr, backend.LocalAddr()) if err != nil { t.Fatal(err) |