go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mws dialer

Browse Source
This commit is contained in:
ginuerzh
2023-10-25 23:11:55 +08:00
parent 5b1183661f
commit 33adbb9027
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
listener/mws/listener.go
View File

@ -149,30 +149,30 @@ func (l *mwsListener) Addr() net.Addr {
}
func (l *mwsListener) upgrade(w http.ResponseWriter, r *http.Request) {
log := l.logger.WithFields(map[string]any{
"local": l.addr.String(),
"remote": r.RemoteAddr,
})
if l.logger.IsLevelEnabled(logger.TraceLevel) {
log := l.logger.WithFields(map[string]any{
"local": l.addr.String(),
"remote": r.RemoteAddr,
})
dump, _ := httputil.DumpRequest(r, false)
log.Trace(string(dump))
}
conn, err := l.upgrader.Upgrade(w, r, l.md.header)
if err != nil {
l.logger.Error(err)
log.Error(err)
return
}
l.mux(ws_util.Conn(conn))
l.mux(ws_util.Conn(conn), log)
}
func (l *mwsListener) mux(conn net.Conn) {
func (l *mwsListener) mux(conn net.Conn, log logger.Logger) {
defer conn.Close()
session, err := mux.ServerSession(conn, l.md.muxCfg)
if err != nil {
l.logger.Error(err)
log.Error(err)
return
}
defer session.Close()
@ -180,7 +180,7 @@ func (l *mwsListener) mux(conn net.Conn) {
for {
stream, err := session.Accept()
if err != nil {
l.logger.Error("accept stream: ", err)
log.Error("accept stream: ", err)
return
}
@ -188,7 +188,7 @@ func (l *mwsListener) mux(conn net.Conn) {
case l.cqueue <- stream:
default:
stream.Close()
l.logger.Warnf("connection queue is full, client %s discarded", stream.RemoteAddr())
log.Warnf("connection queue is full, client %s discarded", stream.RemoteAddr())
}
}
}