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/http2/h2/listener.go
View File

@ -7,8 +7,8 @@ import (
"net/http"
"time"
"github.com/go-gost/gost/pkg/internal/utils"
util_tls "github.com/go-gost/gost/pkg/internal/utils/tls"
"github.com/go-gost/gost/pkg/common/util"
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -50,7 +50,7 @@ func (l *h2Listener) Init(md md.Metadata) (err error) {
if err != nil {
return
}
l.Listener = &utils.TCPKeepAliveListener{
l.Listener = &util.TCPKeepAliveListener{
TCPListener: ln.(*net.TCPListener),
KeepAlivePeriod: l.md.keepAlivePeriod,
}
@ -174,7 +174,7 @@ func (l *h2Listener) upgrade(w http.ResponseWriter, r *http.Request) (*conn, err
}
func (l *h2Listener) 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),

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

@ -5,8 +5,8 @@ import (
"net"
"net/http"
"github.com/go-gost/gost/pkg/internal/utils"
util_tls "github.com/go-gost/gost/pkg/internal/utils/tls"
"github.com/go-gost/gost/pkg/common/util"
tls_util "github.com/go-gost/gost/pkg/common/util/tls"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -60,7 +60,7 @@ func (l *http2Listener) Init(md md.Metadata) (err error) {
l.addr = ln.Addr()
ln = tls.NewListener(
&utils.TCPKeepAliveListener{
&util.TCPKeepAliveListener{
TCPListener: ln.(*net.TCPListener),
KeepAlivePeriod: l.md.keepAlivePeriod,
},
@ -127,7 +127,7 @@ func (l *http2Listener) handleFunc(w http.ResponseWriter, r *http.Request) {
}
func (l *http2Listener) 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),