From 40e8d5642944990404762f89b81bd35155a0c0b9 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Wed, 24 Jul 2024 22:26:15 +0200 Subject: [PATCH] removed read and write dead lines. Appears to be still working. --- cmd/agent/agent.go | 2 -- cmd/tcptows/tcptows.go | 2 -- cmd/wsproxy/wsproxy.go | 2 -- pkg/comms/agentserver.go | 3 ++- pkg/websocketutil/connections.go | 2 -- pkg/websocketutil/services.go | 3 --- 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index 7860403..2261b0e 100755 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -171,8 +171,6 @@ func main() { log.Println("WebSocket connection error:", err) return } - conn.SetReadDeadline(time.Time{}) - conn.SetWriteDeadline(time.Time{}) wsConn := websocketutil.NewWebSocketConn(conn) defer wsConn.Close() diff --git a/cmd/tcptows/tcptows.go b/cmd/tcptows/tcptows.go index e413ad6..8160edc 100644 --- a/cmd/tcptows/tcptows.go +++ b/cmd/tcptows/tcptows.go @@ -37,8 +37,6 @@ func handleConnection(conn net.Conn, wsURL string, insecure bool) { log.Println("WebSocket connection error:", err) return } - _wsConn.SetReadDeadline(time.Time{}) - _wsConn.SetWriteDeadline(time.Time{}) wsConn := websocketutil.NewWebSocketConn(_wsConn) defer wsConn.Close() diff --git a/cmd/wsproxy/wsproxy.go b/cmd/wsproxy/wsproxy.go index 021a237..d1523e0 100644 --- a/cmd/wsproxy/wsproxy.go +++ b/cmd/wsproxy/wsproxy.go @@ -67,8 +67,6 @@ func main() { if err != nil { panic(err) } - _wsConn.SetReadDeadline(time.Time{}) - _wsConn.SetWriteDeadline(time.Time{}) if err != nil { log.Println("WebSocket connection error:", err) panic(err) diff --git a/pkg/comms/agentserver.go b/pkg/comms/agentserver.go index ddc5e81..d75dc75 100644 --- a/pkg/comms/agentserver.go +++ b/pkg/comms/agentserver.go @@ -51,7 +51,8 @@ func NewCommChannel(role Role, wsConn io.ReadWriteCloser) (CommChannel, error) { panic(fmt.Errorf("Undefined role %d", role)) } - // communication from Agent to ConvergeServer + // communication between Agent and ConvergeServer + // Currently used only fof communication from Agent to ConvergeServer switch role { case Agent: diff --git a/pkg/websocketutil/connections.go b/pkg/websocketutil/connections.go index 7ff838a..ea87213 100644 --- a/pkg/websocketutil/connections.go +++ b/pkg/websocketutil/connections.go @@ -72,8 +72,6 @@ func ConnectWebSocket(conn net.Conn, urlStr string) (net.Conn, error) { if err != nil { return nil, err } - wsConn.SetReadDeadline(time.Time{}) - wsConn.SetWriteDeadline(time.Time{}) return NewWebSocketConn(wsConn), nil } diff --git a/pkg/websocketutil/services.go b/pkg/websocketutil/services.go index a1fc248..37efbd5 100644 --- a/pkg/websocketutil/services.go +++ b/pkg/websocketutil/services.go @@ -5,7 +5,6 @@ import ( "log" "net" "net/http" - "time" ) type WebSocketAddr string @@ -29,8 +28,6 @@ func handleWebSocket(w http.ResponseWriter, r *http.Request, log.Println("Error upgrading to WebSocket:", err) return } - conn.SetReadDeadline(time.Time{}) - conn.SetWriteDeadline(time.Time{}) wsConn := NewWebSocketConn(conn) defer wsConn.Close()