From be846216e14b802b86027eaec7ccaff3dbc29553 Mon Sep 17 00:00:00 2001 From: lwch Date: Tue, 24 Aug 2021 17:03:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9server=E7=9A=84timeout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/server/global/constants.go | 8 ++++++++ code/server/handler/client.go | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 code/server/global/constants.go diff --git a/code/server/global/constants.go b/code/server/global/constants.go new file mode 100644 index 0000000..0a6b8af --- /dev/null +++ b/code/server/global/constants.go @@ -0,0 +1,8 @@ +package global + +import "time" + +const ( + ReadTimeout = 5 * time.Second + WriteTimeout = 5 * time.Second +) diff --git a/code/server/handler/client.go b/code/server/handler/client.go index 7107032..0428328 100644 --- a/code/server/handler/client.go +++ b/code/server/handler/client.go @@ -1,6 +1,7 @@ package handler import ( + "natpass/code/client/global" "natpass/code/network" "strings" "sync" @@ -43,7 +44,7 @@ func (c *client) run() { c.parent.closeAll(c) return } - msg, err := c.c.ReadMessage(time.Second) + msg, err := c.c.ReadMessage(global.ReadTimeout) if err != nil { if strings.Contains(err.Error(), "i/o timeout") { continue @@ -57,7 +58,7 @@ func (c *client) run() { } func (c *client) writeMessage(msg *network.Msg) error { - return c.c.WriteMessage(msg, time.Second) + return c.c.WriteMessage(msg, global.WriteTimeout) } func (c *client) addLink(id string) { @@ -92,7 +93,7 @@ func (c *client) close(id string) { Id: id, }, } - c.c.WriteMessage(&msg, time.Second) + c.c.WriteMessage(&msg, global.WriteTimeout) c.Lock() delete(c.links, id) c.Unlock()