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

Add deadline interface

Browse source
This commit is contained in:
世界 2023-04-17 17:57:35 +08:00
parent 66670cdfb7
commit 4f682e05f1
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
6 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client.go
View file

@ -8,7 +8,6 @@ import (
"net"
"os"
"github.com/sagernet/sing/common/bufio/deadline"
"github.com/sagernet/sing/common/debug"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/logger"
@ -96,7 +95,7 @@ func (c *Client) DialContextConn(ctx context.Context, conn net.Conn) (net.Conn,
return nil, err
}
c.logger.TraceContext(ctx, "clint handshake finished")
return deadline.NewConn(newClientConn(hashConn)), nil
return newClientConn(hashConn), nil
case 3:
stream := newStreamWrapper(conn, c.password)
err := c.tlsHandshake(ctx, stream, generateSessionID(c.password))
@ -117,6 +116,6 @@ func (c *Client) DialContextConn(ctx context.Context, conn net.Conn) (net.Conn,
hmacVerify := hmac.New(sha1.New, []byte(c.password))
hmacVerify.Write(serverRandom)
hmacVerify.Write([]byte("S"))
return deadline.NewConn(newVerifiedConn(conn, hmacAdd, hmacVerify, readHMAC)), nil
return newVerifiedConn(conn, hmacAdd, hmacVerify, readHMAC), nil
}
}