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

add metrics for service

Browse Source
This commit is contained in:
ginuerzh
2022-03-05 00:28:13 +08:00
parent 8d8785f534
commit e587b4df7c
34 changed files with 548 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/listener/dns/listener.go
View File

@ -9,6 +9,7 @@ import (
"net/http"
"strings"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -112,6 +113,7 @@ func (l *dnsListener) Accept() (conn net.Conn, err error) {
var ok bool
select {
case conn = <-l.cqueue:
conn = metrics.WrapConn(l.options.Service, conn)
case err, ok = <-l.errChan:
if !ok {
err = listener.ErrClosed

37
pkg/listener/ftcp/conn.go
View File

@ -10,7 +10,7 @@ import (
// serverConn is a server side connection for UDP client peer, it implements net.Conn and net.PacketConn.
type serverConn struct {
net.PacketConn
pc net.PacketConn
raddr net.Addr
rc chan []byte // data receive queue
fresh int32
@ -34,11 +34,11 @@ func newServerConn(conn net.PacketConn, raddr net.Addr, cfg *serverConnConfig) *
cfg = &serverConnConfig{}
}
c := &serverConn{
PacketConn: conn,
raddr: raddr,
rc: make(chan []byte, cfg.qsize),
closed: make(chan struct{}),
config: cfg,
pc: conn,
raddr: raddr,
rc: make(chan []byte, cfg.qsize),
closed: make(chan struct{}),
config: cfg,
}
go c.ttlWait()
return c
@ -54,11 +54,6 @@ func (c *serverConn) send(b []byte) error {
}
func (c *serverConn) Read(b []byte) (n int, err error) {
n, _, err = c.ReadFrom(b)
return
}
func (c *serverConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
select {
case bb := <-c.rc:
n = copy(b, bb)
@ -68,13 +63,11 @@ func (c *serverConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
return
}
addr = c.raddr
return
}
func (c *serverConn) Write(b []byte) (n int, err error) {
return c.WriteTo(b, c.raddr)
return c.pc.WriteTo(b, c.raddr)
}
func (c *serverConn) Close() error {
@ -93,10 +86,26 @@ func (c *serverConn) Close() error {
return nil
}
func (c *serverConn) LocalAddr() net.Addr {
return c.pc.LocalAddr()
}
func (c *serverConn) RemoteAddr() net.Addr {
return c.raddr
}
func (c *serverConn) SetDeadline(t time.Time) error {
return c.pc.SetDeadline(t)
}
func (c *serverConn) SetReadDeadline(t time.Time) error {
return c.pc.SetReadDeadline(t)
}
func (c *serverConn) SetWriteDeadline(t time.Time) error {
return c.pc.SetWriteDeadline(t)
}
func (c *serverConn) ttlWait() {
ticker := time.NewTicker(c.config.ttl)
defer ticker.Stop()

16
pkg/listener/ftcp/listener.go
View File

@ -5,6 +5,7 @@ import (
"sync"
"sync/atomic"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -17,23 +18,23 @@ func init() {
}
type ftcpListener struct {
addr string
md metadata
conn net.PacketConn
connChan chan net.Conn
errChan chan error
connPool connPool
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &ftcpListener{
addr: options.Addr,
logger: options.Logger,
logger: options.Logger,
options: options,
}
}
@ -42,7 +43,7 @@ func (l *ftcpListener) Init(md md.Metadata) (err error) {
return
}
l.conn, err = tcpraw.Listen("tcp", addr)
l.conn, err = tcpraw.Listen("tcp", l.options.Addr)
if err != nil {
return
}
@ -59,6 +60,7 @@ func (l *ftcpListener) Accept() (conn net.Conn, err error) {
var ok bool
select {
case conn = <-l.connChan:
conn = metrics.WrapConn(l.options.Service, conn)
case err, ok = <-l.errChan:
if !ok {
err = listener.ErrClosed

9
pkg/listener/grpc/listener.go
View File

@ -3,6 +3,7 @@ package grpc
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
pb "github.com/go-gost/gost/pkg/common/util/grpc/proto"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -42,15 +43,11 @@ func (l *grpcListener) Init(md md.Metadata) (err error) {
return
}
laddr, err := net.ResolveTCPAddr("tcp", l.options.Addr)
if err != nil {
return
}
ln, err := net.ListenTCP("tcp", laddr)
ln, err := net.Listen("tcp", l.options.Addr)
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
var opts []grpc.ServerOption
if !l.md.insecure {

2
pkg/listener/http2/h2/listener.go
View File

@ -7,6 +7,7 @@ import (
"net/http"
"net/http/httputil"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -68,6 +69,7 @@ func (l *h2Listener) Init(md md.Metadata) (err error) {
return err
}
l.addr = ln.Addr()
ln = metrics.WrapListener(l.options.Service, ln)
if l.h2c {
l.server.Handler = h2c.NewHandler(

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

@ -5,7 +5,7 @@ import (
"net"
"net/http"
"github.com/go-gost/gost/pkg/common/util"
"github.com/go-gost/gost/pkg/common/metrics"
http2_util "github.com/go-gost/gost/pkg/internal/util/http2"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -58,11 +58,10 @@ func (l *http2Listener) Init(md md.Metadata) (err error) {
return err
}
l.addr = ln.Addr()
ln = metrics.WrapListener(l.options.Service, ln)
ln = tls.NewListener(
&util.TCPKeepAliveListener{
TCPListener: ln.(*net.TCPListener),
},
ln,
l.options.TLSConfig,
)

7
pkg/listener/http3/listener.go
View File

@ -3,6 +3,7 @@ package http3
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
pht_util "github.com/go-gost/gost/pkg/internal/util/pht"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -64,7 +65,11 @@ func (l *http3Listener) Init(md md.Metadata) (err error) {
}
func (l *http3Listener) Accept() (conn net.Conn, err error) {
return l.server.Accept()
conn, err = l.server.Accept()
if err != nil {
return
}
return metrics.WrapConn(l.options.Service, conn), nil
}
func (l *http3Listener) Addr() net.Addr {

49
pkg/listener/kcp/listener.go
View File

@ -4,6 +4,7 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/common/metrics"
kcp_util "github.com/go-gost/gost/pkg/common/util/kcp"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -19,22 +20,23 @@ func init() {
}
type kcpListener struct {
addr string
conn net.PacketConn
ln *kcp.Listener
cqueue chan net.Conn
errChan chan error
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &kcpListener{
addr: options.Addr,
logger: options.Logger,
logger: options.Logger,
options: options,
}
}
@ -46,37 +48,45 @@ func (l *kcpListener) Init(md md.Metadata) (err error) {
config := l.md.config
config.Init()
var ln *kcp.Listener
var conn net.PacketConn
if config.TCP {
var conn net.PacketConn
conn, err = tcpraw.Listen("tcp", l.addr)
conn, err = tcpraw.Listen("tcp", l.options.Addr)
} else {
var udpAddr *net.UDPAddr
udpAddr, err = net.ResolveUDPAddr("udp", l.options.Addr)
if err != nil {
return
}
ln, err = kcp.ServeConn(
kcp_util.BlockCrypt(config.Key, config.Crypt, kcp_util.DefaultSalt), config.DataShard, config.ParityShard, conn)
} else {
ln, err = kcp.ListenWithOptions(l.addr,
kcp_util.BlockCrypt(config.Key, config.Crypt, kcp_util.DefaultSalt), config.DataShard, config.ParityShard)
conn, err = net.ListenUDP("udp", udpAddr)
}
if err != nil {
return
}
conn = metrics.WrapUDPConn(l.options.Service, conn)
ln, err := kcp.ServeConn(
kcp_util.BlockCrypt(config.Key, config.Crypt, kcp_util.DefaultSalt),
config.DataShard, config.ParityShard, conn)
if err != nil {
return
}
if config.DSCP > 0 {
if err = ln.SetDSCP(config.DSCP); err != nil {
l.logger.Warn(err)
if er := ln.SetDSCP(config.DSCP); er != nil {
l.logger.Warn(er)
}
}
if err = ln.SetReadBuffer(config.SockBuf); err != nil {
l.logger.Warn(err)
if er := ln.SetReadBuffer(config.SockBuf); er != nil {
l.logger.Warn(er)
}
if err = ln.SetWriteBuffer(config.SockBuf); err != nil {
l.logger.Warn(err)
if er := ln.SetWriteBuffer(config.SockBuf); er != nil {
l.logger.Warn(er)
}
l.ln = ln
l.conn = conn
l.cqueue = make(chan net.Conn, l.md.backlog)
l.errChan = make(chan error, 1)
@ -98,6 +108,7 @@ func (l *kcpListener) Accept() (conn net.Conn, err error) {
}
func (l *kcpListener) Close() error {
l.conn.Close()
return l.ln.Close()
}

22
pkg/listener/obfs/http/listener.go
View File

@ -3,6 +3,7 @@ package http
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -14,20 +15,20 @@ func init() {
}
type obfsListener struct {
addr string
md metadata
net.Listener
logger logger.Logger
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &obfsListener{
addr: options.Addr,
logger: options.Logger,
logger: options.Logger,
options: options,
}
}
@ -36,14 +37,11 @@ func (l *obfsListener) Init(md md.Metadata) (err error) {
return
}
laddr, err := net.ResolveTCPAddr("tcp", l.addr)
if err != nil {
return
}
ln, err := net.ListenTCP("tcp", laddr)
ln, err := net.Listen("tcp", l.options.Addr)
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = ln
return

22
pkg/listener/obfs/tls/listener.go
View File

@ -3,6 +3,7 @@ package tls
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -14,20 +15,20 @@ func init() {
}
type obfsListener struct {
addr string
md metadata
net.Listener
logger logger.Logger
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &obfsListener{
addr: options.Addr,
logger: options.Logger,
logger: options.Logger,
options: options,
}
}
@ -36,14 +37,11 @@ func (l *obfsListener) Init(md md.Metadata) (err error) {
return
}
laddr, err := net.ResolveTCPAddr("tcp", l.addr)
if err != nil {
return
}
ln, err := net.ListenTCP("tcp", laddr)
ln, err := net.Listen("tcp", l.options.Addr)
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = ln
return

7
pkg/listener/option.go
View File

@ -16,6 +16,7 @@ type Options struct {
TLSConfig *tls.Config
Chain chain.Chainer
Logger logger.Logger
Service string
}
type Option func(opts *Options)
@ -55,3 +56,9 @@ func LoggerOption(logger logger.Logger) Option {
opts.Logger = logger
}
}
func ServiceOption(service string) Option {
return func(opts *Options) {
opts.Service = service
}
}

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

@ -5,6 +5,7 @@ package pht
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
pht_util "github.com/go-gost/gost/pkg/internal/util/pht"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -78,7 +79,12 @@ func (l *phtListener) Init(md md.Metadata) (err error) {
}
func (l *phtListener) Accept() (conn net.Conn, err error) {
return l.server.Accept()
conn, err = l.server.Accept()
if err != nil {
return
}
conn = metrics.WrapConn(l.options.Service, conn)
return
}
func (l *phtListener) Addr() net.Addr {

3
pkg/listener/quic/listener.go
View File

@ -4,6 +4,7 @@ import (
"context"
"net"
"github.com/go-gost/gost/pkg/common/metrics"
quic_util "github.com/go-gost/gost/pkg/internal/util/quic"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -52,6 +53,7 @@ func (l *quicListener) Init(md md.Metadata) (err error) {
}
var conn net.PacketConn = uc
// conn = metrics.WrapPacketConn(l.options.Service, conn)
if l.md.cipherKey != nil {
conn = quic_util.CipherPacketConn(uc, l.md.cipherKey)
@ -88,6 +90,7 @@ func (l *quicListener) Accept() (conn net.Conn, err error) {
var ok bool
select {
case conn = <-l.cqueue:
conn = metrics.WrapConn(l.options.Service, conn)
case err, ok = <-l.errChan:
if !ok {
err = listener.ErrClosed

25
pkg/listener/redirect/udp/listener.go
View File

@ -14,20 +14,20 @@ func init() {
}
type redirectListener struct {
addr string
ln *net.UDPConn
logger logger.Logger
md metadata
ln *net.UDPConn
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &redirectListener{
addr: options.Addr,
logger: options.Logger,
logger: options.Logger,
options: options,
}
}
@ -36,7 +36,7 @@ func (l *redirectListener) Init(md md.Metadata) (err error) {
return
}
laddr, err := net.ResolveUDPAddr("udp", l.addr)
laddr, err := net.ResolveUDPAddr("udp", l.options.Addr)
if err != nil {
return
}
@ -51,7 +51,12 @@ func (l *redirectListener) Init(md md.Metadata) (err error) {
}
func (l *redirectListener) Accept() (conn net.Conn, err error) {
return l.accept()
conn, err = l.accept()
if err != nil {
return
}
// conn = metrics.WrapConn(l.options.Service, conn)
return
}
func (l *redirectListener) Addr() net.Addr {

5
pkg/listener/rtcp/listener.go
View File

@ -5,6 +5,7 @@ import (
"net"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/connector"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -64,12 +65,14 @@ func (l *rtcpListener) Accept() (conn net.Conn, err error) {
}
if l.ln == nil {
l.ln, err = l.router.Bind(context.Background(), "tcp", l.laddr.String(),
l.ln, err = l.router.Bind(
context.Background(), "tcp", l.laddr.String(),
connector.MuxBindOption(true),
)
if err != nil {
return nil, connector.NewAcceptError(err)
}
l.ln = metrics.WrapListener(l.options.Service, l.ln)
}
conn, err = l.ln.Accept()
if err != nil {

11
pkg/listener/rudp/listener.go
View File

@ -5,6 +5,7 @@ import (
"net"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/connector"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -17,7 +18,7 @@ func init() {
}
type rudpListener struct {
laddr *net.UDPAddr
laddr net.Addr
ln net.Listener
router *chain.Router
closed chan struct{}
@ -64,7 +65,8 @@ func (l *rudpListener) Accept() (conn net.Conn, err error) {
}
if l.ln == nil {
l.ln, err = l.router.Bind(context.Background(), "udp", l.laddr.String(),
l.ln, err = l.router.Bind(
context.Background(), "udp", l.laddr.String(),
connector.BacklogBindOption(l.md.backlog),
connector.UDPConnTTLBindOption(l.md.ttl),
connector.UDPDataBufferSizeBindOption(l.md.readBufferSize),
@ -80,6 +82,11 @@ func (l *rudpListener) Accept() (conn net.Conn, err error) {
l.ln = nil
return nil, connector.NewAcceptError(err)
}
if pc, ok := conn.(net.PacketConn); ok {
conn = metrics.WrapUDPConn(l.options.Service, pc)
}
return
}

6
pkg/listener/ssh/listener.go
View File

@ -5,6 +5,7 @@ import (
"net"
"time"
"github.com/go-gost/gost/pkg/common/metrics"
ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -18,7 +19,6 @@ func init() {
}
type sshListener struct {
addr string
net.Listener
config *ssh.ServerConfig
cqueue chan net.Conn
@ -34,7 +34,6 @@ func NewListener(opts ...listener.Option) listener.Listener {
opt(&options)
}
return &sshListener{
addr: options.Addr,
logger: options.Logger,
options: options,
}
@ -45,11 +44,12 @@ func (l *sshListener) Init(md md.Metadata) (err error) {
return
}
ln, err := net.Listen("tcp", l.addr)
ln, err := net.Listen("tcp", l.options.Addr)
if err != nil {
return err
}
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = ln
config := &ssh.ServerConfig{

6
pkg/listener/sshd/listener.go
View File

@ -7,6 +7,7 @@ import (
"strconv"
"time"
"github.com/go-gost/gost/pkg/common/metrics"
ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
sshd_util "github.com/go-gost/gost/pkg/internal/util/sshd"
"github.com/go-gost/gost/pkg/listener"
@ -27,7 +28,6 @@ func init() {
}
type sshdListener struct {
addr string
net.Listener
config *ssh.ServerConfig
cqueue chan net.Conn
@ -43,7 +43,6 @@ func NewListener(opts ...listener.Option) listener.Listener {
opt(&options)
}
return &sshdListener{
addr: options.Addr,
logger: options.Logger,
options: options,
}
@ -54,11 +53,12 @@ func (l *sshdListener) Init(md md.Metadata) (err error) {
return
}
ln, err := net.Listen("tcp", l.addr)
ln, err := net.Listen("tcp", l.options.Addr)
if err != nil {
return err
}
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = ln
config := &ssh.ServerConfig{

9
pkg/listener/tcp/listener.go
View File

@ -3,6 +3,7 @@ package tcp
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -36,15 +37,11 @@ func (l *tcpListener) Init(md md.Metadata) (err error) {
return
}
laddr, err := net.ResolveTCPAddr("tcp", l.options.Addr)
if err != nil {
return
}
ln, err := net.ListenTCP("tcp", laddr)
ln, err := net.Listen("tcp", l.options.Addr)
if err != nil {
return
}
l.Listener = metrics.WrapListener(l.options.Service, ln)
l.Listener = ln
return
}

2
pkg/listener/tls/listener.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls"
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -41,6 +42,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) {
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = tls.NewListener(ln, l.options.TLSConfig)

3
pkg/listener/tls/mux/listener.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls"
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
@ -44,6 +45,8 @@ func (l *mtlsListener) Init(md md.Metadata) (err error) {
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
l.Listener = tls.NewListener(ln, l.options.TLSConfig)
l.cqueue = make(chan net.Conn, l.md.backlog)

21
pkg/listener/udp/listener.go
View File

@ -3,6 +3,7 @@ package udp
import (
"net"
"github.com/go-gost/gost/pkg/common/metrics"
"github.com/go-gost/gost/pkg/common/util/udp"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -15,20 +16,20 @@ func init() {
}
type udpListener struct {
addr string
md metadata
net.Listener
logger logger.Logger
logger logger.Logger
md metadata
options listener.Options
}
func NewListener(opts ...listener.Option) listener.Listener {
options := &listener.Options{}
options := listener.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &udpListener{
addr: options.Addr,
logger: options.Logger,
logger: options.Logger,
options: options,
}
}
@ -37,7 +38,7 @@ func (l *udpListener) Init(md md.Metadata) (err error) {
return
}
laddr, err := net.ResolveUDPAddr("udp", l.addr)
laddr, err := net.ResolveUDPAddr("udp", l.options.Addr)
if err != nil {
return
}
@ -47,7 +48,9 @@ func (l *udpListener) Init(md md.Metadata) (err error) {
return
}
l.Listener = udp.NewListener(conn, laddr,
l.Listener = udp.NewListener(
metrics.WrapPacketConn(l.options.Service, conn),
laddr,
l.md.backlog,
l.md.readQueueSize, l.md.readBufferSize,
l.md.ttl,

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

@ -6,6 +6,7 @@ import (
"net/http"
"net/http/httputil"
"github.com/go-gost/gost/pkg/common/metrics"
ws_util "github.com/go-gost/gost/pkg/internal/util/ws"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -82,6 +83,8 @@ func (l *wsListener) Init(md md.Metadata) (err error) {
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
if l.tlsEnabled {
ln = tls.NewListener(ln, l.options.TLSConfig)
}

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

@ -6,6 +6,7 @@ import (
"net/http"
"net/http/httputil"
"github.com/go-gost/gost/pkg/common/metrics"
ws_util "github.com/go-gost/gost/pkg/internal/util/ws"
"github.com/go-gost/gost/pkg/listener"
"github.com/go-gost/gost/pkg/logger"
@ -87,6 +88,8 @@ func (l *mwsListener) Init(md md.Metadata) (err error) {
if err != nil {
return
}
ln = metrics.WrapListener(l.options.Service, ln)
if l.tlsEnabled {
ln = tls.NewListener(ln, l.options.TLSConfig)
}