Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-04-25 12:48:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: tuic protocol error

Browse Source
This commit is contained in:
wwqgtxx 2022-11-29 00:42:26 +08:00
parent db81db5363
commit 9ea09b2b94
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transport/tuic/protocol.go
View File

@ -33,7 +33,7 @@ const (
PacketType = CommandType(0x02) PacketType = CommandType(0x02)
DissociateType = CommandType(0x03) DissociateType = CommandType(0x03)
HeartbeatType = CommandType(0x04) HeartbeatType = CommandType(0x04)
ResponseType = CommandType(0x05) ResponseType = CommandType(0xff)
) )
func (c CommandType) String() string { func (c CommandType) String() string {
@ -119,6 +119,7 @@ func ReadAuthenticateWithHead(head CommandHead, reader BufferedReader) (c Authen
} }
if c.CommandHead.TYPE != AuthenticateType { if c.CommandHead.TYPE != AuthenticateType {
err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE) err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE)
return
} }
_, err = io.ReadFull(reader, c.TKN[:]) _, err = io.ReadFull(reader, c.TKN[:])
if err != nil { if err != nil {
@ -174,6 +175,7 @@ func ReadConnectWithHead(head CommandHead, reader BufferedReader) (c Connect, er
} }
if c.CommandHead.TYPE != ConnectType { if c.CommandHead.TYPE != ConnectType {
err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE) err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE)
return
} }
c.ADDR, err = ReadAddress(reader) c.ADDR, err = ReadAddress(reader)
if err != nil { if err != nil {
@ -231,6 +233,7 @@ func ReadPacketWithHead(head CommandHead, reader BufferedReader) (c Packet, err
} }
if c.CommandHead.TYPE != PacketType { if c.CommandHead.TYPE != PacketType {
err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE) err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE)
return
} }
err = binary.Read(reader, binary.BigEndian, &c.ASSOC_ID) err = binary.Read(reader, binary.BigEndian, &c.ASSOC_ID)
if err != nil { if err != nil {
@ -305,8 +308,9 @@ func ReadDissociateWithHead(head CommandHead, reader BufferedReader) (c Dissocia
if err != nil { if err != nil {
return return
} }
if c.CommandHead.TYPE != PacketType { if c.CommandHead.TYPE != DissociateType {
err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE) err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE)
return
} }
err = binary.Read(reader, binary.BigEndian, &c.ASSOC_ID) err = binary.Read(reader, binary.BigEndian, &c.ASSOC_ID)
if err != nil { if err != nil {
@ -353,6 +357,7 @@ func ReadHeartbeatWithHead(head CommandHead, reader BufferedReader) (c Heartbeat
c.CommandHead = head c.CommandHead = head
if c.CommandHead.TYPE != HeartbeatType { if c.CommandHead.TYPE != HeartbeatType {
err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE) err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE)
return
} }
return return
} }
@ -389,6 +394,7 @@ func ReadResponseWithHead(head CommandHead, reader BufferedReader) (c Response,
c.CommandHead = head c.CommandHead = head
if c.CommandHead.TYPE != ResponseType { if c.CommandHead.TYPE != ResponseType {
err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE) err = fmt.Errorf("error command type: %s", c.CommandHead.TYPE)
return
} }
c.REP, err = reader.ReadByte() c.REP, err = reader.ReadByte()
if err != nil { if err != nil {

4
transport/tuic/server.go
View File

@ -190,8 +190,10 @@ func (s *serverHandler) handleStream() (err error) {
err = s.HandleTcpFn(conn, connect.ADDR.SocksAddr()) err = s.HandleTcpFn(conn, connect.ADDR.SocksAddr())
if err != nil { if err != nil {
err = NewResponseFailed().WriteTo(buf) err = NewResponseFailed().WriteTo(buf)
} defer conn.Close()
} else {
err = NewResponseSucceed().WriteTo(buf) err = NewResponseSucceed().WriteTo(buf)
}
if err != nil { if err != nil {
_ = conn.Close() _ = conn.Close()
return err return err