xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: handle snell server reported error message properly (#848)

Browse source
This commit is contained in:
icpz 2020-07-30 15:54:26 +08:00 committed by GitHub
parent b1d9dfd6bf
commit 77d6f9ae6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
component/snell/snell.go
View file

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt"
"io" "io"
"net" "net"
"sync" "sync"
@ -49,10 +50,16 @@ func (s *Snell) Read(b []byte) (int, error) {
} }
// CommandError // CommandError
// 1 byte error code
if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil { if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil {
return 0, err return 0, err
} }
errcode := int(s.buffer[0])
// 1 byte error message length
if _, err := io.ReadFull(s.Conn, s.buffer[:]); err != nil {
return 0, err
}
length := int(s.buffer[0]) length := int(s.buffer[0])
msg := make([]byte, length) msg := make([]byte, length)
@ -60,7 +67,7 @@ func (s *Snell) Read(b []byte) (int, error) {
return 0, err return 0, err
} }
return 0, errors.New(string(msg)) return 0, fmt.Errorf("server reported code: %d, message: %s", errcode, string(msg))
} }
func WriteHeader(conn net.Conn, host string, port uint) error { func WriteHeader(conn net.Conn, host string, port uint) error {