SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-04 12:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor error handler

Browse source
This commit is contained in:
世界 2022-06-30 21:02:01 +08:00
parent 30b5895320
commit 63a57e6e12
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/exceptions/error.go
View file

@ -100,5 +100,5 @@ func IsTimeout(err error) bool {
} }
type Handler interface { type Handler interface {
HandleError(err error) NewError(ctx context.Context, err error)
} }

2
common/udpnat/service.go
View file

@ -87,7 +87,7 @@ func (s *Service[T]) NewContextPacket(ctx context.Context, key T, buffer *buf.Bu
go func() { go func() {
err := s.handler.NewPacketConnection(ctx, c, metadata) err := s.handler.NewPacketConnection(ctx, c, metadata)
if err != nil { if err != nil {
s.handler.HandleError(err) s.handler.NewError(ctx, err)
} }
c.Close() c.Close()
s.nat.Delete(key) s.nat.Delete(key)

5
protocol/http/handshake.go
View file

@ -19,10 +19,7 @@ import (
N "github.com/sagernet/sing/common/network" N "github.com/sagernet/sing/common/network"
) )
type Handler interface { type Handler = N.TCPConnectionHandler
N.TCPConnectionHandler
N.UDPConnectionHandler
}
func HandleConnection(ctx context.Context, conn net.Conn, authenticator auth.Authenticator, handler Handler, metadata M.Metadata) error { func HandleConnection(ctx context.Context, conn net.Conn, authenticator auth.Authenticator, handler Handler, metadata M.Metadata) error {
reader := std_bufio.NewReader(conn) reader := std_bufio.NewReader(conn)