From 570e71612658f195f9f941fa91c43cc1a53e41f6 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 8 Jun 2018 20:08:12 -0500 Subject: [PATCH] yamux: disable keep alive Disable yamux keep alive in channel and client. yamux keep alive feature closes the connection with proxy and agent when it's unable to ping them. fixes kata-containers/proxy#70 fixes #231 Signed-off-by: Julio Montes --- channel.go | 4 +++- protocols/client/client.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/channel.go b/channel.go index b4f89771a7..9b25c6d86c 100644 --- a/channel.go +++ b/channel.go @@ -145,7 +145,9 @@ func (c *serialChannel) wait() error { func (c *serialChannel) listen() (net.Listener, error) { // Initialize Yamux server. - session, err := yamux.Server(c.serialConn, nil) + config := yamux.DefaultConfig() + config.EnableKeepAlive = false + session, err := yamux.Server(c.serialConn, config) if err != nil { return nil, err } diff --git a/protocols/client/client.go b/protocols/client/client.go index 7bd1843d0c..d2229b4edb 100644 --- a/protocols/client/client.go +++ b/protocols/client/client.go @@ -147,7 +147,9 @@ func agentDialer(addr *url.URL, enableYamux bool) dialer { }() var session *yamux.Session - session, err = yamux.Client(conn, nil) + config := yamux.DefaultConfig() + config.EnableKeepAlive = false + session, err = yamux.Client(conn, config) if err != nil { return nil, err }