code refactor for common package
This commit is contained in:
@ -4,8 +4,8 @@ import (
|
||||
"crypto/tls"
|
||||
"net"
|
||||
|
||||
"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"
|
||||
@ -45,7 +45,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) {
|
||||
}
|
||||
|
||||
ln = tls.NewListener(
|
||||
&utils.TCPKeepAliveListener{
|
||||
&util.TCPKeepAliveListener{
|
||||
TCPListener: ln.(*net.TCPListener),
|
||||
KeepAlivePeriod: l.md.keepAlivePeriod,
|
||||
},
|
||||
@ -57,7 +57,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) {
|
||||
}
|
||||
|
||||
func (l *tlsListener) 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),
|
||||
|
@ -4,7 +4,7 @@ import (
|
||||
"crypto/tls"
|
||||
"net"
|
||||
|
||||
util_tls "github.com/go-gost/gost/pkg/internal/utils/tls"
|
||||
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"
|
||||
@ -127,7 +127,7 @@ func (l *mtlsListener) Accept() (conn net.Conn, err error) {
|
||||
}
|
||||
|
||||
func (l *mtlsListener) 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),
|
||||
|
Reference in New Issue
Block a user