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

code refactor for common package

Browse Source
This commit is contained in:
ginuerzh
2021-11-15 13:09:45 +08:00
parent ce3d62759a
commit 2c0ce35b0b
40 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/listener/ws/listener.go
View File

@ -5,8 +5,8 @@ import (
"net"
"net/http"
util_tls "github.com/go-gost/gost/pkg/internal/utils/tls"
"github.com/go-gost/gost/pkg/internal/utils/ws"
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
ws_util "github.com/go-gost/gost/pkg/common/util/ws"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -116,7 +116,7 @@ func (l *wsListener) Addr() net.Addr {
}
func (l *wsListener) parseMetadata(md md.Metadata) (err error) {
l.md.tlsConfig, err = util_tls.LoadTLSConfig(
l.md.tlsConfig, err = tls_util.LoadTLSConfig(
md.GetString(certFile),
md.GetString(keyFile),
md.GetString(caFile),
@ -136,7 +136,7 @@ func (l *wsListener) upgrade(w http.ResponseWriter, r *http.Request) {
}
select {
case l.connChan <- ws.WebsocketServerConn(conn):
case l.connChan <- ws_util.WebsocketServerConn(conn):
default:
conn.Close()
l.logger.Warn("connection queue is full")

8
pkg/listener/ws/mux/listener.go
View File

@ -5,8 +5,8 @@ import (
"net"
"net/http"
util_tls "github.com/go-gost/gost/pkg/internal/utils/tls"
"github.com/go-gost/gost/pkg/internal/utils/ws"
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
ws_util "github.com/go-gost/gost/pkg/common/util/ws"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -112,7 +112,7 @@ func (l *mwsListener) Addr() net.Addr {
}
func (l *mwsListener) parseMetadata(md md.Metadata) (err error) {
l.md.tlsConfig, err = util_tls.LoadTLSConfig(
l.md.tlsConfig, err = tls_util.LoadTLSConfig(
md.GetString(certFile),
md.GetString(keyFile),
md.GetString(caFile),
@ -131,7 +131,7 @@ func (l *mwsListener) upgrade(w http.ResponseWriter, r *http.Request) {
return
}
l.mux(ws.WebsocketServerConn(conn))
l.mux(ws_util.WebsocketServerConn(conn))
}
func (l *mwsListener) mux(conn net.Conn) {