0
0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-08-22 22:48:35 +00:00
RPRX 2025-08-13 12:44:58 +00:00 committed by GitHub
parent 0fd7691d6b
commit 09cc92c61d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions

View File

@ -93,7 +93,7 @@ func (i *ClientInstance) Handshake(conn net.Conn) (net.Conn, error) {
EncodeHeader(clientHello[5+1+1184+1088:], 23, int(paddingLen)) EncodeHeader(clientHello[5+1+1184+1088:], 23, int(paddingLen))
rand.Read(clientHello[5+1+1184+1088+5:]) rand.Read(clientHello[5+1+1184+1088+5:])
if n, err := c.Conn.Write(clientHello); n != len(clientHello) || err != nil { if _, err := c.Conn.Write(clientHello); err != nil {
return nil, err return nil, err
} }
// client can send more padding / NFS AEAD messages if needed // client can send more padding / NFS AEAD messages if needed
@ -170,7 +170,7 @@ func (c *ClientConn) Write(b []byte) (int, error) {
} }
} }
IncreaseNonce(c.nonce) IncreaseNonce(c.nonce)
if n, err := c.Conn.Write(data); n != len(data) || err != nil { if _, err := c.Conn.Write(data); err != nil {
return 0, err return 0, err
} }
} }
@ -185,7 +185,7 @@ func (c *ClientConn) Read(b []byte) (int, error) {
var t byte var t byte
var l int var l int
var err error var err error
if c.instance == nil { // 1-RTT if c.instance == nil { // from 1-RTT
for { for {
if _, t, l, err = ReadAndDecodeHeader(c.Conn); err != nil { if _, t, l, err = ReadAndDecodeHeader(c.Conn); err != nil {
return 0, err return 0, err

View File

@ -162,7 +162,7 @@ func (i *ServerInstance) Handshake(conn net.Conn) (net.Conn, error) {
EncodeHeader(serverHello[5+1088+21:], 23, int(paddingLen)) EncodeHeader(serverHello[5+1088+21:], 23, int(paddingLen))
rand.Read(serverHello[5+1088+21+5:]) rand.Read(serverHello[5+1088+21+5:])
if n, err := c.Conn.Write(serverHello); n != len(serverHello) || err != nil { if _, err := c.Conn.Write(serverHello); err != nil {
return nil, err return nil, err
} }
// server can send more padding / PFS AEAD messages if needed // server can send more padding / PFS AEAD messages if needed
@ -185,7 +185,7 @@ func (c *ServerConn) Read(b []byte) (int, error) {
return 0, nil return 0, nil
} }
if c.peerAead == nil { if c.peerAead == nil {
if c.peerRandom == nil { // 1-RTT if c.peerRandom == nil { // from 1-RTT
var t byte var t byte
var l int var l int
var err error var err error
@ -288,7 +288,7 @@ func (c *ServerConn) Write(b []byte) (int, error) {
} }
} }
IncreaseNonce(c.nonce) IncreaseNonce(c.nonce)
if n, err := c.Conn.Write(data); n != len(data) || err != nil { if _, err := c.Conn.Write(data); err != nil {
return 0, err return 0, err
} }
} }