From 1a47b43a19da610897995840e530b931a5d06469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20G=C3=A4hwiler?= Date: Tue, 7 Aug 2018 12:33:48 +0300 Subject: [PATCH] test set buffers and only support tcp for now --- transport/conn_test.go | 18 ++++++++++++++++++ transport/net_conn.go | 12 ------------ transport/net_conn_test.go | 4 ++++ transport/websocket_conn.go | 12 ------------ transport/websocket_conn_test.go | 4 ++++ 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/transport/conn_test.go b/transport/conn_test.go index 4d803b4..0e9e56b 100644 --- a/transport/conn_test.go +++ b/transport/conn_test.go @@ -348,3 +348,21 @@ func abstractConnBigAsyncSendAfterCloseTest(t *testing.T, protocol string) { safeReceive(done) } + +func abstractConnSetBuffersTest(t *testing.T, protocol string) { + // TODO: Do some real testing. + + conn2, done := connectionPair(protocol, func(conn1 Conn) { + conn1.SetBuffers(128, 128) + + err := conn1.Close() + assert.NoError(t, err) + }) + + conn2.SetBuffers(128, 128) + + err := conn2.Close() + assert.NoError(t, err) + + safeReceive(done) +} diff --git a/transport/net_conn.go b/transport/net_conn.go index 50f1380..d62e558 100644 --- a/transport/net_conn.go +++ b/transport/net_conn.go @@ -36,18 +36,6 @@ func (c *NetConn) SetBuffers(read, write int) { tcpConn.SetReadBuffer(read) tcpConn.SetWriteBuffer(write) } - - // set ip conn - if tcpConn, ok := c.conn.(*net.IPConn); ok { - tcpConn.SetReadBuffer(read) - tcpConn.SetWriteBuffer(write) - } - - // set unix conn - if tcpConn, ok := c.conn.(*net.UnixConn); ok { - tcpConn.SetReadBuffer(read) - tcpConn.SetWriteBuffer(write) - } } // UnderlyingConn returns the underlying net.Conn. diff --git a/transport/net_conn_test.go b/transport/net_conn_test.go index bb42ec2..5620ac9 100644 --- a/transport/net_conn_test.go +++ b/transport/net_conn_test.go @@ -73,6 +73,10 @@ func TestNetConnBigAsyncSendAfterClose(t *testing.T) { abstractConnBigAsyncSendAfterCloseTest(t, "tcp") } +func TestNetConnSetBuffers(t *testing.T) { + abstractConnSetBuffersTest(t, "tcp") +} + func TestNetConnCloseWhileReadError(t *testing.T) { conn2, done := connectionPair("tcp", func(conn1 Conn) { pkt := packet.NewPublish() diff --git a/transport/websocket_conn.go b/transport/websocket_conn.go index 45f0ac9..e282faa 100644 --- a/transport/websocket_conn.go +++ b/transport/websocket_conn.go @@ -127,18 +127,6 @@ func (c *WebSocketConn) SetBuffers(read, write int) { tcpConn.SetReadBuffer(read) tcpConn.SetWriteBuffer(write) } - - // set ip conn - if tcpConn, ok := c.conn.UnderlyingConn().(*net.IPConn); ok { - tcpConn.SetReadBuffer(read) - tcpConn.SetWriteBuffer(write) - } - - // set unix conn - if tcpConn, ok := c.conn.UnderlyingConn().(*net.UnixConn); ok { - tcpConn.SetReadBuffer(read) - tcpConn.SetWriteBuffer(write) - } } // UnderlyingConn returns the underlying websocket.Conn. diff --git a/transport/websocket_conn_test.go b/transport/websocket_conn_test.go index 1285413..c1d4a0e 100644 --- a/transport/websocket_conn_test.go +++ b/transport/websocket_conn_test.go @@ -74,6 +74,10 @@ func TestWebSocketConnBigAsyncSendAfterClose(t *testing.T) { abstractConnBigAsyncSendAfterCloseTest(t, "ws") } +func TestWebSocketConnSetBuffers(t *testing.T) { + abstractConnSetBuffersTest(t, "ws") +} + func TestWebSocketBadFrameError(t *testing.T) { conn2, done := connectionPair("ws", func(conn1 Conn) { buf := []byte{0x07, 0x00, 0x00, 0x00, 0x00} // < bad frame